@capacitor/cli 7.0.0-alpha.2 → 7.0.0-beta.0

package/dist/android/add.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLocalProperties = exports.addAndroid = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
+const fs_extra_1 = require("fs-extra");
 const os_1 = require("os");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
@@ -17,7 +17,7 @@ async function addAndroid(config) {
 exports.addAndroid = addAndroid;
 async function createLocalProperties(platformDir) {
     const defaultAndroidPath = (0, path_1.join)((0, os_1.homedir)(), 'Library/Android/sdk');
-    if (await (0, utils_fs_1.pathExists)(defaultAndroidPath)) {
+    if (await (0, fs_extra_1.pathExists)(defaultAndroidPath)) {
         const localSettings = `
 ## This file is automatically generated by Android Studio.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
@@ -30,7 +30,7 @@ async function createLocalProperties(platformDir) {
 # header note.
 sdk.dir=${defaultAndroidPath}
   `;
-        await (0, utils_fs_1.writeFile)((0, path_1.join)(platformDir, 'local.properties'), localSettings, {
+        await (0, fs_extra_1.writeFile)((0, path_1.join)(platformDir, 'local.properties'), localSettings, {
             encoding: 'utf-8',
         });
         // Only sync if we were able to create the local properties above, otherwise

package/dist/android/common.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editProjectSettingsAndroid = exports.resolvePlugin = exports.getAndroidPlugins = exports.checkAndroidPackage = void 0;
-const utils_fs_1 = require("@ionic/utils-fs");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
@@ -23,7 +23,7 @@ async function resolvePlugin(plugin) {
         let pluginFilesPath = plugin.manifest.android.src ? plugin.manifest.android.src : platform;
         const absolutePath = (0, path_1.join)(plugin.rootPath, pluginFilesPath, plugin.id);
         // Android folder shouldn't have subfolders, but they used to, so search for them for compatibility reasons
-        if (await (0, utils_fs_1.pathExists)(absolutePath)) {
+        if (await (0, fs_extra_1.pathExists)(absolutePath)) {
             pluginFilesPath = (0, path_1.join)(platform, plugin.id);
         }
         plugin.android = {
@@ -62,33 +62,33 @@ async function editProjectSettingsAndroid(config) {
     const domainPath = appId.split('.').join('/');
     // Make the package source path to the new plugin Java file
     const newJavaPath = (0, path_1.resolve)(config.android.srcMainDirAbs, `java/${domainPath}`);
-    if (!(await (0, utils_fs_1.pathExists)(newJavaPath))) {
-        await (0, utils_fs_1.mkdirp)(newJavaPath);
+    if (!(await (0, fs_extra_1.pathExists)(newJavaPath))) {
+        await (0, fs_extra_1.mkdirp)(newJavaPath);
     }
-    await (0, utils_fs_1.copy)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor/myapp/MainActivity.java'), (0, path_1.resolve)(newJavaPath, 'MainActivity.java'));
+    await (0, fs_extra_1.copy)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor/myapp/MainActivity.java'), (0, path_1.resolve)(newJavaPath, 'MainActivity.java'));
     if (appId.split('.')[1] !== 'getcapacitor') {
-        await (0, utils_fs_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor'));
+        await (0, fs_extra_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor'));
     }
     // Remove our template 'com' folder if their ID doesn't have it
     if (appId.split('.')[0] !== 'com') {
-        await (0, utils_fs_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/'));
+        await (0, fs_extra_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/'));
     }
     // Update the package in the MainActivity java file
     const activityPath = (0, path_1.resolve)(newJavaPath, 'MainActivity.java');
-    let activityContent = await (0, utils_fs_1.readFile)(activityPath, { encoding: 'utf-8' });
+    let activityContent = await (0, fs_extra_1.readFile)(activityPath, { encoding: 'utf-8' });
     activityContent = activityContent.replace(/package ([^;]*)/, `package ${appId}`);
-    await (0, utils_fs_1.writeFile)(activityPath, activityContent, { encoding: 'utf-8' });
+    await (0, fs_extra_1.writeFile)(activityPath, activityContent, { encoding: 'utf-8' });
     // Update the applicationId in build.gradle
-    let gradleContent = await (0, utils_fs_1.readFile)(buildGradlePath, { encoding: 'utf-8' });
+    let gradleContent = await (0, fs_extra_1.readFile)(buildGradlePath, { encoding: 'utf-8' });
     gradleContent = gradleContent.replace(/applicationId "[^"]+"/, `applicationId "${appId}"`);
     // Update the namespace in build.gradle
     gradleContent = gradleContent.replace(/namespace "[^"]+"/, `namespace "${appId}"`);
-    await (0, utils_fs_1.writeFile)(buildGradlePath, gradleContent, { encoding: 'utf-8' });
+    await (0, fs_extra_1.writeFile)(buildGradlePath, gradleContent, { encoding: 'utf-8' });
     // Update the settings in res/values/strings.xml
     const stringsPath = (0, path_1.resolve)(config.android.resDirAbs, 'values/strings.xml');
-    let stringsContent = await (0, utils_fs_1.readFile)(stringsPath, { encoding: 'utf-8' });
+    let stringsContent = await (0, fs_extra_1.readFile)(stringsPath, { encoding: 'utf-8' });
     stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
     stringsContent = stringsContent.replace(/My App/g, appName);
-    await (0, utils_fs_1.writeFile)(stringsPath, stringsContent);
+    await (0, fs_extra_1.writeFile)(stringsPath, stringsContent);
 }
 exports.editProjectSettingsAndroid = editProjectSettingsAndroid;

package/dist/android/doctor.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doctorAndroid = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const errors_1 = require("../errors");
 const log_1 = require("../log");
+const fs_1 = require("../util/fs");
 const xml_1 = require("../util/xml");
 async function doctorAndroid(config) {
     var _a;
@@ -24,20 +25,20 @@ async function doctorAndroid(config) {
 }
 exports.doctorAndroid = doctorAndroid;
 async function checkAppSrcDirs(config) {
-    if (!(await (0, utils_fs_1.pathExists)(config.android.appDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.android.appDirAbs))) {
         return `${colors_1.default.strong(config.android.appDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await (0, utils_fs_1.pathExists)(config.android.srcMainDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.android.srcMainDirAbs))) {
         return `${colors_1.default.strong(config.android.srcMainDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await (0, utils_fs_1.pathExists)(config.android.assetsDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.android.assetsDirAbs))) {
         return `${colors_1.default.strong(config.android.assetsDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await (0, utils_fs_1.pathExists)(config.android.webDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.android.webDirAbs))) {
         return `${colors_1.default.strong(config.android.webDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
     const appSrcMainAssetsWwwIndexHtmlDir = (0, path_1.join)(config.android.webDirAbs, 'index.html');
-    if (!(await (0, utils_fs_1.pathExists)(appSrcMainAssetsWwwIndexHtmlDir))) {
+    if (!(await (0, fs_extra_1.pathExists)(appSrcMainAssetsWwwIndexHtmlDir))) {
         return `${colors_1.default.strong('index.html')} file is missing in ${colors_1.default.strong(config.android.webDirAbs)}`;
     }
     return checkAndroidManifestFile(config);
@@ -45,7 +46,7 @@ async function checkAppSrcDirs(config) {
 async function checkAndroidManifestFile(config) {
     const manifestFileName = 'AndroidManifest.xml';
     const manifestFilePath = (0, path_1.join)(config.android.srcMainDirAbs, manifestFileName);
-    if (!(await (0, utils_fs_1.pathExists)(manifestFilePath))) {
+    if (!(await (0, fs_extra_1.pathExists)(manifestFilePath))) {
         return `${colors_1.default.strong(manifestFileName)} is missing in ${colors_1.default.strong(config.android.srcMainDir)}`;
     }
     try {
@@ -113,11 +114,11 @@ async function checkAndroidManifestData(config, xmlData) {
 }
 async function checkPackage(config, mainActivityClassPath) {
     const appSrcMainJavaDir = (0, path_1.join)(config.android.srcMainDirAbs, 'java');
-    if (!(await (0, utils_fs_1.pathExists)(appSrcMainJavaDir))) {
+    if (!(await (0, fs_extra_1.pathExists)(appSrcMainJavaDir))) {
         return `${colors_1.default.strong('java')} directory is missing in ${colors_1.default.strong(appSrcMainJavaDir)}`;
     }
     const mainActivityClassName = mainActivityClassPath.split('.').pop();
-    const srcFiles = await (0, utils_fs_1.readdirp)(appSrcMainJavaDir, {
+    const srcFiles = await (0, fs_1.readdirp)(appSrcMainJavaDir, {
         filter: (entry) => !entry.stats.isDirectory() &&
             ['.java', '.kt'].includes((0, path_1.extname)(entry.path)) &&
             mainActivityClassName === (0, path_1.parse)(entry.path).name,
@@ -130,10 +131,10 @@ async function checkPackage(config, mainActivityClassPath) {
 async function checkBuildGradle(config) {
     const fileName = 'build.gradle';
     const filePath = (0, path_1.join)(config.android.appDirAbs, fileName);
-    if (!(await (0, utils_fs_1.pathExists)(filePath))) {
+    if (!(await (0, fs_extra_1.pathExists)(filePath))) {
         return `${colors_1.default.strong(fileName)} file is missing in ${colors_1.default.strong(config.android.appDir)}`;
     }
-    let fileContent = await (0, utils_fs_1.readFile)(filePath, { encoding: 'utf-8' });
+    let fileContent = await (0, fs_extra_1.readFile)(filePath, { encoding: 'utf-8' });
     fileContent = fileContent.replace(/'|"/g, '').replace(/\s+/g, ' ');
     const searchFor = `applicationId`;
     if (fileContent.indexOf(searchFor) === -1) {
@@ -144,7 +145,7 @@ async function checkBuildGradle(config) {
 async function checkGradlew(config) {
     const fileName = 'gradlew';
     const filePath = (0, path_1.join)(config.android.platformDirAbs, fileName);
-    if (!(await (0, utils_fs_1.pathExists)(filePath))) {
+    if (!(await (0, fs_extra_1.pathExists)(filePath))) {
         return `${colors_1.default.strong(fileName)} file is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
     return null;

package/dist/android/open.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openAndroid = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const open_1 = tslib_1.__importDefault(require("open"));
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const log_1 = require("../log");
@@ -12,7 +12,7 @@ async function openAndroid(config) {
     const androidStudioPath = await config.android.studioPath;
     const dir = config.android.platformDirAbs;
     try {
-        if (!(await (0, utils_fs_1.pathExists)(androidStudioPath))) {
+        if (!(await (0, fs_extra_1.pathExists)(androidStudioPath))) {
             throw new Error(`Android Studio does not exist at: ${androidStudioPath}`);
         }
         await (0, open_1.default)(dir, { app: { name: androidStudioPath }, wait: false });

package/dist/android/update.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCordovaPluginsGradle = exports.installGradlePlugins = exports.updateAndroid = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
@@ -29,7 +29,7 @@ async function updateAndroid(config) {
     if (cordovaPlugins.length > 0) {
         await copyPluginsNativeFiles(config, cordovaPlugins);
     }
-    if (!(await (0, utils_fs_1.pathExists)(config.android.webDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.android.webDirAbs))) {
         await (0, copy_1.copy)(config, platform);
     }
     await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platform);
@@ -48,7 +48,7 @@ function getGradlePackageName(id) {
 async function writePluginsJson(config, plugins) {
     const classes = await findAndroidPluginClasses(plugins);
     const pluginsJsonPath = (0, path_1.resolve)(config.android.assetsDirAbs, 'capacitor.plugins.json');
-    await (0, utils_fs_1.writeJSON)(pluginsJsonPath, classes, { spaces: '\t' });
+    await (0, fs_extra_1.writeJSON)(pluginsJsonPath, classes, { spaces: '\t' });
 }
 async function findAndroidPluginClasses(plugins) {
     const entries = [];
@@ -62,14 +62,14 @@ async function findAndroidPluginClassesInPlugin(plugin) {
         return [];
     }
     const srcPath = (0, path_1.resolve)(plugin.rootPath, plugin.android.path, 'src/main');
-    const srcFiles = await (0, utils_fs_1.readdirp)(srcPath, {
+    const srcFiles = await (0, fs_1.readdirp)(srcPath, {
         filter: (entry) => !entry.stats.isDirectory() && ['.java', '.kt'].includes((0, path_1.extname)(entry.path)),
     });
     const classRegex = /^@(?:CapacitorPlugin|NativePlugin)[\s\S]+?class ([\w]+)/gm;
     const packageRegex = /^package ([\w.]+);?$/gm;
     debug('Searching %O source files in %O by %O regex', srcFiles.length, srcPath, classRegex);
     const entries = await Promise.all(srcFiles.map(async (srcFile) => {
-        const srcFileContents = await (0, utils_fs_1.readFile)(srcFile, { encoding: 'utf-8' });
+        const srcFileContents = await (0, fs_extra_1.readFile)(srcFile, { encoding: 'utf-8' });
         classRegex.lastIndex = 0;
         const classMatch = classRegex.exec(srcFileContents);
         if (classMatch) {
@@ -146,8 +146,8 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 
@@ -166,15 +166,15 @@ if (hasProperty('postBuildExtras')) {
   postBuildExtras()
 }
 `;
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(settingsPath, 'capacitor.settings.gradle'), settingsLines);
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(dependencyPath, 'capacitor.build.gradle'), dependencyLines);
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(settingsPath, 'capacitor.settings.gradle'), settingsLines);
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(dependencyPath, 'capacitor.build.gradle'), dependencyLines);
 }
 exports.installGradlePlugins = installGradlePlugins;
 async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     var _a, _b, _c;
     const pluginsGradlePath = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'build.gradle');
     const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
-    const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '1.9.10';
+    const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '1.9.25';
     const frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];
@@ -211,7 +211,7 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
         frameworkString += `\n    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
     }
     const applyString = applyArray.join('\n');
-    let buildGradle = await (0, utils_fs_1.readFile)(pluginsGradlePath, { encoding: 'utf-8' });
+    let buildGradle = await (0, fs_extra_1.readFile)(pluginsGradlePath, { encoding: 'utf-8' });
     buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + frameworkString.concat('\n') + '    $2');
     buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + applyString.concat('\n') + '$2');
     if (kotlinNeeded) {
@@ -221,7 +221,7 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
         buildGradle = buildGradle.replace(/(apply\splugin:\s'com\.android\.library')/, `$1\napply plugin: 'kotlin-android'`);
         buildGradle = buildGradle.replace(/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/, `$1\n    sourceSets {\n        main.java.srcDirs += 'src/main/kotlin'\n    }\n$5`);
     }
-    await (0, utils_fs_1.writeFile)(pluginsGradlePath, buildGradle);
+    await (0, fs_extra_1.writeFile)(pluginsGradlePath, buildGradle);
     const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 ext {
   cdvMinSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : ${config.android.minVersion}
@@ -229,7 +229,7 @@ ext {
   cdvPluginPostBuildExtras = []
   cordovaConfig = [:]
 }`;
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
 }
 exports.handleCordovaPluginsGradle = handleCordovaPluginsGradle;
 async function kotlinNeededCheck(config, cordovaPlugins) {
@@ -266,7 +266,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                         baseFolder = 'aidl/';
                     }
                     const target = sourceFile.$['target-dir'].replace('app/src/main/', '').replace('src/', baseFolder);
-                    await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, sourceFile.$.src), (0, path_1.join)(pluginsPath, target, fileName));
+                    await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, sourceFile.$.src), (0, path_1.join)(pluginsPath, target, fileName));
                 }
             }
             const resourceFiles = androidPlatform['resource-file'];
@@ -274,22 +274,22 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                 for (const resourceFile of resourceFiles) {
                     const target = resourceFile.$['target'];
                     if (resourceFile.$.src.split('.').pop() === 'aar') {
-                        await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(pluginsPath, 'libs', target.split('/').pop()));
+                        await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(pluginsPath, 'libs', target.split('/').pop()));
                     }
                     else if (target !== '.') {
-                        await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(pluginsPath, target));
+                        await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(pluginsPath, target));
                     }
                 }
             }
             const libFiles = (0, plugin_1.getPlatformElement)(p, platform, 'lib-file');
             for (const libFile of libFiles) {
-                await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, libFile.$.src), (0, path_1.join)(pluginsPath, 'libs', libFile.$.src.split('/').pop()));
+                await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, libFile.$.src), (0, path_1.join)(pluginsPath, 'libs', libFile.$.src.split('/').pop()));
             }
         }
     }
 }
 async function removePluginsNativeFiles(config) {
-    await (0, utils_fs_1.remove)(config.android.cordovaPluginsDirAbs);
+    await (0, fs_extra_1.remove)(config.android.cordovaPluginsDirAbs);
     await (0, template_1.extractTemplate)(config.cli.assets.android.cordovaPluginsTemplateArchiveAbs, config.android.cordovaPluginsDirAbs);
 }
 async function getPluginsTask(config) {
@@ -302,8 +302,8 @@ async function getPluginsTask(config) {
 async function getVariablesGradleFile(config) {
     const variablesFile = (0, path_1.resolve)(config.android.platformDirAbs, 'variables.gradle');
     let variablesGradle = '';
-    if (await (0, utils_fs_1.pathExists)(variablesFile)) {
-        variablesGradle = await (0, utils_fs_1.readFile)(variablesFile, { encoding: 'utf-8' });
+    if (await (0, fs_extra_1.pathExists)(variablesFile)) {
+        variablesGradle = await (0, fs_extra_1.readFile)(variablesFile, { encoding: 'utf-8' });
     }
     return variablesGradle;
 }

package/dist/common.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseApkNameFromFlavor = exports.checkJDKMajorVersion = exports.resolvePlatform = exports.checkPlatformVersions = exports.getAddedPlatforms = exports.getPlatformTargetName = exports.promptForPlatformTarget = exports.promptForPlatform = exports.isValidEnterprisePlatform = exports.getKnownEnterprisePlatforms = exports.isValidCommunityPlatform = exports.getKnownCommunityPlatforms = exports.isValidPlatform = exports.getKnownPlatforms = exports.selectPlatforms = exports.getProjectPlatformDirectory = exports.getCLIVersion = exports.getCoreVersion = exports.getCapacitorPackageVersion = exports.requireCapacitorPackage = exports.getCapacitorPackage = exports.runTask = exports.runPlatformHook = exports.runHooks = exports.wait = exports.checkAppName = exports.checkAppId = exports.checkAppDir = exports.checkAppConfig = exports.checkCapacitorPlatform = exports.checkPackage = exports.checkWebDir = exports.check = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const utils_terminal_1 = require("@ionic/utils-terminal");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const errors_1 = require("./errors");
@@ -30,11 +30,11 @@ async function checkWebDir(config) {
     if (invalidFolders.includes(config.app.webDir)) {
         return `"${config.app.webDir}" is not a valid value for webDir`;
     }
-    if (!(await (0, utils_fs_1.pathExists)(config.app.webDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(config.app.webDirAbs))) {
         return (`Could not find the web assets directory: ${colors_1.default.strong((0, utils_terminal_1.prettyPath)(config.app.webDirAbs))}.\n` +
             `Please create it and make sure it has an ${colors_1.default.strong('index.html')} file. You can change the path of this directory in ${colors_1.default.strong(config.app.extConfigName)} (${colors_1.default.input('webDir')} option). You may need to compile the web assets for your app (typically ${colors_1.default.input('npm run build')}). More info: ${colors_1.default.strong('https://capacitorjs.com/docs/basics/workflow#sync-your-project')}`);
     }
-    if (!(await (0, utils_fs_1.pathExists)((0, path_1.join)(config.app.webDirAbs, 'index.html')))) {
+    if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(config.app.webDirAbs, 'index.html')))) {
         return (`The web assets directory (${colors_1.default.strong((0, utils_terminal_1.prettyPath)(config.app.webDirAbs))}) must contain an ${colors_1.default.strong('index.html')} file.\n` +
             `It will be the entry point for the web portion of the Capacitor app.`);
     }
@@ -42,8 +42,8 @@ async function checkWebDir(config) {
 }
 exports.checkWebDir = checkWebDir;
 async function checkPackage() {
-    if (!(await (0, utils_fs_1.pathExists)('package.json'))) {
-        if (await (0, utils_fs_1.pathExists)('project.json')) {
+    if (!(await (0, fs_extra_1.pathExists)('package.json'))) {
+        if (await (0, fs_extra_1.pathExists)('project.json')) {
             return null;
         }
         else {
@@ -134,10 +134,10 @@ async function runPlatformHook(config, platformName, platformDir, hook) {
     const { spawn } = await Promise.resolve().then(() => tslib_1.__importStar(require('child_process')));
     let pkg;
     if ((0, monorepotools_1.isNXMonorepo)(platformDir)) {
-        pkg = await (0, utils_fs_1.readJSON)((0, path_1.join)((0, monorepotools_1.findNXMonorepoRoot)(platformDir), 'package.json'));
+        pkg = await (0, fs_extra_1.readJSON)((0, path_1.join)((0, monorepotools_1.findNXMonorepoRoot)(platformDir), 'package.json'));
     }
     else {
-        pkg = await (0, utils_fs_1.readJSON)((0, path_1.join)(platformDir, 'package.json'));
+        pkg = await (0, fs_extra_1.readJSON)((0, path_1.join)(platformDir, 'package.json'));
     }
     const cmd = (_a = pkg.scripts) === null || _a === void 0 ? void 0 : _a[hook];
     if (!cmd) {
@@ -185,7 +185,7 @@ async function getCapacitorPackage(config, name) {
     if (!packagePath) {
         return null;
     }
-    return (0, utils_fs_1.readJSON)(packagePath);
+    return (0, fs_extra_1.readJSON)(packagePath);
 }
 exports.getCapacitorPackage = getCapacitorPackage;
 async function requireCapacitorPackage(config, name) {
@@ -222,7 +222,7 @@ function getPlatformDirectory(config, platform) {
 }
 async function getProjectPlatformDirectory(config, platform) {
     const platformPath = getPlatformDirectory(config, platform);
-    if (platformPath && (await (0, utils_fs_1.pathExists)(platformPath))) {
+    if (platformPath && (await (0, fs_extra_1.pathExists)(platformPath))) {
         return platformPath;
     }
     return null;

package/dist/config.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeConfig = exports.loadConfig = exports.CONFIG_FILE_NAME_JSON = exports.CONFIG_FILE_NAME_JS = exports.CONFIG_FILE_NAME_TS = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const common_1 = require("./common");
@@ -28,7 +28,7 @@ async function loadConfig() {
         var _a, _b;
         if ((0, monorepotools_1.isNXMonorepo)(appRootDir)) {
             const rootOfNXMonorepo = (0, monorepotools_1.findNXMonorepoRoot)(appRootDir);
-            const pkgJSONOfMonorepoRoot = await (0, fn_1.tryFn)(utils_fs_1.readJSON, (0, path_1.resolve)(rootOfNXMonorepo, 'package.json'));
+            const pkgJSONOfMonorepoRoot = await (0, fn_1.tryFn)(fs_extra_1.readJSON, (0, path_1.resolve)(rootOfNXMonorepo, 'package.json'));
             const devDependencies = (_a = pkgJSONOfMonorepoRoot === null || pkgJSONOfMonorepoRoot === void 0 ? void 0 : pkgJSONOfMonorepoRoot.devDependencies) !== null && _a !== void 0 ? _a : {};
             const dependencies = (_b = pkgJSONOfMonorepoRoot === null || pkgJSONOfMonorepoRoot === void 0 ? void 0 : pkgJSONOfMonorepoRoot.dependencies) !== null && _b !== void 0 ? _b : {};
             return {
@@ -53,7 +53,7 @@ async function loadConfig() {
             appName,
             webDir,
             webDirAbs: (0, path_1.resolve)(appRootDir, webDir),
-            package: (_d = (await (0, fn_1.tryFn)(utils_fs_1.readJSON, (0, path_1.resolve)(appRootDir, 'package.json')))) !== null && _d !== void 0 ? _d : {
+            package: (_d = (await (0, fn_1.tryFn)(fs_extra_1.readJSON, (0, path_1.resolve)(appRootDir, 'package.json')))) !== null && _d !== void 0 ? _d : {
                 name: appName,
                 version: '1.0.0',
                 ...depsForNx,
@@ -68,11 +68,11 @@ exports.loadConfig = loadConfig;
 async function writeConfig(extConfig, extConfigFilePath) {
     switch ((0, path_1.extname)(extConfigFilePath)) {
         case '.json': {
-            await (0, utils_fs_1.writeJSON)(extConfigFilePath, extConfig, { spaces: 2 });
+            await (0, fs_extra_1.writeJSON)(extConfigFilePath, extConfig, { spaces: 2 });
             break;
         }
         case '.ts': {
-            await (0, utils_fs_1.writeFile)(extConfigFilePath, formatConfigTS(extConfig));
+            await (0, fs_extra_1.writeFile)(extConfigFilePath, formatConfigTS(extConfig));
             break;
         }
     }
@@ -120,11 +120,11 @@ async function loadExtConfigJS(rootDir, extConfigName, extConfigFilePath) {
 async function loadExtConfig(rootDir) {
     var _a;
     const extConfigFilePathTS = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_TS);
-    if (await (0, utils_fs_1.pathExists)(extConfigFilePathTS)) {
+    if (await (0, fs_extra_1.pathExists)(extConfigFilePathTS)) {
         return loadExtConfigTS(rootDir, exports.CONFIG_FILE_NAME_TS, extConfigFilePathTS);
     }
     const extConfigFilePathJS = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_JS);
-    if (await (0, utils_fs_1.pathExists)(extConfigFilePathJS)) {
+    if (await (0, fs_extra_1.pathExists)(extConfigFilePathJS)) {
         return loadExtConfigJS(rootDir, exports.CONFIG_FILE_NAME_JS, extConfigFilePathJS);
     }
     const extConfigFilePath = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_JSON);
@@ -132,7 +132,7 @@ async function loadExtConfig(rootDir) {
         extConfigType: 'json',
         extConfigName: exports.CONFIG_FILE_NAME_JSON,
         extConfigFilePath: extConfigFilePath,
-        extConfig: (_a = (await (0, fn_1.tryFn)(utils_fs_1.readJSON, extConfigFilePath))) !== null && _a !== void 0 ? _a : {},
+        extConfig: (_a = (await (0, fn_1.tryFn)(fs_extra_1.readJSON, extConfigFilePath))) !== null && _a !== void 0 ? _a : {},
     };
 }
 async function loadCLIConfig(rootDir) {
@@ -160,7 +160,7 @@ async function loadCLIConfig(rootDir) {
                 cordovaPluginsTemplateArchiveAbs: (0, path_1.resolve)(assetsDirAbs, androidCordovaPluginsTemplateArchive),
             },
         },
-        package: await (0, utils_fs_1.readJSON)((0, path_1.resolve)(rootDir, 'package.json')),
+        package: await (0, fs_extra_1.readJSON)((0, path_1.resolve)(rootDir, 'package.json')),
         os: determineOS(process.platform),
     };
 }
@@ -283,7 +283,7 @@ async function determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, na
     const re = /path\s=\spublic[\s\S]+?sourceTree\s=\s([^;]+)/;
     const pbxprojPath = (0, path_1.resolve)(nativeXcodeProjDirAbs, 'project.pbxproj');
     try {
-        const pbxproj = await (0, utils_fs_1.readFile)(pbxprojPath, { encoding: 'utf8' });
+        const pbxproj = await (0, fs_extra_1.readFile)(pbxprojPath, { encoding: 'utf8' });
         const m = pbxproj.match(re);
         if (m && m[1] === 'SOURCE_ROOT') {
             log_1.logger.warn(`Using the iOS project root for the ${colors_1.default.strong('public')} directory is deprecated.\n` +
@@ -307,7 +307,7 @@ async function determineAndroidStudioPath(os) {
             const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./util/subprocess')));
             let p = 'C:\\Program Files\\Android\\Android Studio\\bin\\studio64.exe';
             try {
-                if (!(await (0, utils_fs_1.pathExists)(p))) {
+                if (!(await (0, fs_extra_1.pathExists)(p))) {
                     let commandResult = await runCommand('REG', [
                         'QUERY',
                         'HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio',
@@ -337,13 +337,13 @@ async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjec
         return process.env.CAPACITOR_COCOAPODS_PATH;
     }
     let gemfilePath = '';
-    if (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(rootDir, 'Gemfile'))) {
+    if (await (0, fs_extra_1.pathExists)((0, path_1.resolve)(rootDir, 'Gemfile'))) {
         gemfilePath = (0, path_1.resolve)(rootDir, 'Gemfile');
     }
-    else if (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(platformDir, 'Gemfile'))) {
+    else if (await (0, fs_extra_1.pathExists)((0, path_1.resolve)(platformDir, 'Gemfile'))) {
         gemfilePath = (0, path_1.resolve)(platformDir, 'Gemfile');
     }
-    else if (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(nativeProjectDirAbs, 'Gemfile'))) {
+    else if (await (0, fs_extra_1.pathExists)((0, path_1.resolve)(nativeProjectDirAbs, 'Gemfile'))) {
         gemfilePath = (0, path_1.resolve)(nativeProjectDirAbs, 'Gemfile');
     }
     const appSpecificGemfileExists = gemfilePath != '';
@@ -360,7 +360,7 @@ async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjec
         }
     }
     try {
-        const gemfileText = (await (0, utils_fs_1.readFile)(gemfilePath)).toString();
+        const gemfileText = (await (0, fs_extra_1.readFile)(gemfilePath)).toString();
         if (!gemfileText) {
             return 'pod';
         }