@nx/js 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.7",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -40,15 +40,15 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "23.0.0-beta.5",
-    "@nx/workspace": "23.0.0-beta.5",
+    "@nx/devkit": "23.0.0-beta.7",
+    "@nx/workspace": "23.0.0-beta.7",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
     "chalk": "^4.1.0",
     "columnify": "^1.6.0",
-    "detect-port": "^1.5.1",
+    "detect-port": "^2.1.0",
     "ignore": "^7.0.5",
     "js-tokens": "^4.0.0",
     "jsonc-parser": "3.2.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.5"
+    "nx": "23.0.0-beta.7"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

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

@@ -1 +1 @@
-{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAsB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AAmID,eAAe,YAAY,CAAC"}
+{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAsB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AAmID,eAAe,YAAY,CAAC"}

package/src/executors/node/node.impl.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeExecutor = nodeExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const client_1 = require("nx/src/daemon/client/client");
 const crypto_1 = require("crypto");
 const path = tslib_1.__importStar(require("path"));
@@ -60,7 +60,7 @@ async function* nodeExecutor(options, context) {
     let additionalExitHandler = null;
     let currentTask = null;
     const tasks = [];
-    yield* (0, async_iterable_1.createAsyncIterable)(async ({ done, next, error, registerCleanup }) => {
+    yield* (0, internal_1.createAsyncIterable)(async ({ done, next, error, registerCleanup }) => {
         const processQueue = async () => {
             if (tasks.length === 0)
                 return;

package/src/executors/tsc/lib/typescript-compilation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypescriptSolution = compileTypescriptSolution;
 const tslib_1 = require("tslib");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const internal_1 = require("@nx/devkit/internal");
 const ts = tslib_1.__importStar(require("typescript"));
 const get_custom_transformers_factory_1 = require("./get-custom-transformers-factory");
 const typescript_diagnostic_reporters_1 = require("./typescript-diagnostic-reporters");
@@ -16,7 +16,7 @@ function compileTypescriptSolution(context, watch, logger, hooks, reporters) {
     if (watch) {
         // create an AsyncIterable that doesn't complete, watch mode is only
         // stopped by killing the process
-        return (0, async_iterable_1.createAsyncIterable)(async ({ next }) => {
+        return (0, internal_1.createAsyncIterable)(async ({ next }) => {
             hooks ??= {};
             const callerAfterProjectCompilationCallback = hooks.afterProjectCompilationCallback;
             hooks.afterProjectCompilationCallback = (tsConfig, success) => {

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,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAwCtC,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"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAqBpB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAwCtC,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

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 exports.initGeneratorInternal = initGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const semver_1 = require("@nx/devkit/src/utils/semver");
 const package_json_1 = require("nx/src/utils/package-json");
 const path_1 = require("path");
-const semver_2 = require("semver");
+const semver_1 = require("semver");
 const plugin_1 = require("../../plugins/typescript/plugin");
 const prettier_1 = require("../../utils/prettier");
 const ts_config_1 = require("../../utils/typescript/ts-config");
@@ -18,7 +17,7 @@ async function getInstalledTypescriptVersion(tree) {
     if (!tsVersionInRootPackageJson) {
         return null;
     }
-    if ((0, semver_2.valid)(tsVersionInRootPackageJson)) {
+    if ((0, semver_1.valid)(tsVersionInRootPackageJson)) {
         // it's a pinned version, return it
         return tsVersionInRootPackageJson;
     }
@@ -29,12 +28,12 @@ async function getInstalledTypescriptVersion(tree) {
             tsPackageJson.dependencies?.['typescript'];
         // the installed version matches the package.json version range
         if (installedTsVersion &&
-            (0, semver_2.satisfies)(installedTsVersion, tsVersionInRootPackageJson)) {
+            (0, semver_1.satisfies)(installedTsVersion, tsVersionInRootPackageJson)) {
             return installedTsVersion;
         }
     }
     finally {
-        return (0, semver_1.checkAndCleanWithSemver)(tree, 'typescript', tsVersionInRootPackageJson);
+        return (0, internal_1.checkAndCleanWithSemver)(tree, 'typescript', tsVersionInRootPackageJson);
     }
 }
 async function initGenerator(tree, schema) {
@@ -54,7 +53,7 @@ async function initGeneratorInternal(tree, schema) {
             nxJson.useInferencePlugins !== false;
     schema.addTsPlugin ??= schema.addPlugin;
     if (schema.addTsPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/js/typescript', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/js/typescript', plugin_1.createNodesV2, {
             typecheck: [
                 { targetName: 'typecheck' },
                 { targetName: 'tsc:typecheck' },
@@ -109,7 +108,7 @@ async function initGeneratorInternal(tree, schema) {
     if (!schema.js && !schema.keepExistingVersions) {
         const installedTsVersion = await getInstalledTypescriptVersion(tree);
         if (!installedTsVersion ||
-            !(0, semver_2.satisfies)(installedTsVersion, versions_1.supportedTypescriptVersions, {
+            !(0, semver_1.satisfies)(installedTsVersion, versions_1.supportedTypescriptVersions, {
                 includePrerelease: true,
             })) {
             devDependencies['typescript'] = versions_1.typescriptVersion;

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,EAWjB,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,8BAqK/B;AA2HD,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,CAmH5B;AA+uBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAOA,OAAO,EAML,iBAAiB,EAWjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAkCpB,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,8BAqK/B;AA2HD,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,CAmH5B;AA+uBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -4,11 +4,8 @@ exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.addLint = addLint;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const path_1 = require("path");
 const generator_prompts_1 = require("../../utils/generator-prompts");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
@@ -153,7 +150,7 @@ async function libraryGeneratorInternal(tree, schema) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, internal_1.logShowProjectCommand)(options.name);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
@@ -177,7 +174,7 @@ async function configureProject(tree, options) {
                 options.bundler === 'tsc'))) {
         const outputPath = getOutputPath(options);
         const executor = getBuildExecutor(options.bundler);
-        (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, executor);
+        (0, internal_1.addBuildTargetDefaults)(tree, executor);
         projectConfiguration.targets.build = {
             executor,
             outputs: ['{options.outputPath}'],
@@ -540,7 +537,7 @@ function replaceJestConfig(tree, options) {
     });
 }
 async function normalizeOptions(tree, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     options.addPlugin ??=
         process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -549,7 +546,7 @@ async function normalizeOptions(tree, options) {
     const hasPlugin = (0, ts_solution_setup_1.isUsingTypeScriptPlugin)(tree);
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     if (isUsingTsSolutionConfig) {
-        options.unitTestRunner ??= await (0, prompt_1.promptWhenInteractive)({
+        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
             type: 'autocomplete',
             name: 'unitTestRunner',
             message: `Which unit test runner would you like to use?`,
@@ -558,7 +555,7 @@ async function normalizeOptions(tree, options) {
         }, { unitTestRunner: 'none' }).then(({ unitTestRunner }) => unitTestRunner);
     }
     else {
-        options.unitTestRunner ??= await (0, prompt_1.promptWhenInteractive)({
+        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
             type: 'autocomplete',
             name: 'unitTestRunner',
             message: `Which unit test runner would you like to use?`,
@@ -619,7 +616,7 @@ async function normalizeOptions(tree, options) {
         (options.skipTypeCheck == null || !isUsingTsSolutionConfig)) {
         options.skipTypeCheck = false;
     }
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

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

@@ -1,4 +1,4 @@
-import type { ProjectNameAndRootOptions } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { ProjectNameAndRootOptions } from '@nx/devkit/internal';
 // nx-ignore-next-line
 const { Linter, LinterType } = require('@nx/eslint'); // use require to import to avoid circular dependency
 import type { ProjectPackageManagerWorkspaceState } from '../../utils/package-manager-workspaces';

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;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"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/setup-build/generator.ts"],"names":[],"mappings":"AACA,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"}

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupBuildGenerator = setupBuildGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const posix_1 = require("node:path/posix");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const get_import_path_1 = require("../../utils/get-import-path");
@@ -127,7 +127,7 @@ async function setupBuildGenerator(tree, options) {
                 updatePackageJsonForTsc(tree, options, project);
             }
             else {
-                (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/js:tsc');
+                (0, internal_1.addBuildTargetDefaults)(tree, '@nx/js:tsc');
                 const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
                 project.targets[options.buildTarget] = {
                     executor: `@nx/js:tsc`,
@@ -144,7 +144,7 @@ async function setupBuildGenerator(tree, options) {
             break;
         }
         case 'swc': {
-            (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/js:swc');
+            (0, internal_1.addBuildTargetDefaults)(tree, '@nx/js:swc');
             const outputPath = isTsSolutionSetup
                 ? (0, devkit_1.joinPathFragments)(project.root, 'dist')
                 : (0, devkit_1.joinPathFragments)('dist', project.root);

package/src/migrations/update-22-0-0/remove-external-options-from-js-executors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-external-options-from-js-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,SAAS,UAA+B,CAAC;AAEtD,yBAA+B,IAAI,EAAE,IAAI,iBA+ExC"}
+{"version":3,"file":"remove-external-options-from-js-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-22-0-0/remove-external-options-from-js-executors.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,UAA+B,CAAC;AAEtD,yBAA+B,IAAI,EAAE,IAAI,iBA+ExC"}

package/src/migrations/update-22-0-0/remove-external-options-from-js-executors.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executors = void 0;
 exports.default = default_1;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 exports.executors = ['@nx/js:swc', '@nx/js:tsc'];
 async function default_1(tree) {
     // update options from project configs
     exports.executors.forEach((executor) => {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
             if (options.external === undefined &&
                 options.externalBuildTargets === undefined) {
                 return;

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

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

package/src/plugins/typescript/plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodes = exports.createNodesV2 = exports.PLUGIN_NAME = exports.createDependencies = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
@@ -122,8 +122,10 @@ exports.createNodesV2 = [
         const cache = cacheStore.get(cacheKey);
         initializeTsConfigCache(configFilePaths, context.workspaceRoot, cache);
         const normalizedOptions = normalizePluginOptions(options);
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-        const { configFilePaths: validConfigFilePaths, hashes, projectRoots, } = await resolveValidConfigFilesAndHashes(configFilePaths, normalizedOptions, optionsHash, context, cache);
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, lock_file_1.getLockFileName)(packageManager);
+        const { configFilePaths: validConfigFilePaths, hashes, projectRoots, } = await resolveValidConfigFilesAndHashes(configFilePaths, normalizedOptions, optionsHash, context, cache, lockFileName);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFilePath, options, context, idx) => {
                 const projectRoot = projectRoots[idx];
@@ -156,8 +158,8 @@ exports.createNodesV2 = [
     },
 ];
 exports.createNodes = exports.createNodesV2;
-async function resolveValidConfigFilesAndHashes(configFilePaths, options, optionsHash, context, cache) {
-    const lockFileHash = (0, file_hasher_1.hashFile)((0, node_path_1.join)(context.workspaceRoot, (0, lock_file_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)))) ?? '';
+async function resolveValidConfigFilesAndHashes(configFilePaths, options, optionsHash, context, cache, lockFileName) {
+    const lockFileHash = (0, file_hasher_1.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
     const validConfigFilePaths = [];
     const hashes = [];
     const projectRoots = [];
@@ -246,7 +248,7 @@ function checkIfConfigFileShouldBeProject(config, cache) {
 }
 function buildTscTargets(config, options, context, configFiles, cache, pmc) {
     const targets = {};
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(config.project.root, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(config.project.root, context);
     const tsConfig = retrieveTsConfigFromCache(config.absolutePath, context.workspaceRoot, cache);
     let internalProjectReferences;
     if (options.typecheck &&

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;AAIpB,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAM3E,eAAO,MAAM,yBAAyB,EAAE,yBAkBvC,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;IA4CI,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;IAwHpB,OAAO,CAAC,yBAAyB;CAyClC"}
+{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/release/version-actions.ts"],"names":[],"mappings":"AACA,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,yBAkBvC,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;IA4CI,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;IAwHpB,OAAO,CAAC,yBAAyB;CAyClC"}

package/src/release/version-actions.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.afterAllProjectsVersioned = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const catalog_1 = require("@nx/devkit/src/utils/catalog");
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = require("node:path");
 const release_1 = require("nx/release");
@@ -109,7 +109,7 @@ class JsVersionActions extends release_1.VersionActions {
         }
         // Resolve catalog references if needed
         if (currentVersion) {
-            const catalogManager = (0, catalog_1.getCatalogManager)(tree.root);
+            const catalogManager = (0, internal_1.getCatalogManager)(tree.root);
             if (catalogManager?.isCatalogReference(currentVersion)) {
                 currentVersion = catalogManager.resolveCatalogReference(tree, dependencyPackageName, currentVersion);
             }
@@ -137,7 +137,7 @@ class JsVersionActions extends release_1.VersionActions {
         }
         const logMessages = [];
         const catalogUpdates = [];
-        const catalogManager = (0, catalog_1.getCatalogManager)(tree.root);
+        const catalogManager = (0, internal_1.getCatalogManager)(tree.root);
         for (const manifestToUpdate of this.manifestsToUpdate) {
             (0, devkit_1.updateJson)(tree, manifestToUpdate.manifestPath, (json) => {
                 const dependencyTypes = [

package/src/utils/generator-prompts.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeLinterOption = normalizeLinterOption;
 exports.normalizeUnitTestRunnerOption = normalizeUnitTestRunnerOption;
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
+const internal_1 = require("@nx/devkit/internal");
 const ts_solution_setup_1 = require("./typescript/ts-solution-setup");
 async function normalizeLinterOption(tree, linter) {
     if (linter) {
@@ -13,7 +13,7 @@ async function normalizeLinterOption(tree, linter) {
         ? [{ name: 'none' }, { name: 'eslint' }]
         : [{ name: 'eslint' }, { name: 'none' }];
     const defaultValue = isTsSolutionSetup ? 'none' : 'eslint';
-    return await (0, prompt_1.promptWhenInteractive)({
+    return await (0, internal_1.promptWhenInteractive)({
         type: 'autocomplete',
         name: 'linter',
         message: `Which linter would you like to use?`,
@@ -30,7 +30,7 @@ async function normalizeUnitTestRunnerOption(tree, unitTestRunner, testRunners =
         ? [{ name: 'none' }, ...testRunners.map((runner) => ({ name: runner }))]
         : [...testRunners.map((runner) => ({ name: runner })), { name: 'none' }];
     const defaultValue = (isTsSolutionSetup ? 'none' : testRunners[0]);
-    return await (0, prompt_1.promptWhenInteractive)({
+    return await (0, internal_1.promptWhenInteractive)({
         type: 'autocomplete',
         name: 'unitTestRunner',
         message: `Which unit test runner would you like to use?`,

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

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSwc = compileSwc;
 exports.compileSwcWatch = compileSwcWatch;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const print_diagnostics_1 = require("../typescript/print-diagnostics");
 const run_type_check_1 = require("../typescript/run-type-check");
 const path_1 = require("path");
@@ -101,7 +101,7 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
     if (normalizedOptions.clean) {
         (0, node_fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
     }
-    return yield* (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         let processOnExit;
         let handleCallback;
         let stdoutOnData;

package/src/utils/typescript/compile-typescript-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-typescript-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,4BAA4B,EAC7B,MAAM,oDAAoD,CAAC;AAG5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAWtD,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,yBAAyB,EAC5C,UAAU,EAAE,4BAA4B,EACxC,uBAAuB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClD;IACD,QAAQ,EAAE,aAAa,CAAC,2BAA2B,CAAC,CAAC;IACrD,KAAK,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnC,CA0CA"}
+{"version":3,"file":"compile-typescript-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,4BAA4B,EAC7B,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAWtD,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,yBAAyB,EAC5C,UAAU,EAAE,4BAA4B,EACxC,uBAAuB,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAClD;IACD,QAAQ,EAAE,aAAa,CAAC,2BAA2B,CAAC,CAAC;IACrD,KAAK,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnC,CA0CA"}

package/src/utils/typescript/compile-typescript-files.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypeScriptFiles = compileTypeScriptFiles;
+const internal_1 = require("@nx/devkit/internal");
 const compilation_1 = require("@nx/workspace/src/utilities/typescript/compilation");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const TYPESCRIPT_FOUND_N_ERRORS_WATCHING_FOR_FILE_CHANGES = 6194;
 // Typescript diagnostic message for 6194: Found {0} errors. Watching for file changes.
 // https://github.com/microsoft/TypeScript/blob/d45012c5e2ab122919ee4777a7887307c5f4a1e0/src/compiler/diagnosticMessages.json#L4763-L4766
@@ -17,7 +17,7 @@ function compileTypeScriptFiles(normalizedOptions, tscOptions, postCompilationCa
     });
     let tearDown;
     return {
-        iterator: (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+        iterator: (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
             if (normalizedOptions.watch) {
                 const host = (0, compilation_1.compileTypeScriptWatcher)(tscOptions, async (d) => {
                     if (d.code === TYPESCRIPT_FOUND_N_ERRORS_WATCHING_FOR_FILE_CHANGES) {