@nx/js 0.0.0-pr-32490-e4fdfa9 → 0.0.0-pr-32868-a65a4a2

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Repos · Fast Builds
 
-An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
+Get to green PRs in half the time. Nx optimizes your builds, scales your CI, and fixes failed PRs. Built for developers and AI agents.
 
 This package is a [JavaScript/TypeScript plugin for Nx](https://nx.dev/js/overview).
 

package/migrations.json

@@ -1,5 +1,11 @@
 {
-  "generators": {},
+  "generators": {
+    "migrate-development-custom-condition": {
+      "version": "21.5.0-beta.2",
+      "description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.",
+      "factory": "./src/migrations/update-21-5-0/migrate-development-custom-condition"
+    }
+  },
   "packageJsonUpdates": {
     "19.0.0": {
       "version": "19.0.0-beta.0",
@@ -96,6 +102,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "21.5.0": {
+      "version": "21.5.0-beta.2",
+      "x-prompt": "Do you want to update to TypeScript v5.9?",
+      "requires": {
+        "typescript": ">=5.8.0 <5.9.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.9.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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

package/spec/src/migrations/update-21-5-0/migrate-development-custom-condition.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrate-development-custom-condition.spec.d.ts.map

package/spec/src/migrations/update-21-5-0/migrate-development-custom-condition.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-development-custom-condition.spec.d.ts","sourceRoot":"","sources":["../../../../../../../packages/js/src/migrations/update-21-5-0/migrate-development-custom-condition.spec.ts"],"names":[],"mappings":""}

package/spec/src/release/utils/semver.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=semver.spec.d.ts.map

package/spec/src/release/utils/semver.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver.spec.d.ts","sourceRoot":"","sources":["../../../../../../../packages/js/src/release/utils/semver.spec.ts"],"names":[],"mappings":""}

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

@@ -18,6 +18,6 @@
     "skipLibCheck": true,
     "strict": true,
     "target": "es2022",
-    "customConditions": ["development"]
+    "customConditions": ["<%= customCondition %>"]
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAoBpB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAoCtC,wBAAsB,aAAa,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAS5B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,iBAAiB,CAAC,CA8H5B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAoCtC,wBAAsB,aAAa,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAS5B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAgI5B;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

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

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

@@ -2,7 +2,7 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { LibraryGeneratorSchema, NormalizedLibraryGeneratorOptions } from './schema';
 export declare function libraryGenerator(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
-export type AddLintOptions = Pick<NormalizedLibraryGeneratorOptions, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin'>;
+export type AddLintOptions = Pick<NormalizedLibraryGeneratorOptions, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin' | 'isUsingTsSolutionConfig'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;
 //# sourceMappingURL=library.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAsL/B;AA4HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,CACd,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAqG5B;AA4vBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAYjB,IAAI,EAKL,MAAM,YAAY,CAAC;AA0CpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAsL/B;AA4HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AAivBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -272,7 +272,7 @@ async function addLint(tree, options) {
         // Since the build target is inferred now, we need to let the generator know to add @nx/dependency-checks regardless.
         addPackageJsonDependencyChecks: options.bundler !== 'none',
     });
-    const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
+    const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig, addIgnoresToLintConfig,
     // nx-ignore-next-line
      } = require('@nx/eslint/src/generators/utils/eslint-file');
     // if config is not supported, we don't need to do anything
@@ -334,6 +334,10 @@ async function addLint(tree, options) {
             return o;
         });
     }
+    // Add out-tsc ignore pattern when using TS solution setup
+    if (options.isUsingTsSolutionConfig) {
+        addIgnoresToLintConfig(tree, options.projectRoot, ['**/out-tsc']);
+    }
     return task;
 }
 function addBabelRc(tree, options) {
@@ -432,8 +436,6 @@ function createFiles(tree, options) {
             };
             if (options.isUsingTsSolutionConfig &&
                 !['none', 'rollup', 'vite'].includes(options.bundler)) {
-                // the file must exist in the TS solution setup
-                const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
                 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'),
@@ -442,7 +444,7 @@ function createFiles(tree, options) {
                     generateExportsField: true,
                     packageJsonPath,
                     format: ['esm'],
-                    skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
+                    developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
                 });
             }
             return updatedPackageJson;
@@ -465,7 +467,6 @@ function createFiles(tree, options) {
         }
         if (options.isUsingTsSolutionConfig &&
             !['none', 'rollup', 'vite'].includes(options.bundler)) {
-            const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
             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'),
@@ -474,7 +475,7 @@ function createFiles(tree, options) {
                 generateExportsField: true,
                 packageJsonPath,
                 format: ['esm'],
-                skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
+                developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
             });
         }
         if (!options.useProjectJson && options.name !== options.importPath) {

package/src/generators/setup-build/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/setup-build/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAWL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAoBpB,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CAkL5B;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/setup-build/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAWL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAqBpB,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CAkL5B;AAED,eAAe,mBAAmB,CAAC"}

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

@@ -232,9 +232,6 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
             version: '0.0.1',
         };
     }
-    // the file must exist in the TS solution setup, which is the only case this
-    // function is called
-    const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     packageJson = (0, update_package_json_1.getUpdatedPackageJsonContent)(packageJson, {
         main,
         outputPath,
@@ -243,7 +240,7 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
         packageJsonPath,
         rootDir,
         format,
-        skipDevelopmentExports: !tsconfigBase.compilerOptions?.customConditions?.includes('development'),
+        developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
     });
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
 }

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

@@ -221,9 +221,6 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
             references.push(ref);
             newReferencesSet.add(normalizedPath);
         }
-        if (!newReferencesSet.has(normalizedPath)) {
-            addChangedFile(changedFiles, tsConfigPath, resolvedRefPath, 'stale');
-        }
     }
     for (const dep of dependencies) {
         // Ensure the project reference for the target is set if we can find the
@@ -280,6 +277,11 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
             addChangedFile(changedFiles, tsConfigPath, toFullProjectReferencePath(referencePath), 'missing');
         }
     }
+    for (const ref of originalReferencesSet) {
+        if (!newReferencesSet.has(ref)) {
+            addChangedFile(changedFiles, tsConfigPath, toFullProjectReferencePath((0, devkit_1.joinPathFragments)(projectRoot, ref)), 'stale');
+        }
+    }
     hasChanges ||= newReferencesSet.size !== originalReferencesSet.size;
     if (hasChanges) {
         patchTsconfigJsonReferences(tree, tsconfigInfoCaches, tsConfigPath, references);

package/src/migrations/update-21-5-0/migrate-development-custom-condition.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=migrate-development-custom-condition.d.ts.map

package/src/migrations/update-21-5-0/migrate-development-custom-condition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-development-custom-condition.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-21-5-0/migrate-development-custom-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAIpB,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-5-0/migrate-development-custom-condition.js

@@ -0,0 +1,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
+async function default_1(tree) {
+    if (!isDevelopmentCustomConditionDefined(tree)) {
+        return;
+    }
+    const packageJsonFiles = await getPackageJsonFiles(tree);
+    if (!(await doDevelopmentExportsPointToTsFiles(tree, packageJsonFiles))) {
+        return;
+    }
+    // Get the new custom condition name
+    const newCustomCondition = (0, ts_solution_setup_1.getCustomConditionName)(tree, {
+        skipDevelopmentFallback: true,
+    });
+    updateTsconfigBaseCustomCondition(tree, newCustomCondition);
+    await updatePackageJsonExports(tree, newCustomCondition, packageJsonFiles);
+    await (0, devkit_1.formatFiles)(tree);
+}
+/**
+ * Check if the development custom condition is defined in the repo:
+ * - Both tsconfig.base.json and tsconfig.json exist
+ * - customConditions is set in tsconfig.base.json
+ * - There's a single custom condition and it's named 'development'
+ */
+function isDevelopmentCustomConditionDefined(tree) {
+    if (!tree.exists('tsconfig.base.json') || !tree.exists('tsconfig.json')) {
+        // if any of them don't exist, it means the repo is not using or has deviated
+        // from the TS solution setup, let's leave things as is
+        return false;
+    }
+    const tsconfigBase = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
+    const customConditions = tsconfigBase.compilerOptions?.customConditions;
+    if (!Array.isArray(customConditions) ||
+        customConditions.length !== 1 ||
+        customConditions[0] !== 'development') {
+        // no custom conditions, or more than one, or not named 'development', this
+        // means the repo is not using or has deviated from the TS solution setup
+        return false;
+    }
+    return true;
+}
+/**
+ * Validate that all 'development' conditional exports in workspace package.json files
+ * point to TypeScript files (.ts, .tsx, .mts, .cts)
+ */
+async function doDevelopmentExportsPointToTsFiles(tree, packageJsonFiles) {
+    for (const filePath of packageJsonFiles) {
+        try {
+            const packageJson = (0, devkit_1.readJson)(tree, filePath);
+            if (!packageJson.exports || typeof packageJson.exports !== 'object') {
+                continue;
+            }
+            if (!checkExportsRecursively(packageJson.exports)) {
+                return false;
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return true;
+}
+/**
+ * Check if the `development` conditional exports in the package.json file
+ * point to TS files.
+ */
+function checkExportsRecursively(exports) {
+    if (typeof exports !== 'object' ||
+        exports === null ||
+        Array.isArray(exports)) {
+        // there's no conditional exports, so we're good
+        return true;
+    }
+    for (const [key, value] of Object.entries(exports)) {
+        if (key === 'development') {
+            // check if the development export points to a TS file
+            if (typeof value !== 'string' || !isTypeScriptFile(value)) {
+                return false;
+            }
+        }
+        else {
+            // recursively check nested objects
+            if (!checkExportsRecursively(value)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+function isTypeScriptFile(filePath) {
+    return /\.m?ts$|\.tsx$|\.cts$/.test(filePath);
+}
+function updateTsconfigBaseCustomCondition(tree, newCustomCondition) {
+    (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => {
+        json.compilerOptions.customConditions =
+            json.compilerOptions.customConditions.map((condition) => condition === 'development' ? newCustomCondition : condition);
+        return json;
+    });
+}
+async function updatePackageJsonExports(tree, newCustomCondition, packageJsonFiles) {
+    for (const filePath of packageJsonFiles) {
+        try {
+            const packageJson = (0, devkit_1.readJson)(tree, filePath);
+            if (!packageJson.exports || typeof packageJson.exports !== 'object') {
+                continue;
+            }
+            const updatedExports = updateExportsRecursively(packageJson.exports, newCustomCondition);
+            if (JSON.stringify(updatedExports) !== JSON.stringify(packageJson.exports)) {
+                (0, devkit_1.updateJson)(tree, filePath, (json) => {
+                    json.exports = updatedExports;
+                    return json;
+                });
+                devkit_1.logger.info(`Updated exports in ${filePath}`);
+            }
+        }
+        catch (error) {
+            continue;
+        }
+    }
+}
+function updateExportsRecursively(exports, newCustomCondition) {
+    if (typeof exports !== 'object' ||
+        exports === null ||
+        Array.isArray(exports)) {
+        // no conditional exports, nothing to do
+        return exports;
+    }
+    const updated = {};
+    for (const [key, value] of Object.entries(exports)) {
+        if (key === 'development') {
+            // Replace 'development' key with new custom condition
+            updated[newCustomCondition] = value;
+        }
+        else {
+            // Recursively process nested objects
+            updated[key] = updateExportsRecursively(value, newCustomCondition);
+        }
+    }
+    return updated;
+}
+async function getPackageJsonFiles(tree) {
+    const packageJsonFiles = await (0, devkit_1.globAsync)(tree, ['**/package.json']);
+    return packageJsonFiles.filter((file) => file !== 'package.json');
+}

package/src/plugins/typescript/plugin.js

@@ -173,9 +173,6 @@ async function getConfigFileHash(configFilePath, workspaceRoot, projectRoot, opt
         lockFileHash,
         optionsHash,
         ...(packageJson ? [(0, file_hasher_1.hashObject)(packageJson)] : []),
-        // change this to bust the cache when making changes that would yield
-        // different results for the same hash
-        (0, file_hasher_1.hashObject)({ bust: 3 }),
     ]);
 }
 function checkIfConfigFileShouldBeProject(configFilePath, projectRoot, context) {

package/src/release/utils/semver.d.ts

@@ -0,0 +1,3 @@
+export declare function isValidRange(range: string): boolean;
+export declare function isMatchingDependencyRange(version: string, range: string): boolean;
+//# sourceMappingURL=semver.d.ts.map

package/src/release/utils/semver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/release/utils/semver.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,WAIzC;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAGvE"}

package/src/release/utils/semver.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidRange = isValidRange;
+exports.isMatchingDependencyRange = isMatchingDependencyRange;
+const semver_1 = require("semver");
+function isValidRange(range) {
+    // valid() will return null if a range (including ~,^,*) is used
+    // Check that it is null, and therefore a range
+    return !(0, semver_1.valid)(range) && (0, semver_1.validRange)(range) !== null;
+}
+function isMatchingDependencyRange(version, range) {
+    const coercedVersion = (0, semver_1.coerce)(version, { includePrerelease: true })?.version;
+    return isValidRange(range) && (0, semver_1.satisfies)(coercedVersion, range);
+}

package/src/release/version-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEZ,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAK3E,eAAO,MAAM,yBAAyB,EAAE,yBAmBvC,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,sBAAsB,WAAoB;IAEpC,oCAAoC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAkBI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,GAC9F,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IAkEI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;KACrC,CAAC;IA+BI,oBAAoB,CACxB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;IAcd,yBAAyB,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,EAAE,CAAC;IA+DpB,OAAO,CAAC,yBAAyB;CAyClC"}
+{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEZ,IAAI,EAGL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAM3E,eAAO,MAAM,yBAAyB,EAAE,yBAmBvC,CAAC;AAKF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,sBAAsB,WAAoB;IAEpC,oCAAoC,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;QAC9D,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IAkBI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,GAC9F,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IAkEI,8BAA8B,CAClC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;QACT,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;KACrC,CAAC;IA+BI,oBAAoB,CACxB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;IAcd,yBAAyB,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,EAAE,CAAC;IAuFpB,OAAO,CAAC,yBAAyB;CAyClC"}

package/src/release/version-actions.js

@@ -8,6 +8,7 @@ const release_1 = require("nx/release");
 const npm_config_1 = require("../utils/npm-config");
 const update_lock_file_1 = require("./utils/update-lock-file");
 const chalk = require("chalk");
+const semver_1 = require("./utils/semver");
 const afterAllProjectsVersioned = async (cwd, { rootVersionActionsOptions, ...opts }) => {
     return {
         changedFiles: await (0, update_lock_file_1.updateLockFile)(cwd, {
@@ -136,6 +137,13 @@ class JsVersionActions extends release_1.VersionActions {
                     'peerDependencies',
                     'optionalDependencies',
                 ];
+                // TODO(v22): Flip this to all by default
+                const preserveMatchingDependencyRanges = this.finalConfigForProject.preserveMatchingDependencyRanges === true
+                    ? dependencyTypes
+                    : this.finalConfigForProject.preserveMatchingDependencyRanges ===
+                        false
+                        ? []
+                        : this.finalConfigForProject.preserveMatchingDependencyRanges || [];
                 for (const depType of dependencyTypes) {
                     if (json[depType]) {
                         for (const [dep, version] of Object.entries(dependenciesToUpdate)) {
@@ -153,6 +161,18 @@ class JsVersionActions extends release_1.VersionActions {
                                     numDependenciesToUpdate--;
                                     continue;
                                 }
+                                else if (preserveMatchingDependencyRanges.includes(depType) &&
+                                    !this.isLocalDependencyProtocol(currentVersion)) {
+                                    // If the dependency is specified using a range, do some additional processing to determine whether to update the version
+                                    if ((0, semver_1.isValidRange)(currentVersion) &&
+                                        !(0, semver_1.isMatchingDependencyRange)(version, currentVersion)) {
+                                        throw new Error(`"preserveMatchingDependencyRanges" is enabled for "${depType}" and the new version "${version}" is outside the current range for "${packageName}" in manifest "${manifestToUpdate.manifestPath}". Please update the range before releasing.`);
+                                    }
+                                    else if ((0, semver_1.isValidRange)(currentVersion)) {
+                                        // it is a range, but it is valid
+                                        continue;
+                                    }
+                                }
                                 json[depType][packageName] = version;
                             }
                         }

package/src/utils/package-json/update-package-json.d.ts

@@ -19,7 +19,7 @@ export interface UpdatePackageJsonOption {
     buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
     generateLockfile?: boolean;
     packageJsonPath?: string;
-    skipDevelopmentExports?: boolean;
+    developmentConditionName?: string | null;
 }
 export declare function updatePackageJson(options: UpdatePackageJsonOption, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], fileMap?: ProjectFileMap): void;
 interface Exports {

package/src/utils/package-json/update-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,eAAe,EAIf,cAAc,EAGd,uBAAuB,EAIxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAIxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAK7D,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD,qCAAqC,CAAC,EAAE,cAAc,GAAG,kBAAkB,CAAC;IAC5E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,OAAO,GAAE,cAAqB,GAC7B,IAAI,CAsFN;AAiFD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IAEZ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,uBAAuB,GACvB,YAAY,GACZ,iBAAiB,CACpB,GAAG;IACF,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAgCT;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,GAC/B,WAAW,CAqGb;AA2CD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,YAAY,GACZ,iBAAiB,CACpB,GACA,MAAM,CAWR"}
+{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,eAAe,EAIf,cAAc,EAGd,uBAAuB,EAIxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAIxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAK7D,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD,qCAAqC,CAAC,EAAE,cAAc,GAAG,kBAAkB,CAAC;IAC5E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,OAAO,GAAE,cAAqB,GAC7B,IAAI,CAmFN;AAiFD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IAEZ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,uBAAuB,GACvB,YAAY,GACZ,iBAAiB,CACpB,GAAG;IACF,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAgCT;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,GAC/B,WAAW,CAuGb;AA2CD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,YAAY,GACZ,iBAAiB,CACpB,GACA,MAAM,CAWR"}

package/src/utils/package-json/update-package-json.js

@@ -50,10 +50,7 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
         options.format = ['cjs'];
     }
     // update package specific settings
-    packageJson = getUpdatedPackageJsonContent(packageJson, {
-        skipDevelopmentExports: true,
-        ...options,
-    });
+    packageJson = getUpdatedPackageJsonContent(packageJson, options);
     // save files
     (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
     if (options.generateLockfile) {
@@ -149,16 +146,18 @@ function getUpdatedPackageJsonContent(packageJson, options) {
         packageJson.exports ??=
             typeof packageJson.exports === 'string' ? {} : { ...packageJson.exports };
         packageJson.exports['./package.json'] ??= './package.json';
-        if (!options.skipDevelopmentExports && (hasCjsFormat || hasEsmFormat)) {
+        if (options.developmentConditionName && (hasCjsFormat || hasEsmFormat)) {
             packageJson.exports['.'] ??= {};
             const developmentExports = getDevelopmentExports(options);
             for (const [exportEntry, filePath] of Object.entries(developmentExports)) {
                 if (!packageJson.exports[exportEntry]) {
                     packageJson.exports[exportEntry] ??= {};
-                    packageJson.exports[exportEntry]['development'] ??= filePath;
+                    packageJson.exports[exportEntry][options.developmentConditionName] ??=
+                        filePath;
                 }
                 else if (typeof packageJson.exports[exportEntry] === 'object') {
-                    packageJson.exports[exportEntry].development ??= filePath;
+                    packageJson.exports[exportEntry][options.developmentConditionName] ??=
+                        filePath;
                 }
             }
         }

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

@@ -8,4 +8,16 @@ export declare function updateTsconfigFiles(tree: Tree, projectRoot: string, run
 export declare function addProjectToTsSolutionWorkspace(tree: Tree, projectDir: string): Promise<void>;
 export declare function getProjectType(tree: Tree, projectRoot: string, projectType?: 'library' | 'application'): 'library' | 'application';
 export declare function getProjectSourceRoot(project: ProjectConfiguration, tree?: Tree): string;
+/**
+ * Get the already defined or expected custom condition name. In case it's not
+ * yet defined, it returns the workspace package name or '@nx/source' in case
+ * it's not defined.
+ */
+export declare function getCustomConditionName(tree: Tree, options?: {
+    skipDevelopmentFallback?: boolean;
+}): string;
+/**
+ * Get the already defined custom condition name or null if none is defined.
+ */
+export declare function getDefinedCustomConditionName(tree: Tree): string | null;
 //# sourceMappingURL=ts-solution-setup.d.ts.map

package/src/utils/typescript/ts-solution-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAsBT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAuDD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR"}
+{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,oBAAoB,EAGzB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAWpB,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU3D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,OAAO,EACnB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAsBT;AAED,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAuDD,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,IAAI,CAsBN;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAOf;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,MAAM,EAC/B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC,EAC5D,OAAO,GAAE,MAAM,EAAO,EACtB,OAAO,SAAQ,QAoFhB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAqDnB;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,SAAS,GAAG,aAAa,GACtC,SAAS,GAAG,aAAa,CAoB3B;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,oBAAoB,EAC7B,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,CAgBR;AAKD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAClD,MAAM,CAqCR;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAqCvE"}