@capacitor/cli 5.0.0-beta.1 → 5.0.0-dev-20230412T155745.0

package/dist/common.js

@@ -95,7 +95,7 @@ async function checkAppId(config, id) {
 exports.checkAppId = checkAppId;
 async function checkAppName(config, name) {
     // We allow pretty much anything right now, have fun
-    if (!name || !name.length) {
+    if (!(name === null || name === void 0 ? void 0 : name.length)) {
         return `Must provide an app name. For example: 'Spacebook'`;
     }
     return null;

package/dist/config.js

@@ -12,6 +12,7 @@ const fn_1 = require("./util/fn");
 const js_1 = require("./util/js");
 const node_1 = require("./util/node");
 const promise_1 = require("./util/promise");
+const subprocess_1 = require("./util/subprocess");
 const debug = (0, debug_1.default)('capacitor:config');
 exports.CONFIG_FILE_NAME_TS = 'capacitor.config.ts';
 exports.CONFIG_FILE_NAME_JS = 'capacitor.config.js';
@@ -205,7 +206,6 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
 async function loadIOSConfig(rootDir, extConfig) {
     var _a, _b, _c, _d;
     const name = 'ios';
-    const podPath = determineCocoapodPath();
     const platformDir = (_b = (_a = extConfig.ios) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : 'ios';
     const platformDirAbs = (0, path_1.resolve)(rootDir, platformDir);
     const scheme = (_d = (_c = extConfig.ios) === null || _c === void 0 ? void 0 : _c.scheme) !== null && _d !== void 0 ? _d : 'App';
@@ -216,6 +216,7 @@ async function loadIOSConfig(rootDir, extConfig) {
     const nativeXcodeProjDir = `${nativeProjectDir}/App.xcodeproj`;
     const nativeXcodeProjDirAbs = (0, path_1.resolve)(platformDirAbs, nativeXcodeProjDir);
     const nativeXcodeWorkspaceDirAbs = (0, promise_1.lazy)(() => determineXcodeWorkspaceDirAbs(nativeProjectDirAbs));
+    const podPath = (0, promise_1.lazy)(() => determineGemfileOrCocoapodPath(rootDir, platformDirAbs, nativeProjectDirAbs));
     const webDirAbs = (0, promise_1.lazy)(() => determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs));
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     return {
@@ -315,11 +316,33 @@ async function determineAndroidStudioPath(os) {
     }
     return '';
 }
-function determineCocoapodPath() {
+async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjectDirAbs) {
     if (process.env.CAPACITOR_COCOAPODS_PATH) {
         return process.env.CAPACITOR_COCOAPODS_PATH;
     }
-    return 'pod';
+    // Look for 'Gemfile' in app directories
+    const appSpecificGemfileExists = (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(rootDir, 'Gemfile'))) ||
+        (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(platformDir, 'Gemfile'))) ||
+        (await (0, utils_fs_1.pathExists)((0, path_1.resolve)(nativeProjectDirAbs, 'Gemfile')));
+    // Multi-app projects might share a single global 'Gemfile' at the Git repository root directory.
+    let globalGemfileExists = false;
+    if (!appSpecificGemfileExists) {
+        try {
+            const output = await (0, subprocess_1.getCommandOutput)('git', ['rev-parse', '--show-toplevel'], { cwd: rootDir });
+            if (output != null) {
+                globalGemfileExists = await (0, utils_fs_1.pathExists)((0, path_1.resolve)(output, 'Gemfile'));
+            }
+        }
+        catch (e) {
+            // Nothing
+        }
+    }
+    if (appSpecificGemfileExists || globalGemfileExists) {
+        return 'bundle exec pod';
+    }
+    else {
+        return 'pod';
+    }
 }
 function formatConfigTS(extConfig) {
     // TODO: <reference> tags

package/dist/declarations.d.ts

@@ -537,7 +537,7 @@ export interface CapacitorConfig {
      */
     includePlugins?: string[];
 }
-export interface Portal {
+export interface FederatedApp {
     name: string;
     webDir: string;
     liveUpdateConfig?: LiveUpdateConfig;
@@ -560,13 +560,13 @@ export interface PluginsConfig {
         [key: string]: any;
     } | undefined;
     /**
-     * Capacitor Portals plugin configuration
+     * FederatedCapacitor plugin configuration
      *
-     * @since 3.5.0
+     * @since 5.0.0
      */
-    Portals?: {
-        shell: Portal;
-        apps: Portal[];
+    FederatedCapacitor?: {
+        shell: FederatedApp;
+        apps: FederatedApp[];
         liveUpdatesKey?: string;
     };
     /**

package/dist/ios/common.js

@@ -1,20 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkIOSPackage = void 0;
+exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
+const child_process_1 = require("child_process");
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
+const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const subprocess_1 = require("../util/subprocess");
 async function checkIOSPackage(config) {
     return (0, common_1.checkCapacitorPlatform)(config, 'ios');
 }
 exports.checkIOSPackage = checkIOSPackage;
+function execBundler() {
+    try {
+        const bundleOutput = (0, child_process_1.execSync)('bundle &> /dev/null ; echo $?');
+        return parseInt(bundleOutput.toString());
+    }
+    catch (e) {
+        return -1;
+    }
+}
+async function checkBundler(config) {
+    if (config.cli.os === "mac" /* OS.Mac */) {
+        let bundlerResult = execBundler();
+        if (bundlerResult === 1) {
+            // Bundler version is outdated
+            log_1.logger.info(`Using ${colors_1.default.strong('Gemfile')}: Bundler update needed...`);
+            await (0, subprocess_1.runCommand)('gem', ['install', 'bundler']);
+            bundlerResult = execBundler();
+        }
+        if (bundlerResult === 0) {
+            // Bundler in use, all gems current
+            log_1.logger.info(`Using ${colors_1.default.strong('Gemfile')}: RubyGems bundle installed`);
+        }
+    }
+    return null;
+}
+exports.checkBundler = checkBundler;
 async function checkCocoaPods(config) {
-    if (!(await (0, subprocess_1.isInstalled)(config.ios.podPath)) && config.cli.os === "mac" /* OS.Mac */) {
+    if (!(await (0, subprocess_1.isInstalled)(await config.ios.podPath)) &&
+        config.cli.os === "mac" /* OS.Mac */) {
         return (`CocoaPods is not installed.\n` +
             `See this install guide: ${colors_1.default.strong('https://capacitorjs.com/docs/getting-started/environment-setup#homebrew')}`);
     }

package/dist/ios/doctor.js

@@ -21,7 +21,7 @@ async function doctorIOS(config) {
     // check if www folder is empty (index.html does not exist)
     try {
         await (0, common_1.check)([
-            () => (0, common_2.checkCocoaPods)(config),
+            () => (0, common_2.checkBundler)(config) || (0, common_2.checkCocoaPods)(config),
             () => (0, common_1.checkWebDir)(config),
             checkXcode,
         ]);

package/dist/ios/update.js

@@ -40,7 +40,7 @@ async function updateIOS(config, deployment) {
 }
 exports.updateIOS = updateIOS;
 async function installCocoaPodsPlugins(config, plugins, deployment) {
-    await (0, common_1.runTask)(`Updating iOS native dependencies with ${colors_1.default.input(`${config.ios.podPath} install`)}`, () => {
+    await (0, common_1.runTask)(`Updating iOS native dependencies with ${colors_1.default.input(`${await config.ios.podPath} install`)}`, () => {
         return updatePodfile(config, plugins, deployment);
     });
 }
@@ -51,9 +51,16 @@ async function updatePodfile(config, plugins, deployment) {
     let podfileContent = await (0, utils_fs_1.readFile)(podfilePath, { encoding: 'utf-8' });
     podfileContent = podfileContent.replace(/(def capacitor_pods)[\s\S]+?(\nend)/, `$1${dependenciesContent}$2`);
     await (0, utils_fs_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
+    const podPath = await config.ios.podPath;
+    const useBundler = podPath.startsWith('bundle');
     const podCommandExists = await (0, subprocess_1.isInstalled)('pod');
-    if (podCommandExists) {
-        await (0, subprocess_1.runCommand)(config.ios.podPath, ['install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
+    if (useBundler || podCommandExists) {
+        if (useBundler) {
+            await (0, subprocess_1.runCommand)('bundle', ['exec', 'pod', 'install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
+        }
+        else {
+            await (0, subprocess_1.runCommand)(podPath, ['install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
+        }
     }
     else {
         log_1.logger.warn('Skipping pod install because CocoaPods is not installed');

package/dist/tasks/add.js

@@ -82,7 +82,10 @@ function printNextSteps(platformName) {
 }
 function addChecks(config, platformName) {
     if (platformName === config.ios.name) {
-        return [() => (0, common_3.checkIOSPackage)(config), () => (0, common_3.checkCocoaPods)(config)];
+        return [
+            () => (0, common_3.checkIOSPackage)(config),
+            () => (0, common_3.checkBundler)(config) || (0, common_3.checkCocoaPods)(config),
+        ];
     }
     else if (platformName === config.android.name) {
         return [() => (0, common_1.checkAndroidPackage)(config)];

package/dist/tasks/copy.js

@@ -47,9 +47,9 @@ async function copy(config, platformName, inline = false) {
         }
         await (0, common_1.runPlatformHook)(config, platformName, config.app.rootDir, 'capacitor:copy:before');
         const allPlugins = await (0, plugin_1.getPlugins)(config, platformName);
-        let usesCapacitorPortals = false;
-        if (allPlugins.filter(plugin => plugin.id === '@ionic-enterprise/capacitor-portals').length > 0) {
-            usesCapacitorPortals = true;
+        let usesFederatedCapacitor = false;
+        if (allPlugins.filter(plugin => plugin.id === '@ionic-enterprise/federated-capacitor').length > 0) {
+            usesFederatedCapacitor = true;
         }
         let usesLiveUpdates = false;
         if (allPlugins.filter(plugin => plugin.id === '@capacitor/live-updates')
@@ -62,10 +62,10 @@ async function copy(config, platformName, inline = false) {
             usesSSLPinning = true;
         }
         if (platformName === config.ios.name) {
-            if (usesCapacitorPortals) {
+            if (usesFederatedCapacitor) {
                 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);
+                if ((_c = (_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.FederatedCapacitor) === null || _c === void 0 ? void 0 : _c.liveUpdatesKey) {
+                    await copySecureLiveUpdatesKey(config.app.extConfig.plugins.FederatedCapacitor.liveUpdatesKey, config.app.rootDir, config.ios.nativeTargetDirAbs);
                 }
             }
             else {
@@ -82,10 +82,10 @@ async function copy(config, platformName, inline = false) {
             await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platformName);
         }
         else if (platformName === config.android.name) {
-            if (usesCapacitorPortals) {
+            if (usesFederatedCapacitor) {
                 await copyFederatedWebDirs(config, config.android.webDirAbs);
-                if ((_o = (_m = (_l = config.app.extConfig) === null || _l === void 0 ? void 0 : _l.plugins) === null || _m === void 0 ? void 0 : _m.Portals) === null || _o === void 0 ? void 0 : _o.liveUpdatesKey) {
-                    await copySecureLiveUpdatesKey(config.app.extConfig.plugins.Portals.liveUpdatesKey, config.app.rootDir, config.android.assetsDirAbs);
+                if ((_o = (_m = (_l = config.app.extConfig) === null || _l === void 0 ? void 0 : _l.plugins) === null || _m === void 0 ? void 0 : _m.FederatedCapacitor) === null || _o === void 0 ? void 0 : _o.liveUpdatesKey) {
+                    await copySecureLiveUpdatesKey(config.app.extConfig.plugins.FederatedCapacitor.liveUpdatesKey, config.app.rootDir, config.android.assetsDirAbs);
                 }
             }
             else {
@@ -103,8 +103,8 @@ async function copy(config, platformName, inline = false) {
             await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platformName);
         }
         else if (platformName === config.web.name) {
-            if (usesCapacitorPortals) {
-                log_1.logger.info('Capacitor Portals Plugin installed, skipping web bundling...');
+            if (usesFederatedCapacitor) {
+                log_1.logger.info('FederatedCapacitor Plugin installed, skipping web bundling...');
             }
             else {
                 await (0, copy_1.copyWeb)(config);
@@ -148,23 +148,25 @@ async function copyWebDir(config, nativeAbsDir, webAbsDir) {
 }
 async function copyFederatedWebDirs(config, nativeAbsDir) {
     var _a, _b;
-    log_1.logger.info('Capacitor Portals Plugin Loaded - Copying Web Assets');
-    if (!((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.Portals)) {
-        throw `Capacitor Portals plugin is present but no valid config is defined.`;
+    log_1.logger.info('FederatedCapacitor Plugin Loaded - Copying Web Assets');
+    if (!((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.FederatedCapacitor)) {
+        throw `FederatedCapacitor plugin is present but no valid config is defined.`;
     }
-    const portalsConfig = config.app.extConfig.plugins.Portals;
-    if (!isPortal(portalsConfig.shell)) {
-        throw `Capacitor Portals plugin is present but no valid Shell application is defined in the config.`;
+    const federatedConfig = config.app.extConfig.plugins.FederatedCapacitor;
+    if (federatedConfig) {
+        if (!isFederatedApp(federatedConfig.shell)) {
+            throw `FederatedCapacitor plugin is present but no valid Shell application is defined in the config.`;
+        }
+        if (!federatedConfig.apps.every(isFederatedApp)) {
+            throw `FederatedCapacitor plugin is present but there is a problem with the apps defined in the config.`;
+        }
+        await Promise.all([...federatedConfig.apps, federatedConfig.shell].map(app => {
+            const appDir = (0, path_1.resolve)(config.app.rootDir, app.webDir);
+            return copyWebDir(config, (0, path_1.resolve)(nativeAbsDir, app.name), appDir);
+        }));
     }
-    if (!portalsConfig.apps.every(isPortal)) {
-        throw `Capacitor Portals plugin is present but there is a problem with the apps defined in the config.`;
-    }
-    await Promise.all([...portalsConfig.apps, portalsConfig.shell].map(app => {
-        const appDir = (0, path_1.resolve)(config.app.rootDir, app.webDir);
-        return copyWebDir(config, (0, path_1.resolve)(nativeAbsDir, app.name), appDir);
-    }));
 }
-function isPortal(config) {
+function isFederatedApp(config) {
     return (config.webDir !== undefined &&
         config.name !== undefined);
 }

package/dist/tasks/update.js

@@ -44,7 +44,7 @@ function updateChecks(config, platforms) {
     const checks = [];
     for (const platformName of platforms) {
         if (platformName === config.ios.name) {
-            checks.push(() => (0, common_2.checkCocoaPods)(config));
+            checks.push(() => (0, common_2.checkBundler)(config) || (0, common_2.checkCocoaPods)(config));
         }
         else if (platformName === config.android.name) {
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-dev-20230412T155745.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -60,7 +60,7 @@
     "semver": "^7.3.7",
     "tar": "^6.1.11",
     "tslib": "^2.4.0",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "354ffd2062b1c20951bdc9539d99e6c37f54675e"
+  "gitHead": "b445bfa2bd54f2810d62729ebd99ca2d03ed3cc5"
 }