@nx/js 22.2.1 → 22.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.2.1",
+  "version": "22.2.2",
   "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": "22.2.1",
-    "@nx/workspace": "22.2.1",
+    "@nx/devkit": "22.2.2",
+    "@nx/workspace": "22.2.2",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -60,7 +60,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.2.1"
+    "nx": "22.2.2"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/release-publish/release-publish.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GAsXzB"}
+{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GAsYzB"}

package/src/executors/release-publish/release-publish.impl.js

@@ -155,12 +155,20 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
                             !(err.stderr?.toString().includes('E404') &&
                                 err.stderr?.toString().includes('no such package available'))) {
                             console.error('npm dist-tag add error:');
+                            // npm returns error.summary and error.detail
                             if (stdoutData.error?.summary) {
                                 console.error(stdoutData.error.summary);
                             }
                             if (stdoutData.error?.detail) {
                                 console.error(stdoutData.error.detail);
                             }
+                            // pnpm returns error.code and error.message
+                            if (stdoutData.error?.code && !stdoutData.error?.summary) {
+                                console.error(`Error code: ${stdoutData.error.code}`);
+                            }
+                            if (stdoutData.error?.message && !stdoutData.error?.summary) {
+                                console.error(stdoutData.error.message);
+                            }
                             if (context.isVerbose) {
                                 console.error('npm dist-tag add stdout:');
                                 console.error(JSON.stringify(stdoutData, null, 2));
@@ -285,12 +293,20 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
             }
             const stdoutData = JSON.parse(err.stdout?.toString() || '{}');
             console.error(`${pm} publish error:`);
+            // npm returns error.summary and error.detail
             if (stdoutData.error?.summary) {
                 console.error(stdoutData.error.summary);
             }
             if (stdoutData.error?.detail) {
                 console.error(stdoutData.error.detail);
             }
+            // pnpm returns error.code and error.message
+            if (stdoutData.error?.code && !stdoutData.error?.summary) {
+                console.error(`Error code: ${stdoutData.error.code}`);
+            }
+            if (stdoutData.error?.message && !stdoutData.error?.summary) {
+                console.error(stdoutData.error.message);
+            }
             if (context.isVerbose) {
                 console.error(`${pm} publish stdout:`);
                 console.error(JSON.stringify(stdoutData, null, 2));

package/src/executors/tsc/tsc.impl.d.ts

@@ -1,7 +1,7 @@
 import { ExecutorContext } from '@nx/devkit';
 import type { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/typescript/compilation';
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
-export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string): 'cjs' | 'esm';
+export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string, projectRoot?: string, workspaceRoot?: string): 'cjs' | 'esm';
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
 export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, any>;
 export default tscExecutor;

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

@@ -1 +1 @@
-{"version":3,"file":"tsc.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAQvG,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAOhF,wBAAgB,iCAAiC,CAC/C,sBAAsB,EAAE,MAAM,GAC7B,KAAK,GAAG,KAAK,CAYf;AAED,wBAAgB,kCAAkC,CAChD,iBAAiB,EAAE,yBAAyB,EAC5C,OAAO,EAAE,eAAe,GACvB,4BAA4B,CAa9B;AAED,wBAAuB,WAAW,CAChC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,eAAe,mHAyGzB;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"tsc.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAQvG,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAOhF,wBAAgB,iCAAiC,CAC/C,sBAAsB,EAAE,MAAM,EAC9B,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,GAAG,KAAK,CAkCf;AAED,wBAAgB,kCAAkC,CAChD,iBAAiB,EAAE,yBAAyB,EAC5C,OAAO,EAAE,eAAe,GACvB,4BAA4B,CAa9B;AAED,wBAAuB,WAAW,CAChC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,eAAe,mHAqHzB;AAED,eAAe,WAAW,CAAC"}

package/src/executors/tsc/tsc.impl.js

@@ -5,6 +5,8 @@ exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
 exports.tscExecutor = tscExecutor;
 const ts = require("typescript");
 const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
+const path_1 = require("path");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
@@ -14,8 +16,29 @@ const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-fi
 const lib_1 = require("./lib");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 const create_entry_points_1 = require("../../utils/package-json/create-entry-points");
-function determineModuleFormatFromTsConfig(absolutePathToTsConfig) {
+function determineModuleFormatFromTsConfig(absolutePathToTsConfig, projectRoot, workspaceRoot) {
     const tsConfig = (0, ts_config_1.readTsConfig)(absolutePathToTsConfig);
+    // NodeNext is context-dependent - check package.json type field
+    // NodeNext outputs ESM only when package.json has "type": "module"
+    // Otherwise it outputs CJS (when "type": "commonjs" or no type field)
+    if (tsConfig.options.module === ts.ModuleKind.NodeNext) {
+        if (projectRoot && workspaceRoot) {
+            const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
+            if ((0, fs_1.existsSync)(packageJsonPath)) {
+                try {
+                    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+                    if (packageJson.type === 'module') {
+                        return 'esm';
+                    }
+                }
+                catch {
+                    // Fall through to default CJS
+                }
+            }
+        }
+        // NodeNext defaults to CJS when no type field or when we can't check
+        return 'cjs';
+    }
     if (tsConfig.options.module === ts.ModuleKind.ES2015 ||
         tsConfig.options.module === ts.ModuleKind.ES2020 ||
         tsConfig.options.module === ts.ModuleKind.ES2022 ||
@@ -63,7 +86,9 @@ async function* tscExecutor(_options, context) {
             (0, update_package_json_1.updatePackageJson)({
                 ...options,
                 additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
-                format: [determineModuleFormatFromTsConfig(options.tsConfig)],
+                format: [
+                    determineModuleFormatFromTsConfig(options.tsConfig, options.projectRoot, context.root),
+                ],
             }, context, target, dependencies);
         }
     });
@@ -79,7 +104,9 @@ async function* tscExecutor(_options, context) {
             disposePackageJsonChanges = await (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)({
                 ...options,
                 additionalEntryPoints: (0, create_entry_points_1.createEntryPoints)(options.additionalEntryPoints, context.root),
-                format: [determineModuleFormatFromTsConfig(options.tsConfig)],
+                format: [
+                    determineModuleFormatFromTsConfig(options.tsConfig, options.projectRoot, context.root),
+                ],
             }, context, target, dependencies));
         }
         const handleTermination = async (exitCode) => {

package/src/plugins/typescript/plugin.d.ts

@@ -1,5 +1,6 @@
 import { type CreateDependencies, type CreateNodesV2 } from '@nx/devkit';
 export interface TscPluginOptions {
+    compiler?: 'tsc' | 'tsgo';
     typecheck?: boolean | {
         targetName?: string;
     };

package/src/plugins/typescript/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EAEvB,KAAK,aAAa,EAInB,MAAM,YAAY,CAAC;AAgCpB,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EACN,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACN,KAAK,CAAC,EACF,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;IACN,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAkKD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAI/C,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,gBAAgB,CA6EzD,CAAC;AAEF,eAAO,MAAM,WAAW,iCAAgB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EAEvB,KAAK,aAAa,EAInB,MAAM,YAAY,CAAC;AAgCpB,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EACN,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACN,KAAK,CAAC,EACF,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;IACN,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAmKD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAI/C,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,gBAAgB,CA6EzD,CAAC;AAEF,eAAO,MAAM,WAAW,iCAAgB,CAAC"}

package/src/plugins/typescript/plugin.js

@@ -244,8 +244,9 @@ function buildTscTargets(config, options, context, configFiles) {
         internalProjectReferences = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, config.project);
         const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, config.project);
         const targetName = options.typecheck.targetName;
+        const compiler = options.compiler;
         if (!targets[targetName]) {
-            let command = `tsc --build --emitDeclarationOnly${options.verboseOutput ? ' --verbose' : ''}`;
+            let command = `${compiler} --build --emitDeclarationOnly${options.verboseOutput ? ' --verbose' : ''}`;
             if (tsConfig.options.noEmit ||
                 Object.values(internalProjectReferences).some((ref) => ref.options.noEmit) ||
                 Object.values(externalProjectReferences).some((ref) => ref.options.noEmit)) {
@@ -279,7 +280,7 @@ function buildTscTargets(config, options, context, configFiles) {
                     technologies: ['typescript'],
                     description: 'Runs type-checking for the project.',
                     help: {
-                        command: `${pmc.exec} tsc --build --help`,
+                        command: `${pmc.exec} ${compiler} --build --help`,
                         example: {
                             args: ['--force'],
                         },
@@ -295,9 +296,10 @@ function buildTscTargets(config, options, context, configFiles) {
             (0, util_1.isValidPackageJsonBuildConfig)(tsConfig, context.workspaceRoot, config.project.root))) {
         internalProjectReferences ??= resolveInternalProjectReferences(tsConfig, context.workspaceRoot, config.project);
         const targetName = options.build.targetName;
+        const compiler = options.compiler;
         targets[targetName] = {
             dependsOn: [`^${targetName}`],
-            command: `tsc --build ${options.build.configName}${options.verboseOutput ? ' --verbose' : ''}`,
+            command: `${compiler} --build ${options.build.configName}${options.verboseOutput ? ' --verbose' : ''}`,
             options: { cwd: config.project.root },
             cache: true,
             inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot),
@@ -309,7 +311,7 @@ function buildTscTargets(config, options, context, configFiles) {
                 technologies: ['typescript'],
                 description: 'Builds the project with `tsc`.',
                 help: {
-                    command: `${pmc.exec} tsc --build --help`,
+                    command: `${pmc.exec} ${compiler} --build --help`,
                     example: {
                         args: ['--force'],
                     },
@@ -743,6 +745,8 @@ function readTsConfig(tsConfigPath, workspaceRoot) {
     return ts.parseJsonConfigFileContent(readResult.config, tsSys, (0, node_path_1.dirname)(tsConfigPath));
 }
 function normalizePluginOptions(pluginOptions = {}) {
+    const defaultCompiler = 'tsc';
+    const compiler = pluginOptions.compiler ?? defaultCompiler;
     const defaultTypecheckTargetName = 'typecheck';
     let typecheck = {
         targetName: defaultTypecheckTargetName,
@@ -779,6 +783,7 @@ function normalizePluginOptions(pluginOptions = {}) {
         };
     }
     return {
+        compiler,
         typecheck,
         build,
         verboseOutput: pluginOptions.verboseOutput ?? false,

package/src/utils/assets/copy-assets-handler.js

@@ -27,7 +27,7 @@ const defaultFileEventHandler = (events) => {
         }
         const eventDir = path.dirname(event.src);
         const relativeDest = path.relative(eventDir, event.dest);
-        devkit_1.logger.log(`\n${(0, picocolors_1.dim)(relativeDest)}`);
+        devkit_1.logger.verbose(`\n${(0, picocolors_1.dim)(relativeDest)}`);
     });
 };
 exports.defaultFileEventHandler = defaultFileEventHandler;