@nx/js 20.3.1 → 20.3.3

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.3.1",
+  "version": "20.3.3",
   "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.3.1",
-    "@nx/workspace": "20.3.1",
+    "@nx/devkit": "20.3.3",
+    "@nx/workspace": "20.3.3",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/executors/swc/swc.impl.js

@@ -29,9 +29,7 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
         }
     }
     const outputPath = (0, path_1.join)(root, options.outputPath);
-    if (options.skipTypeCheck == null && !isTsSolutionSetup) {
-        options.skipTypeCheck = false;
-    }
+    options.skipTypeCheck ??= !isTsSolutionSetup;
     if (options.watch == null) {
         options.watch = false;
     }

package/src/generators/library/files/lib/src/lib/__fileName__.spec.ts__tmpl__

@@ -1,4 +1,4 @@
-import { <%= propertyName %> } from './<%= fileName %>';
+import { <%= propertyName %> } from './<%= fileNameImport %>';
 
 describe('<%= propertyName %>', () => {
   it('should work', () => {

package/src/generators/library/library.js

@@ -11,18 +11,19 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
 const path_1 = require("path");
 const generator_prompts_1 = require("../../utils/generator-prompts");
-const package_manager_workspaces_1 = require("../../utils/package-manager-workspaces");
+const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const add_swc_config_1 = require("../../utils/swc/add-swc-config");
 const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
 const configuration_1 = require("../../utils/typescript/configuration");
 const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
+const ensure_typescript_1 = require("../../utils/typescript/ensure-typescript");
 const plugin_1 = require("../../utils/typescript/plugin");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 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 ensure_typescript_1 = require("../../utils/typescript/ensure-typescript");
+const sort_fields_1 = require("../../utils/package-json/sort-fields");
 const defaultOutputDirectory = 'dist';
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
@@ -55,7 +56,7 @@ async function libraryGeneratorInternal(tree, schema) {
         await configurationGenerator(tree, {
             project: options.name,
             compiler: 'swc',
-            format: ['cjs', 'esm'],
+            format: options.isUsingTsSolutionConfig ? ['esm'] : ['cjs', 'esm'],
         });
     }
     if (options.bundler === 'vite') {
@@ -101,6 +102,7 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
             runtimeTsconfigFileName: 'tsconfig.lib.json',
             compiler: options.compiler === 'swc' ? 'swc' : 'babel',
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(tree, {
@@ -120,17 +122,22 @@ 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';
+            }
             return json;
         });
     }
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    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);
     }
-    if (!options.skipWorkspacesWarning &&
-        options.isUsingTsSolutionConfig &&
-        options.projectPackageManagerWorkspaceState !== 'included') {
-        tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(options.projectPackageManagerWorkspaceState, tree.root));
-    }
     if (options.publishable) {
         tasks.push(() => {
             logNxReleaseDocsInfo();
@@ -138,7 +145,7 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     // Always run install to link packages.
     if (options.isUsingTsSolutionConfig) {
-        tasks.push(() => (0, devkit_1.installPackagesTask)(tree));
+        tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
     }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
@@ -175,15 +182,13 @@ async function configureProject(tree, options) {
                 tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
             },
         };
-        if (options.bundler === 'esbuild') {
-            projectConfiguration.targets.build.options.format = ['cjs'];
-        }
         if (options.bundler === 'swc' &&
             (options.skipTypeCheck || options.isUsingTsSolutionConfig)) {
             projectConfiguration.targets.build.options.skipTypeCheck = true;
         }
         if (options.isUsingTsSolutionConfig) {
             if (options.bundler === 'esbuild') {
+                projectConfiguration.targets.build.options.format = ['esm'];
                 projectConfiguration.targets.build.options.declarationRootDir = `${options.projectRoot}/src`;
             }
             else if (options.bundler === 'swc') {
@@ -193,6 +198,7 @@ async function configureProject(tree, options) {
         else {
             projectConfiguration.targets.build.options.assets = [];
             if (options.bundler === 'esbuild') {
+                projectConfiguration.targets.build.options.format = ['cjs'];
                 projectConfiguration.targets.build.options.generatePackageJson = true;
             }
             if (!options.minimal) {
@@ -301,19 +307,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}');
-                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;
@@ -332,7 +340,7 @@ function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
     createProjectTsConfigs(tree, options);
     let fileNameImport = options.fileName;
-    if (options.bundler === 'vite') {
+    if (options.bundler === 'vite' || options.isUsingTsSolutionConfig) {
         const tsConfig = (0, ts_config_1.readTsConfigFromTree)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.lib.json'));
         const ts = (0, ensure_typescript_1.ensureTypescript)();
         if (tsConfig.options.moduleResolution === ts.ModuleResolutionKind.Node16 ||
@@ -376,7 +384,9 @@ function createFiles(tree, options) {
         });
     }
     if (options.bundler === 'swc' || options.bundler === 'rollup') {
-        (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' ? 'commonjs' : 'es6');
+        (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' && !options.isUsingTsSolutionConfig
+            ? 'commonjs'
+            : 'es6');
     }
     else if (options.includeBabelRc) {
         addBabelRc(tree, options);
@@ -405,7 +415,7 @@ function createFiles(tree, options) {
                 // https://docs.npmjs.com/cli/v10/configuring-npm/package-json#files
                 json.files = ['dist', '!**/*.tsbuildinfo'];
             }
-            return {
+            const updatedPackageJson = {
                 ...json,
                 dependencies: {
                     ...json.dependencies,
@@ -413,10 +423,25 @@ function createFiles(tree, options) {
                 },
                 ...determineEntryFields(options),
             };
+            if (options.bundler === 'none') {
+                updatedPackageJson.type = 'module';
+            }
+            else if (options.bundler !== 'vite' && options.bundler !== 'rollup') {
+                return (0, update_package_json_1.getUpdatedPackageJsonContent)(updatedPackageJson, {
+                    main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
+                    outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
+                    projectRoot: options.projectRoot,
+                    rootDir: (0, path_1.join)(options.projectRoot, 'src'),
+                    generateExportsField: true,
+                    packageJsonPath,
+                    format: ['esm'],
+                });
+            }
+            return updatedPackageJson;
         });
     }
     else {
-        const packageJson = {
+        let packageJson = {
             name: options.importPath,
             version: '0.0.1',
             dependencies: determineDependencies(options),
@@ -430,6 +455,22 @@ function createFiles(tree, options) {
             // https://docs.npmjs.com/cli/v10/configuring-npm/package-json#files
             packageJson.files = ['dist', '!**/*.tsbuildinfo'];
         }
+        if (options.isUsingTsSolutionConfig) {
+            if (options.bundler === 'none') {
+                packageJson.type = 'module';
+            }
+            else if (options.bundler !== 'vite' && options.bundler !== 'rollup') {
+                packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
+                    main: (0, path_1.join)(options.projectRoot, 'src/index.ts'),
+                    outputPath: (0, devkit_1.joinPathFragments)(options.projectRoot, 'dist'),
+                    projectRoot: options.projectRoot,
+                    rootDir: (0, path_1.join)(options.projectRoot, 'src'),
+                    generateExportsField: true,
+                    packageJsonPath,
+                    format: ['esm'],
+                });
+            }
+        }
         (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
     }
     if (options.config === 'npm-scripts') {
@@ -441,6 +482,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'));
     }
@@ -577,7 +624,6 @@ async function normalizeOptions(tree, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     options.minimal ??= false;
-    const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(tree, projectRoot);
     // We default to generate a project.json file if the new setup is not being used
     options.useProjectJson ??= !isUsingTsSolutionConfig;
     return {
@@ -590,7 +636,6 @@ async function normalizeOptions(tree, options) {
         importPath,
         hasPlugin,
         isUsingTsSolutionConfig,
-        projectPackageManagerWorkspaceState,
     };
 }
 function addProjectDependencies(tree, options) {
@@ -774,75 +819,87 @@ function determineDependencies(options) {
 function determineEntryFields(options) {
     switch (options.bundler) {
         case 'tsc':
-            return {
-                type: 'commonjs',
-                main: options.isUsingTsSolutionConfig
-                    ? './dist/index.js'
-                    : './src/index.js',
-                typings: options.isUsingTsSolutionConfig
-                    ? './dist/index.d.ts'
-                    : './src/index.d.ts',
-            };
         case 'swc':
-            return {
-                type: 'commonjs',
-                main: options.isUsingTsSolutionConfig
-                    ? './dist/index.js'
-                    : './src/index.js',
-                typings: options.isUsingTsSolutionConfig
-                    ? './dist/index.d.ts'
-                    : './src/index.d.ts',
-            };
+            if (options.isUsingTsSolutionConfig) {
+                return {
+                    type: 'module',
+                    main: './dist/index.js',
+                    types: './dist/index.d.ts',
+                };
+            }
+            else {
+                return {
+                    type: 'commonjs',
+                    main: './src/index.js',
+                    types: './src/index.d.ts',
+                };
+            }
         case 'rollup':
-            return {
-                // Since we're publishing both formats, skip the type field.
-                // Bundlers or Node will determine the entry point to use.
-                main: options.isUsingTsSolutionConfig
-                    ? './dist/index.cjs'
-                    : './index.cjs',
-                module: options.isUsingTsSolutionConfig
-                    ? './dist/index.js'
-                    : './index.js',
-            };
+            if (options.isUsingTsSolutionConfig) {
+                // the rollup configuration generator already handles this
+                return {};
+            }
+            else {
+                return {
+                    // Since we're publishing both formats, skip the type field.
+                    // Bundlers or Node will determine the entry point to use.
+                    main: './index.cjs',
+                    module: './index.js',
+                };
+            }
         case 'vite':
-            return {
-                type: 'module',
-                main: options.isUsingTsSolutionConfig
-                    ? './dist/index.js'
-                    : './index.js',
-                typings: options.isUsingTsSolutionConfig
-                    ? './dist/index.d.ts'
-                    : './index.d.ts',
-            };
+            if (options.isUsingTsSolutionConfig) {
+                // the vite configuration generator already handle this
+                return {};
+            }
+            else {
+                return {
+                    type: 'module',
+                    main: './index.js',
+                    types: './index.d.ts',
+                };
+            }
         case 'esbuild':
-            // For libraries intended for Node, use CJS.
-            return {
-                type: 'commonjs',
-                main: options.isUsingTsSolutionConfig
-                    ? './dist/index.cjs'
-                    : './index.cjs',
-                typings: options.isUsingTsSolutionConfig
-                    ? './dist/index.d.ts'
-                    : './index.d.ts',
-            };
-        default: {
+            if (options.isUsingTsSolutionConfig) {
+                return {
+                    type: 'module',
+                    main: './dist/index.js',
+                    types: './dist/index.d.ts',
+                };
+            }
+            else {
+                return {
+                    type: 'commonjs',
+                    main: './index.cjs',
+                    types: './index.d.ts',
+                };
+            }
+        case 'none': {
+            if (options.isUsingTsSolutionConfig) {
+                return {
+                    main: options.js ? './src/index.js' : './src/index.ts',
+                    types: options.js ? './src/index.js' : './src/index.ts',
+                    exports: {
+                        '.': options.js
+                            ? './src/index.js'
+                            : {
+                                types: './src/index.ts',
+                                import: './src/index.ts',
+                                default: './src/index.ts',
+                            },
+                        './package.json': './package.json',
+                    },
+                };
+            }
             return {
                 // Safest option is to not set a type field.
                 // Allow the user to decide which module format their library is using
                 type: undefined,
-                // For non-buildable libraries, point to source so we can still use them in apps via bundlers like Vite.
-                main: options.isUsingTsSolutionConfig
-                    ? options.js
-                        ? './src/index.js'
-                        : './src/index.ts'
-                    : undefined,
-                types: options.isUsingTsSolutionConfig
-                    ? options.js
-                        ? './src/index.js'
-                        : './src/index.ts'
-                    : undefined,
             };
         }
+        default: {
+            return {};
+        }
     }
 }
 function projectsConfigMatchesProject(projectsConfig, project) {

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

@@ -33,7 +33,6 @@ export interface LibraryGeneratorSchema {
   simpleName?: boolean;
   addPlugin?: boolean;
   useProjectJson?: boolean;
-  skipWorkspacesWarning?: boolean;
   useTscExecutor?: boolean;
 }
 
@@ -47,5 +46,4 @@ export interface NormalizedLibraryGeneratorOptions
   importPath?: string;
   hasPlugin: boolean;
   isUsingTsSolutionConfig: boolean;
-  projectPackageManagerWorkspaceState: ProjectPackageManagerWorkspaceState;
 }

package/src/generators/setup-build/generator.js

@@ -98,7 +98,7 @@ async function setupBuildGenerator(tree, options) {
                 project: options.project,
                 skipFormat: true,
                 skipValidation: true,
-                format: ['cjs'],
+                format: isTsSolutionSetup ? ['esm'] : ['cjs'],
             });
             tasks.push(task);
             break;
@@ -111,7 +111,7 @@ async function setupBuildGenerator(tree, options) {
                 tsConfig: tsConfigFile,
                 project: options.project,
                 compiler: 'tsc',
-                format: ['cjs', 'esm'],
+                format: isTsSolutionSetup ? ['esm'] : ['cjs', 'esm'],
                 addPlugin,
                 skipFormat: true,
                 skipValidation: true,
@@ -165,7 +165,7 @@ async function setupBuildGenerator(tree, options) {
             }
             (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
             tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(tree));
-            (0, add_swc_config_1.addSwcConfig)(tree, project.root, 'commonjs');
+            (0, add_swc_config_1.addSwcConfig)(tree, project.root, isTsSolutionSetup ? 'es6' : 'commonjs');
             if (isTsSolutionSetup) {
                 updatePackageJsonForSwc(tree, options, project);
             }

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

@@ -199,8 +199,9 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
     }
     let hasChanges = false;
     for (const dep of dependencies) {
-        // Ensure the project reference for the target is set
-        let referencePath = dep.data.root;
+        // Ensure the project reference for the target is set if we can find the
+        // relevant tsconfig file
+        let referencePath;
         if (runtimeTsConfigFileName) {
             const runtimeTsConfigPath = (0, devkit_1.joinPathFragments)(dep.data.root, runtimeTsConfigFileName);
             if (tsconfigExists(tree, tsconfigInfoCaches, runtimeTsConfigPath)) {
@@ -233,6 +234,14 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
                 continue;
             }
         }
+        if (!referencePath) {
+            if (tsconfigExists(tree, tsconfigInfoCaches, (0, devkit_1.joinPathFragments)(dep.data.root, 'tsconfig.json'))) {
+                referencePath = dep.data.root;
+            }
+            else {
+                continue;
+            }
+        }
         const relativePathToTargetRoot = (0, posix_1.relative)(projectRoot, referencePath);
         if (!newReferencesSet.has(relativePathToTargetRoot)) {
             newReferencesSet.add(relativePathToTargetRoot);
@@ -270,7 +279,7 @@ function collectProjectDependencies(tree, projectName, projectGraph, collectedDe
             .some((d) => d.name === targetProjectNode.name)) {
             collectedDependencies.get(projectName).push(targetProjectNode);
         }
-        if (process.env.NX_DISABLE_TS_SYNC_TRANSITIVE_DEPENDENCIES === 'true') {
+        if (process.env.NX_ENABLE_TS_SYNC_TRANSITIVE_DEPENDENCIES !== 'true') {
             continue;
         }
         // Recursively get the dependencies of the target project

package/src/plugins/typescript/plugin.js

@@ -94,6 +94,10 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
     const extendedConfigFiles = getExtendedConfigFiles(fullConfigPath, tsConfig);
     const internalReferencedFiles = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
     const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
+    const packageJsonPath = (0, devkit_1.joinPathFragments)(projectRoot, 'package.json');
+    const packageJson = (0, node_fs_1.existsSync)(packageJsonPath)
+        ? (0, devkit_1.readJsonFile)(packageJsonPath)
+        : null;
     const nodeHash = (0, file_hasher_1.hashArray)([
         ...[
             fullConfigPath,
@@ -103,6 +107,7 @@ async function createNodesInternal(configFilePath, options, context, lockFileNam
             (0, node_path_1.join)(context.workspaceRoot, lockFileName),
         ].map(file_hasher_1.hashFile),
         (0, file_hasher_1.hashObject)(options),
+        ...(packageJson ? [(0, file_hasher_1.hashObject)(packageJson)] : []),
     ]);
     const cacheKey = `${nodeHash}_${configFilePath}`;
     targetsCache[cacheKey] ??= buildTscTargets(fullConfigPath, projectRoot, options, context);
@@ -163,7 +168,7 @@ function buildTscTargets(configFilePath, projectRoot, options, context) {
     // Build target
     if (options.build &&
         (0, node_path_1.basename)(configFilePath) === options.build.configName &&
-        isValidPackageJsonBuildConfig(tsConfig, context.workspaceRoot, projectRoot, configFilePath)) {
+        isValidPackageJsonBuildConfig(tsConfig, context.workspaceRoot, projectRoot)) {
         internalProjectReferences ??= resolveInternalProjectReferences(tsConfig, context.workspaceRoot, projectRoot);
         const targetName = options.build.targetName;
         targets[targetName] = {
@@ -230,6 +235,9 @@ function getInputs(namedInputs, configFilePath, tsConfig, internalProjectReferen
     });
     const inputs = [];
     if (includePaths.size) {
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(workspaceRoot, projectRoot, 'package.json'))) {
+            inputs.push('{projectRoot}/package.json');
+        }
         inputs.push(...Array.from(configFiles).map((p) => pathToInputOrOutput(p, workspaceRoot, projectRoot)), ...Array.from(includePaths).map((p) => pathToInputOrOutput((0, devkit_1.joinPathFragments)(projectRoot, p), workspaceRoot, projectRoot)));
     }
     else {
@@ -310,49 +318,45 @@ function getOutputs(configFilePath, tsConfig, internalProjectReferences, workspa
     return Array.from(outputs);
 }
 /**
- * Checks whether a `package.json` file has a valid build configuration by ensuring
- * that the `main`, `module`, or `exports` do not include paths from the `rootDir`.
- * Or if `outFile` is defined, it should not be within the `rootDir`.
+ * Validates the build configuration of a `package.json` file by ensuring that paths in the `exports`, `module`,
+ * and `main` fields reference valid output paths within the `outDir` defined in the TypeScript configuration.
+ * Priority is given to the `exports` field, specifically the `.` export if defined. If `exports` is not defined,
+ * the function falls back to validating `main` and `module` fields. If `outFile` is specified, it validates that the file
+ * is located within the output directory.
+ * If no `package.json` file exists, it assumes the configuration is valid.
  *
  * @param tsConfig The TypeScript configuration object.
  * @param workspaceRoot The workspace root path.
  * @param projectRoot The project root path.
- * @param tsConfigPath The path to the TypeScript configuration file.
  * @returns `true` if the package has a valid build configuration; otherwise, `false`.
  */
-function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot, tsConfigPath) {
-    if (!(0, node_fs_1.existsSync)((0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))) {
+function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot) {
+    const packageJsonPath = (0, node_path_1.join)(workspaceRoot, projectRoot, 'package.json');
+    if (!(0, node_fs_1.existsSync)(packageJsonPath)) {
         // If the package.json file does not exist.
         // Assume it's valid because it would be using `project.json` instead.
         return true;
     }
-    const packageJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(projectRoot, 'package.json'));
-    const rootDir = tsConfig.options.rootDir ?? 'src/';
-    if (!tsConfig.options.rootDir) {
-        console.warn(`The 'rootDir' option is not set in the tsconfig file at ${tsConfigPath}. Assuming 'src/' as the root directory.`);
-    }
-    const isPathWithinSrc = (path) => {
-        const resolvedRootDir = (0, node_path_1.resolve)(workspaceRoot, projectRoot, rootDir);
-        const pathToCheck = (0, node_path_1.resolve)(workspaceRoot, projectRoot, path);
-        return pathToCheck.startsWith(resolvedRootDir);
-    };
-    // If `outFile` is defined, check the validity of the path.
-    if (tsConfig.options.outFile) {
-        if (isPathWithinSrc(tsConfig.options.outFile)) {
-            return false;
-        }
-    }
-    const buildPaths = ['main', 'module'];
-    for (const field of buildPaths) {
-        if (packageJson[field] && isPathWithinSrc(packageJson[field])) {
-            return false;
+    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+    const outDir = tsConfig.options.outFile
+        ? (0, node_path_1.dirname)(tsConfig.options.outFile)
+        : tsConfig.options.outDir;
+    const resolvedOutDir = outDir
+        ? (0, node_path_1.resolve)(workspaceRoot, projectRoot, outDir)
+        : undefined;
+    const isPathSourceFile = (path) => {
+        if (resolvedOutDir) {
+            const pathToCheck = (0, node_path_1.resolve)(workspaceRoot, projectRoot, path);
+            return !pathToCheck.startsWith(resolvedOutDir);
         }
-    }
-    const exports = packageJson?.exports;
+        const ext = (0, node_path_1.extname)(path);
+        // Check that the file extension is a TS file extension. As the source files are in the same directory as the output files.
+        return ['.ts', '.tsx', '.cts', '.mts'].includes(ext);
+    };
     // Checks if the value is a path within the `src` directory.
     const containsInvalidPath = (value) => {
         if (typeof value === 'string') {
-            return isPathWithinSrc(value);
+            return isPathSourceFile(value);
         }
         else if (typeof value === 'object') {
             return Object.entries(value).some(([currentKey, subValue]) => {
@@ -361,30 +365,45 @@ function isValidPackageJsonBuildConfig(tsConfig, workspaceRoot, projectRoot, tsC
                     return false;
                 }
                 if (typeof subValue === 'string') {
-                    return isPathWithinSrc(subValue);
+                    return isPathSourceFile(subValue);
                 }
                 return false;
             });
         }
         return false;
     };
-    if (typeof exports === 'string' && isPathWithinSrc(exports)) {
-        return false;
-    }
-    // Check nested exports if `exports` is an object.
-    if (typeof exports === 'object') {
+    const exports = packageJson?.exports;
+    // Check the `.` export if `exports` is defined.
+    if (exports) {
+        if (typeof exports === 'string') {
+            return !isPathSourceFile(exports);
+        }
+        if (typeof exports === 'object' && '.' in exports) {
+            return !containsInvalidPath(exports['.']);
+        }
+        // Check other exports if `.` is not defined or valid.
         for (const key in exports) {
-            if (containsInvalidPath(exports[key])) {
+            if (key !== '.' && containsInvalidPath(exports[key])) {
                 return false;
             }
         }
+        return true;
+    }
+    // If `exports` is not defined, fallback to `main` and `module` fields.
+    const buildPaths = ['main', 'module'];
+    for (const field of buildPaths) {
+        if (packageJson[field] && isPathSourceFile(packageJson[field])) {
+            return false;
+        }
     }
     return true;
 }
 function pathToInputOrOutput(path, workspaceRoot, projectRoot) {
-    const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, path));
+    const fullProjectRoot = (0, node_path_1.resolve)(workspaceRoot, projectRoot);
+    const fullPath = (0, node_path_1.resolve)(workspaceRoot, path);
+    const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, node_path_1.relative)(fullProjectRoot, fullPath));
     if (pathRelativeToProjectRoot.startsWith('..')) {
-        return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, node_path_1.relative)(workspaceRoot, path));
+        return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, node_path_1.relative)(workspaceRoot, fullPath));
     }
     return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
 }

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/package-json/update-package-json.js

@@ -181,6 +181,9 @@ function getUpdatedPackageJsonContent(packageJson, options) {
                 }
                 else if (typeof packageJson.exports[exportEntry] === 'object') {
                     packageJson.exports[exportEntry].import ??= filePath;
+                    if (!hasCjsFormat) {
+                        packageJson.exports[exportEntry].default ??= filePath;
+                    }
                 }
             }
         }

package/src/utils/swc/compile-swc.js

@@ -52,6 +52,9 @@ function getTypeCheckOptions(normalizedOptions) {
         typeCheckOptions.incremental = true;
         typeCheckOptions.cacheDir = devkit_1.cacheDir;
     }
+    if (normalizedOptions.isTsSolutionSetup && normalizedOptions.skipTypeCheck) {
+        typeCheckOptions.ignoreDiagnostics = true;
+    }
     return typeCheckOptions;
 }
 async function compileSwc(context, normalizedOptions, postCompilationCallback) {
@@ -59,16 +62,25 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
     if (normalizedOptions.clean) {
         (0, node_fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
     }
-    const swcCmdLog = (0, node_child_process_1.execSync)(getSwcCmd(normalizedOptions), {
-        encoding: 'utf8',
-        cwd: normalizedOptions.swcCliOptions.swcCwd,
-        windowsHide: false,
-    });
-    devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
-    const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
-    if (normalizedOptions.skipTypeCheck || normalizedOptions.isTsSolutionSetup) {
+    try {
+        const swcCmdLog = (0, node_child_process_1.execSync)(getSwcCmd(normalizedOptions), {
+            encoding: 'utf8',
+            cwd: normalizedOptions.swcCliOptions.swcCwd,
+            windowsHide: false,
+            stdio: 'pipe',
+        });
+        devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
+    }
+    catch (error) {
+        devkit_1.logger.error('SWC compilation failed');
+        if (error.stderr) {
+            devkit_1.logger.error(error.stderr.toString());
+        }
+        return { success: false };
+    }
+    if (normalizedOptions.skipTypeCheck && !normalizedOptions.isTsSolutionSetup) {
         await postCompilationCallback();
-        return { success: isCompileSuccess };
+        return { success: true };
     }
     const { errors, warnings } = await (0, run_type_check_1.runTypeCheck)(getTypeCheckOptions(normalizedOptions));
     const hasErrors = errors.length > 0;
@@ -78,7 +90,7 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
     }
     await postCompilationCallback();
     return {
-        success: !hasErrors && isCompileSuccess,
+        success: !hasErrors,
         outfile: normalizedOptions.mainOutputPath,
     };
 }

package/src/utils/typescript/run-type-check.d.ts

@@ -14,6 +14,7 @@ interface BaseTypeCheckOptions {
     incremental?: boolean;
     rootDir?: string;
     projectRoot?: string;
+    ignoreDiagnostics?: boolean;
 }
 type Mode = NoEmitMode | EmitDeclarationOnlyMode;
 interface NoEmitMode {

package/src/utils/typescript/run-type-check.js

@@ -18,7 +18,9 @@ async function runTypeCheckWatch(options, callback) {
     };
     const watchProgram = ts.createWatchProgram(host);
     const program = watchProgram.getProgram().getProgram();
-    const diagnostics = ts.getPreEmitDiagnostics(program);
+    const diagnostics = options.ignoreDiagnostics
+        ? []
+        : ts.getPreEmitDiagnostics(program);
     return {
         close: watchProgram.close.bind(watchProgram),
         preEmitErrors: diagnostics
@@ -48,9 +50,9 @@ async function runTypeCheck(options) {
         program = ts.createProgram(config.fileNames, compilerOptions);
     }
     const result = program.emit();
-    const allDiagnostics = ts
-        .getPreEmitDiagnostics(program)
-        .concat(result.diagnostics);
+    const allDiagnostics = options.ignoreDiagnostics
+        ? []
+        : ts.getPreEmitDiagnostics(program).concat(result.diagnostics);
     return getTypeCheckResult(ts, allDiagnostics, workspaceRoot, config.fileNames.length, program.getSourceFiles().length, incremental);
 }
 async function setupTypeScript(options) {

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

@@ -7,9 +7,9 @@ exports.findRuntimeTsConfigName = findRuntimeTsConfigName;
 exports.updateTsconfigFiles = updateTsconfigFiles;
 exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 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 posix_1 = require("node:path/posix");
 function isUsingTypeScriptPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     return (nxJson?.plugins?.some((p) => typeof p === 'string'
@@ -44,7 +44,7 @@ function isWorkspaceSetupWithTsSolution(tree) {
     const baseTsconfigJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     if (!baseTsconfigJson.compilerOptions ||
         !baseTsconfigJson.compilerOptions.composite ||
-        !baseTsconfigJson.compilerOptions.declaration) {
+        baseTsconfigJson.compilerOptions.declaration === false) {
         return false;
     }
     const { compilerOptions, ...rest } = baseTsconfigJson;
@@ -139,17 +139,16 @@ function updateTsconfigFiles(tree, projectRoot, runtimeTsconfigFileName, compile
     }
 }
 function addProjectToTsSolutionWorkspace(tree, projectDir) {
-    // If dir is "libs/foo" then use "libs/**" so we don't need so many entries in the workspace file.
+    // If dir is "libs/foo" then use "libs/*" so we don't need so many entries in the workspace file.
+    // If dir is nested like "libs/shared/foo" then we add "libs/shared/*".
     // If the dir is just "foo" then we have to add it as is.
     const baseDir = (0, posix_1.dirname)(projectDir);
-    const pattern = baseDir === '.' ? projectDir : `${baseDir}/**`;
+    const pattern = baseDir === '.' ? projectDir : `${baseDir}/*`;
     if (tree.exists('pnpm-workspace.yaml')) {
         const { load, dump } = require('@zkochan/js-yaml');
         const workspaceFile = tree.read('pnpm-workspace.yaml', 'utf-8');
-        const yamlData = load(workspaceFile);
-        if (!yamlData?.packages) {
-            yamlData.packages = [];
-        }
+        const yamlData = load(workspaceFile) ?? {};
+        yamlData.packages ??= [];
         if (!yamlData.packages.includes(pattern)) {
             yamlData.packages.push(pattern);
             tree.write('pnpm-workspace.yaml', dump(yamlData, { indent: 2, quotingType: '"', forceQuotes: true }));