@capacitor/cli 4.1.0 → 4.1.1-nightly-e4c143d4.0

package/LICENSE

@@ -1,23 +1,21 @@
-Copyright 2017-present Ionic
-https://ionic.io
-
 MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2017-present Drifty Co.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -88,14 +88,22 @@ function runProgram(config) {
     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/common.js

@@ -16,7 +16,7 @@ exports.checkIOSPackage = checkIOSPackage;
 async function checkCocoaPods(config) {
     if (!(await subprocess_1.isInstalled(config.ios.podPath)) && config.cli.os === "mac" /* Mac */) {
         return (`CocoaPods is not installed.\n` +
-            `See this install guide: ${colors_1.default.strong('https://guides.cocoapods.org/using/getting-started.html#installation')}`);
+            `See this install guide: ${colors_1.default.strong('https://capacitorjs.com/docs/getting-started/environment-setup#homebrew')}`);
     }
     return null;
 }

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

@@ -49,6 +49,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 +61,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 +75,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);
@@ -133,3 +144,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "4.1.0",
+  "version": "4.1.1-nightly-e4c143d4.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": "0b5c2b740e9613512a100051b8822fd1361f4aeb"
+  "gitHead": "e4c143d4da653533570215964808c2f32f5469d3"
 }