@nx/vite 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "private": false,
   "description": "The Nx Plugin for building and testing applications using Vite",
   "repository": {
@@ -31,11 +31,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.11",
+    "@nx/devkit": "23.0.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "enquirer": "~2.3.6",
-    "@nx/js": "23.0.0-beta.11",
-    "@nx/vitest": "23.0.0-beta.11",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/vitest": "23.0.0-beta.13",
     "picomatch": "4.0.4",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -43,7 +43,7 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.11"
+    "nx": "23.0.0-beta.13"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"

package/plugins/nx-copy-assets.plugin.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from 'vite';
-import { AssetGlob } from '@nx/js/src/utils/assets/assets';
+import { AssetGlob } from '@nx/js/internal';
 export declare function nxCopyAssetsPlugin(_assets: (string | AssetGlob)[]): Plugin;
 //# sourceMappingURL=nx-copy-assets.plugin.d.ts.map

package/plugins/nx-copy-assets.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,MAAM,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAG3D,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,CA2C1E"}
+{"version":3,"file":"nx-copy-assets.plugin.d.ts","sourceRoot":"","sources":["../../../../packages/vite/plugins/nx-copy-assets.plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,MAAM,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,CA2C1E"}

package/plugins/nx-copy-assets.plugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCopyAssetsPlugin = nxCopyAssetsPlugin;
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
-const copy_assets_handler_1 = require("@nx/js/src/utils/assets/copy-assets-handler");
+const internal_1 = require("@nx/js/internal");
 function nxCopyAssetsPlugin(_assets) {
     let config;
     let handler;
@@ -28,7 +28,7 @@ function nxCopyAssetsPlugin(_assets) {
                     };
                 }
             });
-            handler = new copy_assets_handler_1.CopyAssetsHandler({
+            handler = new internal_1.CopyAssetsHandler({
                 rootDir: devkit_1.workspaceRoot,
                 projectDir: config.root,
                 outputDir: config.build.outDir.startsWith(config.root)

package/plugins/nx-tsconfig-paths.plugin.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxViteTsPaths = nxViteTsPaths;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
+const js_1 = require("@nx/js");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const tsconfig_paths_1 = require("tsconfig-paths");
@@ -58,7 +57,7 @@ function nxViteTsPaths(options = {}) {
                     process.env.NX_TASK_TARGET_TARGET === 'test'
                     ? 'build'
                     : process.env.NX_TASK_TARGET_TARGET;
-                const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, process.env.NX_TASK_TARGET_PROJECT, depsBuildTarget, process.env.NX_TASK_TARGET_CONFIGURATION);
+                const { dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, projectGraph, devkit_1.workspaceRoot, process.env.NX_TASK_TARGET_PROJECT, depsBuildTarget, process.env.NX_TASK_TARGET_CONFIGURATION);
                 if (process.env.NX_GENERATED_TSCONFIG_PATH) {
                     // This is needed for vitest browser mode because it runs two vite dev servers
                     // so we want to reuse the same tsconfig file for both servers
@@ -67,7 +66,7 @@ function nxViteTsPaths(options = {}) {
                 else {
                     // This tsconfig is used via the Vite ts paths plugin.
                     // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
-                    foundTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(foundTsConfigPath, devkit_1.workspaceRoot, (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot), dependencies, true);
+                    foundTsConfigPath = (0, internal_1.createTmpTsConfig)(foundTsConfigPath, devkit_1.workspaceRoot, (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot), dependencies, true);
                     process.env.NX_GENERATED_TSCONFIG_PATH = foundTsConfigPath;
                 }
                 if (config.command === 'serve') {
@@ -85,13 +84,13 @@ function nxViteTsPaths(options = {}) {
                 throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
             }
             tsConfigPathsEsm = parsed;
-            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
+            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(foundTsConfigPath), parsed.paths, options.mainFields);
             const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
             const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
             logIt('fallback parsed tsconfig: ', rootLevelParsed);
             if (rootLevelParsed.resultType === 'success') {
                 tsConfigPathsFallback = rootLevelParsed;
-                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, ts_config_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
+                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)((0, js_1.resolvePathsBaseUrl)(rootLevelTsConfig), rootLevelParsed.paths, ['main', 'module']);
             }
         },
         resolveId(importPath) {
@@ -129,7 +128,7 @@ function nxViteTsPaths(options = {}) {
             return resolvedFile || null;
         },
         async writeBundle(options) {
-            if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)())
+            if ((0, internal_1.isUsingTsSolutionSetup)())
                 return;
             const outDir = options.dir || 'dist';
             const src = (0, node_path_1.resolve)(projectRoot, 'package.json');

package/src/executors/build/build.impl.js

@@ -43,7 +43,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const executor_utils_1 = require("../../utils/executor-utils");
 const deprecation_1 = require("../../utils/deprecation");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function* viteBuildExecutor(options, context) {
     (0, deprecation_1.warnViteBuildExecutorDeprecation)();
     process.env.VITE_CJS_IGNORE_WARNING = 'true';
@@ -76,7 +76,7 @@ async function* viteBuildExecutor(options, context) {
         ...otherOptions,
     });
     // New TS Solution already has a typecheck target
-    if (!options.skipTypeCheck && !(0, ts_solution_setup_1.isUsingTsSolutionSetup)()) {
+    if (!options.skipTypeCheck && !(0, internal_2.isUsingTsSolutionSetup)()) {
         await (0, executor_utils_1.validateTypes)({
             workspaceRoot: context.root,
             tsconfig: tsConfigForBuild,

package/src/generators/configuration/configuration.js

@@ -5,8 +5,7 @@ exports.viteConfigurationGeneratorInternal = viteConfigurationGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
-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");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const deprecation_1 = require("../../utils/deprecation");
@@ -24,7 +23,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
     const tasks = [];
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const { targets, root: projectRoot } = projectConfig;
-    const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
+    const projectType = (0, internal_1.getProjectType)(tree, projectConfig.root, schema.projectType ?? projectConfig.projectType);
     schema.includeLib ??= projectType === 'library';
     // Setting default to jsdom since it is the most common use case (React, Web).
     // The @nx/js:lib generator specifically sets this to node to be more generic.
@@ -133,7 +132,7 @@ async function viteConfigurationGeneratorInternal(tree, schema) {
         });
         tasks.push(vitestTask);
     }
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(tree)) {
         updatePackageJson(tree, schema, projectType);
     }
     if (!schema.skipFormat) {
@@ -151,10 +150,10 @@ function updatePackageJson(tree, options, projectType) {
     }
     else {
         packageJson = {
-            name: (0, get_import_path_1.getImportPath)(tree, options.project),
+            name: (0, internal_1.getImportPath)(tree, options.project),
             version: '0.0.1',
         };
-        if ((0, ts_solution_setup_1.getProjectType)(tree, project.root, projectType) === 'application') {
+        if ((0, internal_1.getProjectType)(tree, project.root, projectType) === 'application') {
             packageJson.private = true;
         }
     }
@@ -173,7 +172,7 @@ function updatePackageJson(tree, options, projectType) {
             generateExportsField: true,
             packageJsonPath,
             format: ['esm'],
-            developmentConditionName: (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree),
+            developmentConditionName: (0, internal_1.getDefinedCustomConditionName)(tree),
         });
     }
     (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);

package/src/generators/configuration/lib/convert-non-vite.js

@@ -4,14 +4,14 @@ exports.convertNonVite = convertNonVite;
 const devkit_1 = require("@nx/devkit");
 const find_vite_config_1 = require("../../../utils/find-vite-config");
 const generator_utils_1 = require("../../../utils/generator-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 async function convertNonVite(tree, schema, projectRoot, _projectType, targets) {
     // Check if it has vite
     const hasViteConfig = (0, find_vite_config_1.findViteConfig)(tree, projectRoot);
     const hasIndexHtmlAtRoot = tree.exists((0, devkit_1.joinPathFragments)(projectRoot, 'index.html'));
     // Check if it has webpack
     const hasWebpackConfig = (0, find_vite_config_1.findWebpackConfig)(tree, projectRoot);
-    const projectType = (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, _projectType);
+    const projectType = (0, internal_1.getProjectType)(tree, projectRoot, _projectType);
     if (hasWebpackConfig) {
         if (projectType === 'application') {
             (0, generator_utils_1.moveAndEditIndexHtml)(tree, schema);

package/src/generators/init/lib/utils.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDependenciesInstalled = checkDependenciesInstalled;
 exports.moveToDevDependencies = moveToDevDependencies;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_1 = require("@nx/js/internal");
 const semver_1 = require("semver");
-const versions_2 = require("../../../utils/versions");
+const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../../utils/version-utils");
 function hasIncompatibleInstalledEsbuild(host) {
     const installedEsbuildVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(host, 'esbuild');
@@ -13,7 +13,7 @@ function hasIncompatibleInstalledEsbuild(host) {
         return false;
     }
     try {
-        return !(0, semver_1.intersects)(installedEsbuildVersion, versions_1.esbuildVersion, {
+        return !(0, semver_1.intersects)(installedEsbuildVersion, internal_1.esbuildVersion, {
             includePrerelease: true,
         });
     }
@@ -35,28 +35,28 @@ async function checkDependenciesInstalled(host, schema) {
             title: 'Installed esbuild is incompatible with Vite 8. Using Vite 7.',
             bodyLines: [
                 `Found esbuild version "${installedEsbuildVersion}" in the workspace root package.json.`,
-                `Update esbuild to a range compatible with ${versions_1.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
+                `Update esbuild to a range compatible with ${internal_1.esbuildVersion} if you want newly generated Vite projects to use Vite 8 by default.`,
             ],
         });
     }
     const viteVersionToInstall = schema.useViteV5
-        ? versions_2.viteV5Version
+        ? versions_1.viteV5Version
         : schema.useViteV6
-            ? versions_2.viteV6Version
+            ? versions_1.viteV6Version
             : schema.useViteV7 ||
                 installedMajor === 7 ||
                 useViteV7ForEsbuildCompatibility
-                ? versions_2.viteV7Version
+                ? versions_1.viteV7Version
                 : installedMajor === 6
-                    ? versions_2.viteV6Version
+                    ? versions_1.viteV6Version
                     : installedMajor === 5
-                        ? versions_2.viteV5Version
-                        : versions_2.viteVersion;
+                        ? versions_1.viteV5Version
+                        : versions_1.viteVersion;
     return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-        '@nx/vite': versions_2.nxVersion,
-        '@nx/web': versions_2.nxVersion,
+        '@nx/vite': versions_1.nxVersion,
+        '@nx/web': versions_1.nxVersion,
         vite: viteVersionToInstall,
-        jiti: versions_2.jitiVersion,
+        jiti: versions_1.jitiVersion,
     }, undefined, schema.keepExistingVersions);
 }
 function moveToDevDependencies(tree) {

package/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js

@@ -119,19 +119,35 @@ function migrateTargetDefaults(tree) {
         return;
     }
     let hasChanges = false;
-    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-        // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
-        if (targetOrExecutor === '@nx/vite:test') {
-            // Move config to new executor key
-            nxJson.targetDefaults['@nx/vitest:test'] ??= {};
-            Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
-            delete nxJson.targetDefaults['@nx/vite:test'];
-            hasChanges = true;
+    if (Array.isArray(nxJson.targetDefaults)) {
+        for (const entry of nxJson.targetDefaults) {
+            // Pattern A: an executor entry for @nx/vite:test
+            if (entry.executor === '@nx/vite:test' && entry.target === undefined) {
+                entry.executor = '@nx/vitest:test';
+                hasChanges = true;
+            }
+            // Pattern B: a target entry whose executor field references @nx/vite:test
+            else if (entry.executor === '@nx/vite:test') {
+                entry.executor = '@nx/vitest:test';
+                hasChanges = true;
+            }
         }
-        // Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
-        else if (targetConfig.executor === '@nx/vite:test') {
-            targetConfig.executor = '@nx/vitest:test';
-            hasChanges = true;
+    }
+    else {
+        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+            // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
+            if (targetOrExecutor === '@nx/vite:test') {
+                // Move config to new executor key
+                nxJson.targetDefaults['@nx/vitest:test'] ??= {};
+                Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
+                delete nxJson.targetDefaults['@nx/vite:test'];
+                hasChanges = true;
+            }
+            // Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
+            else if (targetConfig.executor === '@nx/vite:test') {
+                targetConfig.executor = '@nx/vitest:test';
+                hasChanges = true;
+            }
         }
     }
     if (hasChanges) {

package/src/plugins/plugin.js

@@ -4,9 +4,7 @@ exports.createNodesV2 = exports.createNodes = exports.createDependencies = void
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_2 = require("@nx/js/src/internal");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
@@ -28,7 +26,7 @@ exports.createNodes = [
         const normalizedOptions = normalizeOptions(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
-        const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const isUsingTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const { roots: projectRoots, configFiles: validConfigFiles } = configFilePaths.reduce((acc, configFile) => {
             const potentialRoot = (0, node_path_1.dirname)(configFile);
             if (checkIfConfigFileShouldBeProject(potentialRoot, context)) {
@@ -191,7 +189,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
             ];
         }
     }
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmc);
     return {
         targets,
         metadata,

package/src/utils/e2e-web-server-info-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DAkC3B;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DAsB3B"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/vite/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAMnD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DA+B3B;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,8DAsB3B"}

package/src/utils/e2e-web-server-info-utils.js

@@ -7,13 +7,12 @@ const internal_1 = require("@nx/devkit/internal");
 async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
-    if ((nxJson.targetDefaults?.['dev'] &&
-        nxJson.targetDefaults?.['dev'].options?.port) ||
-        (nxJson.targetDefaults?.['serve'] &&
-            nxJson.targetDefaults?.['serve'].options?.port)) {
-        e2ePort =
-            nxJson.targetDefaults?.['dev'].options?.port ??
-                nxJson.targetDefaults?.['serve'].options?.port;
+    const devPort = (0, internal_1.readTargetDefaultsForTarget)('dev', nxJson.targetDefaults)
+        ?.options?.port;
+    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
+        ?.options?.port;
+    if (devPort || servePort) {
+        e2ePort = devPort ?? servePort;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/vite/plugin',

package/src/utils/executor-utils.js

@@ -4,7 +4,7 @@ exports.validateTypes = validateTypes;
 exports.createBuildableTsConfig = createBuildableTsConfig;
 exports.loadViteDynamicImport = loadViteDynamicImport;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const options_utils_1 = require("./options-utils");
 const node_child_process_1 = require("node:child_process");
 const js_1 = require("@nx/js");
@@ -36,13 +36,13 @@ function createBuildableTsConfig(projectRoot, options, context) {
     const tsConfig = options.tsConfig ?? (0, options_utils_1.getProjectTsConfigPath)(projectRoot);
     options['buildLibsFromSource'] ??= true;
     if (!options['buildLibsFromSource']) {
-        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 
+        const { dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, 
         // When using incremental building and the serve target is called
         // we need to get the deps for the 'build' target instead.
         context.targetName === 'serve' ? 'build' : context.targetName, context.configurationName);
         // This tsconfig is used via the Vite ts paths plugin.
         // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
-        const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
+        const tmpTsConfigPath = (0, internal_1.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
         process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
         return tmpTsConfigPath;
     }

package/src/utils/generator-utils.js

@@ -14,7 +14,7 @@ exports.handleUnsupportedUserProvidedTargets = handleUnsupportedUserProvidedTarg
 exports.handleUnknownConfiguration = handleUnknownConfiguration;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const vite_config_edit_utils_1 = require("./vite-config-edit-utils");
 function findExistingJsBuildTargetInProject(targets) {
     const output = {};
@@ -66,7 +66,7 @@ function findExistingJsBuildTargetInProject(targets) {
 function addBuildTarget(tree, options, target) {
     (0, internal_1.addBuildTargetDefaults)(tree, '@nx/vite:build');
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     const buildOptions = {
         outputPath: isTsSolutionSetup
             ? (0, devkit_1.joinPathFragments)(project.root, 'dist')
@@ -153,7 +153,7 @@ function addPreviewTarget(tree, options, serveTarget) {
 function editTsConfig(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     if (isTsSolutionSetup) {
         tsconfigPath = [
             (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json'),
@@ -244,7 +244,7 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
     const viteConfigPath = vitestFileName
         ? `${projectRoot}/vitest.config.${extension}`
         : `${projectRoot}/vite.config.${extension}`;
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     const buildOutDir = isTsSolutionSetup
         ? './dist'
         : projectRoot === '.'