@capacitor/cli 3.7.0 → 3.9.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.9.0](https://github.com/ionic-team/capacitor/compare/3.8.0...3.9.0) (2022-10-21)
+
+
+### Features
+
+* **cli:** backports secure live updates support with portals for capacitor to 3.x ([#5988](https://github.com/ionic-team/capacitor/issues/5988)) ([8146cd2](https://github.com/ionic-team/capacitor/commit/8146cd23456b0737680f47ca0a1859c8a979077c)), closes [#5896](https://github.com/ionic-team/capacitor/issues/5896) [#5955](https://github.com/ionic-team/capacitor/issues/5955)
+
+
+
+
+
+# [3.8.0](https://github.com/ionic-team/capacitor/compare/3.7.0...3.8.0) (2022-09-08)
+
+**Note:** Version bump only for package @capacitor/cli
+
+
+
+
+
 # [3.7.0](https://github.com/ionic-team/capacitor/compare/3.6.0...3.7.0) (2022-08-01)
 
 **Note:** Version bump only for package @capacitor/cli

package/dist/declarations.d.ts

@@ -449,6 +449,7 @@ export interface LiveUpdateConfig {
     channel: string;
     autoUpdateMethod: AutoUpdateMethod;
     maxVersions?: number;
+    key?: string;
 }
 export declare type AutoUpdateMethod = 'none' | 'background';
 export interface PluginsConfig {
@@ -468,5 +469,12 @@ export interface PluginsConfig {
     Portals?: {
         shell: Portal;
         apps: Portal[];
+        liveUpdatesKey?: string;
     };
+    /**
+     * Capacitor Live Updates plugin configuration
+     *
+     * @since 4.2.0
+     */
+    LiveUpdates?: LiveUpdateConfig;
 }

package/dist/tasks/copy.js

@@ -39,6 +39,7 @@ async function copyCommand(config, selectedPlatformName) {
 exports.copyCommand = copyCommand;
 async function copy(config, platformName) {
     await common_1.runTask(colors_1.default.success(colors_1.default.strong(`copy ${platformName}`)), async () => {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const result = await common_1.checkWebDir(config);
         if (result) {
             throw result;
@@ -49,13 +50,24 @@ 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);
+                if ((_c = (_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.Portals) === null || _c === void 0 ? void 0 : _c.liveUpdatesKey) {
+                    await copySecureLiveUpdatesKey(config.app.extConfig.plugins.Portals.liveUpdatesKey, config.app.rootDir, config.ios.nativeTargetDirAbs);
+                }
             }
             else {
                 await copyWebDir(config, await config.ios.webDirAbs, config.app.webDirAbs);
             }
+            if (usesLiveUpdates && ((_f = (_e = (_d = config.app.extConfig) === null || _d === void 0 ? void 0 : _d.plugins) === null || _e === void 0 ? void 0 : _e.LiveUpdates) === null || _f === void 0 ? void 0 : _f.key)) {
+                await copySecureLiveUpdatesKey(config.app.extConfig.plugins.LiveUpdates.key, config.app.rootDir, config.ios.nativeTargetDirAbs);
+            }
             await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
             const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
             await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
@@ -63,10 +75,16 @@ async function copy(config, platformName) {
         else if (platformName === config.android.name) {
             if (usesCapacitorPortals) {
                 await copyFederatedWebDirs(config, config.android.webDirAbs);
+                if ((_j = (_h = (_g = config.app.extConfig) === null || _g === void 0 ? void 0 : _g.plugins) === null || _h === void 0 ? void 0 : _h.Portals) === null || _j === void 0 ? void 0 : _j.liveUpdatesKey) {
+                    await copySecureLiveUpdatesKey(config.app.extConfig.plugins.Portals.liveUpdatesKey, config.app.rootDir, config.android.assetsDirAbs);
+                }
             }
             else {
                 await copyWebDir(config, config.android.webDirAbs, config.app.webDirAbs);
             }
+            if (usesLiveUpdates && ((_m = (_l = (_k = config.app.extConfig) === null || _k === void 0 ? void 0 : _k.plugins) === null || _l === void 0 ? void 0 : _l.LiveUpdates) === null || _m === void 0 ? void 0 : _m.key)) {
+                await copySecureLiveUpdatesKey(config.app.extConfig.plugins.LiveUpdates.key, config.app.rootDir, 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 +151,16 @@ function isPortal(config) {
     return (config.webDir !== undefined &&
         config.name !== undefined);
 }
+async function copySecureLiveUpdatesKey(secureLiveUpdatesKeyFile, rootDir, nativeAbsDir) {
+    const keyAbsFromPath = path_1.join(rootDir, secureLiveUpdatesKeyFile);
+    const keyAbsToPath = path_1.join(nativeAbsDir, path_1.basename(keyAbsFromPath));
+    const keyRelToDir = path_1.relative(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": "3.7.0",
+  "version": "3.9.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -70,7 +70,7 @@
     "@types/prompts": "^2.0.8",
     "@types/semver": "^7.3.1",
     "@types/slice-ansi": "^4.0.0",
-    "@types/tar": "^4.0.4",
+    "@types/tar": "^6.1.2",
     "@types/tmp": "^0.2.0",
     "@types/xml2js": "0.4.5",
     "jest": "^26.1.0",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "84ec6619623510e345b2637e33febe94b10cc736"
+  "gitHead": "70a7e72b7461acd5b9bdc89fc9e0232ae8597005"
 }