@capacitor/cli 4.0.0 → 4.0.2-nightly-0ad41d05.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1](https://github.com/ionic-team/capacitor/compare/4.0.0...4.0.1) (2022-07-28)
+
+
+### Bug Fixes
+
+* **cli:** Correct Splash theme update ([#5805](https://github.com/ionic-team/capacitor/issues/5805)) ([25b82a8](https://github.com/ionic-team/capacitor/commit/25b82a84425bf09b2be45b213788b0e13982b9b3))
+* **cli:** Revert some splash migration errors ([#5806](https://github.com/ionic-team/capacitor/issues/5806)) ([471feed](https://github.com/ionic-team/capacitor/commit/471feedc07bef357ac798fcba664bd373e9f8ebf))
+
+
+
+
+
 # [4.0.0](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.2...4.0.0) (2022-07-27)
 
 

package/dist/android/update.js

@@ -130,7 +130,12 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
                 applyArray.push(`apply from: "${relativePluginPath}/${framework.$.src}"`);
             }
             else if (!framework.$.type && !framework.$.custom) {
-                frameworksArray.push(`    implementation "${framework.$.src}"`);
+                if (framework.$.src.startsWith('platform(')) {
+                    frameworksArray.push(`    implementation ${framework.$.src}`);
+                }
+                else {
+                    frameworksArray.push(`    implementation "${framework.$.src}"`);
+                }
             }
         });
         prefsArray = prefsArray.concat(plugin_1.getAllElements(p, platform, 'preference'));
@@ -192,7 +197,12 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     });
     let frameworkString = frameworksArray
         .map(f => {
-        return `    implementation "${f}"`;
+        if (f.startsWith('platform(')) {
+            return `    implementation ${f}`;
+        }
+        else {
+            return `    implementation "${f}"`;
+        }
     })
         .join('\n');
     frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);

package/dist/index.js

@@ -62,10 +62,11 @@ function runProgram(config) {
         .command('sync [platform]')
         .description(`${colors_1.default.input('copy')} + ${colors_1.default.input('update')}`)
         .option('--deployment', "Optional: if provided, Podfile.lock won't be deleted and pod install will use --deployment option")
-        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { deployment }) => {
+        .option('--inline', 'Optional: if true, all source maps will be inlined for easier debugging on mobile devices', false)
+        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { deployment, inline }) => {
         config_1.checkExternalConfig(config.app);
         const { syncCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/sync')));
-        await syncCommand(config, platform, deployment);
+        await syncCommand(config, platform, deployment, inline);
     })));
     commander_1.program
         .command('update [platform]')

package/dist/tasks/add.js

@@ -55,7 +55,7 @@ async function addCommand(config, selectedPlatformName) {
             await doAdd(config, platformName);
             await editPlatforms(config, platformName);
             if (await utils_fs_1.pathExists(config.app.webDirAbs)) {
-                await sync_1.sync(config, platformName, false);
+                await sync_1.sync(config, platformName, false, false);
                 if (platformName === config.android.name) {
                     await common_2.runTask('Syncing Gradle', async () => {
                         return add_1.createLocalProperties(config.android.platformDirAbs);

package/dist/tasks/migrate.js

@@ -37,6 +37,7 @@ const plugins = [
     '@capacitor/local-notifications',
     '@capacitor/motion',
     '@capacitor/network',
+    '@capacitor/preferences',
     '@capacitor/push-notifications',
     '@capacitor/screen-reader',
     '@capacitor/share',
@@ -45,8 +46,8 @@ const plugins = [
     '@capacitor/text-zoom',
     '@capacitor/toast',
 ];
-const coreVersion = 'latest';
-const pluginVersion = 'latest';
+const coreVersion = '^4.0.0';
+const pluginVersion = '^4.0.0';
 async function migrateCommand(config) {
     if (config === null) {
         errors_1.fatal('Config data missing');
@@ -143,14 +144,21 @@ async function migrateCommand(config) {
                 // Variables gradle
                 await common_1.runTask(`Migrating variables.gradle file.`, () => {
                     return (async () => {
+                        const variablesPath = path_1.join(config.android.platformDirAbs, 'variables.gradle');
+                        let txt = readFile(variablesPath);
+                        if (!txt) {
+                            return;
+                        }
+                        txt = txt.replace(/= {2}'/g, `= '`);
+                        utils_fs_1.writeFileSync(variablesPath, txt, { encoding: 'utf-8' });
                         for (const variable of Object.keys(variablesAndClasspaths.variables)) {
-                            if (!(await updateFile(config, path_1.join(config.android.platformDirAbs, 'variables.gradle'), `${variable} = '`, `'`, variablesAndClasspaths.variables[variable].toString(), true))) {
-                                const didWork = await updateFile(config, path_1.join(config.android.platformDirAbs, 'variables.gradle'), `${variable} = `, `\n`, variablesAndClasspaths.variables[variable].toString(), true);
+                            if (!(await updateFile(config, variablesPath, `${variable} = '`, `'`, variablesAndClasspaths.variables[variable].toString(), true))) {
+                                const didWork = await updateFile(config, variablesPath, `${variable} = `, `\n`, variablesAndClasspaths.variables[variable].toString(), true);
                                 if (!didWork) {
-                                    let file = readFile(path_1.join(config.android.platformDirAbs, 'variables.gradle'));
+                                    let file = readFile(variablesPath);
                                     if (file) {
-                                        file = file.replace('ext {', `ext {\n    ${variable} = '${variablesAndClasspaths.variables[variable].toString()}'`);
-                                        utils_fs_1.writeFileSync(path_1.join(config.android.platformDirAbs, 'variables.gradle'), file);
+                                        file = file.replace('}', `    ${variable} = '${variablesAndClasspaths.variables[variable].toString()}'\n}`);
+                                        utils_fs_1.writeFileSync(variablesPath, file);
                                     }
                                 }
                             }
@@ -158,12 +166,12 @@ async function migrateCommand(config) {
                     })();
                 });
                 // remove init
-                await common_1.runTask('Migrating MainActivity by removing init().', () => {
-                    return removeOldInitAndroid(config);
+                await common_1.runTask('Migrating MainActivity', () => {
+                    return migrateMainActivity(config);
                 });
                 rimraf_1.default.sync(path_1.join(config.android.appDirAbs, 'build'));
                 // add new splashscreen
-                await common_1.runTask('Migrate to Android 12 Splashscreen.', () => {
+                await common_1.runTask('Migrate to Android 12 Splashscreen and apply DayNight theme.', () => {
                     return addNewSplashScreen(config);
                 });
             }
@@ -251,7 +259,7 @@ async function writeBreakingChanges() {
         }
     }
     if (broken.length > 0) {
-        log_1.logger.info(`IMPORTANT: Review https://next.capacitorjs.com/docs/updating/4-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
+        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/updating/4-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
     if (allDependencies['@capacitor/android']) {
         log_1.logger.info('Warning: The Android Gradle plugin was updated and it requires Java 11 to run. You may need to select this in Android Studio.');
@@ -287,7 +295,7 @@ async function updateAndroidManifest(filename) {
 async function updateBuildGradle(filename, leaveJCenter, variablesAndClasspaths) {
     // In build.gradle add dependencies:
     // classpath 'com.android.tools.build:gradle:7.2.1'
-    // classpath 'com.google.gms:google-services:4.3.10'
+    // classpath 'com.google.gms:google-services:4.3.13'
     const txt = readFile(filename);
     if (!txt) {
         return;
@@ -298,11 +306,7 @@ async function updateBuildGradle(filename, leaveJCenter, variablesAndClasspaths)
     };
     let replaced = txt;
     for (const dep of Object.keys(neededDeps)) {
-        if (!replaced.includes(`classpath '${dep}`)) {
-            replaced = txt.replace('dependencies {', `dependencies {\n        classpath '${dep}:${neededDeps[dep]}'`);
-        }
-        else {
-            // Update
+        if (replaced.includes(`classpath '${dep}`)) {
             replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
             log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
         }
@@ -409,7 +413,7 @@ 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-bin.zip`);
+    `https\\://services.gradle.org/distributions/gradle-7.4.2-all.zip`);
     utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
 }
 async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
@@ -565,7 +569,7 @@ async function podfileAssertDeploymentTarget(filename) {
     }
     utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
 }
-async function removeOldInitAndroid(config) {
+async function migrateMainActivity(config) {
     const xmlData = await xml_1.readXML(path_1.join(config.android.srcMainDirAbs, 'AndroidManifest.xml'));
     const manifestNode = xmlData.manifest;
     const applicationChildNodes = manifestNode.application;
@@ -615,11 +619,22 @@ async function removeOldInitAndroid(config) {
     let data = readFile(mainActivityClassFilePath);
     if (data) {
         const bindex = data.indexOf('this.init(savedInstanceState');
-        if (bindex == -1)
+        if (bindex !== -1) {
+            const eindex = data.indexOf('}});', bindex) + 4;
+            data = data.replace(data.substring(bindex, eindex), '');
+            data = data.replace('// Initializes the Bridge', '');
+        }
+        const rindex = data.indexOf('registerPlugin');
+        if (rindex !== -1) {
+            if (data.indexOf('super.onCreate(savedInstanceState);') < rindex) {
+                data = data.replace('super.onCreate(savedInstanceState);\n        ', '');
+                const eindex = data.lastIndexOf('.class);') + 8;
+                data = data.replace(data.substring(bindex, eindex), `${data.substring(bindex, eindex)}\n        super.onCreate(savedInstanceState);`);
+            }
+        }
+        if (bindex == -1 && rindex == -1) {
             return;
-        const eindex = data.indexOf('}});', bindex) + 4;
-        data = data.replace(data.substring(bindex, eindex), '');
-        data = data.replace('// Initializes the Bridge', '');
+        }
         utils_fs_1.writeFileSync(mainActivityClassFilePath, data);
     }
 }
@@ -628,6 +643,11 @@ async function addNewSplashScreen(config) {
     let stylesXml = readFile(stylePath);
     if (!stylesXml)
         return;
-    stylesXml = stylesXml.replace('AppTheme.NoActionBar', 'Theme.SplashScreen');
+    stylesXml = stylesXml.replace(`parent="AppTheme.NoActionBar"`, `parent="Theme.SplashScreen"`);
+    // revert wrong replaces
+    stylesXml = stylesXml.replace(`name="Theme.SplashScreen"`, `name="AppTheme.NoActionBar"`);
+    stylesXml = stylesXml.replace(`name="Theme.SplashScreenLaunch"`, `name="AppTheme.NoActionBarLaunch"`);
+    // Apply DayNight theme
+    stylesXml = stylesXml.replace(`parent="Theme.AppCompat.NoActionBar"`, `parent="Theme.AppCompat.DayNight.NoActionBar"`);
     utils_fs_1.writeFileSync(stylePath, stylesXml);
 }

package/dist/tasks/run.js

@@ -56,7 +56,7 @@ async function runCommand(config, selectedPlatformName, options) {
         }
         try {
             if (options.sync) {
-                await sync_1.sync(config, platformName, false);
+                await sync_1.sync(config, platformName, false, true);
             }
             await run(config, platformName, options);
         }

package/dist/tasks/sourcemaps.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inlineSourceMaps = void 0;
+const utils_fs_1 = require("@ionic/utils-fs");
+const path_1 = require("path");
+const log_1 = require("../log");
+function walkDirectory(dirPath) {
+    const files = utils_fs_1.readdirSync(dirPath);
+    files.forEach(file => {
+        const targetFile = path_1.join(dirPath, file);
+        if (utils_fs_1.existsSync(targetFile) && utils_fs_1.lstatSync(targetFile).isDirectory()) {
+            walkDirectory(targetFile);
+        }
+        else {
+            const mapFile = path_1.join(dirPath, `${file}.map`);
+            if (path_1.extname(file) === '.js' && utils_fs_1.existsSync(mapFile)) {
+                const bufMap = utils_fs_1.readFileSync(mapFile).toString('base64');
+                const bufFile = utils_fs_1.readFileSync(targetFile, 'utf8');
+                const result = bufFile.replace(`sourceMappingURL=${file}.map`, 'sourceMappingURL=data:application/json;charset=utf-8;base64,' +
+                    bufMap);
+                utils_fs_1.writeFileSync(targetFile, result);
+                utils_fs_1.unlinkSync(mapFile);
+            }
+        }
+    });
+}
+async function inlineSourceMaps(config, platformName) {
+    let buildDir = '';
+    if (platformName == config.ios.name) {
+        buildDir = await config.ios.webDirAbs;
+    }
+    if (platformName == config.android.name) {
+        buildDir = await config.android.webDirAbs;
+    }
+    if (buildDir) {
+        log_1.logger.info('Inlining sourcemaps');
+        walkDirectory(buildDir);
+    }
+}
+exports.inlineSourceMaps = inlineSourceMaps;

package/dist/tasks/sync.js

@@ -6,11 +6,12 @@ const errors_1 = require("../errors");
 const log_1 = require("../log");
 const promise_1 = require("../util/promise");
 const copy_1 = require("./copy");
+const sourcemaps_1 = require("./sourcemaps");
 const update_1 = require("./update");
 /**
  * Sync is a copy and an update in one.
  */
-async function syncCommand(config, selectedPlatformName, deployment) {
+async function syncCommand(config, selectedPlatformName, deployment, inline) {
     var _a, _b;
     if (selectedPlatformName && !(await common_1.isValidPlatform(selectedPlatformName))) {
         try {
@@ -30,7 +31,7 @@ async function syncCommand(config, selectedPlatformName, deployment) {
                 () => common_1.checkWebDir(config),
                 ...update_1.updateChecks(config, platforms),
             ]);
-            await promise_1.allSerial(platforms.map(platformName => () => sync(config, platformName, deployment)));
+            await promise_1.allSerial(platforms.map(platformName => () => sync(config, platformName, deployment, inline)));
             const now = +new Date();
             const diff = (now - then) / 1000;
             log_1.logger.info(`Sync finished in ${diff}s`);
@@ -44,11 +45,14 @@ async function syncCommand(config, selectedPlatformName, deployment) {
     }
 }
 exports.syncCommand = syncCommand;
-async function sync(config, platformName, deployment) {
+async function sync(config, platformName, deployment, inline) {
     var _a;
     await common_1.runPlatformHook(config, platformName, config.app.rootDir, 'capacitor:sync:before');
     try {
         await copy_1.copy(config, platformName);
+        if (inline) {
+            await sourcemaps_1.inlineSourceMaps(config, platformName);
+        }
     }
     catch (e) {
         log_1.logger.error((_a = e.stack) !== null && _a !== void 0 ? _a : e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "4.0.0",
+  "version": "4.0.2-nightly-0ad41d05.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": "434b1a0ff32f513973ef35258032a4df0cb331c1"
+  "gitHead": "0ad41d0567e69d31e65c92d4890fc8860d0344ac"
 }