chore: test clean cache

packages/core/src/config/__tests__/config-resolvers.test.ts

@@ -1,5 +1,4 @@
 import path from 'node:path';
-import { after } from 'node:test';
 import { fileURLToPath } from 'node:url';
 import util from 'node:util';
 
@@ -10,13 +9,27 @@
 import recommended from '../recommended.js';
 import type { RawUniversalConfig, RawGovernanceConfig } from '../types.js';
 
-vi.mock('node:module', () => ({
-  default: {
-    createRequire: () => ({
-      resolve: (path: string) => `/mock/path/${path}`,
-    }),
-  },
-}));
+vi.mock('node:module', async (importOriginal) => {
+  const { default: nodeModule } = await importOriginal<typeof import('node:module')>();
+  return {
+    default: {
+      ...nodeModule,
+      createRequire(baseUrl: string) {
+        const req = nodeModule.createRequire(baseUrl);
+        return {
+          ...req,
+          resolve: (id: string, opts?: any) => {
+            try {
+              return req.resolve(id, opts);
+            } catch {
+              return `/mock/path/${id}`;
+            }
+          },
+        };
+      },
+    },
+  };
+});
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -638,28 +651,21 @@
   });
 
   it('should work with npm dependencies', async () => {
-    after(() => {
-      (globalThis as any).__webpack_require__ = undefined;
-      (globalThis as any).__non_webpack_require__ = undefined;
-    });
-
-    (globalThis as any).__webpack_require__ = () => {};
-    (globalThis as any).__non_webpack_require__ = (p: string) =>
-      p === '/mock/path/test-plugin'
-        ? {
-            id: 'npm-test-plugin',
-          }
-        : {
-            id: 'local-test-plugin',
-          };
+    vi.doMock('/mock/path/test-plugin', () => ({ default: { id: 'npm-test-plugin' } }));
+    vi.doMock('/mock/path/fixtures/plugin.cjs', () => ({ default: { id: 'local-test-plugin' } }));
 
-    const { resolvedConfig } = await resolveConfig({
-      rawConfigDocument: makeDocument(
-        { plugins: ['test-plugin', 'fixtures/plugin.cjs'] },
-        configPath
-      ),
-    });
-    expect(resolvedConfig.plugins).toEqual(['test-plugin', 'fixtures/plugin.cjs']);
+    try {
+      const { resolvedConfig } = await resolveConfig({
+        rawConfigDocument: makeDocument(
+          { plugins: ['test-plugin', 'fixtures/plugin.cjs'] },
+          configPath
+        ),
+      });
+      expect(resolvedConfig.plugins).toEqual(['test-plugin', 'fixtures/plugin.cjs']);
+    } finally {
+      vi.doUnmock('/mock/path/test-plugin');
+      vi.doUnmock('/mock/path/fixtures/plugin.cjs');
+    }
   });
 
   it('should work with nested schema', async () => {

packages/core/src/config/config-resolvers.ts

@@ -40,6 +40,12 @@ import {
 
 // Cache instantiated plugins during a single execution
 const pluginsCache: Map<string, Plugin[]> = new Map();
+let pluginsCacheVersion = 0;
+
+export const clearPluginsCache = (): void => {
+  pluginsCache.clear();
+  pluginsCacheVersion++;
+};
 
 export type PluginResolveInfo = {
   absolutePath: string;
@@ -215,18 +221,11 @@ export async function resolvePlugins(
           ).absolutePath;
 
       if (!pluginsCache.has(absolutePluginPath)) {
-        let requiredPlugin: ImportedPlugin | undefined;
-
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore FIXME: investigate if we still need this (2.0)
-        if (typeof __webpack_require__ === 'function') {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore FIXME: investigate if we still need this (2.0)
-          requiredPlugin = __non_webpack_require__(absolutePluginPath);
-        } else {
-          const mod = await import(url.pathToFileURL(absolutePluginPath).pathname);
-          requiredPlugin = mod.default || mod;
-        }
+        const pluginUrl = url.pathToFileURL(absolutePluginPath).pathname;
+        const mod = await import(
+          pluginsCacheVersion ? `${pluginUrl}?v=${pluginsCacheVersion}` : pluginUrl
+        );
+        const requiredPlugin: ImportedPlugin | undefined = mod.default || mod;
 
         const pluginCreatorOptions = { contentDir: configDir };
 

packages/core/src/index.ts

@@ -31,6 +31,7 @@ export {
   createConfig,
   findConfig,
   resolvePlugins,
+  clearPluginsCache,
   ConfigValidationError,
   Config, // FIXME: export it as a type
   type RawUniversalConfig,