@nx/js 20.4.0-beta.0 → 20.4.0-beta.1

package/migrations.json

@@ -124,6 +124,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.4.0": {
+      "version": "20.4.0-beta.1",
+      "x-prompt": "Do you want to update to TypeScript v5.7?",
+      "requires": {
+        "typescript": ">=5.6.0 <5.7.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.7.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.0-beta.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": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.4.0-beta.0",
-    "@nx/workspace": "20.4.0-beta.0",
+    "@nx/devkit": "20.4.0-beta.1",
+    "@nx/workspace": "20.4.0-beta.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/generators/init/files/ts-solution/tsconfig.base.json__tmpl__

@@ -5,9 +5,11 @@
     "emitDeclarationOnly": true,
     "importHelpers": true,
     "isolatedModules": true,
-    "lib": ["es2022"],
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
+    "lib": ["es2022"],<% if (platform === 'node') { %>
+    "module": "nodenext",
+    "moduleResolution": "nodenext",<% } else { %>
+    "module": "esnext",
+    "moduleResolution": "bundler",<% } %>
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,

package/src/generators/init/init.js

@@ -87,7 +87,9 @@ async function initGeneratorInternal(tree, schema) {
     }
     if (schema.addTsConfigBase && !(0, ts_config_1.getRootTsConfigFileName)(tree)) {
         if (schema.addTsPlugin) {
+            const platform = schema.platform ?? 'node';
             (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/ts-solution'), '.', {
+                platform,
                 tmpl: '',
             });
         }

package/src/generators/init/schema.d.ts

@@ -9,4 +9,5 @@ export interface InitSchema {
   addPlugin?: boolean;
   updatePackageScripts?: boolean;
   addTsPlugin?: boolean;
+  platform?: 'web' | 'node';
 }

package/src/generators/library/library.js

@@ -23,6 +23,7 @@ const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
+const sort_fields_1 = require("../../utils/package-json/sort-fields");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -121,10 +122,19 @@ async function libraryGeneratorInternal(tree, schema) {
             // add project reference to the runtime tsconfig.lib.json file
             json.references ??= [];
             json.references.push({ path: './tsconfig.lib.json' });
-            if (options.isUsingTsSolutionConfig && options.bundler === 'rollup') {
-                json.compilerOptions.module = 'esnext';
-                json.compilerOptions.moduleResolution = 'bundler';
+            const compilerOptions = getCompilerOptions(options);
+            // respect the module and moduleResolution set by the test runner generator
+            if (json.compilerOptions.module) {
+                compilerOptions.module = json.compilerOptions.module;
             }
+            if (json.compilerOptions.moduleResolution) {
+                compilerOptions.moduleResolution =
+                    json.compilerOptions.moduleResolution;
+            }
+            // filter out options already set with the same value in root tsconfig file that we're going to extend from
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, { ...json.compilerOptions, ...compilerOptions }, 
+            // must have been created by now
+            (0, ts_config_1.getRootTsConfigFileName)(tree));
             return json;
         });
     }
@@ -133,6 +143,7 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.isUsingTsSolutionConfig) {
         (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
+    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -305,19 +316,21 @@ async function addLint(tree, options) {
                 ruleSeverity = value;
                 ruleOptions = {};
             }
-            if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/vite.config.{js,ts,mjs,mts}');
-                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+            const ignoredFiles = new Set(ruleOptions.ignoredFiles ?? []);
+            if (options.bundler === 'vite') {
+                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
             }
             else if (options.bundler === 'rollup') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/rollup.config.{js,ts,mjs,mts,cjs,cts}');
-                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+                ignoredFiles.add('{projectRoot}/rollup.config.{js,ts,mjs,mts,cjs,cts}');
             }
             else if (options.bundler === 'esbuild') {
-                ruleOptions.ignoredFiles ??= [];
-                ruleOptions.ignoredFiles.push('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
+                ignoredFiles.add('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
+            }
+            if (options.unitTestRunner === 'vitest') {
+                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
+            }
+            if (ignoredFiles.size) {
+                ruleOptions.ignoredFiles = Array.from(ignoredFiles);
                 o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
             }
             return o;
@@ -478,6 +491,12 @@ function createFiles(tree, options) {
             return json;
         });
     }
+    else if (!options.isUsingTsSolutionConfig &&
+        options.useProjectJson &&
+        (!options.bundler || options.bundler === 'none') &&
+        !(options.projectRoot === '.')) {
+        tree.delete(packageJsonPath);
+    }
     if (options.minimal && !(options.projectRoot === '.')) {
         tree.delete((0, path_1.join)(options.projectRoot, 'README.md'));
     }
@@ -690,33 +709,8 @@ function getOutputPath(options) {
 }
 function createProjectTsConfigs(tree, options) {
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.projectRoot);
-    let compilerOptionOverrides = {
-        module: options.isUsingTsSolutionConfig
-            ? options.bundler === 'rollup'
-                ? 'esnext'
-                : 'nodenext'
-            : 'commonjs',
-        ...(options.isUsingTsSolutionConfig
-            ? options.bundler === 'rollup'
-                ? { moduleResolution: 'bundler' }
-                : { moduleResolution: 'nodenext' }
-            : {}),
-        ...(options.js ? { allowJs: true } : {}),
-        ...(options.strict
-            ? {
-                forceConsistentCasingInFileNames: true,
-                strict: true,
-                importHelpers: true,
-                noImplicitOverride: true,
-                noImplicitReturns: true,
-                noFallthroughCasesInSwitch: true,
-                ...(!options.isUsingTsSolutionConfig
-                    ? { noPropertyAccessFromIndexSignature: true }
-                    : {}),
-            }
-            : {}),
-    };
-    if (!options.rootProject || options.isUsingTsSolutionConfig) {
+    let compilerOptionOverrides = getCompilerOptions(options);
+    if (options.isUsingTsSolutionConfig) {
         // filter out options already set with the same value in root tsconfig file that we're going to extend from
         compilerOptionOverrides = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, compilerOptionOverrides, 
         // must have been created by now
@@ -788,6 +782,34 @@ function createProjectTsConfigs(tree, options) {
     };
     (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), tsconfig);
 }
+function getCompilerOptions(options) {
+    return {
+        module: options.isUsingTsSolutionConfig
+            ? options.bundler === 'rollup'
+                ? 'esnext'
+                : 'nodenext'
+            : 'commonjs',
+        ...(options.isUsingTsSolutionConfig
+            ? {
+                moduleResolution: options.bundler === 'rollup' ? 'bundler' : 'nodenext',
+            }
+            : {}),
+        ...(options.js ? { allowJs: true } : {}),
+        ...(options.strict
+            ? {
+                forceConsistentCasingInFileNames: true,
+                strict: true,
+                importHelpers: true,
+                noImplicitOverride: true,
+                noImplicitReturns: true,
+                noFallthroughCasesInSwitch: true,
+                ...(!options.isUsingTsSolutionConfig
+                    ? { noPropertyAccessFromIndexSignature: true }
+                    : {}),
+            }
+            : {}),
+    };
+}
 function determineDependencies(options) {
     switch (options.bundler) {
         case 'tsc':

package/src/utils/package-json/sort-fields.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function sortPackageJsonFields(tree: Tree, projectRoot: string): void;

package/src/utils/package-json/sort-fields.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortPackageJsonFields = sortPackageJsonFields;
+const devkit_1 = require("@nx/devkit");
+function sortPackageJsonFields(tree, projectRoot) {
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    if (!tree.exists(packageJsonPath))
+        return;
+    (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
+        // Note that these are fields that our generators may use, so it's not exhaustive.
+        const orderedTopFields = new Set([
+            'name',
+            'version',
+            'private',
+            'description',
+            'type',
+            'main',
+            'module',
+            'types',
+            'exports',
+        ]);
+        const orderedBottomFields = new Set([
+            'dependencies',
+            'devDependencies',
+            'peerDependencies',
+            'optionalDependencies',
+        ]);
+        const otherFields = new Set(Object.keys(json).filter((k) => !orderedTopFields.has(k) && !orderedBottomFields.has(k)));
+        const allFields = [
+            ...orderedTopFields,
+            ...otherFields,
+            ...orderedBottomFields,
+        ];
+        const sortedJson = {};
+        for (const k of allFields) {
+            sortedJson[k] = json[k];
+        }
+        return sortedJson;
+    });
+}

package/src/utils/typescript/ts-solution-setup.js

@@ -10,6 +10,7 @@ const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
+const configuration_1 = require("./configuration");
 function isUsingTypeScriptPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     return (nxJson?.plugins?.some((p) => typeof p === 'string'
@@ -77,15 +78,14 @@ function findRuntimeTsConfigName(tree, projectRoot) {
     return null;
 }
 function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compilerOptions, exclude = [], rootDir = 'src') {
-    if (!isUsingTsSolutionSetup(tree))
+    if (!isUsingTsSolutionSetup(tree)) {
         return;
+    }
     const offset = (0, devkit_1.offsetFromRoot)(projectRoot);
-    const tsconfig = `${projectRoot}/${runtimeTsconfigFileName}`;
-    const tsconfigSpec = `${projectRoot}/tsconfig.spec.json`;
-    const e2eRoot = `${projectRoot}-e2e`;
-    const tsconfigE2E = `${e2eRoot}/tsconfig.json`;
-    if (tree.exists(tsconfig)) {
-        (0, devkit_1.updateJson)(tree, tsconfig, (json) => {
+    const runtimeTsconfigPath = `${projectRoot}/${runtimeTsconfigFileName}`;
+    const specTsconfigPath = `${projectRoot}/tsconfig.spec.json`;
+    if (tree.exists(runtimeTsconfigPath)) {
+        (0, devkit_1.updateJson)(tree, runtimeTsconfigPath, (json) => {
             json.extends = (0, devkit_1.joinPathFragments)(offset, 'tsconfig.base.json');
             json.compilerOptions = {
                 ...json.compilerOptions,
@@ -100,13 +100,15 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
                 // at `<outDir>/<relative path to config from rootDir>/`, so we need
                 // to set it explicitly to ensure it's output to the outDir
                 // https://www.typescriptlang.org/tsconfig/#tsBuildInfoFile
-                json.compilerOptions.tsBuildInfoFile = (0, posix_1.join)('out-tsc', projectRoot.split('/').at(-1), (0, posix_1.basename)(runtimeTsconfigFileName, '.json') + '.tsbuildinfo');
+                json.compilerOptions.tsBuildInfoFile = (0, posix_1.join)(json.compilerOptions.outDir, (0, posix_1.basename)(runtimeTsconfigFileName, '.json') + '.tsbuildinfo');
             }
             else if (json.compilerOptions.tsBuildInfoFile) {
                 // when rootDir is '.' or not set, it would be output to the outDir, so
                 // we don't need to set it explicitly
                 delete json.compilerOptions.tsBuildInfoFile;
             }
+            // don't duplicate compiler options from base tsconfig
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, 'tsconfig.base.json');
             const excludeSet = json.exclude
                 ? new Set(['out-tsc', 'dist', ...json.exclude, ...exclude])
                 : new Set(exclude);
@@ -114,17 +116,20 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
             return json;
         });
     }
-    if (tree.exists(tsconfigSpec)) {
-        (0, devkit_1.updateJson)(tree, tsconfigSpec, (json) => {
+    if (tree.exists(specTsconfigPath)) {
+        (0, devkit_1.updateJson)(tree, specTsconfigPath, (json) => {
             json.extends = (0, devkit_1.joinPathFragments)(offset, 'tsconfig.base.json');
             json.compilerOptions = {
                 ...json.compilerOptions,
                 ...compilerOptions,
             };
+            // don't duplicate compiler options from base tsconfig
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, 'tsconfig.base.json');
             const runtimePath = `./${runtimeTsconfigFileName}`;
             json.references ??= [];
-            if (!json.references.some((x) => x.path === runtimePath))
+            if (!json.references.some((x) => x.path === runtimePath)) {
                 json.references.push({ path: runtimePath });
+            }
             return json;
         });
     }
@@ -132,8 +137,9 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
         (0, devkit_1.updateJson)(tree, 'tsconfig.json', (json) => {
             const projectPath = './' + projectRoot;
             json.references ??= [];
-            if (!json.references.some((x) => x.path === projectPath))
+            if (!json.references.some((x) => x.path === projectPath)) {
                 json.references.push({ path: projectPath });
+            }
             return json;
         });
     }

package/src/utils/versions.d.ts

@@ -8,7 +8,7 @@ export declare const swcNodeVersion = "~1.9.1";
 export declare const tsLibVersion = "^2.3.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const verdaccioVersion = "^5.0.4";
-export declare const typescriptVersion = "~5.6.2";
+export declare const typescriptVersion = "~5.7.2";
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.

package/src/utils/versions.js

@@ -12,7 +12,7 @@ exports.tsLibVersion = '^2.3.0';
 exports.typesNodeVersion = '18.16.9';
 exports.verdaccioVersion = '^5.0.4';
 // Typescript
-exports.typescriptVersion = '~5.6.2';
+exports.typescriptVersion = '~5.7.2';
 /**
  * The minimum version is currently determined from the lowest version
  * that's supported by the lowest Angular supported version, e.g.