@nx/js 20.0.5 → 20.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.0.5",
+  "version": "20.0.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.0.5",
-    "@nx/workspace": "20.0.5",
+    "@nx/devkit": "20.0.6",
+    "@nx/workspace": "20.0.6",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/executors/verdaccio/schema.d.ts

@@ -2,7 +2,7 @@ export interface VerdaccioExecutorSchema {
   location: 'global' | 'user' | 'project' | 'none';
   storage?: string;
   port?: number;
-  listenAddress?: string;
+  listenAddress: string; // default is 'localhost'
   config?: string;
   clear?: boolean;
   scopes?: string[];

package/src/executors/verdaccio/schema.json

@@ -22,7 +22,8 @@
     },
     "listenAddress": {
       "type": "string",
-      "description": "Listen address that Verdaccio should listen to"
+      "description": "Listen address that Verdaccio should listen to",
+      "default": "localhost"
     },
     "config": {
       "type": "string",

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

@@ -129,12 +129,12 @@ function setupNpm(options) {
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
                 );
-                (0, child_process_1.execSync)(`npm config set ${registryName} http://localhost:${options.port}/ --location ${options.location}`, { env, windowsHide: false });
-                (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: false });
-                devkit_1.logger.info(`Set npm ${registryName} to http://localhost:${options.port}/`);
+                (0, child_process_1.execSync)(`npm config set ${registryName} http://${options.listenAddress}:${options.port}/ --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config set //${options.listenAddress}:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env, windowsHide: false });
+                devkit_1.logger.info(`Set npm ${registryName} to http://${options.listenAddress}:${options.port}/`);
             }
             catch (e) {
-                throw new Error(`Failed to set npm ${registryName} to http://localhost:${options.port}/: ${e.message}`);
+                throw new Error(`Failed to set npm ${registryName} to http://${options.listenAddress}:${options.port}/: ${e.message}`);
             }
         });
         return () => {
@@ -146,7 +146,7 @@ function setupNpm(options) {
                 scopes.forEach((scope, index) => {
                     const registryName = scope ? `${scope}:registry` : 'registry';
                     if (npmRegistryPaths[index] &&
-                        currentNpmRegistryPath.includes('localhost')) {
+                        currentNpmRegistryPath.includes(options.listenAddress)) {
                         (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env, windowsHide: false });
                         devkit_1.logger.info(`Reset npm ${registryName} to ${npmRegistryPaths[index]}`);
                     }
@@ -158,7 +158,7 @@ function setupNpm(options) {
                         devkit_1.logger.info('Cleared custom npm registry');
                     }
                 });
-                (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: false });
+                (0, child_process_1.execSync)(`npm config delete //${options.listenAddress}:${options.port}/:_authToken  --location ${options.location}`, { env, windowsHide: false });
             }
             catch (e) {
                 throw new Error(`Failed to reset npm registry: ${e.message}`);
@@ -166,7 +166,7 @@ function setupNpm(options) {
         };
     }
     catch (e) {
-        throw new Error(`Failed to set npm registry to http://localhost:${options.port}/: ${e.message}`);
+        throw new Error(`Failed to set npm registry to http://${options.listenAddress}:${options.port}/: ${e.message}`);
     }
 }
 function getYarnUnsafeHttpWhitelist(isYarnV1) {
@@ -212,17 +212,17 @@ function setupYarn(options) {
                 ?.trim()
                 ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
             );
-            (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://localhost:${options.port}/` +
+            (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} http://${options.listenAddress}:${options.port}/` +
                 (options.location === 'user' ? ' --home' : ''), { env, windowsHide: false });
-            devkit_1.logger.info(`Set yarn ${scopeName}registry to http://localhost:${options.port}/`);
+            devkit_1.logger.info(`Set yarn ${scopeName}registry to http://${options.listenAddress}:${options.port}/`);
         });
         const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
         let whitelistedLocalhost = false;
-        if (!isYarnV1 && !currentWhitelist.has('localhost')) {
+        if (!isYarnV1 && !currentWhitelist.has(options.listenAddress)) {
             whitelistedLocalhost = true;
-            currentWhitelist.add('localhost');
+            currentWhitelist.add(options.listenAddress);
             setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-            devkit_1.logger.info(`Whitelisted http://localhost:${options.port}/ as an unsafe http server`);
+            devkit_1.logger.info(`Whitelisted http://${options.listenAddress}:${options.port}/ as an unsafe http server`);
         }
         return () => {
             try {
@@ -235,7 +235,7 @@ function setupYarn(options) {
                         ? `${scope}:${registryConfigName}`
                         : registryConfigName;
                     if (yarnRegistryPaths[index] &&
-                        currentYarnRegistryPath.includes('localhost')) {
+                        currentYarnRegistryPath.includes(options.listenAddress)) {
                         (0, child_process_1.execSync)(`yarn config set ${registryName} ${yarnRegistryPaths[index]}` +
                             (options.location === 'user' ? ' --home' : ''), {
                             env,
@@ -251,10 +251,10 @@ function setupYarn(options) {
                 });
                 if (whitelistedLocalhost) {
                     const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
-                    if (currentWhitelist.has('localhost')) {
-                        currentWhitelist.delete('localhost');
+                    if (currentWhitelist.has(options.listenAddress)) {
+                        currentWhitelist.delete(options.listenAddress);
                         setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-                        devkit_1.logger.info(`Removed http://localhost:${options.port}/ as an unsafe http server`);
+                        devkit_1.logger.info(`Removed http://${options.listenAddress}:${options.port}/ as an unsafe http server`);
                     }
                 }
             }
@@ -264,7 +264,7 @@ function setupYarn(options) {
         };
     }
     catch (e) {
-        throw new Error(`Failed to set yarn registry to http://localhost:${options.port}/: ${e.message}`);
+        throw new Error(`Failed to set yarn registry to http://${options.listenAddress}:${options.port}/: ${e.message}`);
     }
 }
 exports.default = verdaccioExecutor;

package/src/plugins/typescript/plugin.js

@@ -77,13 +77,21 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
      * - hashes of the content of the relevant files that can affect what's inferred by the plugin:
      *   - current config file
      *   - config files extended by the current config file (recursively up to the root config file)
+     *   - referenced config files that are internal to the owning Nx project of the current config file
      *   - lock file
      * - hash of the plugin options
      * - current config file path
      */
-    const extendedConfigFiles = getExtendedConfigFiles(fullConfigPath, readCachedTsConfig(fullConfigPath));
+    const tsConfig = readCachedTsConfig(fullConfigPath);
+    const extendedConfigFiles = getExtendedConfigFiles(fullConfigPath, tsConfig);
+    const internalReferencedFiles = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
     const nodeHash = (0, file_hasher_1.hashArray)([
-        ...[configFilePath, ...extendedConfigFiles, lockFileName].map(file_hasher_1.hashFile),
+        ...[
+            configFilePath,
+            ...extendedConfigFiles.files,
+            ...Object.keys(internalReferencedFiles),
+            lockFileName,
+        ].map(file_hasher_1.hashFile),
         (0, file_hasher_1.hashObject)(options),
     ]);
     const cacheKey = `${nodeHash}_${configFilePath}`;
@@ -169,12 +177,14 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
 }
 function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferences, workspaceRoot, projectRoot) {
     const configFiles = new Set();
-    const includePaths = new Set();
-    const excludePaths = new Set();
+    const externalDependencies = ['typescript'];
     const extendedConfigFiles = getExtendedConfigFiles(configFilePath, tsConfig);
-    extendedConfigFiles.forEach((configPath) => {
+    extendedConfigFiles.files.forEach((configPath) => {
         configFiles.add(configPath);
     });
+    externalDependencies.push(...extendedConfigFiles.packages);
+    const includePaths = new Set();
+    const excludePaths = new Set();
     const projectTsConfigFiles = [
         [configFilePath, tsConfig],
         ...Object.entries(internalProjectReferences),
@@ -225,7 +235,7 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
     else {
         inputs.push('production' in namedInputs ? '^production' : '^default');
     }
-    inputs.push({ externalDependencies: ['typescript'] });
+    inputs.push({ externalDependencies });
     return inputs;
 }
 function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspaceRoot, projectRoot) {
@@ -238,19 +248,24 @@ function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspa
         if (config.options.outFile) {
             const outFileName = (0, node_path_1.basename)(config.options.outFile, '.js');
             const outFileDir = (0, node_path_1.dirname)(config.options.outFile);
-            outputs.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, node_path_1.relative)(workspaceRoot, config.options.outFile)));
+            outputs.add(pathToInputOrOutput(config.options.outFile, workspaceRoot, projectRoot));
             // outFile is not be used with .cjs, .mjs, .jsx, so the list is simpler
             const outDir = (0, node_path_1.relative)(workspaceRoot, outFileDir);
-            outputs.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', outDir, `${outFileName}.js.map`));
-            outputs.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', outDir, `${outFileName}.d.ts`));
-            outputs.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', outDir, `${outFileName}.d.ts.map`));
+            outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(outDir, `${outFileName}.js.map`), workspaceRoot, projectRoot));
+            outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(outDir, `${outFileName}.d.ts`), workspaceRoot, projectRoot));
+            outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(outDir, `${outFileName}.d.ts.map`), workspaceRoot, projectRoot));
             // https://www.typescriptlang.org/tsconfig#tsBuildInfoFile
             outputs.add(tsConfig.options.tsBuildInfoFile
                 ? pathToInputOrOutput(tsConfig.options.tsBuildInfoFile, workspaceRoot, projectRoot)
-                : (0, devkit_1.joinPathFragments)('{workspaceRoot}', outDir, `${outFileName}.tsbuildinfo`));
+                : pathToInputOrOutput((0, devkit_1.joinPathFragments)(outDir, `${outFileName}.tsbuildinfo`), workspaceRoot, projectRoot));
         }
         else if (config.options.outDir) {
-            outputs.add((0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, node_path_1.relative)(workspaceRoot, config.options.outDir)));
+            outputs.add(pathToInputOrOutput(config.options.outDir, workspaceRoot, projectRoot));
+            if (config.options.tsBuildInfoFile &&
+                !(0, node_path_1.normalize)(config.options.tsBuildInfoFile).startsWith(`${(0, node_path_1.normalize)(config.options.outDir)}${node_path_1.sep}`)) {
+                // https://www.typescriptlang.org/tsconfig#tsBuildInfoFile
+                outputs.add(pathToInputOrOutput(config.options.tsBuildInfoFile, workspaceRoot, projectRoot));
+            }
         }
         else if (config.fileNames.length) {
             // tsc produce files in place when no outDir or outFile is set
@@ -284,16 +299,26 @@ function pathToInputOrOutput(path, workspaceRoot, projectRoot) {
 }
 function getExtendedConfigFiles(tsConfigPath, tsConfig) {
     const extendedConfigFiles = new Set();
+    const extendedExternalPackages = new Set();
     let currentConfigPath = tsConfigPath;
     let currentConfig = tsConfig;
     while (currentConfig.raw?.extends) {
-        const extendedConfigPath = (0, node_path_1.join)((0, node_path_1.dirname)(currentConfigPath), currentConfig.raw.extends);
-        extendedConfigFiles.add(extendedConfigPath);
-        const extendedConfig = readCachedTsConfig(extendedConfigPath);
-        currentConfigPath = extendedConfigPath;
-        currentConfig = extendedConfig;
+        const extendedConfigPath = resolveExtendedTsConfigPath(currentConfig.raw.extends, (0, node_path_1.dirname)(currentConfigPath));
+        if (!extendedConfigPath) {
+            break;
+        }
+        if (extendedConfigPath.externalPackage) {
+            extendedExternalPackages.add(extendedConfigPath.externalPackage);
+            break;
+        }
+        extendedConfigFiles.add(extendedConfigPath.filePath);
+        currentConfig = readCachedTsConfig(extendedConfigPath.filePath);
+        currentConfigPath = extendedConfigPath.filePath;
     }
-    return Array.from(extendedConfigFiles);
+    return {
+        files: Array.from(extendedConfigFiles),
+        packages: Array.from(extendedExternalPackages),
+    };
 }
 function resolveInternalProjectReferences(tsConfig, workspaceRoot, projectRoot, projectReferences = {}) {
     if (!tsConfig.projectReferences?.length) {
@@ -422,3 +447,21 @@ function normalizePluginOptions(pluginOptions = {}) {
         build,
     };
 }
+function resolveExtendedTsConfigPath(tsConfigPath, directory) {
+    try {
+        const resolvedPath = require.resolve(tsConfigPath, {
+            paths: directory ? [directory] : undefined,
+        });
+        if (tsConfigPath.startsWith('.')) {
+            return { filePath: resolvedPath };
+        }
+        // parse the package from the tsconfig path
+        const packageName = tsConfigPath.startsWith('@')
+            ? tsConfigPath.split('/').slice(0, 2).join('/')
+            : tsConfigPath.split('/')[0];
+        return { filePath: resolvedPath, externalPackage: packageName };
+    }
+    catch {
+        return null;
+    }
+}