@capacitor/cli 4.2.0 → 4.2.1-dev-20220921T210130.0

package/dist/cordova.js

@@ -263,7 +263,11 @@ async function logCordovaManualSteps(cordovaPlugins, config, platform) {
 }
 exports.logCordovaManualSteps = logCordovaManualSteps;
 async function logiOSPlist(configElement, config, plugin) {
+    var _a, _b;
     let plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Info.plist');
+    if ((_a = config.app.extConfig.ios) === null || _a === void 0 ? void 0 : _a.scheme) {
+        plistPath = path_1.resolve(config.ios.nativeProjectDirAbs, `${(_b = config.app.extConfig.ios) === null || _b === void 0 ? void 0 : _b.scheme}-Info.plist`);
+    }
     if (!(await utils_fs_1.pathExists(plistPath))) {
         plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Base.lproj', 'Info.plist');
     }

package/dist/declarations.d.ts

@@ -196,6 +196,10 @@ export interface CapacitorConfig {
          *
          * The minimum supported cannot be lower than version `55`, which is required for Capacitor.
          *
+         * If the device uses a lower WebView version, an error message will be shown on Logcat.
+         * If `server.errorPath` is configured, the WebView will redirect to that file, so can be
+         * used to show a custom error.
+         *
          * @since 4.0.0
          * @default 60
          */
@@ -361,6 +365,7 @@ export interface CapacitorConfig {
         /**
          * Configure the local scheme on iOS.
          *
+         * [Can't be set to schemes that the WKWebView already handles, such as http or https](https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/2875766-seturlschemehandler)
          * This can be useful when migrating from
          * [`cordova-plugin-ionic-webview`](https://github.com/ionic-team/cordova-plugin-ionic-webview),
          * where the default scheme on iOS is `ionic`.
@@ -414,6 +419,7 @@ export interface CapacitorConfig {
         allowNavigation?: string[];
         /**
          * Specify path to a local html page to display in case of errors.
+         * On Android the html file won't have access to Capacitor plugins.
          *
          * @since 4.0.0
          * @default null
@@ -503,4 +509,30 @@ export interface PluginsConfig {
      * @since 4.2.0
      */
     LiveUpdates?: LiveUpdateConfig;
+    /**
+     * Capacitor Cookies plugin configuration
+     *
+     * @since 4.3.0
+     */
+    CapacitorCookies?: {
+        /**
+         * Enable CapacitorCookies to override the global `document.cookie` on native.
+         *
+         * @default false
+         */
+        enabled?: boolean;
+    };
+    /**
+     * Capacitor Http plugin configuration
+     *
+     * @since 4.3.0
+     */
+    CapacitorHttp?: {
+        /**
+         * Enable CapacitorHttp to override the global `fetch` and `XMLHttpRequest` on native.
+         *
+         * @default false
+         */
+        enabled?: boolean;
+    };
 }

package/dist/ios/update.js

@@ -85,7 +85,7 @@ async function generatePodFile(config, plugins) {
         if (!p.ios) {
             return '';
         }
-        return `  pod '${p.ios.name}', :path => '${path_1.relative(podfilePath, await utils_fs_1.realpath(p.rootPath))}'\n`;
+        return `  pod '${p.ios.name}', :path => '${fs_1.convertToUnixPath(path_1.relative(podfilePath, await utils_fs_1.realpath(p.rootPath)))}'\n`;
     }));
     const cordovaPlugins = plugins.filter(p => plugin_1.getPluginType(p, platform) === 1 /* Cordova */);
     cordovaPlugins.map(async (p) => {

package/dist/tasks/migrate.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
 const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const errors_1 = require("../errors");
 const log_1 = require("../log");
@@ -48,6 +49,7 @@ const plugins = [
 ];
 const coreVersion = '^4.0.0';
 const pluginVersion = '^4.0.0';
+const gradleVersion = '7.4.2';
 async function migrateCommand(config) {
     if (config === null) {
         errors_1.fatal('Config data missing');
@@ -80,12 +82,22 @@ async function migrateCommand(config) {
             });
             const runNpmInstall = typeof npmInstallConfirm === 'string' &&
                 npmInstallConfirm.toLowerCase() === 'y';
-            await common_1.runTask(`Installing Latest NPM Modules.`, () => {
-                return installLatestNPMLibs(runNpmInstall, config);
-            });
-            await common_1.runTask(`Migrating @capacitor/storage to @capacitor/preferences.`, () => {
-                return migrateStoragePluginToPreferences(runNpmInstall);
-            });
+            try {
+                await common_1.runTask(`Installing Latest NPM Modules.`, () => {
+                    return installLatestNPMLibs(runNpmInstall, config);
+                });
+            }
+            catch (ex) {
+                log_1.logger.error(`npm install failed. Try deleting node_modules folder and running ${colors_1.default.input('npm install --force')} manually.`);
+            }
+            try {
+                await common_1.runTask(`Migrating @capacitor/storage to @capacitor/preferences.`, () => {
+                    return migrateStoragePluginToPreferences(runNpmInstall);
+                });
+            }
+            catch (ex) {
+                log_1.logger.error(`@capacitor/preferences failed to install. Try deleting node_modules folder and running ${colors_1.default.input('npm install @capacitor/preferences --force')} manually.`);
+            }
             if (allDependencies['@capacitor/ios'] &&
                 utils_fs_1.existsSync(config.ios.platformDirAbs)) {
                 // Set deployment target to 13.0
@@ -138,7 +150,7 @@ async function migrateCommand(config) {
                     return updateAppBuildGradle(path_1.join(config.android.appDirAbs, 'build.gradle'));
                 });
                 // Update gradle-wrapper.properties
-                await common_1.runTask(`Migrating gradle-wrapper.properties by updating gradle version from 7.0 to 7.4.2.`, () => {
+                await common_1.runTask(`Migrating gradle-wrapper.properties by updating gradle version from 7.0 to ${gradleVersion}.`, () => {
                     return updateGradleWrapper(path_1.join(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
                 });
                 // Variables gradle
@@ -189,6 +201,19 @@ async function migrateCommand(config) {
             await common_1.runTask(`Running cap sync.`, () => {
                 return subprocess_1.getCommandOutput('npx', ['cap', 'sync']);
             });
+            try {
+                await common_1.runTask(`Upgrading gradle wrapper files`, () => {
+                    return updateGradleWrapperFiles(config.android.platformDirAbs);
+                });
+            }
+            catch (e) {
+                if (e.includes('EACCES')) {
+                    log_1.logger.error(`gradlew file does not have executable permissions. This can happen if the Android platform was added on a Windows machine. Please run ${colors_1.default.input(`chmod +x ./${config.android.platformDir}/gradlew`)} and ${colors_1.default.input(`cd ${config.android.platformDir} && ./gradlew wrapper --distribution-type all --gradle-version ${gradleVersion} --warning-mode all`)} to update the files manually`);
+                }
+                else {
+                    log_1.logger.error(`gradle wrapper files were not updated`);
+                }
+            }
             // Write all breaking changes
             await common_1.runTask(`Writing breaking changes.`, () => {
                 return writeBreakingChanges();
@@ -232,9 +257,8 @@ async function installLatestNPMLibs(runInstall, config) {
         encoding: 'utf-8',
     });
     if (runInstall) {
-        rimraf_1.default.sync(path_1.join(config.app.rootDir, 'package-lock.json'));
         rimraf_1.default.sync(path_1.join(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
-        await subprocess_1.getCommandOutput('npm', ['i']);
+        await subprocess_1.runCommand('npm', ['i']);
     }
     else {
         log_1.logger.info(`Please run an install command with your package manager of choice. (ex: yarn install)`);
@@ -245,10 +269,7 @@ async function migrateStoragePluginToPreferences(runInstall) {
         log_1.logger.info('NOTE: @capacitor/storage was renamed to @capacitor/preferences, please be sure to replace occurances in your code.');
         if (runInstall) {
             await subprocess_1.getCommandOutput('npm', ['uninstall', '@capacitor/storage']);
-            await subprocess_1.getCommandOutput('npm', [
-                'i',
-                `@capacitor/preferences@${pluginVersion}`,
-            ]);
+            await subprocess_1.runCommand('npm', ['i', `@capacitor/preferences@${pluginVersion}`]);
         }
         else {
             log_1.logger.info(`Please manually uninstall @capacitor/storage and replace it with @capacitor/preferences@${pluginVersion}`);
@@ -423,9 +444,22 @@ async function updateGradleWrapper(filename) {
     }
     const replaced = setAllStringIn(txt, 'distributionUrl=', '\n', 
     // eslint-disable-next-line no-useless-escape
-    `https\\://services.gradle.org/distributions/gradle-7.4.2-all.zip`);
+    `https\\://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip`);
     utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
 }
+async function updateGradleWrapperFiles(platformDir) {
+    await subprocess_1.runCommand(`./gradlew`, [
+        'wrapper',
+        '--distribution-type',
+        'all',
+        '--gradle-version',
+        gradleVersion,
+        '--warning-mode',
+        'all',
+    ], {
+        cwd: platformDir,
+    });
+}
 async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
     if (config === null) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "4.2.0",
+  "version": "4.2.1-dev-20220921T210130.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "101a5681ab37147de8c702b2048ae3185b28a5b2"
+  "gitHead": "2320dc7d8abed7185bf42642d7f634e8f3faa3f1"
 }