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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-pr.35356.e1b62ce",
+  "version": "22.7.0-rc.0",
   "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.0",
+    "@nx/workspace": "22.7.0-rc.0",
     "@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.0"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

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;AAmJD,eAAe,YAAY,CAAC"}

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

@@ -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)}.`);
@@ -348,6 +358,15 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     }
     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/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 {