@capacitor/cli 4.1.1-nightly-9658fe15.0 → 4.2.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.2.0](https://github.com/ionic-team/capacitor/compare/4.1.0...4.2.0) (2022-09-08)
+
+
+### Features
+
+* **cli:** add inline option to copy command ([#5901](https://github.com/ionic-team/capacitor/issues/5901)) ([17fbabb](https://github.com/ionic-team/capacitor/commit/17fbabb2a77d1b356d24048efc5883bd4d049104))
+* **cli:** add scheme and flavor options to run command ([#5873](https://github.com/ionic-team/capacitor/issues/5873)) ([e4c143d](https://github.com/ionic-team/capacitor/commit/e4c143d4da653533570215964808c2f32f5469d3))
+* **cli:** copy signature when using secure live updates ([#5896](https://github.com/ionic-team/capacitor/issues/5896)) ([0f17177](https://github.com/ionic-team/capacitor/commit/0f17177b1c64c0f69f86e990e4e150b820da497b))
+
+
+
+
+
 # [4.1.0](https://github.com/ionic-team/capacitor/compare/4.0.1...4.1.0) (2022-08-18)
 
 

package/dist/android/run.js

@@ -9,10 +9,11 @@ const common_1 = require("../common");
 const native_run_1 = require("../util/native-run");
 const subprocess_1 = require("../util/subprocess");
 const debug = debug_1.default('capacitor:android:run');
-async function runAndroid(config, { target: selectedTarget }) {
+async function runAndroid(config, { target: selectedTarget, flavor: selectedFlavor }) {
     var _a;
     const target = await common_1.promptForPlatformTarget(await native_run_1.getPlatformTargets('android'), selectedTarget);
-    const arg = `assemble${((_a = config.android) === null || _a === void 0 ? void 0 : _a.flavor) || ''}Debug`;
+    const runFlavor = selectedFlavor || ((_a = config.android) === null || _a === void 0 ? void 0 : _a.flavor) || '';
+    const arg = `assemble${runFlavor}Debug`;
     const gradleArgs = [arg];
     debug('Invoking ./gradlew with args: %O', gradleArgs);
     try {

package/dist/declarations.d.ts

@@ -476,6 +476,7 @@ export interface LiveUpdateConfig {
     channel: string;
     autoUpdateMethod: AutoUpdateMethod;
     maxVersions?: number;
+    key?: string;
 }
 export declare type AutoUpdateMethod = 'none' | 'background';
 export interface PluginsConfig {
@@ -496,4 +497,10 @@ export interface PluginsConfig {
         shell: Portal;
         apps: Portal[];
     };
+    /**
+     * Capacitor Live Updates plugin configuration
+     *
+     * @since 4.2.0
+     */
+    LiveUpdates?: LiveUpdateConfig;
 }

package/dist/index.js

@@ -80,22 +80,31 @@ function runProgram(config) {
     commander_1.program
         .command('copy [platform]')
         .description('copies the web app build into the native app')
-        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
+        .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, { inline }) => {
         config_1.checkExternalConfig(config.app);
         const { copyCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/copy')));
-        await copyCommand(config, platform);
+        await copyCommand(config, platform, inline);
     })));
     commander_1.program
         .command(`run [platform]`)
         .description(`runs ${colors_1.default.input('sync')}, then builds and deploys the native app`)
+        .option('--scheme <schemeName>', 'set the scheme of the iOS project')
+        .option('--flavor <flavorName>', 'set the flavor of the Android project')
         .option('--list', 'list targets, then quit')
         // TODO: remove once --json is a hidden option (https://github.com/tj/commander.js/issues/1106)
         .allowUnknownOption(true)
         .option('--target <id>', 'use a specific target')
         .option('--no-sync', `do not run ${colors_1.default.input('sync')}`)
-        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { list, target, sync }) => {
+        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { scheme, flavor, list, target, sync }) => {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
-        await runCommand(config, platform, { list, target, sync });
+        await runCommand(config, platform, {
+            scheme,
+            flavor,
+            list,
+            target,
+            sync,
+        });
     })));
     commander_1.program
         .command('open [platform]')

package/dist/ios/run.js

@@ -9,14 +9,15 @@ const common_1 = require("../common");
 const native_run_1 = require("../util/native-run");
 const subprocess_1 = require("../util/subprocess");
 const debug = debug_1.default('capacitor:ios:run');
-async function runIOS(config, { target: selectedTarget }) {
+async function runIOS(config, { target: selectedTarget, scheme: selectedScheme }) {
     const target = await common_1.promptForPlatformTarget(await native_run_1.getPlatformTargets('ios'), selectedTarget);
+    const runScheme = selectedScheme || config.ios.scheme;
     const derivedDataPath = path_1.resolve(config.ios.platformDirAbs, 'DerivedData', target.id);
     const xcodebuildArgs = [
         '-workspace',
         path_1.basename(await config.ios.nativeXcodeWorkspaceDirAbs),
         '-scheme',
-        config.ios.scheme,
+        runScheme,
         '-configuration',
         'Debug',
         '-destination',
@@ -28,7 +29,7 @@ async function runIOS(config, { target: selectedTarget }) {
     await common_1.runTask('Running xcodebuild', async () => subprocess_1.runCommand('xcrun', ['xcodebuild', ...xcodebuildArgs], {
         cwd: config.ios.nativeProjectDirAbs,
     }));
-    const appName = `${config.ios.scheme}.app`;
+    const appName = `${runScheme}.app`;
     const appPath = path_1.resolve(derivedDataPath, 'Build/Products', target.virtual ? 'Debug-iphonesimulator' : 'Debug-iphoneos', appName);
     const nativeRunArgs = ['ios', '--app', appPath, '--target', target.id];
     debug('Invoking native-run with args: %O', nativeRunArgs);

package/dist/tasks/copy.js

@@ -12,7 +12,8 @@ const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const promise_1 = require("../util/promise");
 const copy_1 = require("../web/copy");
-async function copyCommand(config, selectedPlatformName) {
+const sourcemaps_1 = require("./sourcemaps");
+async function copyCommand(config, selectedPlatformName, inline = false) {
     var _a;
     if (selectedPlatformName && !(await common_1.isValidPlatform(selectedPlatformName))) {
         const platformDir = common_1.resolvePlatform(config, selectedPlatformName);
@@ -26,7 +27,7 @@ async function copyCommand(config, selectedPlatformName) {
     else {
         const platforms = await common_1.selectPlatforms(config, selectedPlatformName);
         try {
-            await promise_1.allSerial(platforms.map(platformName => () => copy(config, platformName)));
+            await promise_1.allSerial(platforms.map(platformName => () => copy(config, platformName, inline)));
         }
         catch (e) {
             if (errors_1.isFatal(e)) {
@@ -37,7 +38,7 @@ async function copyCommand(config, selectedPlatformName) {
     }
 }
 exports.copyCommand = copyCommand;
-async function copy(config, platformName) {
+async function copy(config, platformName, inline = false) {
     await common_1.runTask(colors_1.default.success(colors_1.default.strong(`copy ${platformName}`)), async () => {
         const result = await common_1.checkWebDir(config);
         if (result) {
@@ -49,6 +50,11 @@ async function copy(config, platformName) {
         if (allPlugins.filter(plugin => plugin.id === '@ionic-enterprise/capacitor-portals').length > 0) {
             usesCapacitorPortals = true;
         }
+        let usesLiveUpdates = false;
+        if (allPlugins.filter(plugin => plugin.id === '@capacitor/live-updates')
+            .length > 0) {
+            usesLiveUpdates = true;
+        }
         if (platformName === config.ios.name) {
             if (usesCapacitorPortals) {
                 await copyFederatedWebDirs(config, await config.ios.webDirAbs);
@@ -56,6 +62,9 @@ async function copy(config, platformName) {
             else {
                 await copyWebDir(config, await config.ios.webDirAbs, config.app.webDirAbs);
             }
+            if (usesLiveUpdates) {
+                await copySecureLiveUpdatesKey(config, config.ios.nativeTargetDirAbs);
+            }
             await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
             const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
             await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
@@ -67,6 +76,9 @@ async function copy(config, platformName) {
             else {
                 await copyWebDir(config, config.android.webDirAbs, config.app.webDirAbs);
             }
+            if (usesLiveUpdates) {
+                await copySecureLiveUpdatesKey(config, config.android.assetsDirAbs);
+            }
             await copyCapacitorConfig(config, config.android.assetsDirAbs);
             const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
             await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
@@ -83,6 +95,9 @@ async function copy(config, platformName) {
         else {
             throw `Platform ${platformName} is not valid.`;
         }
+        if (inline) {
+            await sourcemaps_1.inlineSourceMaps(config, platformName);
+        }
     });
     await common_1.runPlatformHook(config, platformName, config.app.rootDir, 'capacitor:copy:after');
 }
@@ -133,3 +148,21 @@ function isPortal(config) {
     return (config.webDir !== undefined &&
         config.name !== undefined);
 }
+async function copySecureLiveUpdatesKey(config, nativeAbsDir) {
+    var _a, _b, _c;
+    if (!((_c = (_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.LiveUpdates) === null || _c === void 0 ? void 0 : _c.key)) {
+        return;
+    }
+    const secureLiveUpdatesKeyFile = config.app.extConfig.plugins.LiveUpdates.key;
+    const keyAbsFromPath = path_1.join(config.app.rootDir, secureLiveUpdatesKeyFile);
+    const keyAbsToPath = path_1.join(nativeAbsDir, path_1.basename(keyAbsFromPath));
+    const keyRelToDir = path_1.relative(config.app.rootDir, nativeAbsDir);
+    if (!(await utils_fs_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 common_1.runTask(`Copying Secure Live Updates key from ${colors_1.default.strong(secureLiveUpdatesKeyFile)} to ${keyRelToDir}`, async () => {
+        return utils_fs_1.copy(keyAbsFromPath, keyAbsToPath);
+    });
+}

package/dist/tasks/sync.js

@@ -6,16 +6,15 @@ 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, inline) {
+async function syncCommand(config, selectedPlatformName, deployment, inline = false) {
     var _a, _b;
     if (selectedPlatformName && !(await common_1.isValidPlatform(selectedPlatformName))) {
         try {
-            await copy_1.copyCommand(config, selectedPlatformName);
+            await copy_1.copyCommand(config, selectedPlatformName, inline);
         }
         catch (e) {
             log_1.logger.error((_a = e.stack) !== null && _a !== void 0 ? _a : e);
@@ -45,14 +44,11 @@ async function syncCommand(config, selectedPlatformName, deployment, inline) {
     }
 }
 exports.syncCommand = syncCommand;
-async function sync(config, platformName, deployment, inline) {
+async function sync(config, platformName, deployment, inline = false) {
     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);
-        }
+        await copy_1.copy(config, platformName, inline);
     }
     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.1.1-nightly-9658fe15.0",
+  "version": "4.2.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": "9658fe15213a375e2107e122357da3fd259ef9a2"
+  "gitHead": "101a5681ab37147de8c702b2048ae3185b28a5b2"
 }