@capacitor/cli 6.0.0-beta.2 → 6.0.0-dev-8046d907.0

package/dist/android/add.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLocalProperties = exports.addAndroid = void 0;
+exports.createLocalProperties = exports.addAndroid = exports.defaultAndroidTemplatePackage = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const os_1 = require("os");
@@ -9,9 +9,10 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
+exports.defaultAndroidTemplatePackage = '@capacitor/android-template';
 async function addAndroid(config) {
     await (0, common_1.runTask)(`Adding native android project in ${colors_1.default.strong(config.android.platformDir)}`, async () => {
-        return (0, template_1.extractTemplate)(config.cli.assets.android.platformTemplateArchiveAbs, config.android.platformDirAbs);
+        return (0, template_1.extractTemplatePackage)(config.cli.assets.android.platformTemplateArchiveAbs, config.android.platformDirAbs);
     });
 }
 exports.addAndroid = addAndroid;

package/dist/android/build.js

@@ -29,8 +29,15 @@ async function buildAndroid(config, buildOptions) {
             throw e;
         }
     }
-    const releasePath = (0, path_1.join)(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', buildOptions.flavor ? `${flavor}Release` : 'release');
-    const unsignedReleaseName = `app${config.android.flavor ? `-${config.android.flavor}` : ''}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
+    const releaseDir = releaseTypeIsAAB
+        ? flavor !== ''
+            ? `${flavor}Release`
+            : 'release'
+        : flavor !== ''
+            ? (0, path_1.join)(flavor, 'release')
+            : 'release';
+    const releasePath = (0, path_1.join)(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', releaseDir);
+    const unsignedReleaseName = `app${flavor !== '' ? `-${flavor}` : ''}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
     const signedReleaseName = unsignedReleaseName.replace(`-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`, `-release-signed.${releaseType.toLowerCase()}`);
     if (buildOptions.signingtype == 'jarsigner') {
         await signWithJarSigner(config, buildOptions, releasePath, signedReleaseName, unsignedReleaseName);
@@ -56,6 +63,12 @@ async function signWithApkSigner(config, buildOptions, releasePath, signedReleas
         '--out',
         `${(0, path_1.join)(releasePath, signedReleaseName)}`,
     ];
+    if (buildOptions.keystorealias) {
+        signingArgs.push('--ks-key-alias', buildOptions.keystorealias);
+    }
+    if (buildOptions.keystorealiaspass) {
+        signingArgs.push('--key-pass', `pass:${buildOptions.keystorealiaspass}`);
+    }
     await (0, common_1.runTask)('Signing Release', async () => {
         await (0, subprocess_1.runCommand)('apksigner', signingArgs, {
             cwd: config.android.platformDirAbs,

package/dist/android/common.js

@@ -54,6 +54,7 @@ exports.resolvePlugin = resolvePlugin;
  * This is a little trickier for Android because the appId becomes
  * the package name.
  */
+// TODO: Remove
 async function editProjectSettingsAndroid(config) {
     const appId = config.app.appId;
     const appName = config.app.appName

package/dist/android/run.js

@@ -30,7 +30,7 @@ async function runAndroid(config, { target: selectedTarget, flavor: selectedFlav
         }
     }
     const pathToApk = `${config.android.platformDirAbs}/${config.android.appDir}/build/outputs/apk${runFlavor !== '' ? '/' + runFlavor : ''}/debug`;
-    const apkName = `app${runFlavor !== '' ? '-' + runFlavor : ''}-debug.apk`;
+    const apkName = (0, common_1.parseApkNameFromFlavor)(runFlavor);
     const apkPath = (0, path_1.resolve)(pathToApk, apkName);
     const nativeRunArgs = ['android', '--app', apkPath, '--target', target.id];
     if (selectedPorts) {

package/dist/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkJDKMajorVersion = exports.resolvePlatform = exports.checkPlatformVersions = exports.getAddedPlatforms = exports.getPlatformTargetName = exports.promptForPlatformTarget = exports.promptForPlatform = exports.isValidEnterprisePlatform = exports.getKnownEnterprisePlatforms = exports.isValidCommunityPlatform = exports.getKnownCommunityPlatforms = exports.isValidPlatform = exports.getKnownPlatforms = exports.selectPlatforms = exports.getProjectPlatformDirectory = exports.getCLIVersion = exports.getCoreVersion = exports.getCapacitorPackageVersion = exports.requireCapacitorPackage = exports.getCapacitorPackage = exports.runTask = exports.runPlatformHook = exports.wait = exports.checkAppName = exports.checkAppId = exports.checkAppDir = exports.checkAppConfig = exports.checkCapacitorPlatform = exports.checkPackage = exports.checkWebDir = exports.check = void 0;
+exports.parseApkNameFromFlavor = exports.checkJDKMajorVersion = exports.resolvePlatform = exports.checkPlatformVersions = exports.getAddedPlatforms = exports.getPlatformTargetName = exports.promptForPlatformTarget = exports.promptForPlatform = exports.isValidEnterprisePlatform = exports.getKnownEnterprisePlatforms = exports.isValidCommunityPlatform = exports.getKnownCommunityPlatforms = exports.isValidPlatform = exports.getKnownPlatforms = exports.selectPlatforms = exports.getProjectPlatformDirectory = exports.getCLIVersion = exports.getCoreVersion = exports.getCapacitorPackageVersion = exports.requireCapacitorPackage = exports.getCapacitorPackage = exports.runTask = exports.runPlatformHook = exports.wait = exports.checkAppName = exports.checkAppId = exports.checkAppDir = exports.checkAppConfig = exports.checkCapacitorPlatform = exports.checkPackage = exports.checkWebDir = exports.check = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const utils_terminal_1 = require("@ionic/utils-terminal");
@@ -391,3 +391,8 @@ async function checkJDKMajorVersion() {
     }
 }
 exports.checkJDKMajorVersion = checkJDKMajorVersion;
+function parseApkNameFromFlavor(flavor) {
+    const convertedName = flavor.replace(/([A-Z])/g, '-$1').toLowerCase();
+    return `app-${convertedName ? `${convertedName}-` : ''}debug.apk`;
+}
+exports.parseApkNameFromFlavor = parseApkNameFromFlavor;

package/dist/config.js

@@ -6,6 +6,7 @@ const utils_fs_1 = require("@ionic/utils-fs");
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
+const common_1 = require("./common");
 const errors_1 = require("./errors");
 const log_1 = require("./log");
 const fn_1 = require("./util/fn");
@@ -78,7 +79,7 @@ async function writeConfig(extConfig, extConfigFilePath) {
 }
 exports.writeConfig = writeConfig;
 async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
-    var _a, _b;
+    var _a;
     try {
         const tsPath = (0, node_1.resolveNode)(rootDir, 'typescript');
         if (!tsPath) {
@@ -87,7 +88,9 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
         }
         const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
         const extConfigObject = (0, node_1.requireTS)(ts, extConfigFilePath);
-        const extConfig = (_a = extConfigObject.default) !== null && _a !== void 0 ? _a : extConfigObject;
+        const extConfig = extConfigObject.default
+            ? await extConfigObject.default
+            : extConfigObject;
         return {
             extConfigType: 'ts',
             extConfigName,
@@ -97,7 +100,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
     }
     catch (e) {
         if (!(0, errors_1.isFatal)(e)) {
-            (0, errors_1.fatal)(`Parsing ${colors_1.default.strong(extConfigName)} failed.\n\n${(_b = e.stack) !== null && _b !== void 0 ? _b : e}`);
+            (0, errors_1.fatal)(`Parsing ${colors_1.default.strong(extConfigName)} failed.\n\n${(_a = e.stack) !== null && _a !== void 0 ? _a : e}`);
         }
         throw e;
     }
@@ -109,7 +112,7 @@ async function loadExtConfigJS(rootDir, extConfigName, extConfigFilePath) {
             extConfigType: 'js',
             extConfigName,
             extConfigFilePath: extConfigFilePath,
-            extConfig: require(extConfigFilePath),
+            extConfig: await require(extConfigFilePath),
         };
     }
     catch (e) {
@@ -164,7 +167,7 @@ async function loadCLIConfig(rootDir) {
     };
 }
 async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const name = 'android';
     const platformDir = (_b = (_a = extConfig.android) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : 'android';
     const platformDirAbs = (0, path_1.resolve)(rootDir, platformDir);
@@ -175,23 +178,21 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const webDir = `${assetsDir}/public`;
     const resDir = `${srcMainDir}/res`;
     let apkPath = `${appDir}/build/outputs/apk/`;
-    let flavorPrefix = '';
     const flavor = ((_c = extConfig.android) === null || _c === void 0 ? void 0 : _c.flavor) || '';
     if ((_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor) {
         apkPath = `${apkPath}/${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
-        flavorPrefix = `-${(_f = extConfig.android) === null || _f === void 0 ? void 0 : _f.flavor}`;
     }
-    const apkName = `app${flavorPrefix}-debug.apk`;
+    const apkName = (0, common_1.parseApkNameFromFlavor)(flavor);
     const buildOutputDir = `${apkPath}/debug`;
     const cordovaPluginsDir = 'capacitor-cordova-android-plugins';
     const studioPath = (0, promise_1.lazy)(() => determineAndroidStudioPath(cliConfig.os));
     const buildOptions = {
-        keystorePath: (_h = (_g = extConfig.android) === null || _g === void 0 ? void 0 : _g.buildOptions) === null || _h === void 0 ? void 0 : _h.keystorePath,
-        keystorePassword: (_k = (_j = extConfig.android) === null || _j === void 0 ? void 0 : _j.buildOptions) === null || _k === void 0 ? void 0 : _k.keystorePassword,
-        keystoreAlias: (_m = (_l = extConfig.android) === null || _l === void 0 ? void 0 : _l.buildOptions) === null || _m === void 0 ? void 0 : _m.keystoreAlias,
-        keystoreAliasPassword: (_p = (_o = extConfig.android) === null || _o === void 0 ? void 0 : _o.buildOptions) === null || _p === void 0 ? void 0 : _p.keystoreAliasPassword,
-        signingType: (_r = (_q = extConfig.android) === null || _q === void 0 ? void 0 : _q.buildOptions) === null || _r === void 0 ? void 0 : _r.signingType,
-        releaseType: (_t = (_s = extConfig.android) === null || _s === void 0 ? void 0 : _s.buildOptions) === null || _t === void 0 ? void 0 : _t.releaseType,
+        keystorePath: (_g = (_f = extConfig.android) === null || _f === void 0 ? void 0 : _f.buildOptions) === null || _g === void 0 ? void 0 : _g.keystorePath,
+        keystorePassword: (_j = (_h = extConfig.android) === null || _h === void 0 ? void 0 : _h.buildOptions) === null || _j === void 0 ? void 0 : _j.keystorePassword,
+        keystoreAlias: (_l = (_k = extConfig.android) === null || _k === void 0 ? void 0 : _k.buildOptions) === null || _l === void 0 ? void 0 : _l.keystoreAlias,
+        keystoreAliasPassword: (_o = (_m = extConfig.android) === null || _m === void 0 ? void 0 : _m.buildOptions) === null || _o === void 0 ? void 0 : _o.keystoreAliasPassword,
+        signingType: (_q = (_p = extConfig.android) === null || _p === void 0 ? void 0 : _p.buildOptions) === null || _q === void 0 ? void 0 : _q.signingType,
+        releaseType: (_s = (_r = extConfig.android) === null || _r === void 0 ? void 0 : _r.buildOptions) === null || _s === void 0 ? void 0 : _s.releaseType,
     };
     return {
         name,
@@ -379,7 +380,7 @@ async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjec
 }
 function formatConfigTS(extConfig) {
     // TODO: <reference> tags
-    return `import { CapacitorConfig } from '@capacitor/cli';
+    return `import type { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = ${(0, js_1.formatJSObject)(extConfig)};
 

package/dist/index.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runProgram = exports.run = void 0;
 const tslib_1 = require("tslib");
 const commander_1 = require("commander");
-const path_1 = require("path");
+const add_1 = require("./android/add");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const config_1 = require("./config");
 const errors_1 = require("./errors");
+const add_2 = require("./ios/add");
 const ipc_1 = require("./ipc");
 const log_1 = require("./log");
 const telemetry_1 = require("./telemetry");
@@ -95,19 +96,22 @@ function runProgram(config) {
         .option('--keystorepath <keystorePath>', 'Path to the keystore')
         .option('--keystorepass <keystorePass>', 'Password to the keystore')
         .option('--keystorealias <keystoreAlias>', 'Key Alias in the keystore')
+        .option('--configuration <name>', 'Configuration name of the iOS Scheme')
         .option('--keystorealiaspass <keystoreAliasPass>', 'Password for the Key Alias')
         .addOption(new commander_1.Option('--androidreleasetype <androidreleasetype>', 'Android release type; APK or AAB').choices(['AAB', 'APK']))
         .addOption(new commander_1.Option('--signing-type <signingtype>', 'Program used to sign apps (default: jarsigner)').choices(['apksigner', 'jarsigner']))
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, }) => {
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, keystorepath, keystorepass, keystorealias, keystorealiaspass, androidreleasetype, signingType, configuration, }) => {
         const { buildCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/build')));
         await buildCommand(config, platform, {
             scheme,
+            flavor,
             keystorepath,
             keystorepass,
             keystorealias,
             keystorealiaspass,
             androidreleasetype,
             signingtype: signingType,
+            configuration,
         });
     })));
     commander_1.program
@@ -124,7 +128,8 @@ function runProgram(config) {
         .option('-l, --live-reload', 'Enable Live Reload')
         .option('--host <host>', 'Host used for live reload')
         .option('--port <port>', 'Port used for live reload')
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, target, sync, forwardPorts, liveReload, host, port, }) => {
+        .option('--configuration <name>', 'Configuration name of the iOS Scheme')
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { scheme, flavor, list, target, sync, forwardPorts, liveReload, host, port, configuration, }) => {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
         await runCommand(config, platform, {
             scheme,
@@ -136,6 +141,7 @@ function runProgram(config) {
             liveReload,
             host,
             port,
+            configuration,
         });
     })));
     commander_1.program
@@ -149,15 +155,36 @@ function runProgram(config) {
         .command('add [platform]')
         .description('add a native platform project')
         .option('--packagemanager <packageManager>', 'The package manager to use for dependency installs (SPM, Cocoapods)')
-        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { packagemanager }) => {
+        .option('--template <>', 'An external template package to use for the specified platform')
+        .option('--packageName <>', `A package name to use when installing a local template tgz.  Defaults to the package file name`)
+        .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { packagemanager, template, packageName }) => {
         (0, config_1.checkExternalConfig)(config.app);
-        const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
+        const { addCommand, prepareTemplate } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
         const configWritable = config;
-        if (packagemanager === 'SPM') {
-            configWritable.cli.assets.ios.platformTemplateArchive =
-                'ios-spm-template.tar.gz';
-            configWritable.cli.assets.ios.platformTemplateArchiveAbs = (0, path_1.resolve)(configWritable.cli.assetsDirAbs, configWritable.cli.assets.ios.platformTemplateArchive);
+        if (!template) {
+            // TODO: do we need to be able to specify a particular version?
+            if (platform === configWritable.ios.name) {
+                if (packagemanager === 'SPM') {
+                    template = add_2.defaultIOSTemplatePackageSPM;
+                }
+                else {
+                    template = add_2.defaultIOSTemplatePackageCocoapods;
+                }
+            }
+            else if (platform === configWritable.android.name) {
+                template = add_1.defaultAndroidTemplatePackage;
+            }
+        }
+        // TODO: how handle SPM with custom templates?
+        if (platform === configWritable.ios.name) {
+            configWritable.cli.assets.ios.platformTemplateArchiveAbs =
+                await prepareTemplate(configWritable, template, packageName);
+        }
+        else if (platform === configWritable.android.name) {
+            configWritable.cli.assets.android.platformTemplateArchiveAbs =
+                await prepareTemplate(configWritable, template, packageName);
         }
+        // TODO: should we validate custom templates?
         await addCommand(configWritable, platform);
     })));
     commander_1.program

package/dist/ios/add.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIOS = void 0;
+exports.addIOS = exports.defaultIOSTemplatePackageCocoapods = exports.defaultIOSTemplatePackageSPM = void 0;
 const tslib_1 = require("tslib");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const template_1 = require("../util/template");
+exports.defaultIOSTemplatePackageSPM = '@capacitor/ios-spm-template';
+exports.defaultIOSTemplatePackageCocoapods = '@capacitor/ios-cocoapods-template';
 async function addIOS(config) {
     await (0, common_1.runTask)(`Adding native Xcode project in ${colors_1.default.strong(config.ios.platformDir)}`, () => {
-        return (0, template_1.extractTemplate)(config.cli.assets.ios.platformTemplateArchiveAbs, config.ios.platformDirAbs);
+        return (0, template_1.extractTemplatePackage)(config.cli.assets.ios.platformTemplateArchiveAbs, config.ios.platformDirAbs);
     });
 }
 exports.addIOS = addIOS;

package/dist/ios/build.js

@@ -7,13 +7,25 @@ const path_1 = require("path");
 const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
 const common_1 = require("../common");
 const log_1 = require("../log");
+const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 async function buildiOS(config, buildOptions) {
     var _a;
     const theScheme = (_a = buildOptions.scheme) !== null && _a !== void 0 ? _a : 'App';
+    const packageManager = await (0, spm_1.checkPackageManager)(config);
+    let typeOfBuild;
+    let projectName;
+    if (packageManager == 'Cocoapods') {
+        typeOfBuild = '-workspace';
+        projectName = (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs);
+    }
+    else {
+        typeOfBuild = '-project';
+        projectName = (0, path_1.basename)(await config.ios.nativeXcodeProjDirAbs);
+    }
     await (0, common_1.runTask)('Building xArchive', async () => (0, subprocess_1.runCommand)('xcodebuild', [
-        '-workspace',
-        (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs),
+        typeOfBuild,
+        projectName,
         '-scheme',
         `${theScheme}`,
         '-destination',
@@ -44,6 +56,8 @@ async function buildiOS(config, buildOptions) {
         '-exportPath',
         'output',
         '-allowProvisioningUpdates',
+        '-configuration',
+        buildOptions.configuration,
     ], {
         cwd: config.ios.nativeProjectDirAbs,
     }));

package/dist/ios/common.js

@@ -85,6 +85,7 @@ exports.resolvePlugin = resolvePlugin;
 /**
  * Update the native project files with the desired app id and app name
  */
+// TODO: Remove
 async function editProjectSettingsIOS(config) {
     const appId = config.app.appId;
     const appName = config.app.appName

package/dist/ios/run.js

@@ -7,19 +7,32 @@ const path_1 = require("path");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const native_run_1 = require("../util/native-run");
+const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
 const debug = (0, debug_1.default)('capacitor:ios:run');
-async function runIOS(config, { target: selectedTarget, scheme: selectedScheme }) {
+async function runIOS(config, { target: selectedTarget, scheme: selectedScheme, configuration: selectedConfiguration, }) {
     const target = await (0, common_1.promptForPlatformTarget)(await (0, native_run_1.getPlatformTargets)('ios'), selectedTarget);
     const runScheme = selectedScheme || config.ios.scheme;
+    const configuration = selectedConfiguration || 'Debug';
     const derivedDataPath = (0, path_1.resolve)(config.ios.platformDirAbs, 'DerivedData', target.id);
+    const packageManager = await (0, spm_1.checkPackageManager)(config);
+    let typeOfBuild;
+    let projectName;
+    if (packageManager == 'Cocoapods') {
+        typeOfBuild = '-workspace';
+        projectName = (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs);
+    }
+    else {
+        typeOfBuild = '-project';
+        projectName = (0, path_1.basename)(await config.ios.nativeXcodeProjDirAbs);
+    }
     const xcodebuildArgs = [
-        '-workspace',
-        (0, path_1.basename)(await config.ios.nativeXcodeWorkspaceDirAbs),
+        typeOfBuild,
+        projectName,
         '-scheme',
         runScheme,
         '-configuration',
-        'Debug',
+        configuration,
         '-destination',
         `id=${target.id}`,
         '-derivedDataPath',
@@ -30,7 +43,9 @@ async function runIOS(config, { target: selectedTarget, scheme: selectedScheme }
         cwd: config.ios.nativeProjectDirAbs,
     }));
     const appName = `${runScheme}.app`;
-    const appPath = (0, path_1.resolve)(derivedDataPath, 'Build/Products', target.virtual ? 'Debug-iphonesimulator' : 'Debug-iphoneos', appName);
+    const appPath = (0, path_1.resolve)(derivedDataPath, 'Build/Products', target.virtual
+        ? `${configuration}-iphonesimulator`
+        : `${configuration}-iphoneos`, appName);
     const nativeRunArgs = ['ios', '--app', appPath, '--target', target.id];
     debug('Invoking native-run with args: %O', nativeRunArgs);
     await (0, common_1.runTask)(`Deploying ${colors_1.default.strong(appName)} to ${colors_1.default.input(target.id)}`, async () => (0, native_run_1.runNativeRun)(nativeRunArgs));

package/dist/ios/update.js

@@ -12,6 +12,7 @@ const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
 const fs_1 = require("../util/fs");
+const iosplugin_1 = require("../util/iosplugin");
 const node_1 = require("../util/node");
 const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
@@ -27,6 +28,7 @@ async function updateIOS(config, deployment) {
     else {
         await updateIOSCocoaPods(config, plugins, deployment);
     }
+    (0, iosplugin_1.generateIOSPackageJSON)(config, plugins);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'ios');
 }
 exports.updateIOS = updateIOS;

package/dist/tasks/add.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCommand = void 0;
+exports.addCommand = exports.prepareTemplate = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const utils_terminal_1 = require("@ionic/utils-terminal");
+const node_path_1 = require("node:path");
 const add_1 = require("../android/add");
 const common_1 = require("../android/common");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
@@ -12,7 +13,39 @@ const errors_1 = require("../errors");
 const add_2 = require("../ios/add");
 const common_3 = require("../ios/common");
 const log_1 = require("../log");
+const subprocess_1 = require("../util/subprocess");
 const sync_1 = require("./sync");
+async function prepareTemplate(config, template, packageName) {
+    // a local template file
+    if (template.startsWith('file://')) {
+        const templatePath = (0, node_path_1.resolve)(template.replace('file://', ''));
+        if (!(0, utils_fs_1.existsSync)(templatePath)) {
+            (0, errors_1.fatal)(`Template file not found at path: ${templatePath}`);
+        }
+        if (!templatePath.endsWith('.tar.gz') && !templatePath.endsWith('.tgz')) {
+            (0, errors_1.fatal)('Template file must be .tar.gz or .tgz');
+        }
+        log_1.logger.info(`Using local template at ${templatePath}`);
+        if (!packageName) {
+            packageName = (0, node_path_1.basename)(templatePath)
+                .replace('.tar.gz', '')
+                .replace('.tgz', '');
+        }
+    }
+    else {
+        const packageComponents = template.split(/@[~^]?([\dvx*]+(?:[-.](?:[\dx*]+|alpha|beta|rc))*)/gm);
+        packageName = packageComponents[0];
+    }
+    try {
+        log_1.logger.info(`Installing template package: ${template}`);
+        await (0, subprocess_1.runCommand)('npm', ['install', '--save-dev', template]);
+        return (0, node_path_1.join)(config.app.rootDir, 'node_modules', packageName);
+    }
+    catch (err) {
+        (0, errors_1.fatal)(`Could not install template package ${template}:\n ${err}`);
+    }
+}
+exports.prepareTemplate = prepareTemplate;
 async function addCommand(config, selectedPlatformName) {
     var _a;
     if (selectedPlatformName && !(await (0, common_2.isValidPlatform)(selectedPlatformName))) {
@@ -53,7 +86,7 @@ async function addCommand(config, selectedPlatformName) {
                 ...addChecks(config, platformName),
             ]);
             await doAdd(config, platformName);
-            await editPlatforms(config, platformName);
+            await runTemplateHooks(config, platformName);
             if (await (0, utils_fs_1.pathExists)(config.app.webDirAbs)) {
                 await (0, sync_1.sync)(config, platformName, false, false);
                 if (platformName === config.android.name) {
@@ -107,6 +140,7 @@ async function doAdd(config, platformName) {
         }
     });
 }
+// TODO: Remove
 async function editPlatforms(config, platformName) {
     if (platformName === config.ios.name) {
         await (0, common_3.editProjectSettingsIOS)(config);
@@ -115,6 +149,18 @@ async function editPlatforms(config, platformName) {
         await (0, common_1.editProjectSettingsAndroid)(config);
     }
 }
+async function runTemplateHooks(config, platformName) {
+    let templateDir = undefined;
+    if (platformName === config.ios.name) {
+        templateDir = config.cli.assets.ios.platformTemplateArchiveAbs;
+    }
+    else if (platformName === config.android.name) {
+        templateDir = config.cli.assets.android.platformTemplateArchiveAbs;
+    }
+    if (templateDir) {
+        await (0, common_2.runPlatformHook)(config, platformName, templateDir, 'capacitor:add:after');
+    }
+}
 function webWarning() {
     log_1.logger.error(`Not adding platform ${colors_1.default.strong('web')}.\n` +
         `In Capacitor, the web platform is just your web app! For example, if you have a React or Angular project, the web platform is that project.\n` +

package/dist/tasks/build.js

@@ -29,6 +29,7 @@ async function buildCommand(config, selectedPlatformName, buildOptions) {
         signingtype: buildOptions.signingtype ||
             config.android.buildOptions.signingType ||
             'jarsigner',
+        configuration: buildOptions.configuration || 'Release',
     };
     try {
         await build(config, platformName, buildCommandOptions);

package/dist/tasks/copy.js

@@ -8,8 +8,10 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
+const common_2 = require("../ios/common");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
+const iosplugin_1 = require("../util/iosplugin");
 const promise_1 = require("../util/promise");
 const copy_1 = require("../web/copy");
 const sourcemaps_1 = require("./sourcemaps");
@@ -80,6 +82,8 @@ async function copy(config, platformName, inline = false) {
             await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
             const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
             await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platformName);
+            const iosPlugins = await (0, common_2.getIOSPlugins)(allPlugins);
+            await (0, iosplugin_1.generateIOSPackageJSON)(config, iosPlugins);
         }
         else if (platformName === config.android.name) {
             if (usesFederatedCapacitor) {
@@ -193,11 +197,6 @@ async function copySSLCert(sslCertPaths, rootDir, targetDir) {
     const validCertPaths = [];
     for (const sslCertPath of sslCertPaths) {
         const certAbsFromPath = (0, path_1.join)(rootDir, sslCertPath);
-        if (!/^.+\.(cer)$/.test(certAbsFromPath)) {
-            log_1.logger.warn(`Cannot copy file from ${colors_1.default.strong(certAbsFromPath)}\n` +
-                `The file is not a .cer SSL Certificate file.`);
-            return;
-        }
         if (!(await (0, utils_fs_1.pathExists)(certAbsFromPath))) {
             log_1.logger.warn(`Cannot copy SSL Certificate file from ${colors_1.default.strong(certAbsFromPath)}\n` +
                 `SSL Certificate does not exist at specified path.`);

package/dist/tasks/migrate.js

@@ -127,6 +127,10 @@ async function migrateCommand(config, noprompt, packagemanager) {
             if (allDependencies['@capacitor/ios'] &&
                 (0, utils_fs_1.existsSync)(config.ios.platformDirAbs)) {
                 // ios template changes
+                // Remove NSLocationAlwaysUsageDescription
+                await (0, common_2.runTask)(`Migrating Info.plist by removing NSLocationAlwaysUsageDescription key.`, () => {
+                    return removeKey((0, path_1.join)(config.ios.nativeTargetDirAbs, 'Info.plist'), 'NSLocationAlwaysUsageDescription');
+                });
             }
             if (allDependencies['@capacitor/android'] &&
                 (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
@@ -177,15 +181,15 @@ async function migrateCommand(config, noprompt, packagemanager) {
                         }
                         const pluginVariables = {
                             firebaseMessagingVersion: '23.3.1',
-                            playServicesLocationVersion: '21.0.1',
+                            playServicesLocationVersion: '21.1.0',
                             androidxBrowserVersion: '1.7.0',
                             androidxMaterialVersion: '1.10.0',
                             androidxExifInterfaceVersion: '1.3.6',
                             androidxCoreKTXVersion: '1.12.0',
-                            googleMapsPlayServicesVersion: '18.1.0',
-                            googleMapsUtilsVersion: '3.5.3',
-                            googleMapsKtxVersion: '3.4.0',
-                            googleMapsUtilsKtxVersion: '3.4.0',
+                            googleMapsPlayServicesVersion: '18.2.0',
+                            googleMapsUtilsVersion: '3.8.2',
+                            googleMapsKtxVersion: '5.0.0',
+                            googleMapsUtilsKtxVersion: '5.0.0',
                             kotlinxCoroutinesVersion: '1.7.3',
                             coreSplashScreenVersion: '1.0.1',
                         };
@@ -304,9 +308,10 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
 async function writeBreakingChanges() {
     const breaking = [
         '@capacitor/camera',
-        '@capacitor/device',
+        '@capacitor/filesystem',
+        '@capacitor/geolocation',
+        '@capacitor/google-maps',
         '@capacitor/local-notifications',
-        '@capacitor/push-notifications',
     ];
     const broken = [];
     for (const lib of breaking) {
@@ -315,7 +320,7 @@ async function writeBreakingChanges() {
         }
     }
     if (broken.length > 0) {
-        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/updating/5-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
+        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/next/updating/6-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
 }
 async function getAndroidVariablesAndClasspaths(config) {
@@ -537,3 +542,26 @@ async function patchOldCapacitorPlugins(config) {
     }));
 }
 exports.patchOldCapacitorPlugins = patchOldCapacitorPlugins;
+async function removeKey(filename, key) {
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    let lines = txt.split('\n');
+    let removed = false;
+    let removing = false;
+    lines = lines.filter(line => {
+        if (removing && line.includes('</string>')) {
+            removing = false;
+            return false;
+        }
+        if (line.includes(`<key>${key}</key`)) {
+            removing = true;
+            removed = true;
+        }
+        return !removing;
+    });
+    if (removed) {
+        (0, utils_fs_1.writeFileSync)(filename, lines.join('\n'), 'utf-8');
+    }
+}

package/dist/util/iosplugin.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateIOSPackageJSON = exports.writePluginJSON = exports.findPluginClasses = exports.getPluginFiles = void 0;
+const utils_fs_1 = require("@ionic/utils-fs");
+const path_1 = require("path");
+const cordova_1 = require("../cordova");
+async function getPluginFiles(plugins) {
+    var _a, _b;
+    let filenameList = [];
+    const options = {
+        filter: item => {
+            if (item.path.endsWith('.swift') || item.path.endsWith('.m')) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        },
+    };
+    for (const plugin of plugins) {
+        if (typeof ((_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name) !== 'undefined') {
+            const pluginPath = (0, path_1.resolve)(plugin.rootPath, (_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.path);
+            const filenames = await (0, utils_fs_1.readdirp)(pluginPath, options);
+            filenameList = filenameList.concat(filenames);
+        }
+    }
+    return filenameList;
+}
+exports.getPluginFiles = getPluginFiles;
+async function findPluginClasses(files) {
+    const classList = [];
+    for (const file of files) {
+        const fileData = (0, utils_fs_1.readFileSync)(file, 'utf-8');
+        const swiftPluginRegex = RegExp(/@objc\(([A-Za-z0-9_-]+)\)/);
+        const objcPluginRegex = RegExp(/CAP_PLUGIN\(([A-Za-z0-9_-]+)/);
+        const swiftMatches = swiftPluginRegex.exec(fileData);
+        if ((swiftMatches === null || swiftMatches === void 0 ? void 0 : swiftMatches[1]) != null) {
+            classList.push(swiftMatches[1]);
+        }
+        const objcMatches = objcPluginRegex.exec(fileData);
+        if ((objcMatches === null || objcMatches === void 0 ? void 0 : objcMatches[1]) != null) {
+            classList.push(objcMatches[1]);
+        }
+    }
+    return classList;
+}
+exports.findPluginClasses = findPluginClasses;
+async function writePluginJSON(config, classList) {
+    const capJSONFile = (0, path_1.resolve)(config.ios.nativeTargetDirAbs, 'capacitor.config.json');
+    const capJSON = (0, utils_fs_1.readJSONSync)(capJSONFile);
+    capJSON['packageClassList'] = classList;
+    (0, utils_fs_1.writeJSONSync)(capJSONFile, capJSON, { spaces: '\t' });
+}
+exports.writePluginJSON = writePluginJSON;
+async function generateIOSPackageJSON(config, plugins) {
+    const fileList = await getPluginFiles(plugins);
+    const classList = await findPluginClasses(fileList);
+    const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
+    if (cordovaPlugins.length > 0) {
+        classList.push('CDVPlugin');
+    }
+    writePluginJSON(config, classList);
+}
+exports.generateIOSPackageJSON = generateIOSPackageJSON;

package/dist/util/node.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveNode = exports.requireTS = void 0;
 const utils_fs_1 = require("@ionic/utils-fs");
+const fs_1 = require("fs");
 const path_1 = require("path");
 /**
  * @see https://github.com/ionic-team/stencil/blob/HEAD/src/compiler/sys/node-require.ts
@@ -43,6 +44,10 @@ function resolveNode(root, ...pathSegments) {
         return require.resolve(pathSegments.join('/'), { paths: [root] });
     }
     catch (e) {
+        const path = [root, 'node_modules', ...pathSegments].join('/');
+        if ((0, fs_1.existsSync)(path)) {
+            return path;
+        }
         return null;
     }
 }

package/dist/util/spm.js

@@ -1,83 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPackageManager = exports.generatePackageFile = exports.findPackageSwiftFile = void 0;
+exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
 const log_1 = require("../log");
+async function checkPackageManager(config) {
+    const iosDirectory = config.ios.nativeProjectDirAbs;
+    if ((0, utils_fs_1.existsSync)((0, path_1.resolve)(iosDirectory, 'CapApp-SPM'))) {
+        return 'SPM';
+    }
+    return 'Cocoapods';
+}
+exports.checkPackageManager = checkPackageManager;
 async function findPackageSwiftFile(config) {
     const packageDirectory = (0, path_1.resolve)(config.ios.nativeProjectDirAbs, 'CapApp-SPM');
     return (0, path_1.resolve)(packageDirectory, 'Package.swift');
 }
 exports.findPackageSwiftFile = findPackageSwiftFile;
-function readSwiftPackage(packageLine) {
-    const packageRegex = RegExp(/.package\(\s*name:\s*"([A-Za-z0-9_-]+)"/);
-    const lineMatch = packageLine.match(packageRegex);
-    if (lineMatch === null) {
-        return null;
-    }
-    return lineMatch[1];
-}
 async function generatePackageFile(config, plugins) {
-    var _a, _b;
-    const swiftPluginList = [];
-    for (const plugin of plugins) {
-        const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
-        const pluginStatement = `.package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}"),`;
-        swiftPluginList.push(pluginStatement);
-    }
     const packageSwiftFile = await findPackageSwiftFile(config);
     try {
-        if (!(0, utils_fs_1.existsSync)(packageSwiftFile)) {
-            log_1.logger.error(`Unable to find ${packageSwiftFile}. Try updating it manually`);
-        }
-        const packageSwiftText = (0, utils_fs_1.readFileSync)(packageSwiftFile, 'utf-8');
-        const packageSwiftTextLines = packageSwiftText.split('\n');
-        let textToWrite = '';
-        const packages = [];
-        for (const lineIndex in packageSwiftTextLines) {
-            const line = packageSwiftTextLines;
-            const index = parseInt(lineIndex);
-            if (line[index].includes('dependencies: [') &&
-                line[index + 1].includes('.package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")')) {
-                let tempIndex = index + 1;
-                while (!line[tempIndex].includes('],')) {
-                    const swiftPack = readSwiftPackage(line[tempIndex]);
-                    if (swiftPack !== null) {
-                        packages.push(swiftPack);
-                    }
-                    tempIndex++;
-                }
-            }
-            if (line[index].includes('.package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")')) {
-                if (line[index].endsWith(',')) {
-                    textToWrite += line[index] + '\n';
-                }
-                else {
-                    textToWrite += line[index] + ',\n';
-                }
-                for (const swiftPlugin of swiftPluginList) {
-                    const name = (_b = readSwiftPackage(swiftPlugin)) !== null && _b !== void 0 ? _b : '';
-                    if (!packages.includes(name)) {
-                        textToWrite += '        ' + swiftPlugin + '\n';
-                    }
-                }
-            }
-            else {
-                textToWrite += line[index] + '\n';
-            }
-        }
+        const textToWrite = generatePackageText(config, plugins);
         (0, utils_fs_1.writeFileSync)(packageSwiftFile, textToWrite);
     }
     catch (err) {
-        log_1.logger.error(`Unable to read ${packageSwiftFile}. Verify it is not already open. ${err}`);
+        log_1.logger.error(`Unable to write to ${packageSwiftFile}. Verify it is not already open. \n Error: ${err}`);
     }
 }
 exports.generatePackageFile = generatePackageFile;
-async function checkPackageManager(config) {
-    const iosDirectory = config.ios.nativeProjectDirAbs;
-    if ((0, utils_fs_1.existsSync)((0, path_1.resolve)(iosDirectory, 'CapApp-SPM'))) {
-        return 'SPM';
+function generatePackageText(config, plugins) {
+    var _a, _b, _c;
+    let packageSwiftText = `// swift-tools-version: 5.9
+import PackageDescription
+
+// DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
+let package = Package(
+    name: "CapApp-SPM",
+    platforms: [.iOS(.v13)],
+    products: [
+        .library(
+            name: "CapApp-SPM",
+            targets: ["CapApp-SPM"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main")`;
+    for (const plugin of plugins) {
+        const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+        packageSwiftText += `,\n        .package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}")`;
     }
-    return 'Cocoapods';
+    packageSwiftText += `
+    ],
+    targets: [
+        .target(
+            name: "CapApp-SPM",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-spm"),
+                .product(name: "Cordova", package: "capacitor-spm")`;
+    for (const plugin of plugins) {
+        packageSwiftText += `,\n                .product(name: "${(_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.name}", package: "${(_c = plugin.ios) === null || _c === void 0 ? void 0 : _c.name}")`;
+    }
+    packageSwiftText += `
+            ]
+        )
+    ]
+)
+`;
+    return packageSwiftText;
 }
-exports.checkPackageManager = checkPackageManager;

package/dist/util/template.js

@@ -1,11 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractTemplate = void 0;
+exports.extractTemplatePackage = exports.extractTemplate = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
+const node_path_1 = require("node:path");
 const tar_1 = tslib_1.__importDefault(require("tar"));
 async function extractTemplate(src, dir) {
     await (0, utils_fs_1.mkdirp)(dir);
-    await tar_1.default.extract({ file: src, cwd: dir });
+    if (!(0, utils_fs_1.lstatSync)(src).isDirectory()) {
+        await tar_1.default.extract({ file: src, cwd: dir });
+    }
+    else {
+        (0, utils_fs_1.cpSync)(src, dir, {
+            recursive: true,
+        });
+    }
 }
 exports.extractTemplate = extractTemplate;
+async function extractTemplatePackage(src, dir) {
+    await (0, utils_fs_1.mkdirp)(dir);
+    if (!(0, utils_fs_1.lstatSync)(src).isDirectory()) {
+        await tar_1.default.extract({
+            file: src,
+            cwd: dir,
+            filter: (path, entry) => {
+                if (path.startsWith('./template/')) {
+                    entry.path = entry.path.replace('./template/', './');
+                    return true;
+                }
+                return false;
+            },
+        });
+    }
+    else {
+        (0, utils_fs_1.cpSync)((0, node_path_1.join)(src, 'template'), dir, {
+            recursive: true,
+        });
+    }
+}
+exports.extractTemplatePackage = extractTemplatePackage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0-dev-8046d907.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -85,5 +85,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "8046d907d2d2c0779316adbcabda426acee2dfc3"
 }