@nx/plugin 23.0.0-beta.2 → 23.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.20",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/jest": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@nx/eslint": "23.0.0-beta.2"
+    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/jest": "23.0.0-beta.20",
+    "@nx/js": "23.0.0-beta.20",
+    "@nx/eslint": "23.0.0-beta.20"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.2"
+    "nx": "23.0.0-beta.20"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/create-package/create-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAO5B;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAoC5B;AAwJD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"create-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/create-package/create-package.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAO5B;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,8BAoC5B;AAwJD,eAAe,sBAAsB,CAAC"}

package/src/generators/create-package/create-package.js

@@ -4,10 +4,8 @@ exports.createPackageGenerator = createPackageGenerator;
 exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("nx/src/utils/versions");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("nx/src/utils/versions");
 const path_1 = require("path");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../generator/generator");
@@ -24,10 +22,10 @@ async function createPackageGeneratorInternal(host, schema) {
     const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
     const pluginPackageName = await addPresetGenerator(host, options);
     if (options.bundler === 'tsc') {
-        tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
+        tasks.push((0, js_1.addTsLibDependencies)(host));
     }
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
-        'create-nx-workspace': versions_2.nxVersion,
+        'create-nx-workspace': versions_1.nxVersion,
     }, {});
     tasks.push(installTask);
     const cliPackageTask = await createCliPackage(host, options, pluginPackageName);
@@ -73,7 +71,7 @@ async function createCliPackage(host, options, pluginPackageName) {
         useTscExecutor: true,
     });
     host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(host);
     // Add the bin entry to the package.json
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (packageJson) => {
         packageJson.bin = {
@@ -88,8 +86,8 @@ async function createCliPackage(host, options, pluginPackageName) {
             delete packageJson.exports;
         }
         packageJson.dependencies = {
-            'create-nx-workspace': versions_2.nxVersion,
-            ...(options.bundler === 'tsc' && { tslib: versions_1.tsLibVersion }),
+            'create-nx-workspace': versions_1.nxVersion,
+            ...(options.bundler === 'tsc' && { tslib: internal_1.tsLibVersion }),
         };
         return packageJson;
     });
@@ -131,7 +129,7 @@ function addE2eProject(host, options) {
     const e2eProjectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.e2eProject);
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.project);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), (0, ts_solution_setup_1.getProjectSourceRoot)(e2eProjectConfiguration, host), {
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), (0, internal_1.getProjectSourceRoot)(e2eProjectConfiguration, host), {
         pluginName: options.project,
         cliName: options.name,
         packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),

package/src/generators/create-package/utils/normalize-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/create-package/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAS7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAkD3B"}
+{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/create-package/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAO7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAkD3B"}

package/src/generators/create-package/utils/normalize-schema.js

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 async function normalizeSchema(host, schema) {
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, schema.linter);
-    const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, schema.unitTestRunner, ['jest']);
+    const linter = await (0, internal_2.normalizeLinterOption)(host, schema.linter);
+    const unitTestRunner = await (0, internal_2.normalizeUnitTestRunnerOption)(host, schema.unitTestRunner, ['jest']);
     if (!schema.directory) {
         throw new Error(`Please provide the --directory option. It should be the directory containing the project '${schema.project}'.`);
     }
-    const { projectName, names: projectNames, projectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    const { projectName, names: projectNames, projectRoot, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: schema.name,
         projectType: 'library',
         directory: schema.directory,
@@ -20,8 +19,8 @@ async function normalizeSchema(host, schema) {
     // jsLibraryGenerator, so, if the TS solution setup is not configured, we
     // additionally check if the TS solution setup will be configured by the
     // jsLibraryGenerator
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) ||
-        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) ||
+        (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = schema.addPlugin ??
         (isTsSolutionSetup &&

package/src/generators/e2e-project/e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAeL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAkBpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA+LvC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMnE;AAED,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA8C3E;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"e2e.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/e2e-project/e2e.ts"],"names":[],"mappings":"AACA,OAAO,EAeL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA+LvC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMnE;AAED,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA8C3E;AAED,eAAe,mBAAmB,CAAC"}

package/src/generators/e2e-project/e2e.js

@@ -2,25 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.e2eProjectGenerator = e2eProjectGenerator;
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
+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 eslint_1 = require("@nx/eslint");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
-const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
-const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
-const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
+    const linter = await (0, internal_2.normalizeLinterOption)(host, options.linter);
     const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = options.addPlugin ??
         (process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
     let projectRoot;
-    const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    const projectNameAndRootOptions = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: projectName,
         projectType: 'application',
         directory: options.rootProject || !options.projectDirectory
@@ -29,7 +26,7 @@ async function normalizeOptions(host, options) {
     });
     projectRoot = projectNameAndRootOptions.projectRoot;
     const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host);
     return {
         ...options,
         projectName,
@@ -92,7 +89,7 @@ async function addJest(host, options) {
         addPlugin: options.addPlugin,
         compiler: options.isTsSolutionSetup ? 'swc' : undefined,
     });
-    const { startLocalRegistryPath, stopLocalRegistryPath } = (0, add_local_registry_scripts_1.addLocalRegistryScripts)(host);
+    const { startLocalRegistryPath, stopLocalRegistryPath } = (0, internal_2.addLocalRegistryScripts)(host);
     const jestConfigPath = (0, jest_1.findJestConfig)(host, options.projectRoot);
     if (!jestConfigPath) {
         throw new Error(`Could not find Jest config for project ${options.projectName} at ${options.projectRoot}`);
@@ -149,7 +146,7 @@ async function e2eProjectGeneratorInternal(host, schema) {
     validatePlugin(host, schema.pluginName);
     const options = await normalizeOptions(host, schema);
     addFiles(host, options);
-    tasks.push(await (0, generator_1.setupVerdaccio)(host, {
+    tasks.push(await (0, js_1.setupVerdaccio)(host, {
         skipFormat: true,
     }));
     tasks.push(await addJest(host, options));
@@ -174,7 +171,7 @@ async function e2eProjectGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

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

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAmCvC,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,iBAsBzB;AAsID,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAajE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAmCvC,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,iBAsBzB;AAsID,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAajE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/executor/executor.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExecutorsJson = createExecutorsJson;
 exports.executorGenerator = executorGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const paths_1 = require("../../utils/paths");
 const versions_1 = require("../../utils/versions");
@@ -85,7 +85,7 @@ async function updateExecutorJson(host, options) {
     });
 }
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['ts'],
@@ -124,7 +124,7 @@ async function normalizeOptions(tree, options) {
         description,
         projectRoot,
         projectSourceRoot: projectSourceRoot ?? (0, path_1.join)(projectRoot, 'src'),
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        isTsSolutionSetup: (0, internal_2.isUsingTsSolutionSetup)(tree),
     };
 }
 async function executorGenerator(host, schema) {

package/src/generators/executor/files/executor/__fileName__.ts.template

@@ -1,5 +1,5 @@
-import { PromiseExecutor } from "@nx/devkit";
-import { <%= className %>ExecutorSchema } from './schema';
+import type { PromiseExecutor } from "@nx/devkit";
+import type { <%= className %>ExecutorSchema } from './schema';
 
 const runExecutor: PromiseExecutor<<%= className %>ExecutorSchema> = async (options) => {
   console.log('Executor ran for <%= className %>', options);

package/src/generators/executor/files/hasher/hasher.spec.ts.template

@@ -15,7 +15,8 @@ describe('<%=propertyName%>Hasher', () => {
             },
             overrides: {},
             outputs: [],
-            parallelism: true
+            parallelism: true,
+            cache: false
         }, {
             hasher: mockHasher
         } as unknown as HasherContext)

package/src/generators/executor/files/hasher/hasher.ts.template

@@ -1,4 +1,4 @@
-import { CustomHasher } from '@nx/devkit';
+import type { CustomHasher } from '@nx/devkit';
 
 /**
  * This is a boilerplate custom hasher that matches

package/src/generators/generator/files/generator/__fileName__.ts.template

@@ -2,10 +2,10 @@ import {
   addProjectConfiguration,
   formatFiles,
   generateFiles,
-  Tree,
+  type Tree,
 } from '@nx/devkit';
 import * as path from 'path';
-import { <%= className %>GeneratorSchema } from './schema';
+import type { <%= className %>GeneratorSchema } from './schema';
 
 export async function <%= generatorFnName %> (tree: Tree, options: <%= schemaInterfaceName %>) {
   const projectRoot = `libs/${options.name}`;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2FvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,UAAU,CAAC,EAAE,OAAO,iBAuBrB;AA2ED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAalE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"AACA,OAAO,EAQL,IAAI,EAGL,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2FvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,UAAU,CAAC,EAAE,OAAO,iBAuBrB;AA2ED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAalE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/generator/generator.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGeneratorsJson = createGeneratorsJson;
 exports.generatorGenerator = generatorGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
 const has_generator_1 = require("../../utils/has-generator");
 const paths_1 = require("../../utils/paths");
 const versions_1 = require("../../utils/versions");
 const generator_1 = tslib_1.__importDefault(require("../lint-checks/generator"));
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['ts'],
@@ -51,7 +51,7 @@ async function normalizeOptions(tree, options) {
         description,
         projectRoot,
         projectSourceRoot: projectSourceRoot ?? (0, node_path_1.join)(projectRoot, 'src'),
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        isTsSolutionSetup: (0, internal_2.isUsingTsSolutionSetup)(tree),
     };
 }
 function addFiles(host, options) {

package/src/generators/lint-checks/generator.d.ts

@@ -1,5 +1,5 @@
 import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-import type { Schema as EsLintExecutorOptions } from '@nx/eslint/src/executors/lint/schema';
+import type { Schema as EsLintExecutorOptions } from '@nx/eslint/internal';
 import { PluginLintChecksGeneratorSchema } from './schema';
 import { PackageJson } from 'nx/src/utils/package-json';
 export default function pluginLintCheckGenerator(host: Tree, options: PluginLintChecksGeneratorSchema): Promise<void>;

package/src/generators/lint-checks/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,EAGpB,mBAAmB,EACnB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE5F,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAuB,MAAM,2BAA2B,CAAC;AAU7E,wBAA8B,wBAAwB,CACpD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,iBA2BzC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,EACxC,WAAW,EAAE,WAAW,QAyDzB;AAmLD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,GAC5B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAO7E"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/lint-checks/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,EAGpB,mBAAmB,EACnB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAuB,MAAM,2BAA2B,CAAC;AAU7E,wBAA8B,wBAAwB,CACpD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,iBA2BzC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,+BAA+B,EACxC,WAAW,EAAE,WAAW,QAyDzB;AA2MD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,GAC5B,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAO7E"}

package/src/generators/lint-checks/generator.js

@@ -6,8 +6,7 @@ exports.getEsLintOptions = getEsLintOptions;
 const devkit_1 = require("@nx/devkit");
 const logger_1 = require("nx/src/utils/logger");
 const package_json_1 = require("nx/src/utils/package-json");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const internal_1 = require("@nx/eslint/internal");
 async function pluginLintCheckGenerator(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const packageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
@@ -49,7 +48,7 @@ function addMigrationJsonChecks(host, options, packageJson) {
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
     }
     // Update project level eslintrc
-    (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
+    (0, internal_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
         Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
         const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
         fileSet.add(relativeMigrationsJsonPath);
@@ -60,7 +59,7 @@ function addMigrationJsonChecks(host, options, packageJson) {
     });
 }
 function formatFilesEntries(tree, files) {
-    if (!(0, flat_config_1.useFlatConfig)(tree)) {
+    if (!(0, internal_1.useFlatConfig)(tree)) {
         return files;
     }
     const filesAfter = files.map((f) => {
@@ -97,12 +96,31 @@ function updateProjectTarget(host, options, packageJson) {
             opts.lintFilePatterns.push(`${project.root}/package.json`);
             opts.lintFilePatterns = [...new Set(opts.lintFilePatterns)];
             project.targets[target].options = opts;
+            // Plugin checks read schema/implementation files which may live in the
+            // project's build outputs (and migration prompt files copied as assets).
+            // Ensure lint runs after build and includes the relevant build outputs
+            // as inputs so the sandbox allows the reads and the cache invalidates
+            // when those outputs change.
+            const targetConfig = project.targets[target];
+            const dependsOn = new Set(targetConfig.dependsOn ?? []);
+            dependsOn.add('build');
+            targetConfig.dependsOn = Array.from(dependsOn);
+            const inputs = targetConfig.inputs ?? ['...'];
+            const hasDependentOutputs = inputs.some((input) => typeof input === 'object' &&
+                input !== null &&
+                'dependentTasksOutputFiles' in input);
+            if (!hasDependentOutputs) {
+                inputs.push({
+                    dependentTasksOutputFiles: '**/*.{json,d.ts,js,md}',
+                });
+            }
+            targetConfig.inputs = inputs;
         }
     }
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
 }
 function updateProjectEslintConfig(host, options, packageJson) {
-    if ((0, eslint_file_1.isEslintConfigSupported)(host, options.root)) {
+    if ((0, internal_1.isEslintConfigSupported)(host, options.root)) {
         const lookup = (o) => Object.keys(o.rules ?? {}).includes('@nx/nx-plugin-checks') ||
             Object.keys(o.rules ?? {}).includes('@nrwl/nx/nx-plugin-checks');
         const files = [
@@ -113,12 +131,12 @@ function updateProjectEslintConfig(host, options, packageJson) {
             packageJson.builders,
             (0, package_json_1.readNxMigrateConfig)(packageJson).migrations,
         ].filter((f) => !!f);
-        const parser = (0, flat_config_1.useFlatConfig)(host)
+        const parser = (0, internal_1.useFlatConfig)(host)
             ? { languageOptions: { parser: 'jsonc-eslint-parser' } }
             : { parser: 'jsonc-eslint-parser' };
-        if ((0, eslint_file_1.lintConfigHasOverride)(host, options.root, lookup)) {
+        if ((0, internal_1.lintConfigHasOverride)(host, options.root, lookup)) {
             // update it
-            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => ({
+            (0, internal_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => ({
                 ...o,
                 files: formatFilesEntries(host, [
                     ...new Set([
@@ -135,7 +153,7 @@ function updateProjectEslintConfig(host, options, packageJson) {
         }
         else {
             // add it
-            (0, eslint_file_1.addOverrideToLintConfig)(host, options.root, {
+            (0, internal_1.addOverrideToLintConfig)(host, options.root, {
                 files: formatFilesEntries(host, files),
                 ...parser,
                 rules: {
@@ -149,11 +167,11 @@ function updateProjectEslintConfig(host, options, packageJson) {
 // This is required, otherwise every json file that is not overriden
 // will display false errors in the IDE
 function updateRootEslintConfig(host) {
-    if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-        if (!(0, eslint_file_1.lintConfigHasOverride)(host, '', (o) => Array.isArray(o.files)
+    if ((0, internal_1.isEslintConfigSupported)(host)) {
+        if (!(0, internal_1.lintConfigHasOverride)(host, '', (o) => Array.isArray(o.files)
             ? o.files.some((f) => f.match(/\.json$/))
             : !!o.files?.match(/\.json$/), true)) {
-            (0, eslint_file_1.addOverrideToLintConfig)(host, '', {
+            (0, internal_1.addOverrideToLintConfig)(host, '', {
                 files: '*.json',
                 parser: 'jsonc-eslint-parser',
                 rules: {},
@@ -187,7 +205,7 @@ function setupVsCodeLintingForJsonFiles(host) {
     (0, devkit_1.writeJson)(host, '.vscode/settings.json', existing);
 }
 function projectIsEsLintEnabled(tree, project) {
-    return !!(0, eslint_file_1.findEslintFile)(tree, project.root);
+    return !!(0, internal_1.findEslintFile)(tree, project.root);
 }
 function getEsLintOptions(project) {
     return Object.entries(project.targets || {}).find(([, x]) => x.executor === '@nx/eslint:lint' ||

package/src/generators/migration/files/migration/__fileName__.ts__tmpl__

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 
 export default function update(host: Tree) {
     // ...

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

@@ -1 +1 @@
-{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiKvC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAuBlE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"migration.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/migration/migration.ts"],"names":[],"mappings":"AACA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiKvC,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAuBlE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/migration/migration.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrationGenerator = migrationGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
 const package_json_1 = require("nx/src/utils/package-json");
 const paths_1 = require("../../utils/paths");
 const versions_1 = require("../../utils/versions");
 const generator_1 = require("../lint-checks/generator");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, project, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['ts'],
@@ -27,7 +27,7 @@ async function normalizeOptions(tree, options) {
         description,
         projectRoot,
         projectSourceRoot: projectSourceRoot ?? (0, node_path_1.join)(projectRoot, 'src'),
-        isTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        isTsSolutionSetup: (0, internal_2.isUsingTsSolutionSetup)(tree),
     };
     return normalized;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAuDvC,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAM/D;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwFvE;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/plugin/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAapB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAuDvC,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAM/D;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA+FvE;AAED,eAAe,eAAe,CAAC"}

package/src/generators/plugin/plugin.js

@@ -5,9 +5,7 @@ exports.pluginGeneratorInternal = pluginGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path = tslib_1.__importStar(require("path"));
 const e2e_1 = require("../e2e-project/e2e");
 const generator_1 = tslib_1.__importDefault(require("../lint-checks/generator"));
@@ -24,7 +22,7 @@ function updatePluginConfig(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (project.targets.build) {
         if (options.isTsSolutionSetup && options.bundler === 'tsc') {
-            project.targets.build.options.rootDir = (0, ts_solution_setup_1.getProjectSourceRoot)(project, host);
+            project.targets.build.options.rootDir = (0, internal_1.getProjectSourceRoot)(project, host);
             project.targets.build.options.generatePackageJson = false;
         }
         project.targets.build.options.assets = [
@@ -67,12 +65,19 @@ async function pluginGeneratorInternal(host, schema) {
     }));
     if (options.isTsSolutionSetup) {
         (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
-            delete json.type;
+            // Force CommonJS for the plugin package. `jsLibraryGenerator` sets
+            // `type: "module"` for TS-solution libs, but Nx-plugin generators
+            // and executors that get loaded by `nx generate` / `nx run` rely on
+            // CJS globals like `__dirname` (e.g. `path.join(__dirname, 'files')`
+            // in generator factories). Setting `type: "commonjs"` explicitly
+            // overrides Node's content-based ESM detection so the source TS
+            // files load as CJS at runtime.
+            json.type = 'commonjs';
             return json;
         });
     }
     if (options.bundler === 'tsc') {
-        tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
+        tasks.push((0, js_1.addTsLibDependencies)(host));
     }
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
         '@nx/devkit': nxVersion,
@@ -83,8 +88,8 @@ async function pluginGeneratorInternal(host, schema) {
     }));
     // Ensures Swc Deps are installed to handle running
     // local plugin generators and executors
-    tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
-    tasks.push((0, add_swc_dependencies_1.addSwcRegisterDependencies)(host));
+    tasks.push((0, internal_1.addSwcDependencies)(host));
+    tasks.push((0, internal_1.addSwcRegisterDependencies)(host));
     await addFiles(host, options);
     updatePluginConfig(host, options);
     if (options.e2eTestRunner !== 'none') {

package/src/generators/plugin/utils/normalize-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAS7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAwD3B"}
+{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAO7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAwD3B"}

package/src/generators/plugin/utils/normalize-schema.js

@@ -2,24 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
-    const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, options.unitTestRunner, ['jest', 'vitest']);
+    const linter = await (0, internal_2.normalizeLinterOption)(host, options.linter);
+    const unitTestRunner = await (0, internal_2.normalizeUnitTestRunnerOption)(host, options.unitTestRunner, ['jest', 'vitest']);
     // this helper is called before the jsLibraryGenerator is called, so, if the
     // TS solution setup is not configured, we additionally check if the TS
     // solution setup will be configured by the jsLibraryGenerator
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) ||
-        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, options.addPlugin);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(host) ||
+        (0, internal_2.shouldConfigureTsSolutionSetup)(host, options.addPlugin);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = options.addPlugin ??
         (isTsSolutionSetup &&
             process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, projectRoot, importPath } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

package/src/utils/paths.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArtifactMetadataDirectory = getArtifactMetadataDirectory;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 function getArtifactMetadataDirectory(tree, projectName, sourceDirectory, isTsSolutionSetup) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
@@ -24,6 +24,6 @@ function getArtifactMetadataDirectory(tree, projectName, sourceDirectory, isTsSo
     // unless the user manually changed the build process. In that case, we can't
     // reliably determine the output directory because it depends on the build
     // tool, so we'll just assume some defaults.
-    const baseDir = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const baseDir = (0, internal_1.getProjectSourceRoot)(project, tree);
     return `./${(0, posix_1.join)('dist', (0, posix_1.relative)(baseDir, sourceDirectory))}`;
 }