@nx/js 23.0.0-beta.0 → 23.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.0.0-beta.0",
+  "version": "23.0.0-beta.10",
   "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,18 +40,18 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "23.0.0-beta.0",
-    "@nx/workspace": "23.0.0-beta.0",
+    "@nx/devkit": "23.0.0-beta.10",
+    "@nx/workspace": "23.0.0-beta.10",
     "@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",
-    "ignore": "^5.0.4",
+    "detect-port": "^2.1.0",
+    "ignore": "^7.0.5",
     "js-tokens": "^4.0.0",
-    "jsonc-parser": "3.2.0",
+    "jsonc-parser": "^3.2.0",
     "npm-run-path": "^4.0.1",
     "picocolors": "^1.1.0",
     "picomatch": "4.0.4",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.0"
+    "nx": "23.0.0-beta.10"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/copy-workspace-modules/copy-workspace-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAa5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}
+{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAc5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}

package/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -8,6 +8,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
     const outputDirectory = getOutputDir(schema, context);
@@ -128,6 +129,7 @@ function getOutputDir(schema, context) {
     return outputDir;
 }
 function normalizeOutputPath(outputPath) {
+    outputPath = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputPath);
     if (!outputPath.startsWith(devkit_1.workspaceRoot)) {
         outputPath = (0, path_1.join)(devkit_1.workspaceRoot, outputPath);
     }

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;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA6ID,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"));
@@ -18,6 +18,7 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const detect_module_format_1 = require("./lib/detect-module-format");
 const output_file_1 = require("./lib/output-file");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 const globalLineAwareWriter = new line_aware_writer_1.LineAwareWriter();
 async function* nodeExecutor(options, context) {
     process.env.NODE_ENV ??= context?.configurationName ?? 'development';
@@ -59,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;
@@ -298,7 +299,7 @@ function calculateResolveMappings(context, options) {
             // `outputs` are cache patterns and may contain globs (e.g. from the
             // inferred `@nx/js/typescript` build target). Strip the glob portion
             // so the runtime require overrides resolve to the actual output dir.
-            const outputDir = stripGlobToBaseDir(c.outputs[0]);
+            const outputDir = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(c.outputs[0]);
             m[c.name] = (0, devkit_1.joinPathFragments)(context.root, outputDir);
         }
         return m;
@@ -338,7 +339,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
             // `{projectRoot}/dist/**/*.{js,...}` to avoid caching non-tsc files).
             // Strip the glob portion back to the last path separator before it to
             // recover the base output directory.
-            const outputDir = stripGlobToBaseDir(outputFilePath);
+            const outputDir = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputFilePath);
             return path.join(outputDir, 'main.js');
         }
         const fallbackFile = path.join('dist', project.data.root, 'main.js');
@@ -356,15 +357,6 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     }
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
-function stripGlobToBaseDir(pathWithGlob) {
-    const globIdx = pathWithGlob.search(/[*?[{(]/);
-    if (globIdx === -1) {
-        return pathWithGlob.replace(/[\\/]+$/, '');
-    }
-    const prefix = pathWithGlob.slice(0, globIdx);
-    const lastSep = Math.max(prefix.lastIndexOf('/'), prefix.lastIndexOf('\\'));
-    return lastSep === -1 ? '' : prefix.slice(0, lastSep);
-}
 function fileToRunCorrectPath(fileToRun) {
     if ((0, fileutils_1.fileExists)(fileToRun))
         return fileToRun;

package/src/executors/prune-lockfile/prune-lockfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}
+{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGrD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}

package/src/executors/prune-lockfile/prune-lockfile.js

@@ -9,6 +9,7 @@ const utils_1 = require("nx/src/tasks-runner/utils");
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
     const outputDirectory = getOutputDir(schema, context);
@@ -89,6 +90,7 @@ function getOutputDir(schema, context) {
     return outputDir;
 }
 function normalizeOutputPath(outputPath) {
+    outputPath = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputPath);
     if (!outputPath.startsWith(devkit_1.workspaceRoot)) {
         outputPath = (0, path_1.join)(devkit_1.workspaceRoot, outputPath);
     }

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/executors/tsc/tsc.impl.d.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import type { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/typescript/compilation';
+import type { TypeScriptCompilationOptions } from '../../utils/typescript/compilation';
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
 export declare function determineModuleFormatFromTsConfig(absolutePathToTsConfig: string, projectRoot?: string, workspaceRoot?: string): 'cjs' | 'esm';
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;

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

@@ -1 +1 @@
-{"version":3,"file":"tsc.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAC;AAQvG,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAOhF,wBAAgB,iCAAiC,CAC/C,sBAAsB,EAAE,MAAM,EAC9B,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,GAAG,KAAK,CAkCf;AAED,wBAAgB,kCAAkC,CAChD,iBAAiB,EAAE,yBAAyB,EAC5C,OAAO,EAAE,eAAe,GACvB,4BAA4B,CAa9B;AAED,wBAAuB,WAAW,CAChC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,eAAe,mHAqHzB;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"tsc.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAKhB,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAQvF,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAOhF,wBAAgB,iCAAiC,CAC/C,sBAAsB,EAAE,MAAM,EAC9B,WAAW,CAAC,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,GACrB,KAAK,GAAG,KAAK,CAkCf;AAED,wBAAgB,kCAAkC,CAChD,iBAAiB,EAAE,yBAAyB,EAC5C,OAAO,EAAE,eAAe,GACvB,4BAA4B,CAa9B;AAED,wBAAuB,WAAW,CAChC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,eAAe,mHAqHzB;AAED,eAAe,WAAW,CAAC"}

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,CA4G5B;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}'],
@@ -318,7 +315,12 @@ async function addLint(tree, options) {
                 ignoredFiles.add('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
             }
             if (options.unitTestRunner === 'vitest') {
-                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
+                // When bundler is 'vite', vite.config holds both build and test config
+                // (added above). Otherwise, @nx/vitest:configuration generates a
+                // dedicated vitest.config file for non-framework JS libraries.
+                ignoredFiles.add(options.bundler === 'vite'
+                    ? '{projectRoot}/vite.config.{js,ts,mjs,mts}'
+                    : '{projectRoot}/vitest.config.{js,ts,mjs,mts}');
             }
             if (ignoredFiles.size) {
                 ruleOptions.ignoredFiles = Array.from(ignoredFiles);
@@ -535,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' &&
@@ -544,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?`,
@@ -553,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?`,
@@ -614,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 &&
@@ -626,9 +628,9 @@ function resolveShallowExternalProjectReferences(tsConfig, workspaceRoot, projec
 }
 /**
  * Collects unique tsconfig paths (relative to their project root) from the
- * project reference chain and returns them as `^{projectRoot}/...` input
- * patterns. We only need to discover the full set of distinct relative paths
- * from the reference chain.
+ * project reference chain — including any `extends` chains within those refs —
+ * and returns them as `^{projectRoot}/...` input patterns. We only need to
+ * discover the full set of distinct relative paths.
  */
 function getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectReferences, workspaceRoot, project, cache) {
     const externalRefs = {};
@@ -659,7 +661,34 @@ function getExternalProjectReferenceTsconfigPatterns(tsConfig, internalProjectRe
         visited.add(configPath);
         const wsRelPath = posixRelative(workspaceRoot, configPath);
         const tsConfigData = tsConfigCacheData[wsRelPath]?.data;
-        if (!tsConfigData?.projectReferences?.length) {
+        if (!tsConfigData) {
+            continue;
+        }
+        // Walk `extends` chains for the visited tsconfig. tsc reads extended
+        // configs while resolving project references, so the rel paths must be
+        // emitted as inputs. Workspace-root files (no owning project) are skipped
+        // — those are covered by the local project's own extends walk.
+        if (tsConfigData.extendedConfigFiles?.length) {
+            for (const extended of tsConfigData.extendedConfigFiles) {
+                if (!extended.filePath || visited.has(extended.filePath)) {
+                    continue;
+                }
+                const extendedWsRelPath = posixRelative(workspaceRoot, extended.filePath);
+                if (!tsConfigCacheData[extendedWsRelPath]) {
+                    continue;
+                }
+                const extendedContext = getConfigContext(extended.filePath, workspaceRoot, cache);
+                if (extendedContext.project.root &&
+                    extendedContext.project.root !== '.') {
+                    uniqueRelPaths.add(posixRelative(extendedContext.project.absolute, extended.filePath));
+                    worklist.push({
+                        configPath: extended.filePath,
+                        ownerProject: extendedContext.project,
+                    });
+                }
+            }
+        }
+        if (!tsConfigData.projectReferences?.length) {
             continue;
         }
         for (const ref of tsConfigData.projectReferences) {

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/buildable-libs-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AA0ED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UAsBvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QA6DhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAkFvE"}
+{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAiBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AA0ED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UAsBvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QA6DhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAsFvE"}

package/src/utils/buildable-libs-utils.js

@@ -14,6 +14,7 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const output_1 = require("nx/src/utils/output");
 const path_1 = require("path");
 const ts_config_1 = require("./typescript/ts-config");
+const strip_glob_to_base_dir_1 = require("./strip-glob-to-base-dir");
 const crypto_1 = require("crypto");
 const project_graph_1 = require("nx/src/config/project-graph");
 function isBuildable(target, node) {
@@ -311,7 +312,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
         target: targetName,
         configuration: configurationName,
     }, {}, node);
-    const packageJsonPath = `${outputs[0]}/package.json`;
+    const packageJsonPath = `${(0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0])}/package.json`;
     let packageJson;
     let workspacePackageJson;
     try {
@@ -341,7 +342,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                         target: targetName,
                         configuration: configurationName,
                     }, {}, entry.node);
-                    const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                    const depPackageJsonPath = (0, path_1.join)(root, (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0]), 'package.json');
                     depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[typeOfDependency][packageName] = depVersion;
                 }

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/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,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"}
+{"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;AAM7D,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;AAqFD,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

@@ -14,6 +14,7 @@ const path_1 = require("path");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const get_main_file_dir_1 = require("../get-main-file-dir");
+const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
@@ -101,7 +102,7 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
                     target: targetName,
                     configuration: configurationName,
                 }, {}, entry.node);
-                const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                const depPackageJsonPath = (0, path_1.join)(root, (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0]), 'package.json');
                 if ((0, node_fs_1.existsSync)(depPackageJsonPath)) {
                     const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[propType] ??= {};

package/src/utils/strip-glob-to-base-dir.d.ts

@@ -0,0 +1,2 @@
+export declare function stripGlobToBaseDir(pathWithGlob: string): string;
+//# sourceMappingURL=strip-glob-to-base-dir.d.ts.map

package/src/utils/strip-glob-to-base-dir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"strip-glob-to-base-dir.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/strip-glob-to-base-dir.ts"],"names":[],"mappings":"AAIA,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ/D"}

package/src/utils/strip-glob-to-base-dir.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripGlobToBaseDir = stripGlobToBaseDir;
+// `outputs` entries on inferred targets (e.g. from `@nx/js/typescript`) are
+// cache-match patterns and may contain globs. Strip the glob portion back to
+// the last path separator to recover the base output directory. Returns the
+// input with trailing separators stripped when there is no glob.
+function stripGlobToBaseDir(pathWithGlob) {
+    const globIdx = pathWithGlob.search(/[*?[{(]/);
+    if (globIdx === -1) {
+        return pathWithGlob.replace(/[\\/]+$/, '');
+    }
+    const prefix = pathWithGlob.slice(0, globIdx);
+    const lastSep = Math.max(prefix.lastIndexOf('/'), prefix.lastIndexOf('\\'));
+    return lastSep === -1 ? '' : prefix.slice(0, lastSep);
+}

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/compilation.d.ts

@@ -0,0 +1,23 @@
+import type * as ts from 'typescript';
+import type { CustomTransformers, Diagnostic, Program } from 'typescript';
+export interface TypeScriptCompilationOptions {
+    outputPath: string;
+    projectName: string;
+    projectRoot: string;
+    tsConfig: string;
+    deleteOutputPath?: boolean;
+    rootDir?: string;
+    watch?: boolean;
+    getCustomTransformers?(program: Program): CustomTransformers;
+}
+export interface TypescriptWatchChangeEvent {
+    diagnostic: ts.Diagnostic;
+    newLine: string;
+    options: ts.CompilerOptions;
+    errorCount: number;
+}
+export declare function compileTypeScript(options: TypeScriptCompilationOptions): {
+    success: boolean;
+};
+export declare function compileTypeScriptWatcher(options: TypeScriptCompilationOptions, callback: (diagnostic: Diagnostic, newLine: string, options: ts.CompilerOptions, errorCount: number) => void | Promise<void>): ts.WatchOfFilesAndCompilerOptions<ts.BuilderProgram>;
+//# sourceMappingURL=compilation.d.ts.map

package/src/utils/typescript/compilation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compilation.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compilation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAM1E,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,kBAAkB,CAAC;CAC9D;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,4BAA4B,GAAG;IACxE,OAAO,EAAE,OAAO,CAAC;CAClB,CASA;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,4BAA4B,EACrC,QAAQ,EAAE,CACR,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,EAAE,CAAC,eAAe,EAC3B,UAAU,EAAE,MAAM,KACf,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,wDAwD1B"}

package/src/utils/typescript/compilation.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileTypeScript = compileTypeScript;
+exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
+const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
+const ts_config_1 = require("./ts-config");
+const ensure_typescript_1 = require("./ensure-typescript");
+let tsModule;
+function compileTypeScript(options) {
+    const normalizedOptions = normalizeOptions(options);
+    const tsConfig = getNormalizedTsConfig(normalizedOptions);
+    if (normalizedOptions.deleteOutputPath) {
+        (0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
+    }
+    return createProgram(tsConfig, normalizedOptions);
+}
+function compileTypeScriptWatcher(options, callback) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const normalizedOptions = normalizeOptions(options);
+    const tsConfig = getNormalizedTsConfig(normalizedOptions);
+    if (normalizedOptions.deleteOutputPath) {
+        (0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
+    }
+    const host = tsModule.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, tsModule.sys);
+    const originalAfterProgramCreate = host.afterProgramCreate;
+    host.afterProgramCreate = (builderProgram) => {
+        const originalProgramEmit = builderProgram.emit;
+        builderProgram.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
+            const consumerCustomTransformers = options.getCustomTransformers?.(builderProgram.getProgram());
+            const mergedCustomTransformers = mergeCustomTransformers(customTransformers, consumerCustomTransformers);
+            return originalProgramEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, mergedCustomTransformers);
+        };
+        if (originalAfterProgramCreate)
+            originalAfterProgramCreate(builderProgram);
+    };
+    const originalOnWatchStatusChange = host.onWatchStatusChange;
+    host.onWatchStatusChange = async (a, b, c, d) => {
+        originalOnWatchStatusChange?.(a, b, c, d);
+        await callback?.(a, b, c, d);
+    };
+    return tsModule.createWatchProgram(host);
+}
+function mergeCustomTransformers(originalCustomTransformers, consumerCustomTransformers) {
+    if (!consumerCustomTransformers)
+        return originalCustomTransformers;
+    const mergedCustomTransformers = {};
+    if (consumerCustomTransformers.before) {
+        mergedCustomTransformers.before = originalCustomTransformers?.before
+            ? [
+                ...originalCustomTransformers.before,
+                ...consumerCustomTransformers.before,
+            ]
+            : consumerCustomTransformers.before;
+    }
+    if (consumerCustomTransformers.after) {
+        mergedCustomTransformers.after = originalCustomTransformers?.after
+            ? [
+                ...originalCustomTransformers.after,
+                ...consumerCustomTransformers.after,
+            ]
+            : consumerCustomTransformers.after;
+    }
+    if (consumerCustomTransformers.afterDeclarations) {
+        mergedCustomTransformers.afterDeclarations =
+            originalCustomTransformers?.afterDeclarations
+                ? [
+                    ...originalCustomTransformers.afterDeclarations,
+                    ...consumerCustomTransformers.afterDeclarations,
+                ]
+                : consumerCustomTransformers.afterDeclarations;
+    }
+    return mergedCustomTransformers;
+}
+function getNormalizedTsConfig(options) {
+    const tsConfig = (0, ts_config_1.readTsConfig)(options.tsConfig);
+    tsConfig.options.outDir = options.outputPath;
+    tsConfig.options.noEmitOnError = true;
+    tsConfig.options.rootDir = options.rootDir;
+    if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
+        tsConfig.options.tsBuildInfoFile = (0, devkit_1.joinPathFragments)(options.outputPath, 'tsconfig.tsbuildinfo');
+    }
+    return tsConfig;
+}
+function createProgram(tsconfig, { projectName, getCustomTransformers }) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const host = tsModule.createCompilerHost(tsconfig.options);
+    const program = tsModule.createProgram({
+        rootNames: tsconfig.fileNames,
+        options: tsconfig.options,
+        host,
+    });
+    devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
+    const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers?.(program));
+    if (results.emitSkipped) {
+        const diagnostics = tsModule.formatDiagnosticsWithColorAndContext(results.diagnostics, {
+            getCurrentDirectory: () => tsModule.sys.getCurrentDirectory(),
+            getNewLine: () => tsModule.sys.newLine,
+            getCanonicalFileName: (name) => name,
+        });
+        devkit_1.logger.error(diagnostics);
+        return { success: false };
+    }
+    else {
+        devkit_1.logger.info(`Done compiling TypeScript files for project "${projectName}".`);
+        return { success: true };
+    }
+}
+function normalizeOptions(options) {
+    return {
+        ...options,
+        deleteOutputPath: options.deleteOutputPath ?? true,
+        rootDir: options.rootDir ?? options.projectRoot,
+    };
+}

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

@@ -1,4 +1,4 @@
-import { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/typescript/compilation';
+import { TypeScriptCompilationOptions } from './compilation';
 import { NormalizedExecutorOptions } from '../schema';
 export interface TypescriptCompilationResult {
     success: boolean;

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,eAAe,CAAC;AAEvB,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 compilation_1 = require("@nx/workspace/src/utilities/typescript/compilation");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const internal_1 = require("@nx/devkit/internal");
+const compilation_1 = require("./compilation");
 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) {

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

@@ -1,4 +1,6 @@
 import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+import type { JsonInput } from 'nx/src/native';
+export declare const TS_SOLUTION_SETUP_TSCONFIG_INPUT: JsonInput;
 export declare function isUsingTypeScriptPlugin(tree: Tree): boolean;
 export declare function shouldConfigureTsSolutionSetup(tree: Tree, addPlugins: boolean, addTsPlugin?: boolean): boolean;
 export declare function isUsingTsSolutionSetup(tree?: Tree): boolean;

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;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"}
+{"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;AAUpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,gCAAgC,EAAE,SAG9C,CAAC;AAEF,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"}

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = void 0;
 exports.isUsingTypeScriptPlugin = isUsingTypeScriptPlugin;
 exports.shouldConfigureTsSolutionSetup = shouldConfigureTsSolutionSetup;
 exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
@@ -17,6 +18,10 @@ const posix_1 = require("node:path/posix");
 const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
 const configuration_1 = require("./configuration");
+exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = {
+    json: '{workspaceRoot}/tsconfig.json',
+    fields: ['extends', 'files', 'include'],
+};
 function isUsingTypeScriptPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     return (nxJson?.plugins?.some((p) => typeof p === 'string'

package/src/utils/versions.d.ts

@@ -6,7 +6,7 @@ export declare const swcCoreVersion = "~1.15.5";
 export declare const swcHelpersVersion = "~0.5.18";
 export declare const swcNodeVersion = "~1.11.1";
 export declare const tsLibVersion = "^2.3.0";
-export declare const typesNodeVersion = "20.19.9";
+export declare const typesNodeVersion = "^22.0.0";
 export declare const verdaccioVersion = "^6.3.2";
 export declare const typescriptVersion = "~5.9.2";
 /**

package/src/utils/versions.js

@@ -9,7 +9,7 @@ exports.swcCoreVersion = '~1.15.5';
 exports.swcHelpersVersion = '~0.5.18';
 exports.swcNodeVersion = '~1.11.1';
 exports.tsLibVersion = '^2.3.0';
-exports.typesNodeVersion = '20.19.9';
+exports.typesNodeVersion = '^22.0.0';
 exports.verdaccioVersion = '^6.3.2';
 // Typescript
 exports.typescriptVersion = '~5.9.2';