nativescript 8.9.1 → 8.9.3-dev.0

package/lib/services/webpack/webpack-compiler-service.js

@@ -16,8 +16,7 @@ const constants_1 = require("../../constants");
 const yok_1 = require("../../common/yok");
 const package_path_helper_1 = require("../../helpers/package-path-helper");
 class WebpackCompilerService extends events_1.EventEmitter {
-    constructor($options, $errors, $childProcess, $fs, $hooksService, $hostInfo, $logger, $mobileHelper, $cleanupService, $packageManager, $packageInstallationManager // private $sharedEventBus: ISharedEventBus
-    ) {
+    constructor($options, $errors, $childProcess, $fs, $hooksService, $hostInfo, $logger, $mobileHelper, $cleanupService, $packageManager, $packageInstallationManager, $projectConfigService) {
         super();
         this.$options = $options;
         this.$errors = $errors;
@@ -30,6 +29,7 @@ class WebpackCompilerService extends events_1.EventEmitter {
         this.$cleanupService = $cleanupService;
         this.$packageManager = $packageManager;
         this.$packageInstallationManager = $packageInstallationManager;
+        this.$projectConfigService = $projectConfigService;
         this.webpackProcesses = {};
         this.expectedHashes = {};
     }
@@ -51,23 +51,14 @@ class WebpackCompilerService extends events_1.EventEmitter {
                 });
                 childProcess.on("message", (message) => {
                     this.$logger.trace("Message from webpack", message);
-                    // if we are on webpack5 - we handle HMR in a  slightly different way
                     if (typeof message === "object" &&
                         "version" in message &&
                         "type" in message) {
-                        // first compilation can be ignored because it will be synced regardless
-                        // handling it here would trigger 2 syncs
                         if (isFirstWebpackWatchCompilation) {
                             isFirstWebpackWatchCompilation = false;
                             resolve(childProcess);
                             return;
                         }
-                        // if ((message as IWebpackMessage).type === "hmr-status") {
-                        // 	// we pass message through our event-bus to be handled wherever needed
-                        // 	// in this case webpack-hmr-status-service listens for this event
-                        // 	this.$sharedEventBus.emit("webpack:hmr-status", message);
-                        // 	return;
-                        // }
                         return this.handleHMRMessage(message, platformData, projectData, prepareData);
                     }
                     if (message === "Webpack compilation complete.") {
@@ -82,7 +73,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
                                 prepareData.hmr ? message.hash : "";
                             return;
                         }
-                        // Persist the previousHash value before calling `this.getUpdatedEmittedFiles` as it will modify the expectedHashes object with the current hash
                         const previousHash = this.expectedHashes[platformData.platformNameLowerCase];
                         let result;
                         if (prepareData.hmr) {
@@ -107,7 +97,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
                             platform: platformData.platformNameLowerCase,
                         };
                         this.$logger.trace("Generated data from webpack message:", data);
-                        // the hash of the compilation is the same as the previous one and there are only hot updates produced
                         if (data.hasOnlyHotUpdateFiles && previousHash === message.hash) {
                             return;
                         }
@@ -180,16 +169,20 @@ class WebpackCompilerService extends events_1.EventEmitter {
         }
     }
     async shouldUsePreserveSymlinksOption() {
-        // pnpm does not require symlink (https://github.com/nodejs/node-eps/issues/46#issuecomment-277373566)
-        // and it also does not work in some cases.
-        // Check https://github.com/NativeScript/nativescript-cli/issues/5259 for more information
         const currentPackageManager = await this.$packageManager.getPackageManagerName();
         const res = currentPackageManager !== constants_1.PackageManagers.pnpm;
         return res;
     }
     async startWebpackProcess(platformData, projectData, prepareData) {
-        if (!this.$fs.exists(projectData.webpackConfigPath)) {
-            this.$errors.fail(`The webpack configuration file ${projectData.webpackConfigPath} does not exist. Ensure the file exists, or update the path in ${constants_1.CONFIG_FILE_NAME_DISPLAY}.`);
+        if (projectData.bundlerConfigPath) {
+            if (!this.$fs.exists(projectData.bundlerConfigPath)) {
+                this.$errors.fail(`The bundler configuration file ${projectData.bundlerConfigPath} does not exist. Ensure the file exists, or update the path in ${constants_1.CONFIG_FILE_NAME_DISPLAY}.`);
+            }
+        }
+        else {
+            if (!this.$fs.exists(projectData.webpackConfigPath)) {
+                this.$errors.fail(`The webpack configuration file ${projectData.webpackConfigPath} does not exist. Ensure the file exists, or update the path in ${constants_1.CONFIG_FILE_NAME_DISPLAY}.`);
+            }
         }
         const envData = this.buildEnvData(platformData.platformNameLowerCase, projectData, prepareData);
         const envParams = await this.buildEnvCommandLineParams(envData, platformData, projectData, prepareData);
@@ -203,8 +196,8 @@ class WebpackCompilerService extends events_1.EventEmitter {
         const args = [
             ...additionalNodeArgs,
             this.getWebpackExecutablePath(projectData),
-            this.isWebpack5(projectData) ? `build` : null,
-            `--config=${projectData.webpackConfigPath}`,
+            this.isModernBundler(projectData) ? `build` : null,
+            `--config=${projectData.bundlerConfigPath || projectData.webpackConfigPath}`,
             ...envParams,
         ].filter(Boolean);
         if (prepareData.watch) {
@@ -245,28 +238,16 @@ class WebpackCompilerService extends events_1.EventEmitter {
         });
         envData.verbose = envData.verbose || this.$logger.isVerbose();
         envData.production = envData.production || prepareData.release;
-        // add the config file name to the env data so the webpack process can read the
-        // correct config file when resolving the CLI lib and the config service
-        // we are explicitly setting it to false to force using the defaults
         envData.config =
             (_b = (_a = process.env.NATIVESCRIPT_CONFIG_NAME) !== null && _a !== void 0 ? _a : this.$options.config) !== null && _b !== void 0 ? _b : "false";
-        // explicitly set the env variable
         process.env.NATIVESCRIPT_CONFIG_NAME = envData.config;
-        // The snapshot generation is wrongly located in the Webpack plugin.
-        // It should be moved in the Native Prepare of the CLI or a Gradle task in the Runtime.
-        // As a workaround, we skip the mksnapshot, xxd and android-ndk calls based on skipNativePrepare.
-        // In this way the plugin will prepare only the snapshot JS entry without any native prepare and
-        // we will able to execute cloud builds with snapshot without having any local snapshot or Docker setup.
-        // TODO: Remove this flag when we remove the native part from the plugin.
         envData.skipSnapshotTools =
             prepareData.nativePrepare && prepareData.nativePrepare.skipNativePrepare;
-        // only set sourceMap if not explicitly set through a flag
         if (typeof ((_c = prepareData === null || prepareData === void 0 ? void 0 : prepareData.env) === null || _c === void 0 ? void 0 : _c.sourceMap) === "undefined") {
             if (!prepareData.release) {
                 envData.sourceMap = true;
             }
         }
-        // convert string to boolean
         if (envData.sourceMap === "true" || envData.sourceMap === "false") {
             envData.sourceMap = envData.sourceMap === "true";
         }
@@ -318,15 +299,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
     }
     getUpdatedEmittedFiles(allEmittedFiles, chunkFiles, nextHash, platform) {
         const currentHash = this.getCurrentHotUpdateHash(allEmittedFiles);
-        // This logic is needed as there are already cases when webpack doesn't emit any files physically.
-        // We've set noEmitOnErrors in webpack.config.js based on noEmitOnError from tsconfig.json,
-        // so webpack doesn't emit any files when noEmitOnErrors: true is set in webpack.config.js and
-        // there is a compilation error in the source code. On the other side, hmr generates new hot-update files
-        // on every change and the hash of the next hmr update is written inside hot-update.json file.
-        // Although webpack doesn't emit any files, hmr hash is still generated. The hash is generated per compilation no matter
-        // if files will be emitted or not. This way, the first successful compilation after fixing the compilation error generates
-        // a hash that is not the same as the one expected in the latest emitted hot-update.json file.
-        // As a result, the hmr chain is broken and the changes are not applied.
         const isHashValid = nextHash
             ? this.expectedHashes[platform] === currentHash
             : true;
@@ -345,7 +317,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
         let hotHash;
         const hotUpdateScripts = emittedFiles.filter((x) => x.endsWith(".hot-update.js"));
         if (hotUpdateScripts && hotUpdateScripts.length) {
-            // the hash is the same for each hot update in the current compilation
             const hotUpdateName = hotUpdateScripts[0];
             const matcher = /^(.+)\.(.+)\.hot-update/gm;
             const matches = matcher.exec(hotUpdateName);
@@ -363,7 +334,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
         }
     }
     handleHMRMessage(message, platformData, projectData, prepareData) {
-        // handle new webpack hmr packets
         this.$logger.trace("Received message from webpack process:", message);
         if (message.type !== "compilation") {
             return;
@@ -371,7 +341,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
         this.$logger.trace("Webpack build done!");
         const files = message.data.emittedAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
         const staleFiles = message.data.staleAssets.map((asset) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, asset));
-        // extract last hash from emitted filenames
         const lastHash = (() => {
             const absoluteFileNameWithLastHash = files.find((fileName) => fileName.endsWith("hot-update.js"));
             if (!absoluteFileNameWithLastHash) {
@@ -384,7 +353,6 @@ class WebpackCompilerService extends events_1.EventEmitter {
             }
         })();
         if (!files.length) {
-            // ignore compilations if no new files are emitted
             return;
         }
         this.emit(constants_1.WEBPACK_COMPILATION_COMPLETE, {
@@ -399,8 +367,9 @@ class WebpackCompilerService extends events_1.EventEmitter {
         });
     }
     getWebpackExecutablePath(projectData) {
-        if (this.isWebpack5(projectData)) {
-            const packagePath = (0, package_path_helper_1.resolvePackagePath)("@nativescript/webpack", {
+        const bundler = this.getBundler();
+        if (this.isModernBundler(projectData)) {
+            const packagePath = (0, package_path_helper_1.resolvePackagePath)(`@nativescript/${bundler}`, {
                 paths: [projectData.projectDir],
             });
             if (packagePath) {
@@ -415,23 +384,32 @@ class WebpackCompilerService extends events_1.EventEmitter {
         }
         return path.resolve(packagePath, "bin", "webpack.js");
     }
-    isWebpack5(projectData) {
-        const packageJSONPath = (0, package_path_helper_1.resolvePackageJSONPath)("@nativescript/webpack", {
-            paths: [projectData.projectDir],
-        });
-        if (packageJSONPath) {
-            const packageData = this.$fs.readJson(packageJSONPath);
-            const ver = semver.coerce(packageData.version);
-            if (semver.satisfies(ver, ">= 5.0.0")) {
+    isModernBundler(projectData) {
+        const bundler = this.getBundler();
+        switch (bundler) {
+            case "rspack":
                 return true;
-            }
+            default:
+                const packageJSONPath = (0, package_path_helper_1.resolvePackageJSONPath)("@nativescript/webpack", {
+                    paths: [projectData.projectDir],
+                });
+                if (packageJSONPath) {
+                    const packageData = this.$fs.readJson(packageJSONPath);
+                    const ver = semver.coerce(packageData.version);
+                    if (semver.satisfies(ver, ">= 5.0.0")) {
+                        return true;
+                    }
+                }
+                break;
         }
         return false;
     }
+    getBundler() {
+        return this.$projectConfigService.getValue(`bundler`, "webpack");
+    }
 }
 exports.WebpackCompilerService = WebpackCompilerService;
 __decorate([
     (0, decorators_1.performanceLog)()
 ], WebpackCompilerService.prototype, "startWebpackProcess", null);
 yok_1.injector.register("webpackCompilerService", WebpackCompilerService);
-//# sourceMappingURL=webpack-compiler-service.js.map

package/lib/services/xcconfig-service.js

@@ -55,7 +55,6 @@ class XcconfigService {
                 }
             });
             if (isPropertyParsed) {
-                // property can be an empty string, so we don't check for that.
                 return property;
             }
         }
@@ -64,4 +63,3 @@ class XcconfigService {
 }
 exports.XcconfigService = XcconfigService;
 yok_1.injector.register("xcconfigService", XcconfigService);
-//# sourceMappingURL=xcconfig-service.js.map

package/lib/services/xcproj-service.js

@@ -21,4 +21,3 @@ class XcprojService {
     }
 }
 yok_1.injector.register("xcprojService", XcprojService);
-//# sourceMappingURL=xcproj-service.js.map

package/lib/shared-event-bus.js

@@ -2,12 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
 const yok_1 = require("./common/yok");
-/**
- * Event Bus used by different services to emit state changes and
- * allow listening for these state changes without needing a reference
- * to the emitting service.
- */
 class SharedEventBus extends events_1.EventEmitter {
 }
 yok_1.injector.register("sharedEventBus", SharedEventBus);
-//# sourceMappingURL=shared-event-bus.js.map

package/lib/sys-info.js

@@ -79,7 +79,7 @@ class SysInfo {
         if (macOSVersion && macOSVersion < constants_1.MacOSVersions.HighSierra) {
             return {
                 message: (0, util_1.format)(constants_1.MacOSDeprecationStringFormat, macOSVersion),
-                severity: "high" /* SystemWarningsSeverity.high */,
+                severity: "high",
             };
         }
         return null;
@@ -101,4 +101,3 @@ __decorate([
     (0, decorators_1.exported)("sysInfo")
 ], SysInfo.prototype, "getSupportedNodeVersionRange", null);
 yok_1.injector.register("sysInfo", SysInfo);
-//# sourceMappingURL=sys-info.js.map

package/lib/tools/config-manipulation/config-transformer.js

@@ -55,7 +55,6 @@ class ConfigTransformer {
             const parts = key.split(".");
             const name = parts.shift();
             const property = this.getProperty(name, parent);
-            // no android key, add it to parent to root
             if (!property) {
                 return undefined;
             }
@@ -65,14 +64,11 @@ class ConfigTransformer {
             if (!_parent) {
                 return undefined;
             }
-            // add nonExistent.deep to android: {}
             return this.getProperty(parts.join("."), _parent);
         }
-        // if we have a parent, we are reading the property from it
         if (parent) {
             return parent.getProperty(key);
         }
-        // otherwise we just read it from the root exports object
         return this.getProperty(key, this.getDefaultExportValue());
     }
     addProperty(key, value, parent = null) {
@@ -194,22 +190,15 @@ class ConfigTransformer {
         }
         this.setInitializerValue(initializer, newValue);
     }
-    /**
-     * @internal
-     */
     getFullText() {
         return this.config.getFullText();
     }
-    /**
-     * @internal
-     */
     getValue(key) {
         return this.getPropertyValue(this.getProperty(key));
     }
     setValue(key, value) {
         const property = this.getProperty(key);
         if (!property) {
-            // add new property
             this.addProperty(key, value);
         }
         else {
@@ -219,4 +208,3 @@ class ConfigTransformer {
     }
 }
 exports.ConfigTransformer = ConfigTransformer;
-//# sourceMappingURL=config-transformer.js.map

package/lib/tools/node-modules/node-modules-builder.js

@@ -29,4 +29,3 @@ class NodeModulesBuilder {
 }
 exports.NodeModulesBuilder = NodeModulesBuilder;
 yok_1.injector.register("nodeModulesBuilder", NodeModulesBuilder);
-//# sourceMappingURL=node-modules-builder.js.map

package/lib/tools/node-modules/node-modules-dependencies-builder.js

@@ -56,18 +56,14 @@ class NodeModulesDependenciesBuilder {
             let modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                 paths: [parentModulesPath],
             });
-            // perhaps traverse up the tree here?
             if (!modulePath) {
-                // fallback to searching in the root path
                 modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                     paths: [rootPath],
                 });
             }
-            // if we failed to find the module...
             if (!modulePath) {
                 return null;
             }
-            // if we already resolved this dependency, we return null to avoid a duplicate resolution
             if (resolvedDependencies.some((r) => {
                 return r.name === depDescription.name && r.directory === modulePath;
             })) {
@@ -92,7 +88,6 @@ class NodeModulesDependenciesBuilder {
             const packageJsonContents = this.$fs.readJson(packageJsonPath);
             dependency.version = packageJsonContents.version;
             if (!!packageJsonContents.nativescript) {
-                // add `nativescript` property, necessary for resolving plugins
                 dependency.nativescript = packageJsonContents.nativescript;
             }
             dependency.dependencies = _.keys(packageJsonContents.dependencies);
@@ -103,4 +98,3 @@ class NodeModulesDependenciesBuilder {
 }
 exports.NodeModulesDependenciesBuilder = NodeModulesDependenciesBuilder;
 yok_1.injector.register("nodeModulesDependenciesBuilder", NodeModulesDependenciesBuilder);
-//# sourceMappingURL=node-modules-dependencies-builder.js.map

package/lib/yarn-package-manager.js

@@ -113,4 +113,3 @@ __decorate([
     (0, decorators_1.exported)("yarn")
 ], YarnPackageManager.prototype, "getCachePath", null);
 yok_1.injector.register("yarn", YarnPackageManager);
-//# sourceMappingURL=yarn-package-manager.js.map

package/lib/yarn2-package-manager.js

@@ -36,8 +36,6 @@ class Yarn2PackageManager extends base_package_manager_1.BasePackageManager {
         }
         const packageJsonPath = path.join(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
-        // remove unsupported flags
-        // todo: refactor all package managers to map typed flags to the actual flags
         const cleanedConfig = _.omit(config, ["save-dev", "save-exact"]);
         const flags = this.getFlagsString(cleanedConfig, true);
         let params = [];
@@ -124,4 +122,3 @@ __decorate([
     (0, decorators_1.exported)("yarn2")
 ], Yarn2PackageManager.prototype, "getCachePath", null);
 yok_1.injector.register("yarn2", Yarn2PackageManager);
-//# sourceMappingURL=yarn2-package-manager.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "8.9.1",
+  "version": "8.9.3-dev.0",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {