fix(vite): PCV3 Plugin update to use resolveConfig

nrwl · Jan 23, 2024 · 1e99127 · 1e99127
1 parent 096cefb
commit 1e99127
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 62 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: {},
@@ -11,16 +11,6 @@ jest.mock('vite', () => ({
   }),
 }));
 
-jest.mock('../utils/executor-utils', () => ({
-  loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
-      path: 'vitest.config.ts',
-      config: {},
-      dependencies: [],
-    }),
-  }),
-}));
-
 describe('@nx/vite/plugin', () => {
   let createNodesFunction = createNodes[1];
   let context: CreateNodesContext;

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: {
@@ -15,20 +15,6 @@ jest.mock('vite', () => ({
   }),
 }));
 
-jest.mock('../utils/executor-utils', () => ({
-  loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
-      path: 'vite.config.ts',
-      config: {
-        test: {
-          some: 'option',
-        },
-      },
-      dependencies: [],
-    }),
-  }),
-}));
-
 describe('@nx/vite/plugin with test node', () => {
   let createNodesFunction = createNodes[1];
   let context: CreateNodesContext;

diff --git a/packages/vite/src/plugins/plugin.spec.ts b/packages/vite/src/plugins/plugin.spec.ts
@@ -3,7 +3,7 @@ import { createNodes } from './plugin';
 import { TempFs } from 'nx/src/internal-testing-utils/temp-fs';
 
 jest.mock('vite', () => ({
-  loadConfigFromFile: jest.fn().mockImplementation(() => {
+  resolveConfig: jest.fn().mockImplementation(() => {
     return Promise.resolve({
       path: 'vite.config.ts',
       config: {},
@@ -12,16 +12,6 @@ jest.mock('vite', () => ({
   }),
 }));
 
-jest.mock('../utils/executor-utils', () => ({
-  loadViteDynamicImport: jest.fn().mockResolvedValue({
-    loadConfigFromFile: jest.fn().mockResolvedValue({
-      path: 'vite.config.ts',
-      config: {},
-      dependencies: [],
-    }),
-  }),
-}));
-
 describe('@nx/vite/plugin', () => {
   let createNodesFunction = createNodes[1];
   let context: CreateNodesContext;

diff --git a/packages/vite/src/plugins/plugin.ts b/packages/vite/src/plugins/plugin.ts
@@ -15,7 +15,7 @@ import { existsSync, readdirSync } from 'fs';
 import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes';
 import { projectGraphCacheDirectory } from 'nx/src/utils/cache-directory';
 import { getLockFileName } from '@nx/js';
-import { loadViteDynamicImport } from '../utils/executor-utils';
+import { resolveConfig } from 'vite';
 
 export interface VitePluginOptions {
   buildTargetName?: string;
@@ -92,17 +92,16 @@ async function buildViteTargets(
   options: VitePluginOptions,
   context: CreateNodesContext
 ) {
-  const { loadConfigFromFile } = await loadViteDynamicImport();
-  const viteConfig = await loadConfigFromFile(
+  const viteConfig = await resolveConfig(
     {
-      command: 'build',
+      configFile: configFilePath,
       mode: 'production',
     },
-    configFilePath
+    'build'
   );
 
   const { buildOutputs, testOutputs, hasTest } = getOutputs(
-    viteConfig?.config,
+    viteConfig,
     projectRoot
   );