@nx/js 22.7.0-pr.35356.e1b62ce → 22.7.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-pr.35356.e1b62ce",
+  "version": "22.7.0-rc.1",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -40,8 +40,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.0-pr.35356.e1b62ce",
-    "@nx/workspace": "22.7.0-pr.35356.e1b62ce",
+    "@nx/devkit": "22.7.0-rc.1",
+    "@nx/workspace": "22.7.0-rc.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35356.e1b62ce"
+    "nx": "22.7.0-rc.1"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/node/lib/output-file.d.ts

@@ -0,0 +1,9 @@
+interface OutputFileNameOptions {
+    buildTargetExecutor: string;
+    main: string;
+    outputPath: string;
+    rootDir: string;
+}
+export declare function getOutputFileName({ buildTargetExecutor, main, outputPath, rootDir, }: OutputFileNameOptions): string;
+export {};
+//# sourceMappingURL=output-file.d.ts.map

package/src/executors/node/lib/output-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"output-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/js/src/executors/node/lib/output-file.ts"],"names":[],"mappings":"AAIA,UAAU,qBAAqB;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,iBAAiB,CAAC,EAChC,mBAAmB,EACnB,IAAI,EACJ,UAAU,EACV,OAAO,GACR,EAAE,qBAAqB,GAAG,MAAM,CAqBhC"}

package/src/executors/node/lib/output-file.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOutputFileName = getOutputFileName;
+const path_1 = require("path");
+const path_2 = require("nx/src/utils/path");
+const get_main_file_dir_1 = require("../../../utils/get-main-file-dir");
+function getOutputFileName({ buildTargetExecutor, main, outputPath, rootDir, }) {
+    const fileName = `${(0, path_1.parse)(main).name}.js`;
+    if (buildTargetExecutor !== '@nx/js:tsc' &&
+        buildTargetExecutor !== '@nx/js:swc') {
+        return fileName;
+    }
+    const mainDirectory = (0, path_2.normalizePath)((0, path_1.dirname)(main));
+    const normalizedOutputPath = (0, path_2.normalizePath)(outputPath);
+    const isMainInsideOutputPath = mainDirectory === normalizedOutputPath ||
+        mainDirectory.startsWith(`${normalizedOutputPath}/`);
+    const base = isMainInsideOutputPath ? normalizedOutputPath : rootDir;
+    return (0, path_2.joinPathFragments)((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(main, base), fileName);
+}

package/src/executors/node/node.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA+HD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA6ID,eAAe,YAAY,CAAC"}

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

@@ -15,9 +15,9 @@ const kill_tree_1 = require("./lib/kill-tree");
 const line_aware_writer_1 = require("./lib/line-aware-writer");
 const coalescing_debounce_1 = require("./lib/coalescing-debounce");
 const fileutils_1 = require("nx/src/utils/fileutils");
-const get_main_file_dir_1 = require("../../utils/get-main-file-dir");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const detect_module_format_1 = require("./lib/detect-module-format");
+const output_file_1 = require("./lib/output-file");
 const globalLineAwareWriter = new line_aware_writer_1.LineAwareWriter();
 async function* nodeExecutor(options, context) {
     process.env.NODE_ENV ??= context?.configurationName ?? 'development';
@@ -295,7 +295,11 @@ function calculateResolveMappings(context, options) {
     const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, parsed.project, parsed.target, parsed.configuration);
     return dependencies.reduce((m, c) => {
         if (c.node.type !== 'npm' && c.outputs[0] != null) {
-            m[c.name] = (0, devkit_1.joinPathFragments)(context.root, c.outputs[0]);
+            // `outputs` are cache patterns and may contain globs (e.g. from the
+            // inferred `@nx/js/typescript` build target). Strip the glob portion
+            // so the runtime require overrides resolve to the actual output dir.
+            const outputDir = stripGlobToBaseDir(c.outputs[0]);
+            m[c.name] = (0, devkit_1.joinPathFragments)(context.root, outputDir);
         }
         return m;
     }, {});
@@ -329,7 +333,13 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
                 projectRoot: project.data.root,
                 workspaceRoot: context.root,
             });
-            return path.join(outputFilePath, 'main.js');
+            // `outputs` are cache patterns and may contain globs (e.g. the inferred
+            // `@nx/js/typescript` build target scopes its output to
+            // `{projectRoot}/dist/**/*.{js,...}` to avoid caching non-tsc files).
+            // Strip the glob portion back to the last path separator before it to
+            // recover the base output directory.
+            const outputDir = stripGlobToBaseDir(outputFilePath);
+            return path.join(outputDir, 'main.js');
         }
         const fallbackFile = path.join('dist', project.data.root, 'main.js');
         devkit_1.logger.warn(`Build option ${chalk_1.default.bold('outputFileName')} not set for ${chalk_1.default.bold(project.name)}. Using fallback value of ${chalk_1.default.bold(fallbackFile)}.`);
@@ -337,17 +347,24 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     }
     let outputFileName = buildOptions.outputFileName;
     if (!outputFileName) {
-        const fileName = `${path.parse(buildOptions.main).name}.js`;
-        if (buildTargetExecutor === '@nx/js:tsc' ||
-            buildTargetExecutor === '@nx/js:swc') {
-            outputFileName = path.join((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(buildOptions.main, project.data.root), fileName);
-        }
-        else {
-            outputFileName = fileName;
-        }
+        outputFileName = (0, output_file_1.getOutputFileName)({
+            buildTargetExecutor,
+            main: buildOptions.main,
+            outputPath: buildOptions.outputPath,
+            rootDir: buildOptions.rootDir ?? project.data.root,
+        });
     }
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
+function stripGlobToBaseDir(pathWithGlob) {
+    const globIdx = pathWithGlob.search(/[*?[{(]/);
+    if (globIdx === -1) {
+        return pathWithGlob.replace(/[\\/]+$/, '');
+    }
+    const prefix = pathWithGlob.slice(0, globIdx);
+    const lastSep = Math.max(prefix.lastIndexOf('/'), prefix.lastIndexOf('\\'));
+    return lastSep === -1 ? '' : prefix.slice(0, lastSep);
+}
 function fileToRunCorrectPath(fileToRun) {
     if ((0, fileutils_1.fileExists)(fileToRun))
         return fileToRun;

package/src/executors/tsc/lib/typescript-compilation.js

@@ -61,7 +61,6 @@ function* compileTS(context, logger, hooks, reporters) {
     });
     const rootNames = Object.keys(context);
     const solutionBuilder = ts.createSolutionBuilder(solutionBuilderHost, rootNames, {});
-    // eslint-disable-next-line no-constant-condition
     while (true) {
         project = solutionBuilder.getNextInvalidatedProject();
         if (!project) {

package/src/generators/typescript-sync/typescript-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA2CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyQ5E;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA4CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyQ5E;AAED,eAAe,aAAa,CAAC"}

package/src/generators/typescript-sync/typescript-sync.js

@@ -199,6 +199,7 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
     const stringifiedJsonContents = readRawTsconfigContents(tree, tsconfigInfoCaches, tsConfigPath);
     const tsConfig = (0, devkit_1.parseJson)(stringifiedJsonContents);
     const ignoredReferences = new Set(tsConfig.nx?.sync?.ignoredReferences ?? []);
+    const ignoredDependencies = new Set(tsConfig.nx?.sync?.ignoredDependencies ?? []);
     // We have at least one dependency so we can safely set it to an empty array if not already set
     const references = [];
     const originalReferencesSet = new Set();
@@ -236,6 +237,12 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
         }
     }
     for (const dep of dependencies) {
+        if (ignoredDependencies.has(dep.name)) {
+            // The user has explicitly opted out of this dependency edge, typically
+            // to break a circular project reference graph that the project graph
+            // intentionally allows.
+            continue;
+        }
         // Ensure the project reference for the target is set if we can find the
         // relevant tsconfig file
         let referencePath;

package/src/plugins/typescript/plugin.js

@@ -456,17 +456,18 @@ function getInputs(namedInputs, config, tsConfig, internalProjectReferences, wor
     if (excludePaths.size) {
         inputs.push(...Array.from(excludePaths).map((p) => `!${pathToInputOrOutput((0, devkit_1.joinPathFragments)(config.project.root, p), workspaceRoot, config.project)}`));
     }
-    // tsc --build reads .d.ts and .tsbuildinfo files from dependent tasks, not
-    // the source files of dependencies. This correctly tracks build outputs from
-    // both external project references and same-project task dependencies (e.g.
-    // build-native producing .d.ts files that may be excluded from file watching
-    // via .nxignore. "*.d.ts" are also read from the deps projects sources.
+    // tsc --build reads .d.ts/.d.cts/.d.mts and .tsbuildinfo files from dependent
+    // tasks, not the source files of dependencies. This correctly tracks build
+    // outputs from both external project references and same-project task
+    // dependencies (e.g. build-native producing .d.ts files that may be excluded
+    // from file watching via .nxignore). Declaration files are also read from
+    // the deps projects sources.
     inputs.push({
-        dependentTasksOutputFiles: '**/*.{d.ts,tsbuildinfo}',
+        dependentTasksOutputFiles: '**/*.{d.ts,d.cts,d.mts,tsbuildinfo}',
         transitive: true,
     });
     inputs.push({
-        fileset: '{projectRoot}/**/*.d.ts',
+        fileset: '{projectRoot}/**/*.{d.ts,d.cts,d.mts}',
         dependencies: true,
     });
     const externalRefPatterns = getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectReferences, workspaceRoot, config.project, cache);
@@ -499,9 +500,9 @@ function getOutputs(config, rootTsConfig, internalProjectReferences, workspaceRo
         }
         else if (tsConfig.options.outDir) {
             if (emitDeclarationOnly) {
-                outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(tsConfig.options.outDir, '**/*.d.ts'), workspaceRoot, config.project));
+                outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(tsConfig.options.outDir, '**/*.{d.ts,d.cts,d.mts}'), workspaceRoot, config.project));
                 if (tsConfig.options.declarationMap) {
-                    outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(tsConfig.options.outDir, '**/*.d.ts.map'), workspaceRoot, config.project));
+                    outputs.add(pathToInputOrOutput((0, devkit_1.joinPathFragments)(tsConfig.options.outDir, '**/*.{d.ts,d.cts,d.mts}.map'), workspaceRoot, config.project));
                 }
             }
             else {