@nx/vite 23.3.0-beta.5 → 23.3.0-beta.6

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

@@ -21,6 +21,7 @@ const nx_vite_build_coordination_plugin_1 = require("./nx-vite-build-coordinatio
 function nxViteTsPaths(options = {}) {
     (0, deprecation_1.warnNxViteTsPathsDeprecation)();
     let foundTsConfigPath;
+    let tsConfigPathsLoaded = false;
     let matchTsPathEsm;
     let matchTsPathEsmExact;
     let matchTsPathFallback;
@@ -55,6 +56,7 @@ function nxViteTsPaths(options = {}) {
         async configResolved(config) {
             projectRoot = config.root;
             projectRootFromWorkspaceRoot = (0, node_path_1.relative)(devkit_1.workspaceRoot, projectRoot);
+            tsConfigPathsLoaded = false;
             foundTsConfigPath = getTsConfig(process.env.NX_TSCONFIG_PATH ??
                 (0, node_path_1.join)(devkit_1.workspaceRoot, 'tmp', projectRootFromWorkspaceRoot, process.env.NX_TASK_TARGET_TARGET ?? 'build', 'tsconfig.generated.json'));
             if (!foundTsConfigPath)
@@ -91,34 +93,10 @@ function nxViteTsPaths(options = {}) {
                     }
                 }
             }
-            const parsed = (0, tsconfig_paths_1.loadConfig)(foundTsConfigPath);
-            logIt('first parsed tsconfig: ', parsed);
-            if (parsed.resultType === 'failed') {
-                throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
-            }
-            // `loadConfig` derives `absoluteBaseUrl` from the leaf tsconfig, but
-            // `paths` resolve against the config that declared them.
-            const pathsBaseUrl = (0, js_1.resolvePathsBaseUrl)(foundTsConfigPath);
-            tsConfigPathsEsm = { ...parsed, absoluteBaseUrl: pathsBaseUrl };
-            matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)(pathsBaseUrl, parsed.paths, options.mainFields);
-            matchTsPathEsmExact = createExactMatchPath(pathsBaseUrl, parsed.paths, options.mainFields);
-            const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
-            // A workspace may have no root-level tsconfig at all. Passing no path to
-            // `loadConfig` makes it search upwards from the cwd instead, which finds
-            // an unrelated tsconfig whose directory is not this workspace.
-            if (rootLevelTsConfig) {
-                const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
-                logIt('fallback parsed tsconfig: ', rootLevelParsed);
-                if (rootLevelParsed.resultType === 'success') {
-                    const rootLevelPathsBaseUrl = (0, js_1.resolvePathsBaseUrl)(rootLevelTsConfig);
-                    tsConfigPathsFallback = {
-                        ...rootLevelParsed,
-                        absoluteBaseUrl: rootLevelPathsBaseUrl,
-                    };
-                    matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)(rootLevelPathsBaseUrl, rootLevelParsed.paths, ['main', 'module']);
-                    matchTsPathFallbackExact = createExactMatchPath(rootLevelPathsBaseUrl, rootLevelParsed.paths, ['main', 'module']);
-                }
-            }
+            // Graph construction resolves every config and never a module, so the
+            // parsing waits for the first `resolveId` there.
+            if (!global.NX_GRAPH_CREATION)
+                loadTsConfigPaths();
         },
         resolveId(importPath) {
             // Let other resolvers handle this path.
@@ -130,6 +108,8 @@ function nxViteTsPaths(options = {}) {
             // by tsconfig path mapping (which would incorrectly use baseUrl).
             if (importPath.startsWith('/'))
                 return null;
+            if (!tsConfigPathsLoaded)
+                loadTsConfigPaths();
             let resolvedFile;
             try {
                 resolvedFile =
@@ -179,6 +159,37 @@ function nxViteTsPaths(options = {}) {
             }
         },
     };
+    function loadTsConfigPaths() {
+        const parsed = (0, tsconfig_paths_1.loadConfig)(foundTsConfigPath);
+        logIt('first parsed tsconfig: ', parsed);
+        if (parsed.resultType === 'failed') {
+            throw new Error(`Failed loading tsconfig at ${foundTsConfigPath}`);
+        }
+        // `loadConfig` derives `absoluteBaseUrl` from the leaf tsconfig, but
+        // `paths` resolve against the config that declared them.
+        const pathsBaseUrl = (0, js_1.resolvePathsBaseUrl)(foundTsConfigPath);
+        tsConfigPathsEsm = { ...parsed, absoluteBaseUrl: pathsBaseUrl };
+        matchTsPathEsm = (0, tsconfig_paths_1.createMatchPath)(pathsBaseUrl, parsed.paths, options.mainFields);
+        matchTsPathEsmExact = createExactMatchPath(pathsBaseUrl, parsed.paths, options.mainFields);
+        const rootLevelTsConfig = getTsConfig((0, node_path_1.join)(devkit_1.workspaceRoot, 'tsconfig.base.json'));
+        // A workspace may have no root-level tsconfig at all. Passing no path to
+        // `loadConfig` makes it search upwards from the cwd instead, which finds
+        // an unrelated tsconfig whose directory is not this workspace.
+        if (rootLevelTsConfig) {
+            const rootLevelParsed = (0, tsconfig_paths_1.loadConfig)(rootLevelTsConfig);
+            logIt('fallback parsed tsconfig: ', rootLevelParsed);
+            if (rootLevelParsed.resultType === 'success') {
+                const rootLevelPathsBaseUrl = (0, js_1.resolvePathsBaseUrl)(rootLevelTsConfig);
+                tsConfigPathsFallback = {
+                    ...rootLevelParsed,
+                    absoluteBaseUrl: rootLevelPathsBaseUrl,
+                };
+                matchTsPathFallback = (0, tsconfig_paths_1.createMatchPath)(rootLevelPathsBaseUrl, rootLevelParsed.paths, ['main', 'module']);
+                matchTsPathFallbackExact = createExactMatchPath(rootLevelPathsBaseUrl, rootLevelParsed.paths, ['main', 'module']);
+            }
+        }
+        tsConfigPathsLoaded = true;
+    }
     function getTsConfig(preferredTsConfigPath) {
         const projectTsConfigPath = (0, options_utils_1.getProjectTsConfigPath)(projectRootFromWorkspaceRoot);
         return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.3.0-beta.5",
+  "version": "23.3.0-beta.6",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -94,10 +94,10 @@
     "supportsOptionalMigrations": true
   },
   "dependencies": {
-    "@nx/devkit": "23.3.0-beta.5",
+    "@nx/devkit": "23.3.0-beta.6",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/js": "23.3.0-beta.5",
-    "@nx/vitest": "23.3.0-beta.5",
+    "@nx/js": "23.3.0-beta.6",
+    "@nx/vitest": "23.3.0-beta.6",
     "picomatch": "4.0.4",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
@@ -105,8 +105,8 @@
     "ajv": "^8.0.0"
   },
   "devDependencies": {
-    "@nx/eslint": "23.3.0-beta.5",
-    "nx": "23.3.0-beta.5"
+    "@nx/eslint": "23.3.0-beta.6",
+    "nx": "23.3.0-beta.6"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"