@capacitor/cli 6.2.0 → 7.0.0-alpha.2

package/dist/tasks/run.js

@@ -15,8 +15,7 @@ const native_run_1 = require("../util/native-run");
 const sync_1 = require("./sync");
 async function runCommand(config, selectedPlatformName, options) {
     var _a, _b, _c, _d;
-    options.host =
-        (_b = (_a = options.host) !== null && _a !== void 0 ? _a : livereload_1.CapLiveReloadHelper.getIpAddress()) !== null && _b !== void 0 ? _b : 'localhost';
+    options.host = (_b = (_a = options.host) !== null && _a !== void 0 ? _a : livereload_1.CapLiveReloadHelper.getIpAddress()) !== null && _b !== void 0 ? _b : 'localhost';
     options.port = (_c = options.port) !== null && _c !== void 0 ? _c : '3000';
     if (selectedPlatformName && !(await (0, common_1.isValidPlatform)(selectedPlatformName))) {
         const platformDir = (0, common_1.resolvePlatform)(config, selectedPlatformName);
@@ -38,7 +37,7 @@ async function runCommand(config, selectedPlatformName, options) {
         }
         if (options.list) {
             const targets = await (0, native_run_1.getPlatformTargets)(platformName);
-            const outputTargets = targets.map(t => {
+            const outputTargets = targets.map((t) => {
                 var _a;
                 return ({
                     name: (0, common_1.getPlatformTargetName)(t),
@@ -51,7 +50,7 @@ async function runCommand(config, selectedPlatformName, options) {
                 process.stdout.write(`${JSON.stringify(outputTargets)}\n`);
             }
             else {
-                const rows = outputTargets.map(t => [t.name, t.api, t.id]);
+                const rows = outputTargets.map((t) => [t.name, t.api, t.id]);
                 log_1.output.write(`${(0, utils_terminal_1.columnar)(rows, {
                     headers: ['Name', 'API', 'Target ID'],
                     vsep: ' ',
@@ -72,7 +71,7 @@ async function runCommand(config, selectedPlatformName, options) {
             }
             await run(config, platformName, options);
             if (options.liveReload) {
-                new Promise(resolve => process.on('SIGINT', resolve))
+                new Promise((resolve) => process.on('SIGINT', resolve))
                     .then(async () => {
                     await livereload_1.CapLiveReloadHelper.revertCapConfigForLiveReload();
                     if (platformName === config.android.name) {
@@ -109,7 +108,7 @@ async function run(config, platformName, options) {
 }
 exports.run = run;
 function createRunnablePlatformFilter(config) {
-    return platform => platform === config.ios.name || platform === config.android.name;
+    return (platform) => platform === config.ios.name || platform === config.android.name;
 }
 async function sleepForever() {
     return new Promise(() => {

package/dist/tasks/sourcemaps.js

@@ -6,7 +6,7 @@ const path_1 = require("path");
 const log_1 = require("../log");
 function walkDirectory(dirPath) {
     const files = (0, utils_fs_1.readdirSync)(dirPath);
-    files.forEach(file => {
+    files.forEach((file) => {
         const targetFile = (0, path_1.join)(dirPath, file);
         if ((0, utils_fs_1.existsSync)(targetFile) && (0, utils_fs_1.lstatSync)(targetFile).isDirectory()) {
             walkDirectory(targetFile);
@@ -16,8 +16,7 @@ function walkDirectory(dirPath) {
             if ((0, path_1.extname)(file) === '.js' && (0, utils_fs_1.existsSync)(mapFile)) {
                 const bufMap = (0, utils_fs_1.readFileSync)(mapFile).toString('base64');
                 const bufFile = (0, utils_fs_1.readFileSync)(targetFile, 'utf8');
-                const result = bufFile.replace(`sourceMappingURL=${file}.map`, 'sourceMappingURL=data:application/json;charset=utf-8;base64,' +
-                    bufMap);
+                const result = bufFile.replace(`sourceMappingURL=${file}.map`, 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + bufMap);
                 (0, utils_fs_1.writeFileSync)(targetFile, result);
                 (0, utils_fs_1.unlinkSync)(mapFile);
             }

package/dist/tasks/sync.js

@@ -25,12 +25,8 @@ async function syncCommand(config, selectedPlatformName, deployment, inline = fa
         const then = +new Date();
         const platforms = await (0, common_1.selectPlatforms)(config, selectedPlatformName);
         try {
-            await (0, common_1.check)([
-                () => (0, common_1.checkPackage)(),
-                () => (0, common_1.checkWebDir)(config),
-                ...(0, update_1.updateChecks)(config, platforms),
-            ]);
-            await (0, promise_1.allSerial)(platforms.map(platformName => () => sync(config, platformName, deployment, inline)));
+            await (0, common_1.check)([() => (0, common_1.checkPackage)(), () => (0, common_1.checkWebDir)(config), ...(0, update_1.updateChecks)(config, platforms)]);
+            await (0, promise_1.allSerial)(platforms.map((platformName) => () => sync(config, platformName, deployment, inline)));
             const now = +new Date();
             const diff = (now - then) / 1000;
             log_1.logger.info(`Sync finished in ${diff}s`);

package/dist/tasks/telemetry.js

@@ -6,7 +6,8 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const errors_1 = require("../errors");
 const log_1 = require("../log");
 const sysconfig_1 = require("../sysconfig");
-const telemetry_1 = require("../telemetry");
+const THANK_YOU = `\nThank you for helping to make Capacitor better! 💖` +
+    `\nInformation about the data we collect is available on our website: ${colors_1.default.strong('https://capacitorjs.com/telemetry')}\n`;
 async function telemetryCommand(onOrOff) {
     const sysconfig = await (0, sysconfig_1.readConfig)();
     const enabled = interpretEnabled(onOrOff);
@@ -18,7 +19,7 @@ async function telemetryCommand(onOrOff) {
             await (0, sysconfig_1.writeConfig)({ ...sysconfig, telemetry: enabled });
             (0, log_1.logSuccess)(`You have ${colors_1.default.strong(`opted ${enabled ? 'in' : 'out'}`)} ${enabled ? 'for' : 'of'} telemetry on this machine.`);
             if (enabled) {
-                log_1.output.write(telemetry_1.THANK_YOU);
+                log_1.output.write(THANK_YOU);
             }
         }
     }

package/dist/tasks/update.js

@@ -26,7 +26,7 @@ async function updateCommand(config, selectedPlatformName, deployment) {
         const platforms = await (0, common_1.selectPlatforms)(config, selectedPlatformName);
         try {
             await (0, common_1.check)([() => (0, common_1.checkPackage)(), ...updateChecks(config, platforms)]);
-            await (0, promise_1.allSerial)(platforms.map(platformName => async () => await update(config, platformName, deployment)));
+            await (0, promise_1.allSerial)(platforms.map((platformName) => async () => await update(config, platformName, deployment)));
             const now = +new Date();
             const diff = (now - then) / 1000;
             log_1.logger.info(`Update finished in ${diff}s`);

package/dist/telemetry.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendMetric = exports.telemetryAction = exports.THANK_YOU = void 0;
+exports.sendMetric = exports.telemetryAction = void 0;
 const tslib_1 = require("tslib");
 const commander_1 = require("commander");
 const debug_1 = tslib_1.__importDefault(require("debug"));
@@ -11,8 +11,9 @@ const sysconfig_1 = require("./sysconfig");
 const subprocess_1 = require("./util/subprocess");
 const term_1 = require("./util/term");
 const debug = (0, debug_1.default)('capacitor:telemetry');
-exports.THANK_YOU = `\nThank you for helping to make Capacitor better! 💖` +
-    `\nInformation about the data we collect is available on our website: ${colors_1.default.strong('https://capacitorjs.com/telemetry')}\n`;
+const THANK_YOU = `\nThank you for helping improve Capacitor by sharing anonymous usage data! 💖` +
+    `\nInformation about the data we collect is available on our website: ${colors_1.default.strong('https://capacitorjs.com/telemetry')}` +
+    `\nYou can disable telemetry at any time by using the ${colors_1.default.input('npx cap telemetry off')} command.`;
 function telemetryAction(config, action) {
     return async (...actionArgs) => {
         const start = new Date();
@@ -55,9 +56,10 @@ function telemetryAction(config, action) {
         if ((0, term_1.isInteractive)()) {
             let sysconfig = await (0, sysconfig_1.readConfig)();
             if (!error && typeof sysconfig.telemetry === 'undefined') {
-                const confirm = await promptForTelemetry();
-                sysconfig = { ...sysconfig, telemetry: confirm };
+                // Telemetry is opt-out; turn telemetry on then inform the user how to opt-out.
+                sysconfig = { ...sysconfig, telemetry: true };
                 await (0, sysconfig_1.writeConfig)(sysconfig);
+                log_1.output.write(THANK_YOU);
             }
             await sendMetric(sysconfig, 'capacitor_cli_command', data);
         }
@@ -86,19 +88,6 @@ async function sendMetric(sysconfig, name, data) {
     }
 }
 exports.sendMetric = sendMetric;
-async function promptForTelemetry() {
-    const { confirm } = await (0, log_1.logPrompt)(`${colors_1.default.strong('Would you like to help improve Capacitor by sharing anonymous usage data? 💖')}\n` +
-        `Read more about what is being collected and why here: ${colors_1.default.strong('https://capacitorjs.com/telemetry')}. You can change your mind at any time by using the ${colors_1.default.input('npx cap telemetry')} command.`, {
-        type: 'confirm',
-        name: 'confirm',
-        message: 'Share anonymous usage data?',
-        initial: true,
-    });
-    if (confirm) {
-        log_1.output.write(exports.THANK_YOU);
-    }
-    return confirm;
-}
 /**
  * Get a unique anonymous identifier for this app.
  */

package/dist/util/fs.js

@@ -9,7 +9,7 @@ const convertToUnixPath = (path) => {
 exports.convertToUnixPath = convertToUnixPath;
 const deleteFolderRecursive = (directoryPath) => {
     if ((0, utils_fs_1.existsSync)(directoryPath)) {
-        (0, utils_fs_1.readdirSync)(directoryPath).forEach(file => {
+        (0, utils_fs_1.readdirSync)(directoryPath).forEach((file) => {
             const curPath = (0, path_1.join)(directoryPath, file);
             if ((0, utils_fs_1.lstatSync)(curPath).isDirectory()) {
                 (0, exports.deleteFolderRecursive)(curPath);

package/dist/util/iosplugin.js

@@ -9,9 +9,8 @@ async function getPluginFiles(plugins) {
     var _a;
     let filenameList = [];
     const options = {
-        filter: item => {
-            if (item.stats.isFile() &&
-                (item.path.endsWith('.swift') || item.path.endsWith('.m'))) {
+        filter: (item) => {
+            if (item.stats.isFile() && (item.path.endsWith('.swift') || item.path.endsWith('.m'))) {
                 return true;
             }
             else {

package/dist/util/livereload.js

@@ -73,7 +73,7 @@ class CapLiveReload {
             return res[0].address;
         }
         const all = Object.keys(interfaces)
-            .map(nic => {
+            .map((nic) => {
             //
             // Note: name will only be `public` or `private`
             // when this is called.
@@ -86,9 +86,7 @@ class CapLiveReload {
                 if (!name) {
                     return true;
                 }
-                return name === 'public'
-                    ? isPrivate(details.address)
-                    : isPublic(details.address);
+                return name === 'public' ? isPrivate(details.address) : isPublic(details.address);
             });
             return addresses.length ? addresses[0].address : undefined;
         })
@@ -138,8 +136,7 @@ class CapLiveReload {
         (0, utils_fs_1.writeJSONSync)(capConfigPath, configJson, { spaces: '\t' });
     }
     async revertCapConfigForLiveReload() {
-        if (this.configJsonToRevertTo.json == null ||
-            this.configJsonToRevertTo.platformPath == null)
+        if (this.configJsonToRevertTo.json == null || this.configJsonToRevertTo.platformPath == null)
             return;
         const capConfigPath = this.configJsonToRevertTo.platformPath;
         const configJson = this.configJsonToRevertTo.json;

package/dist/util/monorepotools.js

@@ -13,8 +13,7 @@ function findMonorepoRoot(currentPath) {
     const packageJsonPath = (0, node_path_1.join)(currentPath, 'package.json');
     const pnpmWorkspacePath = (0, node_path_1.join)(currentPath, 'pnpm-workspace.yaml');
     if ((0, node_fs_1.existsSync)(pnpmWorkspacePath) ||
-        ((0, node_fs_1.existsSync)(packageJsonPath) &&
-            JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf-8')).workspaces)) {
+        ((0, node_fs_1.existsSync)(packageJsonPath) && JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf-8')).workspaces)) {
         return currentPath;
     }
     const parentPath = (0, node_path_1.dirname)(currentPath);

package/dist/util/promise.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazy = exports.LazyPromise = exports.allSerial = void 0;
 function allSerial(funcs) {
-    return funcs.reduce((promise, func) => promise.then(result => func().then(x => result.concat(x))), Promise.resolve([]));
+    return funcs.reduce((promise, func) => promise.then((result) => func().then((x) => result.concat(x))), Promise.resolve([]));
 }
 exports.allSerial = allSerial;
 class LazyPromise extends Promise {

package/dist/util/spm.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePackageFile = exports.findPackageSwiftFile = exports.checkPackageManager = void 0;
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
-const common_1 = require("../common");
 const log_1 = require("../log");
 async function checkPackageManager(config) {
     const iosDirectory = config.ios.nativeProjectDirAbs;
@@ -22,7 +21,7 @@ async function generatePackageFile(config, plugins) {
     const packageSwiftFile = await findPackageSwiftFile(config);
     try {
         log_1.logger.warn('SPM Support is still experimental');
-        const textToWrite = await generatePackageText(config, plugins);
+        const textToWrite = generatePackageText(config, plugins);
         (0, utils_fs_1.writeFileSync)(packageSwiftFile, textToWrite);
     }
     catch (err) {
@@ -30,9 +29,8 @@ async function generatePackageFile(config, plugins) {
     }
 }
 exports.generatePackageFile = generatePackageFile;
-async function generatePackageText(config, plugins) {
+function generatePackageText(config, plugins) {
     var _a, _b, _c;
-    const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const pbx = (0, utils_fs_1.readFileSync)((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
     const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
     const iosVersion = pbx.substring(pbx.indexOf(searchString) + searchString.length, pbx.indexOf(searchString) + searchString.length + 2);
@@ -49,7 +47,7 @@ let package = Package(
             targets: ["CapApp-SPM"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "${iosPlatformVersion}")`;
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.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}")`;

package/dist/util/subprocess.js

@@ -10,13 +10,7 @@ async function runCommand(command, args, options = {}) {
     catch (e) {
         if (e instanceof utils_subprocess_1.SubprocessError) {
             // old behavior of just throwing the stdout/stderr strings
-            throw e.output
-                ? e.output
-                : e.code
-                    ? e.code
-                    : e.error
-                        ? e.error.message
-                        : 'Unknown error';
+            throw e.output ? e.output : e.code ? e.code : e.error ? e.error.message : 'Unknown error';
         }
         throw e;
     }

package/dist/util/term.js

@@ -18,7 +18,7 @@ const checkInteractive = (...args) => {
     }
     // Make sure none of the provided args are empty, otherwise print the interactive
     // warning and return false
-    if (args.filter(arg => !arg).length) {
+    if (args.filter((arg) => !arg).length) {
         log_1.logger.error(`Non-interactive shell detected.\n` +
             `Run the command with ${colors_1.default.input('--help')} to see a list of arguments that must be provided.`);
         return false;

package/dist/util/uuid.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uuidv4 = void 0;
 function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
         const r = (Math.random() * 16) | 0;
         const v = c == 'x' ? r : (r & 0x3) | 0x8;
         return v.toString(16);

package/dist/util/xml.js

@@ -21,9 +21,7 @@ async function readXML(path) {
 }
 exports.readXML = readXML;
 function parseXML(xmlStr, options) {
-    const parser = options !== undefined
-        ? new xml2js_1.default.Parser({ ...options })
-        : new xml2js_1.default.Parser();
+    const parser = options !== undefined ? new xml2js_1.default.Parser({ ...options }) : new xml2js_1.default.Parser();
     let xmlObj;
     parser.parseString(xmlStr, (err, result) => {
         if (!err) {
@@ -34,7 +32,7 @@ function parseXML(xmlStr, options) {
 }
 exports.parseXML = parseXML;
 async function writeXML(object) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         const builder = new xml2js_1.default.Builder({
             headless: true,
             explicitRoot: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "6.2.0",
+  "version": "7.0.0-alpha.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -27,7 +27,7 @@
     "cross platform"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "main": "dist/index.js",
   "types": "dist/declarations.d.ts",

package/dist/web/copy.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyWeb = void 0;
-const tslib_1 = require("tslib");
-const utils_fs_1 = require("@ionic/utils-fs");
-const path_1 = require("path");
-const colors_1 = tslib_1.__importDefault(require("../colors"));
-const common_1 = require("../common");
-const errors_1 = require("../errors");
-const node_1 = require("../util/node");
-async function copyWeb(config) {
-    if (config.app.bundledWebRuntime) {
-        const runtimePath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/core', 'dist', 'capacitor.js');
-        if (!runtimePath) {
-            (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/core/dist/capacitor.js')}.\n` + `Are you sure ${colors_1.default.strong('@capacitor/core')} is installed?`);
-        }
-        return (0, common_1.runTask)(`Copying ${colors_1.default.strong('capacitor.js')} to web dir`, () => {
-            return (0, utils_fs_1.copy)(runtimePath, (0, path_1.join)(config.app.webDirAbs, 'capacitor.js'));
-        });
-    }
-}
-exports.copyWeb = copyWeb;