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

package/dist/cordova.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeCordovaAndroidManifest = exports.getCordovaPreferences = exports.needsStaticPod = exports.getIncompatibleCordovaPlugins = exports.checkPluginDependencies = exports.logCordovaManualSteps = exports.getCordovaPlugins = exports.handleCordovaPluginsJS = exports.autoGenerateConfig = exports.removePluginFiles = exports.createEmptyCordovaJS = exports.copyCordovaJS = exports.copyPluginsJS = exports.generateCordovaPluginsJSFile = 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 plist_1 = tslib_1.__importDefault(require("plist"));
 const prompts_1 = tslib_1.__importDefault(require("prompts"));
@@ -102,26 +102,26 @@ async function copyPluginsJS(config, cordovaPlugins, platform) {
     await Promise.all(cordovaPlugins.map(async (p) => {
         const pluginId = p.xml.$.id;
         const pluginDir = (0, path_1.join)(pluginsDir, pluginId, 'www');
-        await (0, utils_fs_1.ensureDir)(pluginDir);
+        await (0, fs_extra_1.ensureDir)(pluginDir);
         const jsModules = (0, plugin_1.getJSModules)(p, platform);
         await Promise.all(jsModules.map(async (jsModule) => {
             const filePath = (0, path_1.join)(webDir, 'plugins', pluginId, jsModule.$.src);
-            await (0, utils_fs_1.copy)((0, path_1.join)(p.rootPath, jsModule.$.src), filePath);
-            let data = await (0, utils_fs_1.readFile)(filePath, { encoding: 'utf-8' });
+            await (0, fs_extra_1.copy)((0, path_1.join)(p.rootPath, jsModule.$.src), filePath);
+            let data = await (0, fs_extra_1.readFile)(filePath, { encoding: 'utf-8' });
             data = data.trim();
             // mimics Cordova's module name logic if the name attr is missing
             const name = pluginId + '.' + (jsModule.$.name || (0, path_1.basename)(jsModule.$.src, (0, path_1.extname)(jsModule.$.src)));
             data = `cordova.define("${name}", function(require, exports, module) { \n${data}\n});`;
             data = data.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script\s*>/gi, '');
-            await (0, utils_fs_1.writeFile)(filePath, data, { encoding: 'utf-8' });
+            await (0, fs_extra_1.writeFile)(filePath, data, { encoding: 'utf-8' });
         }));
         const assets = (0, plugin_1.getAssets)(p, platform);
         await Promise.all(assets.map(async (asset) => {
             const filePath = (0, path_1.join)(webDir, asset.$.target);
-            await (0, utils_fs_1.copy)((0, path_1.join)(p.rootPath, asset.$.src), filePath);
+            await (0, fs_extra_1.copy)((0, path_1.join)(p.rootPath, asset.$.src), filePath);
         }));
     }));
-    await (0, utils_fs_1.writeFile)(cordovaPluginsJSFile, generateCordovaPluginsJSFile(config, cordovaPlugins, platform));
+    await (0, fs_extra_1.writeFile)(cordovaPluginsJSFile, generateCordovaPluginsJSFile(config, cordovaPlugins, platform));
 }
 exports.copyPluginsJS = copyPluginsJS;
 async function copyCordovaJS(config, platform) {
@@ -130,21 +130,21 @@ async function copyCordovaJS(config, platform) {
         (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/core/cordova.js')}.\n` +
             `Are you sure ${colors_1.default.strong('@capacitor/core')} is installed?`);
     }
-    return (0, utils_fs_1.copy)(cordovaPath, (0, path_1.join)(await getWebDir(config, platform), 'cordova.js'));
+    return (0, fs_extra_1.copy)(cordovaPath, (0, path_1.join)(await getWebDir(config, platform), 'cordova.js'));
 }
 exports.copyCordovaJS = copyCordovaJS;
 async function createEmptyCordovaJS(config, platform) {
     const webDir = await getWebDir(config, platform);
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(webDir, 'cordova.js'), '');
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(webDir, 'cordova_plugins.js'), '');
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(webDir, 'cordova.js'), '');
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(webDir, 'cordova_plugins.js'), '');
 }
 exports.createEmptyCordovaJS = createEmptyCordovaJS;
 async function removePluginFiles(config, platform) {
     const webDir = await getWebDir(config, platform);
     const pluginsDir = (0, path_1.join)(webDir, 'plugins');
     const cordovaPluginsJSFile = (0, path_1.join)(webDir, 'cordova_plugins.js');
-    await (0, utils_fs_1.remove)(pluginsDir);
-    await (0, utils_fs_1.remove)(cordovaPluginsJSFile);
+    await (0, fs_extra_1.remove)(pluginsDir);
+    await (0, fs_extra_1.remove)(cordovaPluginsJSFile);
 }
 exports.removePluginFiles = removePluginFiles;
 async function autoGenerateConfig(config, cordovaPlugins, platform) {
@@ -154,9 +154,9 @@ async function autoGenerateConfig(config, cordovaPlugins, platform) {
     if (platform === 'ios') {
         xmlDir = config.ios.nativeTargetDirAbs;
     }
-    await (0, utils_fs_1.ensureDir)(xmlDir);
+    await (0, fs_extra_1.ensureDir)(xmlDir);
     const cordovaConfigXMLFile = (0, path_1.join)(xmlDir, fileName);
-    await (0, utils_fs_1.remove)(cordovaConfigXMLFile);
+    await (0, fs_extra_1.remove)(cordovaConfigXMLFile);
     const pluginEntries = [];
     cordovaPlugins.map((p) => {
         const currentPlatform = (0, plugin_1.getPluginPlatform)(p, platform);
@@ -203,7 +203,7 @@ async function autoGenerateConfig(config, cordovaPlugins, platform) {
   ${pluginEntriesString.join('')}
   ${pluginPreferencesString.join('')}
 </widget>`;
-    await (0, utils_fs_1.writeFile)(cordovaConfigXMLFile, content);
+    await (0, fs_extra_1.writeFile)(cordovaConfigXMLFile, content);
 }
 exports.autoGenerateConfig = autoGenerateConfig;
 async function getWebDir(config, platform) {
@@ -217,7 +217,7 @@ async function getWebDir(config, platform) {
 }
 async function handleCordovaPluginsJS(cordovaPlugins, config, platform) {
     const webDir = await getWebDir(config, platform);
-    await (0, utils_fs_1.mkdirp)(webDir);
+    await (0, fs_extra_1.mkdirp)(webDir);
     if (cordovaPlugins.length > 0) {
         (0, plugin_1.printPlugins)(cordovaPlugins, platform, 'cordova');
         await copyCordovaJS(config, platform);
@@ -264,12 +264,12 @@ async function logiOSPlist(configElement, config, plugin) {
     if ((_a = config.app.extConfig.ios) === null || _a === void 0 ? void 0 : _a.scheme) {
         plistPath = (0, path_1.resolve)(config.ios.nativeProjectDirAbs, `${(_b = config.app.extConfig.ios) === null || _b === void 0 ? void 0 : _b.scheme}-Info.plist`);
     }
-    if (!(await (0, utils_fs_1.pathExists)(plistPath))) {
+    if (!(await (0, fs_extra_1.pathExists)(plistPath))) {
         plistPath = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Base.lproj', 'Info.plist');
     }
-    if (await (0, utils_fs_1.pathExists)(plistPath)) {
+    if (await (0, fs_extra_1.pathExists)(plistPath)) {
         const xmlMeta = await (0, xml_1.readXML)(plistPath);
-        const data = await (0, utils_fs_1.readFile)(plistPath, { encoding: 'utf-8' });
+        const data = await (0, fs_extra_1.readFile)(plistPath, { encoding: 'utf-8' });
         const trimmedPlistData = data.replace(/(\t|\r|\n)/g, '');
         const plistData = plist_1.default.parse(data);
         const dict = xmlMeta.plist.dict.pop();
@@ -490,7 +490,7 @@ async function getCordovaPreferences(config) {
     var _a, _b, _c, _d, _e;
     const configXml = (0, path_1.join)(config.app.rootDir, 'config.xml');
     let cordova = {};
-    if (await (0, utils_fs_1.pathExists)(configXml)) {
+    if (await (0, fs_extra_1.pathExists)(configXml)) {
         cordova.preferences = {};
         const xmlMeta = await (0, xml_1.readXML)(configXml);
         if (xmlMeta.widget.preference) {
@@ -569,7 +569,7 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform, cle
                             }
                             else {
                                 const manifestPathOfCapApp = (0, path_1.join)(config.android.appDirAbs, 'src', 'main', 'AndroidManifest.xml');
-                                const manifestContentTrimmed = (await (0, utils_fs_1.readFile)(manifestPathOfCapApp))
+                                const manifestContentTrimmed = (await (0, fs_extra_1.readFile)(manifestPathOfCapApp))
                                     .toString()
                                     .trim()
                                     .replace(/\n|\t|\r/g, '')
@@ -766,8 +766,8 @@ ${rootXMLEntries.join('\n')}
     for (const preference of prefsArray) {
         content = content.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
     }
-    if (await (0, utils_fs_1.pathExists)(manifestPath)) {
-        await (0, utils_fs_1.writeFile)(manifestPath, content);
+    if (await (0, fs_extra_1.pathExists)(manifestPath)) {
+        await (0, fs_extra_1.writeFile)(manifestPath, content);
     }
 }
 exports.writeCordovaAndroidManifest = writeCordovaAndroidManifest;

package/dist/declarations.d.ts

@@ -69,6 +69,13 @@ export interface CapacitorConfig {
      * @since 6.0.0
      */
     zoomEnabled?: boolean;
+    /**
+     * Whether to give the webview initial focus.
+     *
+     * @since 7.0.0
+     * @default true
+     */
+    initialFocus?: boolean;
     android?: {
         /**
          * Specify a custom path to the native Android project.
@@ -172,6 +179,8 @@ export interface CapacitorConfig {
         /**
          * Whether to give the webview initial focus.
          *
+         * Overrides global `initialFocus` option.
+         *
          * @since 3.5.1
          * @default true
          */
@@ -250,6 +259,14 @@ export interface CapacitorConfig {
          * @default false
          */
         useLegacyBridge?: boolean;
+        /**
+         * Make service worker requests go through Capacitor bridge.
+         * Set it to false to use your own handling.
+         *
+         * @since 7.0.0
+         * @default true
+         */
+        resolveServiceWorkerRequests?: boolean;
     };
     ios?: {
         /**
@@ -405,6 +422,15 @@ export interface CapacitorConfig {
          * @default false
          */
         webContentsDebuggingEnabled?: boolean;
+        /**
+         * Whether to give the webview initial focus.
+         *
+         * Overrides global `initialFocus` option.
+         *
+         * @since 7.0.0
+         * @default true
+         */
+        initialFocus?: boolean;
     };
     server?: {
         /**

package/dist/index.js

@@ -123,8 +123,7 @@ function runProgram(config) {
         .option('--scheme <schemeName>', 'set the scheme of the iOS project')
         .option('--flavor <flavorName>', 'set the flavor of the Android project (flavor dimensions not yet supported)')
         .option('--list', 'list targets, then quit')
-        // TODO: remove once --json is a hidden option (https://github.com/tj/commander.js/issues/1106)
-        .allowUnknownOption(true)
+        .addOption(new commander_1.Option('--json').hideHelp())
         .option('--target <id>', 'use a specific target')
         .option('--no-sync', `do not run ${colors_1.default.input('sync')}`)
         .option('--forwardPorts <port:port>', 'Automatically run "adb reverse" for better live-reloading support')
@@ -132,12 +131,13 @@ function runProgram(config) {
         .option('--host <host>', 'Host used for live reload')
         .option('--port <port>', 'Port used for live reload')
         .option('--configuration <name>', 'Configuration name of the iOS Scheme')
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, target, sync, forwardPorts, liveReload, host, port, configuration }) => {
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, json, target, sync, forwardPorts, liveReload, host, port, configuration }) => {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
         await runCommand(config, platform, {
             scheme,
             flavor,
             list,
+            json,
             target,
             sync,
             forwardPorts,

package/dist/ios/build.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildiOS = 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 rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const common_1 = require("../common");
 const log_1 = require("../log");
 const spm_1 = require("../util/spm");
@@ -45,7 +44,7 @@ async function buildiOS(config, buildOptions) {
 </dict>
 </plist>`;
     const archivePlistPath = (0, path_1.join)(`${config.ios.nativeProjectDirAbs}`, 'archive.plist');
-    (0, utils_fs_1.writeFileSync)(archivePlistPath, archivePlistContents);
+    (0, fs_extra_1.writeFileSync)(archivePlistPath, archivePlistContents);
     await (0, common_1.runTask)('Building IPA', async () => (0, subprocess_1.runCommand)('xcodebuild', [
         'archive',
         '-archivePath',
@@ -62,8 +61,8 @@ async function buildiOS(config, buildOptions) {
         cwd: config.ios.nativeProjectDirAbs,
     }));
     await (0, common_1.runTask)('Cleaning up', async () => {
-        (0, utils_fs_1.unlinkSync)(archivePlistPath);
-        rimraf_1.default.sync((0, path_1.join)(config.ios.nativeProjectDirAbs, `${theScheme}.xcarchive`));
+        (0, fs_extra_1.unlinkSync)(archivePlistPath);
+        rimraf_1.rimraf.sync((0, path_1.join)(config.ios.nativeProjectDirAbs, `${theScheme}.xcarchive`));
     });
     (0, log_1.logSuccess)(`Successfully generated an IPA at: ${(0, path_1.join)(config.ios.nativeProjectDirAbs, 'output')}`);
 }

package/dist/ios/common.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const child_process_1 = require("child_process");
+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");
@@ -88,11 +88,11 @@ async function editProjectSettingsIOS(config) {
     const appName = config.app.appName.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
     const pbxPath = `${config.ios.nativeXcodeProjDirAbs}/project.pbxproj`;
     const plistPath = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'Info.plist');
-    let plistContent = await (0, utils_fs_1.readFile)(plistPath, { encoding: 'utf-8' });
+    let plistContent = await (0, fs_extra_1.readFile)(plistPath, { encoding: 'utf-8' });
     plistContent = plistContent.replace(/<key>CFBundleDisplayName<\/key>[\s\S]?\s+<string>([^<]*)<\/string>/, `<key>CFBundleDisplayName</key>\n        <string>${appName}</string>`);
-    let pbxContent = await (0, utils_fs_1.readFile)(pbxPath, { encoding: 'utf-8' });
+    let pbxContent = await (0, fs_extra_1.readFile)(pbxPath, { encoding: 'utf-8' });
     pbxContent = pbxContent.replace(/PRODUCT_BUNDLE_IDENTIFIER = ([^;]+)/g, `PRODUCT_BUNDLE_IDENTIFIER = ${appId}`);
-    await (0, utils_fs_1.writeFile)(plistPath, plistContent, { encoding: 'utf-8' });
-    await (0, utils_fs_1.writeFile)(pbxPath, pbxContent, { encoding: 'utf-8' });
+    await (0, fs_extra_1.writeFile)(plistPath, plistContent, { encoding: 'utf-8' });
+    await (0, fs_extra_1.writeFile)(pbxPath, pbxContent, { encoding: 'utf-8' });
 }
 exports.editProjectSettingsIOS = editProjectSettingsIOS;

package/dist/ios/update.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installCocoaPodsPlugins = exports.updateIOS = 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");
@@ -38,7 +38,7 @@ async function updateIOSCocoaPods(config, plugins, deployment) {
     if (cordovaPlugins.length > 0) {
         await copyPluginsNativeFiles(config, cordovaPlugins);
     }
-    if (!(await (0, utils_fs_1.pathExists)(await config.ios.webDirAbs))) {
+    if (!(await (0, fs_extra_1.pathExists)(await config.ios.webDirAbs))) {
         await (0, copy_1.copy)(config, platform);
     }
     await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platform);
@@ -60,10 +60,10 @@ async function updatePodfile(config, plugins, deployment) {
     const dependenciesContent = await generatePodFile(config, plugins);
     const relativeCapacitoriOSPath = await getRelativeCapacitoriOSPath(config);
     const podfilePath = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile');
-    let podfileContent = await (0, utils_fs_1.readFile)(podfilePath, { encoding: 'utf-8' });
+    let podfileContent = await (0, fs_extra_1.readFile)(podfilePath, { encoding: 'utf-8' });
     podfileContent = podfileContent.replace(/(def capacitor_pods)[\s\S]+?(\nend)/, `$1${dependenciesContent}$2`);
     podfileContent = podfileContent.replace(/(require_relative)[\s\S]+?(@capacitor\/ios\/scripts\/pods_helpers')/, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
-    await (0, utils_fs_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
+    await (0, fs_extra_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
     const podPath = await config.ios.podPath;
     const useBundler = podPath.startsWith('bundle');
     const podCommandExists = await (0, subprocess_1.isInstalled)('pod');
@@ -98,7 +98,7 @@ async function getRelativeCapacitoriOSPath(config) {
         (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/ios')}.\n` +
             `Are you sure ${colors_1.default.strong('@capacitor/ios')} is installed?`);
     }
-    return (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, utils_fs_1.realpath)((0, path_1.dirname)(capacitoriOSPath))));
+    return (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, fs_extra_1.realpath)((0, path_1.dirname)(capacitoriOSPath))));
 }
 async function generatePodFile(config, plugins) {
     const relativeCapacitoriOSPath = await getRelativeCapacitoriOSPath(config);
@@ -107,7 +107,7 @@ async function generatePodFile(config, plugins) {
         if (!p.ios) {
             return '';
         }
-        return `  pod '${p.ios.name}', :path => '${(0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, utils_fs_1.realpath)(p.rootPath)))}'\n`;
+        return `  pod '${p.ios.name}', :path => '${(0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, fs_extra_1.realpath)(p.rootPath)))}'\n`;
     }));
     const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
     cordovaPlugins.map(async (p) => {
@@ -302,7 +302,7 @@ async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
     s.swift_version  = '5.1'
     ${frameworksString}
   end`;
-    await (0, utils_fs_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, `${name}.podspec`), content);
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, `${name}.podspec`), content);
 }
 function getLinkerFlags(config) {
     var _a;
@@ -334,28 +334,28 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
             }
             const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
             const fileDest = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, destFolder, p.name, fileName);
-            await (0, utils_fs_1.copy)(filePath, fileDest);
+            await (0, fs_extra_1.copy)(filePath, fileDest);
             if (!codeFile.$.framework) {
-                let fileContent = await (0, utils_fs_1.readFile)(fileDest, { encoding: 'utf-8' });
+                let fileContent = await (0, fs_extra_1.readFile)(fileDest, { encoding: 'utf-8' });
                 if (fileExt === 'swift') {
                     fileContent = 'import Cordova\n' + fileContent;
-                    await (0, utils_fs_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                 }
                 else {
                     if (fileContent.includes('@import Firebase;')) {
                         fileContent = fileContent.replace('@import Firebase;', '#import <Firebase/Firebase.h>');
-                        await (0, utils_fs_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                     if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
                         fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
                         fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', '[NSBundle mainBundle]');
                         fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', '[NSBundle mainBundle]');
-                        await (0, utils_fs_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                     if (fileContent.includes('[self.webView superview]') || fileContent.includes('self.webView.superview')) {
                         fileContent = fileContent.replace(/\[self.webView superview\]/g, 'self.viewController.view');
                         fileContent = fileContent.replace(/self.webView.superview/g, 'self.viewController.view');
-                        await (0, utils_fs_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                 }
             }
@@ -363,17 +363,17 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
         for (const resourceFile of resourceFiles) {
             const fileName = resourceFile.$.src.split('/').pop();
-            await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'resources', fileName));
+            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'resources', fileName));
         }
         for (const framework of frameworks) {
             if (framework.$.custom && framework.$.custom === 'true') {
-                await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, framework.$.src), (0, path_1.join)(sourcesFolder, framework.$.src));
+                await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, framework.$.src), (0, path_1.join)(sourcesFolder, framework.$.src));
             }
         }
     }
 }
 async function removePluginsNativeFiles(config) {
-    await (0, utils_fs_1.remove)(config.ios.cordovaPluginsDirAbs);
+    await (0, fs_extra_1.remove)(config.ios.cordovaPluginsDirAbs);
     await (0, template_1.extractTemplate)(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
 }
 function filterResources(plugin) {

package/dist/ipc.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.receive = exports.send = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
 const utils_subprocess_1 = require("@ionic/utils-subprocess");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+const fs_extra_1 = require("fs-extra");
 const https_1 = require("https");
 const path_1 = require("path");
 const cli_1 = require("./util/cli");
@@ -14,10 +14,10 @@ const debug = (0, debug_1.default)('capacitor:ipc');
  */
 async function send(msg) {
     const dir = cli_1.ENV_PATHS.log;
-    await (0, utils_fs_1.mkdirp)(dir);
+    await (0, fs_extra_1.mkdirp)(dir);
     const logPath = (0, path_1.resolve)(dir, 'ipc.log');
     debug('Sending %O IPC message to forked process (logs: %O)', msg.type, logPath);
-    const fd = await (0, utils_fs_1.open)(logPath, 'a');
+    const fd = await (0, fs_extra_1.open)(logPath, 'a');
     const p = (0, utils_subprocess_1.fork)(process.argv[1], ['📡'], { stdio: ['ignore', fd, fd, 'ipc'] });
     p.send(msg);
     p.disconnect();

package/dist/plugin.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllElements = exports.getFilePath = exports.getAssets = exports.getJSModules = exports.getPluginType = exports.getPlatformElement = exports.getPluginPlatform = exports.printPlugins = exports.fixName = exports.getDependencies = exports.resolvePlugin = exports.getPlugins = exports.getIncludedPluginPackages = 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 errors_1 = require("./errors");
@@ -34,7 +34,7 @@ async function resolvePlugin(config, name) {
             (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong(`node_modules/${name}`)}.\n` + `Are you sure ${colors_1.default.strong(name)} is installed?`);
         }
         const rootPath = (0, path_1.dirname)(packagePath);
-        const meta = await (0, utils_fs_1.readJSON)(packagePath);
+        const meta = await (0, fs_extra_1.readJSON)(packagePath);
         if (!meta) {
             return null;
         }

package/dist/sysconfig.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeConfig = exports.readConfig = 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 cli_1 = require("./util/cli");
 const uuid_1 = require("./util/uuid");
@@ -13,7 +13,7 @@ const SYSCONFIG_PATH = (0, path_1.resolve)(cli_1.ENV_PATHS.config, SYSCONFIG_FIL
 async function readConfig() {
     debug('Reading from %O', SYSCONFIG_PATH);
     try {
-        return await (0, utils_fs_1.readJSON)(SYSCONFIG_PATH);
+        return await (0, fs_extra_1.readJSON)(SYSCONFIG_PATH);
     }
     catch (e) {
         if (e.code !== 'ENOENT') {
@@ -29,7 +29,7 @@ async function readConfig() {
 exports.readConfig = readConfig;
 async function writeConfig(sysconfig) {
     debug('Writing to %O', SYSCONFIG_PATH);
-    await (0, utils_fs_1.mkdirp)((0, path_1.dirname)(SYSCONFIG_PATH));
-    await (0, utils_fs_1.writeJSON)(SYSCONFIG_PATH, sysconfig, { spaces: '\t' });
+    await (0, fs_extra_1.mkdirp)((0, path_1.dirname)(SYSCONFIG_PATH));
+    await (0, fs_extra_1.writeJSON)(SYSCONFIG_PATH, sysconfig, { spaces: '\t' });
 }
 exports.writeConfig = writeConfig;

package/dist/tasks/add.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCommand = 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 add_1 = require("../android/add");
 const common_1 = require("../android/common");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
@@ -50,7 +50,7 @@ async function addCommand(config, selectedPlatformName) {
             await (0, common_2.check)([() => (0, common_2.checkPackage)(), () => (0, common_2.checkAppConfig)(config), ...addChecks(config, platformName)]);
             await doAdd(config, platformName);
             await editPlatforms(config, platformName);
-            if (await (0, utils_fs_1.pathExists)(config.app.webDirAbs)) {
+            if (await (0, fs_extra_1.pathExists)(config.app.webDirAbs)) {
                 await (0, sync_1.sync)(config, platformName, false, false);
                 if (platformName === config.android.name) {
                     await (0, common_2.runTask)('Syncing Gradle', async () => {

package/dist/tasks/copy.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copy = exports.copyCommand = 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");
@@ -125,7 +125,7 @@ async function copyCapacitorConfig(config, nativeAbsDir) {
     await (0, common_1.runTask)(`Creating ${colors_1.default.strong(nativeConfigFile)} in ${nativeRelDir}`, async () => {
         var _a;
         (_a = config.app.extConfig.android) === null || _a === void 0 ? true : delete _a.buildOptions;
-        await (0, utils_fs_1.writeJSON)(nativeConfigFilePath, config.app.extConfig, {
+        await (0, fs_extra_1.writeJSON)(nativeConfigFilePath, config.app.extConfig, {
             spaces: '\t',
         });
     });
@@ -134,14 +134,14 @@ async function copyWebDir(config, nativeAbsDir, webAbsDir) {
     var _a;
     const webRelDir = (0, path_1.basename)(webAbsDir);
     const nativeRelDir = (0, path_1.relative)(config.app.rootDir, nativeAbsDir);
-    if (((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.url) && !(await (0, utils_fs_1.pathExists)(webAbsDir))) {
+    if (((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.url) && !(await (0, fs_extra_1.pathExists)(webAbsDir))) {
         log_1.logger.warn(`Cannot copy web assets from ${colors_1.default.strong(webRelDir)} to ${nativeRelDir}\n` +
             `Web asset directory specified by ${colors_1.default.input('webDir')} does not exist. This is not an error because ${colors_1.default.input('server.url')} is set in config.`);
         return;
     }
     await (0, common_1.runTask)(`Copying web assets from ${colors_1.default.strong(webRelDir)} to ${nativeRelDir}`, async () => {
-        await (0, utils_fs_1.remove)(nativeAbsDir);
-        return (0, utils_fs_1.copy)(webAbsDir, nativeAbsDir);
+        await (0, fs_extra_1.remove)(nativeAbsDir);
+        return (0, fs_extra_1.copy)(webAbsDir, nativeAbsDir);
     });
 }
 async function copyFederatedWebDirs(config, nativeAbsDir) {
@@ -177,20 +177,20 @@ async function copySecureLiveUpdatesKey(secureLiveUpdatesKeyFile, rootDir, nativ
     const keyAbsFromPath = (0, path_1.join)(rootDir, secureLiveUpdatesKeyFile);
     const keyAbsToPath = (0, path_1.join)(nativeAbsDir, (0, path_1.basename)(keyAbsFromPath));
     const keyRelToDir = (0, path_1.relative)(rootDir, nativeAbsDir);
-    if (!(await (0, utils_fs_1.pathExists)(keyAbsFromPath))) {
+    if (!(await (0, fs_extra_1.pathExists)(keyAbsFromPath))) {
         log_1.logger.warn(`Cannot copy Secure Live Updates signature file from ${colors_1.default.strong(keyAbsFromPath)} to ${keyRelToDir}\n` +
             `Signature file does not exist at specified key path.`);
         return;
     }
     await (0, common_1.runTask)(`Copying Secure Live Updates key from ${colors_1.default.strong(secureLiveUpdatesKeyFile)} to ${keyRelToDir}`, async () => {
-        return (0, utils_fs_1.copy)(keyAbsFromPath, keyAbsToPath);
+        return (0, fs_extra_1.copy)(keyAbsFromPath, keyAbsToPath);
     });
 }
 async function copySSLCert(sslCertPaths, rootDir, targetDir) {
     const validCertPaths = [];
     for (const sslCertPath of sslCertPaths) {
         const certAbsFromPath = (0, path_1.join)(rootDir, sslCertPath);
-        if (!(await (0, utils_fs_1.pathExists)(certAbsFromPath))) {
+        if (!(await (0, fs_extra_1.pathExists)(certAbsFromPath))) {
             log_1.logger.warn(`Cannot copy SSL Certificate file from ${colors_1.default.strong(certAbsFromPath)}\n` +
                 `SSL Certificate does not exist at specified path.`);
             return;
@@ -202,7 +202,7 @@ async function copySSLCert(sslCertPaths, rootDir, targetDir) {
     await (0, common_1.runTask)(`Copying SSL Certificates from to ${certsDirRelToDir}`, async () => {
         const promises = [];
         for (const certPath of validCertPaths) {
-            promises.push((0, utils_fs_1.copy)(certPath, (0, path_1.join)(certsDirAbsToPath, (0, path_1.basename)(certPath))));
+            promises.push((0, fs_extra_1.copy)(certPath, (0, path_1.join)(certsDirAbsToPath, (0, path_1.basename)(certPath))));
         }
         return Promise.all(promises);
     });

package/dist/tasks/doctor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doctor = exports.doctorCore = exports.doctorCommand = void 0;
 const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
+const fs_extra_1 = require("fs-extra");
 const doctor_1 = require("../android/doctor");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
@@ -47,7 +47,7 @@ async function printInstalledPackages(config) {
 async function printPackageVersion(packageName, packagePath) {
     let version;
     if (packagePath) {
-        version = (await (0, utils_fs_1.readJSON)(packagePath)).version;
+        version = (await (0, fs_extra_1.readJSON)(packagePath)).version;
     }
     log_1.output.write(`  ${packageName}: ${colors_1.default.weak(version || 'not installed')}\n`);
 }