add support for CJS vite config

pzmosquito · Jun 23, 2023 · 8122440 · 8122440
1 parent a91c0f3
commit 8122440
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -41,7 +41,8 @@ exports.resolve = (source, file, config) => {
             viteConfig = viteConfigFile[pluginConfig.namedExport]
         }
         else {
-            viteConfig = typeof viteConfigFile.default === "function" ? viteConfigFile.default() : viteConfigFile.default;
+            const viteConfigObj = viteConfigFile.default ?? viteConfigFile
+            viteConfig = typeof viteConfigObj === "function" ? viteConfigObj() : viteConfigObj;
         }
 
         const defaultExtensions = [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"];

diff --git a/index.test.js b/index.test.js
@@ -18,8 +18,8 @@ describe("Resolver Plugin Tests", () => {
         expect(result.path).toBe(null);
     });
 
-    test("should resolve non-core module", () => {
-        resolve.sync = jest.fn((source) => "/path/to/resolved.js");
+    test("should resolve non-core module with ESM vite config", () => {
+        resolve.sync = jest.fn(() => "/path/to/resolved.js");
 
         jest.mock("/path/to/vite.config.js", () => ({
             default: {
@@ -29,10 +29,34 @@ describe("Resolver Plugin Tests", () => {
                         "_": "/path/to/src",
                     },
                 },
-            }
+            },
         }), { virtual: true });
 
-        const result = resolver.resolve("_/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
+        // JS module
+        let result = resolver.resolve("_/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
+
+        expect(result.found).toBe(true);
+        expect(result.path).toBe("/path/to/resolved.js");
+        expect(resolve.sync).toHaveBeenCalledWith("/path/to/src/module", {
+            basedir: "/path/to",
+            extensions: [".js"],
+        });
+    });
+
+    test("should resolve non-core module with CJS vite config", () => {
+        resolve.sync = jest.fn(() => "/path/to/resolved.js");
+
+        jest.mock("/path/to/vite.config.js", () => ({
+            resolve: {
+                extensions: [".js"],
+                alias: {
+                    "_": "/path/to/src",
+                },
+            },
+        }), { virtual: true });
+
+        // JS module
+        let result = resolver.resolve("_/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
 
         expect(result.found).toBe(true);
         expect(result.path).toBe("/path/to/resolved.js");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-import-resolver-vite",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Vite module resolution plugin for eslint-plugin-import.",
   "keywords": [
     "eslint",