fix(vite): PCV3 Plugin update to use resolveConfig

nrwl · Jan 24, 2024 · d785db0 · d785db0
1 parent 096cefb
commit d785db0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 29 deletions.
diff --git a/packages/vite/src/plugins/__snapshots__/plugin-with-test.spec.ts.snap b/packages/vite/src/plugins/__snapshots__/plugin-with-test.spec.ts.snap
@@ -46,25 +46,6 @@ exports[`@nx/vite/plugin with test node root project should create nodes - with
             "buildTarget": "build",
           },
         },
-        "test": {
-          "cache": true,
-          "command": "vitest run",
-          "inputs": [
-            "default",
-            "^production",
-            {
-              "externalDependencies": [
-                "vitest",
-              ],
-            },
-          ],
-          "options": {
-            "cwd": ".",
-          },
-          "outputs": [
-            "{projectRoot}/coverage",
-          ],
-        },
       },
     },
   },

diff --git a/packages/vite/src/plugins/plugin-vitest.spec.ts b/packages/vite/src/plugins/plugin-vitest.spec.ts
@@ -2,7 +2,7 @@ import { CreateNodesContext } from '@nx/devkit';
 import { createNodes } from './plugin';
 
 jest.mock('vite', () => ({
-  loadConfigFromFile: jest.fn().mockImplementation(() => {
+  resolveConfig: jest.fn().mockImplementation(() => {
     return Promise.resolve({
       path: 'vitest.config.ts',
       config: {},
@@ -13,7 +13,7 @@ jest.mock('vite', () => ({
 
 jest.mock('../utils/executor-utils', () => ({
   loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
+    resolveConfig: jest.fn().mockResolvedValue({
       path: 'vitest.config.ts',
       config: {},
       dependencies: [],

diff --git a/packages/vite/src/plugins/plugin-with-test.spec.ts b/packages/vite/src/plugins/plugin-with-test.spec.ts
@@ -2,7 +2,7 @@ import { CreateNodesContext } from '@nx/devkit';
 import { createNodes } from './plugin';
 
 jest.mock('vite', () => ({
-  loadConfigFromFile: jest.fn().mockImplementation(() => {
+  resolveConfig: jest.fn().mockImplementation(() => {
     return Promise.resolve({
       path: 'vite.config.ts',
       config: {
@@ -17,7 +17,7 @@ jest.mock('vite', () => ({
 
 jest.mock('../utils/executor-utils', () => ({
   loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
+    resolveConfig: jest.fn().mockResolvedValue({
       path: 'vite.config.ts',
       config: {
         test: {

diff --git a/packages/vite/src/plugins/plugin.spec.ts b/packages/vite/src/plugins/plugin.spec.ts
@@ -14,7 +14,7 @@ jest.mock('vite', () => ({
 
 jest.mock('../utils/executor-utils', () => ({
   loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
+    resolveConfig: jest.fn().mockResolvedValue({
       path: 'vite.config.ts',
       config: {},
       dependencies: [],

diff --git a/packages/vite/src/plugins/plugin.ts b/packages/vite/src/plugins/plugin.ts
@@ -92,17 +92,23 @@ async function buildViteTargets(
   options: VitePluginOptions,
   context: CreateNodesContext
 ) {
-  const { loadConfigFromFile } = await loadViteDynamicImport();
-  const viteConfig = await loadConfigFromFile(
+  const remappedProjectRoot = projectRoot === '.' ? '' : projectRoot;
+  const absoluteConfigFilePath = joinPathFragments(
+    context.workspaceRoot,
+    remappedProjectRoot,
+    configFilePath
+  );
+  const { resolveConfig } = await loadViteDynamicImport();
+  const viteConfig = await resolveConfig(
     {
-      command: 'build',
+      configFile: absoluteConfigFilePath,
       mode: 'production',
     },
-    configFilePath
+    'build'
   );
 
   const { buildOutputs, testOutputs, hasTest } = getOutputs(
-    viteConfig?.config,
+    viteConfig,
     projectRoot
   );