@nx/js 23.0.0-beta.15 → 23.0.0-beta.16

package/dist/internal.d.ts

@@ -1,7 +1,8 @@
-export { registerTsProject, registerTsConfigPaths, } from 'nx/src/plugins/js/utils/register';
+export { forceRegisterEsmLoader, loadTsFile, registerTsProject, registerTsConfigPaths, requireWithTsconfigFallback, } from 'nx/src/plugins/js/utils/register';
 export { TargetProjectLocator, isBuiltinModuleImport, } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
 export { findProjectsNpmDependencies } from 'nx/src/plugins/js/package-json/create-package-json';
 export { walkTsconfigExtendsChain, type RawTsconfigJsonCache, } from './src/utils/typescript/raw-tsconfig';
+export { isEsmProject } from './src/utils/module-format/is-esm-project';
 export { TS_SOLUTION_SETUP_TSCONFIG_INPUT, addProjectToTsSolutionWorkspace, assertNotUsingTsSolutionSetup, findRuntimeTsConfigName, getDefinedCustomConditionName, getProjectSourceRoot, getProjectType, isUsingTsSolutionSetup, shouldConfigureTsSolutionSetup, updateTsconfigFiles, } from './src/utils/typescript/ts-solution-setup';
 export { ensureTypescript } from './src/utils/typescript/ensure-typescript';
 export { getNeededCompilerOptionOverrides } from './src/utils/typescript/configuration';

package/dist/internal.js

@@ -5,13 +5,16 @@
 // internal consumers and may change without semver protection. Consider it
 // the @nx/js equivalent of `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = exports.releaseTasks = exports.addReleaseConfigForTsSolution = exports.addReleaseConfigForNonTsSolution = exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = exports.getImportPath = exports.createGlobPatternsForDependencies = exports.normalizeUnitTestRunnerOption = exports.normalizeLinterOption = exports.isValidPackageJsonBuildConfig = exports.addBuildAndWatchDepsTargets = exports.findNpmDependencies = exports.getProjectPackageManagerWorkspaceStateWarningTask = exports.getProjectPackageManagerWorkspaceState = exports.getNpmScope = exports.sortPackageJsonFields = exports.CopyAssetsHandler = exports.addSwcRegisterDependencies = exports.addSwcDependencies = exports.addSwcTestConfig = exports.addSwcConfig = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = exports.compileTypeScript = exports.getNeededCompilerOptionOverrides = exports.ensureTypescript = exports.updateTsconfigFiles = exports.shouldConfigureTsSolutionSetup = exports.isUsingTsSolutionSetup = exports.getProjectType = exports.getProjectSourceRoot = exports.getDefinedCustomConditionName = exports.findRuntimeTsConfigName = exports.assertNotUsingTsSolutionSetup = exports.addProjectToTsSolutionWorkspace = exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = exports.walkTsconfigExtendsChain = exports.findProjectsNpmDependencies = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.registerTsConfigPaths = exports.registerTsProject = void 0;
-exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = void 0;
+exports.esbuildVersion = exports.nxVersion = exports.releaseTasks = exports.addReleaseConfigForTsSolution = exports.addReleaseConfigForNonTsSolution = exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = exports.getImportPath = exports.createGlobPatternsForDependencies = exports.normalizeUnitTestRunnerOption = exports.normalizeLinterOption = exports.isValidPackageJsonBuildConfig = exports.addBuildAndWatchDepsTargets = exports.findNpmDependencies = exports.getProjectPackageManagerWorkspaceStateWarningTask = exports.getProjectPackageManagerWorkspaceState = exports.getNpmScope = exports.sortPackageJsonFields = exports.CopyAssetsHandler = exports.addSwcRegisterDependencies = exports.addSwcDependencies = exports.addSwcTestConfig = exports.addSwcConfig = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = exports.compileTypeScript = exports.getNeededCompilerOptionOverrides = exports.ensureTypescript = exports.updateTsconfigFiles = exports.shouldConfigureTsSolutionSetup = exports.isUsingTsSolutionSetup = exports.getProjectType = exports.getProjectSourceRoot = exports.getDefinedCustomConditionName = exports.findRuntimeTsConfigName = exports.assertNotUsingTsSolutionSetup = exports.addProjectToTsSolutionWorkspace = exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = exports.isEsmProject = exports.walkTsconfigExtendsChain = exports.findProjectsNpmDependencies = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.requireWithTsconfigFallback = exports.registerTsConfigPaths = exports.registerTsProject = exports.loadTsFile = exports.forceRegisterEsmLoader = void 0;
+exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = void 0;
 // Re-exports of nx-source internals (need `no-restricted-imports` overrides).
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 var register_1 = require("nx/src/plugins/js/utils/register");
+Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return register_1.forceRegisterEsmLoader; } });
+Object.defineProperty(exports, "loadTsFile", { enumerable: true, get: function () { return register_1.loadTsFile; } });
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
 Object.defineProperty(exports, "registerTsConfigPaths", { enumerable: true, get: function () { return register_1.registerTsConfigPaths; } });
+Object.defineProperty(exports, "requireWithTsconfigFallback", { enumerable: true, get: function () { return register_1.requireWithTsconfigFallback; } });
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 var target_project_locator_1 = require("nx/src/plugins/js/project-graph/build-dependencies/target-project-locator");
 Object.defineProperty(exports, "TargetProjectLocator", { enumerable: true, get: function () { return target_project_locator_1.TargetProjectLocator; } });
@@ -22,6 +25,10 @@ Object.defineProperty(exports, "findProjectsNpmDependencies", { enumerable: true
 // Raw tsconfig walkers (the other AST utils ship via the public @nx/js entry)
 var raw_tsconfig_1 = require("./src/utils/typescript/raw-tsconfig");
 Object.defineProperty(exports, "walkTsconfigExtendsChain", { enumerable: true, get: function () { return raw_tsconfig_1.walkTsconfigExtendsChain; } });
+// Module-format detection for generators (project package.json `type` field +
+// TS solution awareness; mirrors Node's nearest-package.json semantics).
+var is_esm_project_1 = require("./src/utils/module-format/is-esm-project");
+Object.defineProperty(exports, "isEsmProject", { enumerable: true, get: function () { return is_esm_project_1.isEsmProject; } });
 // TS solution setup detection
 var ts_solution_setup_1 = require("./src/utils/typescript/ts-solution-setup");
 Object.defineProperty(exports, "TS_SOLUTION_SETUP_TSCONFIG_INPUT", { enumerable: true, get: function () { return ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT; } });

package/dist/src/executors/node/lib/detect-module-format.d.ts

@@ -1,4 +1,5 @@
-export type ModuleFormat = 'cjs' | 'esm';
+import { type ModuleFormat } from '../../../utils/module-format/module-format';
+export type { ModuleFormat };
 export interface ModuleFormatDetectionOptions {
     projectRoot: string;
     workspaceRoot: string;

package/dist/src/executors/node/lib/detect-module-format.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectModuleFormat = detectModuleFormat;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ts_config_1 = require("../../../utils/typescript/ts-config");
-const ts = tslib_1.__importStar(require("typescript"));
+const module_format_1 = require("../../../utils/module-format/module-format");
 function detectModuleFormat(options) {
     if (options.buildOptions?.format) {
         const formats = Array.isArray(options.buildOptions.format)
@@ -28,13 +27,9 @@ function detectModuleFormat(options) {
     const packageJsonPath = (0, path_1.join)(options.workspaceRoot, options.projectRoot, 'package.json');
     if ((0, fs_1.existsSync)(packageJsonPath)) {
         try {
-            const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-            if (packageJson.type === 'module') {
-                return 'esm';
-            }
-            if (packageJson.type === 'commonjs') {
-                return 'cjs';
-            }
+            const fmt = (0, module_format_1.getPackageJsonModuleFormat)((0, devkit_1.readJsonFile)(packageJsonPath));
+            if (fmt)
+                return fmt;
         }
         catch {
             // Continue to next detection method
@@ -42,20 +37,9 @@ function detectModuleFormat(options) {
     }
     if (options.tsConfig && (0, fs_1.existsSync)(options.tsConfig)) {
         try {
-            const tsConfig = (0, ts_config_1.readTsConfig)(options.tsConfig);
-            if (tsConfig.options.module === ts.ModuleKind.ES2015 ||
-                tsConfig.options.module === ts.ModuleKind.ES2020 ||
-                tsConfig.options.module === ts.ModuleKind.ES2022 ||
-                tsConfig.options.module === ts.ModuleKind.ESNext ||
-                tsConfig.options.module === ts.ModuleKind.NodeNext) {
-                // For NodeNext, we need to check moduleResolution
-                if (tsConfig.options.module === ts.ModuleKind.NodeNext) {
-                    // NodeNext uses package.json type field, which we already checked
-                    // Default to CJS if no type field
-                    return 'cjs';
-                }
-                return 'esm';
-            }
+            const fmt = (0, module_format_1.getTsConfigModuleFormat)((0, ts_config_1.readTsConfig)(options.tsConfig).options);
+            if (fmt)
+                return fmt;
         }
         catch {
             // Continue to default

package/dist/src/generators/init/init.js

@@ -99,12 +99,16 @@ async function initGeneratorInternal(tree, schema) {
     }
     const devDependencies = {
         '@nx/js': versions_1.nxVersion,
-        // When loading .ts config files (e.g. webpack.config.ts, jest.config.ts, etc.)
-        // we prefer to use SWC, and fallback to ts-node for workspaces that don't use SWC.
-        '@swc-node/register': versions_1.swcNodeVersion,
-        '@swc/core': versions_1.swcCoreVersion,
+        // Required by SWC-compiled output (decorators -> @swc/helpers/_/_ts_decorate
+        // imports). The default @nx/jest setup transforms with @swc/jest, so any
+        // workspace using decorators (NestJS, Angular, etc.) needs @swc/helpers
+        // resolvable at test time. Cheap to ship and avoids per-generator install.
         '@swc/helpers': versions_1.swcHelpersVersion,
     };
+    // @swc-node/register and @swc/core are no longer installed by init - native
+    // Node.js type stripping handles .ts config loading on Node 23+ (or 22.6+
+    // with --experimental-strip-types). loadTsFile registers swc/ts-node lazily
+    // when a config uses syntax native strip can't handle.
     if (!schema.js && !schema.keepExistingVersions) {
         const installedTsVersion = await getInstalledTypescriptVersion(tree);
         if (!installedTsVersion ||

package/dist/src/utils/module-format/is-esm-project.d.ts

@@ -0,0 +1,16 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Determine whether a project should be treated as ESM for the purpose of
+ * emitting `.ts` config and source files (e.g. choosing between
+ * `__filename`/`__dirname` and `import.meta.dirname`, or `require()` and
+ * `import` for sibling subpath imports).
+ *
+ * Mirrors Node's package.json `type` resolution: the **closest**
+ * package.json with a recognized `type` field wins.
+ *
+ * Resolution order:
+ * 1. The project's package.json `type`, if present and recognized.
+ * 2. The workspace-root package.json `type`, if present and recognized.
+ * 3. Default: `false` (CJS).
+ */
+export declare function isEsmProject(tree: Tree, projectRoot: string): boolean;

package/dist/src/utils/module-format/is-esm-project.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEsmProject = isEsmProject;
+const devkit_1 = require("@nx/devkit");
+const module_format_1 = require("./module-format");
+/**
+ * Determine whether a project should be treated as ESM for the purpose of
+ * emitting `.ts` config and source files (e.g. choosing between
+ * `__filename`/`__dirname` and `import.meta.dirname`, or `require()` and
+ * `import` for sibling subpath imports).
+ *
+ * Mirrors Node's package.json `type` resolution: the **closest**
+ * package.json with a recognized `type` field wins.
+ *
+ * Resolution order:
+ * 1. The project's package.json `type`, if present and recognized.
+ * 2. The workspace-root package.json `type`, if present and recognized.
+ * 3. Default: `false` (CJS).
+ */
+function isEsmProject(tree, projectRoot) {
+    const projectPackageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    if (tree.exists(projectPackageJsonPath)) {
+        const projectFmt = (0, module_format_1.getPackageJsonModuleFormat)((0, devkit_1.readJson)(tree, projectPackageJsonPath));
+        // Only honor an explicit type field; fall through to workspace when
+        // unset so we match Node's "walk up to nearest type field" behavior.
+        if (projectFmt !== null) {
+            return projectFmt === 'esm';
+        }
+    }
+    const workspaceFmt = (0, module_format_1.getPackageJsonModuleFormat)((0, devkit_1.readJson)(tree, 'package.json'));
+    return workspaceFmt === 'esm';
+}

package/dist/src/utils/module-format/module-format.d.ts

@@ -0,0 +1,17 @@
+import type * as ts from 'typescript';
+export type ModuleFormat = 'cjs' | 'esm';
+/**
+ * Decide module format from a parsed package.json `type` field alone.
+ * Returns `null` when the field is unset or holds an unrecognized value -
+ * callers can then fall back to other signals (tsconfig, defaults).
+ */
+export declare function getPackageJsonModuleFormat(packageJson: {
+    type?: string;
+} | null | undefined): ModuleFormat | null;
+/**
+ * Decide module format from tsconfig compiler options' `module` setting.
+ * Returns `null` when the setting is unset OR when it is `NodeNext` /
+ * `Node16` (those defer to the package.json `type` field, so the caller
+ * should have already checked package.json).
+ */
+export declare function getTsConfigModuleFormat(compilerOptions: ts.CompilerOptions | null | undefined): ModuleFormat | null;

package/dist/src/utils/module-format/module-format.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageJsonModuleFormat = getPackageJsonModuleFormat;
+exports.getTsConfigModuleFormat = getTsConfigModuleFormat;
+/**
+ * Decide module format from a parsed package.json `type` field alone.
+ * Returns `null` when the field is unset or holds an unrecognized value -
+ * callers can then fall back to other signals (tsconfig, defaults).
+ */
+function getPackageJsonModuleFormat(packageJson) {
+    if (!packageJson)
+        return null;
+    if (packageJson.type === 'module')
+        return 'esm';
+    if (packageJson.type === 'commonjs')
+        return 'cjs';
+    return null;
+}
+/**
+ * Decide module format from tsconfig compiler options' `module` setting.
+ * Returns `null` when the setting is unset OR when it is `NodeNext` /
+ * `Node16` (those defer to the package.json `type` field, so the caller
+ * should have already checked package.json).
+ */
+function getTsConfigModuleFormat(compilerOptions) {
+    const m = compilerOptions?.module;
+    if (m === undefined)
+        return null;
+    // Lazy-require typescript so importing this module (e.g. via
+    // @nx/js/internal -> is-esm-project) doesn't fail in workspaces that
+    // haven't installed typescript yet (fresh CNW projects before a
+    // generator adds it).
+    const tsMod = require('typescript');
+    if (m === tsMod.ModuleKind.NodeNext || m === tsMod.ModuleKind.Node16)
+        return null;
+    if (m === tsMod.ModuleKind.ES2015 ||
+        m === tsMod.ModuleKind.ES2020 ||
+        m === tsMod.ModuleKind.ES2022 ||
+        m === tsMod.ModuleKind.ESNext) {
+        return 'esm';
+    }
+    return 'cjs';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.0.0-beta.15",
+  "version": "23.0.0-beta.16",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -136,11 +136,11 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/workspace": "23.0.0-beta.15",
-    "@nx/devkit": "23.0.0-beta.15"
+    "@nx/devkit": "23.0.0-beta.16",
+    "@nx/workspace": "23.0.0-beta.16"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.15"
+    "nx": "23.0.0-beta.16"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"