nativescript 9.0.0-alpha.1 → 9.0.0-alpha.2

package/lib/common/services/hooks-service.js

@@ -93,24 +93,38 @@ class HooksService {
         }
         return _.flatten(results);
     }
+    isESModule(hook) {
+        const ext = path.extname(hook.fullPath).toLowerCase();
+        return ext === ".mjs";
+    }
     async executeHook(directoryPath, hookName, hook, hookArguments) {
         hookArguments = hookArguments || {};
         let result;
         const relativePath = path.relative(directoryPath, hook.fullPath);
         const trackId = relativePath.replace(new RegExp("\\" + path.sep, "g"), constants_1.AnalyticsEventLabelDelimiter);
+        const isESM = this.isESModule(hook);
         let command = this.getSheBangInterpreter(hook);
         let inProc = false;
         if (!command) {
             command = hook.fullPath;
             if ([".mjs", ".js"].includes(path.extname(hook.fullPath).toLowerCase())) {
                 command = process.argv[0];
-                inProc = this.shouldExecuteInProcess(this.$fs.readText(hook.fullPath));
+                inProc = isESM
+                    ? true
+                    : this.shouldExecuteInProcess(this.$fs.readText(hook.fullPath));
             }
         }
         const startTime = this.$performanceService.now();
         if (inProc) {
             this.$logger.trace("Executing %s hook at location %s in-process", hookName, hook.fullPath);
-            const hookEntryPoint = require(hook.fullPath);
+            let hookEntryPoint;
+            if (isESM) {
+                const { default: hookFn } = await Promise.resolve(`${hook.fullPath}`).then(s => require(s));
+                hookEntryPoint = hookFn;
+            }
+            else {
+                hookEntryPoint = require(hook.fullPath);
+            }
             this.$logger.trace(`Validating ${hookName} arguments.`);
             const invalidArguments = this.validateHookArguments(hookEntryPoint, hook.fullPath);
             if (invalidArguments.length) {
@@ -119,7 +133,8 @@ class HooksService {
             }
             const projectDataHookArg = hookArguments["hookArgs"] && hookArguments["hookArgs"]["projectData"];
             if (projectDataHookArg) {
-                hookArguments["projectData"] = hookArguments["$projectData"] = projectDataHookArg;
+                hookArguments["projectData"] = hookArguments["$projectData"] =
+                    projectDataHookArg;
             }
             const maybePromise = this.$injector.resolve(hookEntryPoint, hookArguments);
             if (maybePromise) {
@@ -215,9 +230,11 @@ class HooksService {
     prepareEnvironment(hookFullPath) {
         const clientName = this.$staticConfig.CLIENT_NAME.toUpperCase();
         const environment = {};
-        environment[util.format("%s-COMMANDLINE", clientName)] = process.argv.join(" ");
+        environment[util.format("%s-COMMANDLINE", clientName)] =
+            process.argv.join(" ");
         environment[util.format("%s-HOOK_FULL_PATH", clientName)] = hookFullPath;
-        environment[util.format("%s-VERSION", clientName)] = this.$staticConfig.version;
+        environment[util.format("%s-VERSION", clientName)] =
+            this.$staticConfig.version;
         return {
             cwd: this.$projectHelper.projectDir,
             stdio: "inherit",

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

@@ -200,9 +200,10 @@ class BundlerCompilerService extends events_1.EventEmitter {
         }
         const envData = this.buildEnvData(platformData.platformNameLowerCase, projectData, prepareData);
         const isVite = this.getBundler() === "vite";
+        const cliArgs = await this.buildEnvCommandLineParams(envData, platformData, projectData, prepareData);
         const envParams = isVite
-            ? [`--mode=${platformData.platformNameLowerCase}`]
-            : await this.buildEnvCommandLineParams(envData, platformData, projectData, prepareData);
+            ? [`--mode=${platformData.platformNameLowerCase}`, "--", ...cliArgs]
+            : cliArgs;
         const additionalNodeArgs = semver.major(process.version) <= 8 ? ["--harmony"] : [];
         if (await this.shouldUsePreserveSymlinksOption()) {
             additionalNodeArgs.push("--preserve-symlinks");

package/package.json

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