@capacitor/cli 4.7.3 → 5.0.0-alpha.2

package/dist/config.js

@@ -12,14 +12,14 @@ 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 debug = debug_1.default('capacitor:config');
+const debug = (0, debug_1.default)('capacitor:config');
 exports.CONFIG_FILE_NAME_TS = 'capacitor.config.ts';
 exports.CONFIG_FILE_NAME_JS = 'capacitor.config.js';
 exports.CONFIG_FILE_NAME_JSON = 'capacitor.config.json';
 async function loadConfig() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const appRootDir = process.cwd();
-    const cliRootDir = path_1.dirname(__dirname);
+    const cliRootDir = (0, path_1.dirname)(__dirname);
     const conf = await loadExtConfig(appRootDir);
     const appId = (_a = conf.extConfig.appId) !== null && _a !== void 0 ? _a : '';
     const appName = (_b = conf.extConfig.appName) !== null && _b !== void 0 ? _b : '';
@@ -35,13 +35,12 @@ async function loadConfig() {
             appId,
             appName,
             webDir,
-            webDirAbs: path_1.resolve(appRootDir, webDir),
-            package: (_d = (await fn_1.tryFn(utils_fs_1.readJSON, path_1.resolve(appRootDir, 'package.json')))) !== null && _d !== void 0 ? _d : {
+            webDirAbs: (0, path_1.resolve)(appRootDir, webDir),
+            package: (_d = (await (0, fn_1.tryFn)(utils_fs_1.readJSON, (0, path_1.resolve)(appRootDir, 'package.json')))) !== null && _d !== void 0 ? _d : {
                 name: appName,
                 version: '1.0.0',
             },
             ...conf,
-            bundledWebRuntime: (_e = conf.extConfig.bundledWebRuntime) !== null && _e !== void 0 ? _e : false,
         },
     };
     debug('config: %O', config);
@@ -49,13 +48,13 @@ async function loadConfig() {
 }
 exports.loadConfig = loadConfig;
 async function writeConfig(extConfig, extConfigFilePath) {
-    switch (path_1.extname(extConfigFilePath)) {
+    switch ((0, path_1.extname)(extConfigFilePath)) {
         case '.json': {
-            await utils_fs_1.writeJSON(extConfigFilePath, extConfig, { spaces: 2 });
+            await (0, utils_fs_1.writeJSON)(extConfigFilePath, extConfig, { spaces: 2 });
             break;
         }
         case '.ts': {
-            await utils_fs_1.writeFile(extConfigFilePath, formatConfigTS(extConfig));
+            await (0, utils_fs_1.writeFile)(extConfigFilePath, formatConfigTS(extConfig));
             break;
         }
     }
@@ -64,13 +63,13 @@ exports.writeConfig = writeConfig;
 async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
     var _a, _b;
     try {
-        const tsPath = node_1.resolveNode(rootDir, 'typescript');
+        const tsPath = (0, node_1.resolveNode)(rootDir, 'typescript');
         if (!tsPath) {
-            errors_1.fatal('Could not find installation of TypeScript.\n' +
+            (0, errors_1.fatal)('Could not find installation of TypeScript.\n' +
                 `To use ${colors_1.default.strong(extConfigName)} files, you must install TypeScript in your project, e.g. w/ ${colors_1.default.input('npm install -D typescript')}`);
         }
         const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
-        const extConfigObject = node_1.requireTS(ts, extConfigFilePath);
+        const extConfigObject = (0, node_1.requireTS)(ts, extConfigFilePath);
         const extConfig = (_a = extConfigObject.default) !== null && _a !== void 0 ? _a : extConfigObject;
         return {
             extConfigType: 'ts',
@@ -80,8 +79,8 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
         };
     }
     catch (e) {
-        if (!errors_1.isFatal(e)) {
-            errors_1.fatal(`Parsing ${colors_1.default.strong(extConfigName)} failed.\n\n${(_b = e.stack) !== null && _b !== void 0 ? _b : 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}`);
         }
         throw e;
     }
@@ -97,30 +96,30 @@ async function loadExtConfigJS(rootDir, extConfigName, extConfigFilePath) {
         };
     }
     catch (e) {
-        errors_1.fatal(`Parsing ${colors_1.default.strong(extConfigName)} failed.\n\n${(_a = e.stack) !== null && _a !== void 0 ? _a : e}`);
+        (0, errors_1.fatal)(`Parsing ${colors_1.default.strong(extConfigName)} failed.\n\n${(_a = e.stack) !== null && _a !== void 0 ? _a : e}`);
     }
 }
 async function loadExtConfig(rootDir) {
     var _a;
-    const extConfigFilePathTS = path_1.resolve(rootDir, exports.CONFIG_FILE_NAME_TS);
-    if (await utils_fs_1.pathExists(extConfigFilePathTS)) {
+    const extConfigFilePathTS = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_TS);
+    if (await (0, utils_fs_1.pathExists)(extConfigFilePathTS)) {
         return loadExtConfigTS(rootDir, exports.CONFIG_FILE_NAME_TS, extConfigFilePathTS);
     }
-    const extConfigFilePathJS = path_1.resolve(rootDir, exports.CONFIG_FILE_NAME_JS);
-    if (await utils_fs_1.pathExists(extConfigFilePathJS)) {
+    const extConfigFilePathJS = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_JS);
+    if (await (0, utils_fs_1.pathExists)(extConfigFilePathJS)) {
         return loadExtConfigJS(rootDir, exports.CONFIG_FILE_NAME_JS, extConfigFilePathJS);
     }
-    const extConfigFilePath = path_1.resolve(rootDir, exports.CONFIG_FILE_NAME_JSON);
+    const extConfigFilePath = (0, path_1.resolve)(rootDir, exports.CONFIG_FILE_NAME_JSON);
     return {
         extConfigType: 'json',
         extConfigName: exports.CONFIG_FILE_NAME_JSON,
         extConfigFilePath: extConfigFilePath,
-        extConfig: (_a = (await fn_1.tryFn(utils_fs_1.readJSON, extConfigFilePath))) !== null && _a !== void 0 ? _a : {},
+        extConfig: (_a = (await (0, fn_1.tryFn)(utils_fs_1.readJSON, extConfigFilePath))) !== null && _a !== void 0 ? _a : {},
     };
 }
 async function loadCLIConfig(rootDir) {
     const assetsDir = 'assets';
-    const assetsDirAbs = path_1.join(rootDir, assetsDir);
+    const assetsDirAbs = (0, path_1.join)(rootDir, assetsDir);
     const iosPlatformTemplateArchive = 'ios-template.tar.gz';
     const iosCordovaPluginsTemplateArchive = 'capacitor-cordova-ios-plugins.tar.gz';
     const androidPlatformTemplateArchive = 'android-template.tar.gz';
@@ -132,18 +131,18 @@ async function loadCLIConfig(rootDir) {
         assets: {
             ios: {
                 platformTemplateArchive: iosPlatformTemplateArchive,
-                platformTemplateArchiveAbs: path_1.resolve(assetsDirAbs, iosPlatformTemplateArchive),
+                platformTemplateArchiveAbs: (0, path_1.resolve)(assetsDirAbs, iosPlatformTemplateArchive),
                 cordovaPluginsTemplateArchive: iosCordovaPluginsTemplateArchive,
-                cordovaPluginsTemplateArchiveAbs: path_1.resolve(assetsDirAbs, iosCordovaPluginsTemplateArchive),
+                cordovaPluginsTemplateArchiveAbs: (0, path_1.resolve)(assetsDirAbs, iosCordovaPluginsTemplateArchive),
             },
             android: {
                 platformTemplateArchive: androidPlatformTemplateArchive,
-                platformTemplateArchiveAbs: path_1.resolve(assetsDirAbs, androidPlatformTemplateArchive),
+                platformTemplateArchiveAbs: (0, path_1.resolve)(assetsDirAbs, androidPlatformTemplateArchive),
                 cordovaPluginsTemplateArchive: androidCordovaPluginsTemplateArchive,
-                cordovaPluginsTemplateArchiveAbs: path_1.resolve(assetsDirAbs, androidCordovaPluginsTemplateArchive),
+                cordovaPluginsTemplateArchiveAbs: (0, path_1.resolve)(assetsDirAbs, androidCordovaPluginsTemplateArchive),
             },
         },
-        package: await utils_fs_1.readJSON(path_1.resolve(rootDir, 'package.json')),
+        package: await (0, utils_fs_1.readJSON)((0, path_1.resolve)(rootDir, 'package.json')),
         os: determineOS(process.platform),
     };
 }
@@ -151,7 +150,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     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 = path_1.resolve(rootDir, platformDir);
+    const platformDirAbs = (0, path_1.resolve)(rootDir, platformDir);
     const appDir = 'app';
     const srcDir = `${appDir}/src`;
     const srcMainDir = `${srcDir}/main`;
@@ -168,7 +167,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const apkName = `app${flavorPrefix}-debug.apk`;
     const buildOutputDir = `${apkPath}/debug`;
     const cordovaPluginsDir = 'capacitor-cordova-android-plugins';
-    const studioPath = promise_1.lazy(() => determineAndroidStudioPath(cliConfig.os));
+    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,
@@ -183,22 +182,22 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
         platformDir,
         platformDirAbs,
         cordovaPluginsDir,
-        cordovaPluginsDirAbs: path_1.resolve(platformDirAbs, cordovaPluginsDir),
+        cordovaPluginsDirAbs: (0, path_1.resolve)(platformDirAbs, cordovaPluginsDir),
         appDir,
-        appDirAbs: path_1.resolve(platformDirAbs, appDir),
+        appDirAbs: (0, path_1.resolve)(platformDirAbs, appDir),
         srcDir,
-        srcDirAbs: path_1.resolve(platformDirAbs, srcDir),
+        srcDirAbs: (0, path_1.resolve)(platformDirAbs, srcDir),
         srcMainDir,
-        srcMainDirAbs: path_1.resolve(platformDirAbs, srcMainDir),
+        srcMainDirAbs: (0, path_1.resolve)(platformDirAbs, srcMainDir),
         assetsDir,
-        assetsDirAbs: path_1.resolve(platformDirAbs, assetsDir),
+        assetsDirAbs: (0, path_1.resolve)(platformDirAbs, assetsDir),
         webDir,
-        webDirAbs: path_1.resolve(platformDirAbs, webDir),
+        webDirAbs: (0, path_1.resolve)(platformDirAbs, webDir),
         resDir,
-        resDirAbs: path_1.resolve(platformDirAbs, resDir),
+        resDirAbs: (0, path_1.resolve)(platformDirAbs, resDir),
         apkName,
         buildOutputDir,
-        buildOutputDirAbs: path_1.resolve(platformDirAbs, buildOutputDir),
+        buildOutputDirAbs: (0, path_1.resolve)(platformDirAbs, buildOutputDir),
         flavor,
         buildOptions,
     };
@@ -208,16 +207,16 @@ async function loadIOSConfig(rootDir, extConfig) {
     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 = path_1.resolve(rootDir, platformDir);
+    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';
     const nativeProjectDir = 'App';
-    const nativeProjectDirAbs = path_1.resolve(platformDirAbs, nativeProjectDir);
+    const nativeProjectDirAbs = (0, path_1.resolve)(platformDirAbs, nativeProjectDir);
     const nativeTargetDir = `${nativeProjectDir}/App`;
-    const nativeTargetDirAbs = path_1.resolve(platformDirAbs, nativeTargetDir);
+    const nativeTargetDirAbs = (0, path_1.resolve)(platformDirAbs, nativeTargetDir);
     const nativeXcodeProjDir = `${nativeProjectDir}/App.xcodeproj`;
-    const nativeXcodeProjDirAbs = path_1.resolve(platformDirAbs, nativeXcodeProjDir);
-    const nativeXcodeWorkspaceDirAbs = promise_1.lazy(() => determineXcodeWorkspaceDirAbs(nativeProjectDirAbs));
-    const webDirAbs = promise_1.lazy(() => determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs));
+    const nativeXcodeProjDirAbs = (0, path_1.resolve)(platformDirAbs, nativeXcodeProjDir);
+    const nativeXcodeWorkspaceDirAbs = (0, promise_1.lazy)(() => determineXcodeWorkspaceDirAbs(nativeProjectDirAbs));
+    const webDirAbs = (0, promise_1.lazy)(() => determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs));
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     return {
         name,
@@ -226,23 +225,23 @@ async function loadIOSConfig(rootDir, extConfig) {
         platformDirAbs,
         scheme,
         cordovaPluginsDir,
-        cordovaPluginsDirAbs: path_1.resolve(platformDirAbs, cordovaPluginsDir),
+        cordovaPluginsDirAbs: (0, path_1.resolve)(platformDirAbs, cordovaPluginsDir),
         nativeProjectDir,
         nativeProjectDirAbs,
         nativeTargetDir,
         nativeTargetDirAbs,
         nativeXcodeProjDir,
         nativeXcodeProjDirAbs,
-        nativeXcodeWorkspaceDir: promise_1.lazy(async () => path_1.relative(platformDirAbs, await nativeXcodeWorkspaceDirAbs)),
+        nativeXcodeWorkspaceDir: (0, promise_1.lazy)(async () => (0, path_1.relative)(platformDirAbs, await nativeXcodeWorkspaceDirAbs)),
         nativeXcodeWorkspaceDirAbs,
-        webDir: promise_1.lazy(async () => path_1.relative(platformDirAbs, await webDirAbs)),
+        webDir: (0, promise_1.lazy)(async () => (0, path_1.relative)(platformDirAbs, await webDirAbs)),
         webDirAbs,
         podPath,
     };
 }
 async function loadWebConfig(rootDir, webDir) {
     const platformDir = webDir;
-    const platformDirAbs = path_1.resolve(rootDir, platformDir);
+    const platformDirAbs = (0, path_1.resolve)(rootDir, platformDir);
     return {
         name: 'web',
         platformDir,
@@ -252,46 +251,46 @@ async function loadWebConfig(rootDir, webDir) {
 function determineOS(os) {
     switch (os) {
         case 'darwin':
-            return "mac" /* Mac */;
+            return "mac" /* OS.Mac */;
         case 'win32':
-            return "windows" /* Windows */;
+            return "windows" /* OS.Windows */;
         case 'linux':
-            return "linux" /* Linux */;
+            return "linux" /* OS.Linux */;
     }
-    return "unknown" /* Unknown */;
+    return "unknown" /* OS.Unknown */;
 }
 async function determineXcodeWorkspaceDirAbs(nativeProjectDirAbs) {
-    return path_1.resolve(nativeProjectDirAbs, 'App.xcworkspace');
+    return (0, path_1.resolve)(nativeProjectDirAbs, 'App.xcworkspace');
 }
 async function determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs) {
     const re = /path\s=\spublic[\s\S]+?sourceTree\s=\s([^;]+)/;
-    const pbxprojPath = path_1.resolve(nativeXcodeProjDirAbs, 'project.pbxproj');
+    const pbxprojPath = (0, path_1.resolve)(nativeXcodeProjDirAbs, 'project.pbxproj');
     try {
-        const pbxproj = await utils_fs_1.readFile(pbxprojPath, { encoding: 'utf8' });
+        const pbxproj = await (0, utils_fs_1.readFile)(pbxprojPath, { encoding: 'utf8' });
         const m = pbxproj.match(re);
         if (m && m[1] === 'SOURCE_ROOT') {
             log_1.logger.warn(`Using the iOS project root for the ${colors_1.default.strong('public')} directory is deprecated.\n` +
                 `Please follow the Upgrade Guide to move ${colors_1.default.strong('public')} inside the iOS target directory: ${colors_1.default.strong('https://capacitorjs.com/docs/updating/3-0#move-public-into-the-ios-target-directory')}`);
-            return path_1.resolve(nativeProjectDirAbs, 'public');
+            return (0, path_1.resolve)(nativeProjectDirAbs, 'public');
         }
     }
     catch (e) {
         // ignore
     }
-    return path_1.resolve(nativeTargetDirAbs, 'public');
+    return (0, path_1.resolve)(nativeTargetDirAbs, 'public');
 }
 async function determineAndroidStudioPath(os) {
     if (process.env.CAPACITOR_ANDROID_STUDIO_PATH) {
         return process.env.CAPACITOR_ANDROID_STUDIO_PATH;
     }
     switch (os) {
-        case "mac" /* Mac */:
+        case "mac" /* OS.Mac */:
             return '/Applications/Android Studio.app';
-        case "windows" /* Windows */: {
+        case "windows" /* OS.Windows */: {
             const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./util/subprocess')));
             let p = 'C:\\Program Files\\Android\\Android Studio\\bin\\studio64.exe';
             try {
-                if (!(await utils_fs_1.pathExists(p))) {
+                if (!(await (0, utils_fs_1.pathExists)(p))) {
                     let commandResult = await runCommand('REG', [
                         'QUERY',
                         'HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio',
@@ -311,7 +310,7 @@ async function determineAndroidStudioPath(os) {
             }
             return p;
         }
-        case "linux" /* Linux */:
+        case "linux" /* OS.Linux */:
             return '/usr/local/android-studio/bin/studio.sh';
     }
     return '';
@@ -326,7 +325,7 @@ function formatConfigTS(extConfig) {
     // TODO: <reference> tags
     return `import { CapacitorConfig } from '@capacitor/cli';
 
-const config: CapacitorConfig = ${js_1.formatJSObject(extConfig)};
+const config: CapacitorConfig = ${(0, js_1.formatJSObject)(extConfig)};
 
 export default config;\n`;
 }
@@ -338,5 +337,12 @@ function checkExternalConfig(config) {
         log_1.logger.warn(`The ${colors_1.default.strong('hideLogs')} configuration option has been deprecated. ` +
             `Please update to use ${colors_1.default.strong('loggingBehavior')} instead.`);
     }
+    if (typeof config.extConfig.bundledWebRuntime !== 'undefined') {
+        let actionMessage = `Can be safely deleted.`;
+        if (config.extConfig.bundledWebRuntime === true) {
+            actionMessage = `Please, use a bundler to bundle Capacitor and its plugins.`;
+        }
+        log_1.logger.warn(`The ${colors_1.default.strong('bundledWebRuntime')} configuration option has been deprecated. ${actionMessage}`);
+    }
 }
 exports.checkExternalConfig = checkExternalConfig;