@nx/js 19.0.0-beta.6 → 19.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.0.0-beta.6",
+  "version": "19.0.0-beta.8",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -57,9 +57,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.0.0-beta.6",
-    "@nx/workspace": "19.0.0-beta.6",
-    "@nrwl/js": "19.0.0-beta.6"
+    "@nx/devkit": "19.0.0-beta.8",
+    "@nx/workspace": "19.0.0-beta.8",
+    "@nrwl/js": "19.0.0-beta.8"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/node.impl.js

@@ -297,7 +297,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
 function fileToRunCorrectPath(fileToRun) {
     if ((0, fileutils_1.fileExists)(fileToRun))
         return fileToRun;
-    const extensionsToTry = ['.cjs', '.mjs', 'cjs.js', '.esm.js'];
+    const extensionsToTry = ['.cjs', '.mjs', '.cjs.js', '.esm.js'];
     for (const ext of extensionsToTry) {
         const file = fileToRun.replace(/\.js$/, ext);
         if ((0, fileutils_1.fileExists)(file))

package/src/executors/verdaccio/verdaccio.impl.js

@@ -8,6 +8,10 @@ const detectPort = require("detect-port");
 const path_1 = require("path");
 const semver_1 = require("semver");
 let childProcess;
+let env = {
+    SKIP_YARN_COREPACK_CHECK: 'true',
+    ...process.env,
+};
 /**
  * - set npm and yarn to use local registry
  * - start verdaccio
@@ -104,19 +108,19 @@ function createVerdaccioOptions(options, workspaceRoot) {
 }
 function setupNpm(options) {
     try {
-        (0, child_process_1.execSync)('npm --version');
+        (0, child_process_1.execSync)('npm --version', { env });
     }
     catch (e) {
         return () => { };
     }
     let npmRegistryPath;
     try {
-        npmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)
+        npmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`, { env })
             ?.toString()
             ?.trim()
             ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
-        (0, child_process_1.execSync)(`npm config set registry http://localhost:${options.port}/ --location ${options.location}`);
-        (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`);
+        (0, child_process_1.execSync)(`npm config set registry http://localhost:${options.port}/ --location ${options.location}`, { env });
+        (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env });
         devkit_1.logger.info(`Set npm registry to http://localhost:${options.port}/`);
     }
     catch (e) {
@@ -124,19 +128,21 @@ function setupNpm(options) {
     }
     return () => {
         try {
-            const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`)
+            const currentNpmRegistryPath = (0, child_process_1.execSync)(`npm config get registry --location ${options.location}`, { env })
                 ?.toString()
                 ?.trim()
                 ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
             if (npmRegistryPath && currentNpmRegistryPath.includes('localhost')) {
-                (0, child_process_1.execSync)(`npm config set registry ${npmRegistryPath} --location ${options.location}`);
+                (0, child_process_1.execSync)(`npm config set registry ${npmRegistryPath} --location ${options.location}`, { env });
                 devkit_1.logger.info(`Reset npm registry to ${npmRegistryPath}`);
             }
             else {
-                (0, child_process_1.execSync)(`npm config delete registry --location ${options.location}`);
+                (0, child_process_1.execSync)(`npm config delete registry --location ${options.location}`, {
+                    env,
+                });
                 devkit_1.logger.info('Cleared custom npm registry');
             }
-            (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`);
+            (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env });
         }
         catch (e) {
             throw new Error(`Failed to reset npm registry: ${e.message}`);
@@ -145,22 +151,25 @@ function setupNpm(options) {
 }
 function getYarnUnsafeHttpWhitelist(isYarnV1) {
     return !isYarnV1
-        ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json`).toString()))
+        ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json`, {
+            env,
+        }).toString()))
         : null;
 }
 function setYarnUnsafeHttpWhitelist(currentWhitelist, options) {
     if (currentWhitelist.size > 0) {
-        (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''));
+        (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''), { env });
     }
     else {
         (0, child_process_1.execSync)(`yarn config unset unsafeHttpWhitelist` +
-            (options.location === 'user' ? ' --home' : ''));
+            (options.location === 'user' ? ' --home' : ''), { env });
     }
 }
 function setupYarn(options) {
     let isYarnV1;
     try {
-        isYarnV1 = (0, semver_1.major)((0, child_process_1.execSync)('yarn --version').toString().trim()) === 1;
+        isYarnV1 =
+            (0, semver_1.major)((0, child_process_1.execSync)('yarn --version', { env }).toString().trim()) === 1;
     }
     catch {
         // This would fail if yarn is not installed which is okay
@@ -168,12 +177,14 @@ function setupYarn(options) {
     }
     try {
         const registryConfigName = isYarnV1 ? 'registry' : 'npmRegistryServer';
-        const yarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)
+        const yarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`, {
+            env,
+        })
             ?.toString()
             ?.trim()
             ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
         (0, child_process_1.execSync)(`yarn config set ${registryConfigName} http://localhost:${options.port}/` +
-            (options.location === 'user' ? ' --home' : ''));
+            (options.location === 'user' ? ' --home' : ''), { env });
         devkit_1.logger.info(`Set yarn registry to http://localhost:${options.port}/`);
         const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
         let whitelistedLocalhost = false;
@@ -185,18 +196,18 @@ function setupYarn(options) {
         }
         return () => {
             try {
-                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)
+                const currentYarnRegistryPath = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`, { env })
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
                 if (yarnRegistryPath && currentYarnRegistryPath.includes('localhost')) {
                     (0, child_process_1.execSync)(`yarn config set ${registryConfigName} ${yarnRegistryPath}` +
-                        (options.location === 'user' ? ' --home' : ''));
+                        (options.location === 'user' ? ' --home' : ''), { env });
                     devkit_1.logger.info(`Reset yarn ${registryConfigName} to ${yarnRegistryPath}`);
                 }
                 else {
                     (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryConfigName}` +
-                        (options.location === 'user' ? ' --home' : ''));
+                        (options.location === 'user' ? ' --home' : ''), { env });
                     devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
                 }
                 if (whitelistedLocalhost) {

package/src/plugins/typescript/plugin.js

@@ -43,11 +43,13 @@ exports.createNodes = [
             !siblingFiles.includes('tsconfig.json')) {
             return {};
         }
-        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-        const targets = targetsCache[hash]
-            ? targetsCache[hash]
+        const nodeHash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, pluginOptions, context, [(0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+        // The hash is calculated at the node/project level, so we add the config file path to avoid conflicts when caching
+        const cacheKey = `${nodeHash}_${configFilePath}`;
+        const targets = targetsCache[cacheKey]
+            ? targetsCache[cacheKey]
             : buildTscTargets(fullConfigPath, projectRoot, pluginOptions, context);
-        calculatedTargets[hash] = targets;
+        calculatedTargets[cacheKey] = targets;
         return {
             projects: {
                 [projectRoot]: {