fix: fix cjs issue.

kktjs · Oct 2, 2023 · 202441c · 202441c
1 parent 4c6787b
commit 202441c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/core/src/index.ts b/core/src/index.ts
@@ -11,7 +11,7 @@ import { overridePaths } from 'kkt/lib/overrides/paths';
 import { sync as gzipSize } from 'gzip-size';
 import filesize from 'filesize';
 import './overrides';
-import { filterPlugins, removeLoaders, hasTypeModule } from './utils';
+import { filterPlugins, removeLoaders, solveCjsLoaders, hasTypeModule } from './utils';
 
 function help() {
   const { version } = require('../package.json');
@@ -220,6 +220,8 @@ process.on('exit', (code) => {
       conf = filterPlugins(conf, argvs.minify, isWeb ? fileName : null);
       if (isWeb) {
         conf = removeLoaders(conf);
+      } else {
+        conf = solveCjsLoaders(conf);
       }
       conf.entry = inputFile;
       if (argvs.sourceMap) {

diff --git a/core/src/utils.ts b/core/src/utils.ts
@@ -61,6 +61,29 @@ export function removeLoaders(conf: WebpackConfiguration) {
   return conf;
 }
 
+/** Solve cjs issue */
+export function solveCjsLoaders(conf: WebpackConfiguration) {
+  conf.module.rules = conf.module.rules.map((rule) => {
+    if (typeof rule === 'object' && rule.oneOf) {
+      rule.oneOf = rule.oneOf
+        .map((item) =>
+          item &&
+          item.exclude &&
+          /@babel(?:\/|\\{1,2})runtime/.toString() === item.exclude.toString() &&
+          item.test.toString() === /\.(js|mjs)$/.toString()
+            ? {
+                ...item,
+                test: /\.(js|cjs|mjs)$/,
+              }
+            : item,
+        )
+        .filter(Boolean);
+    }
+    return rule;
+  });
+  return conf;
+}
+
 export function hasTypeModule(path: string) {
   while (path !== (path = PATH.resolve(path, '..'))) {
     try {

diff --git a/examples/bundle/package.json b/examples/bundle/package.json
@@ -24,11 +24,11 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@kkt/less-modules": "^7.4.9",
+    "@kkt/less-modules": "^7.5.3",
     "@kkt/ncc": "^1.0.15",
-    "@types/react": "^18.0.31",
-    "@types/react-dom": "^18.0.11",
-    "kkt": "^7.4.9"
+    "@types/react": "^18.2.24",
+    "@types/react-dom": "^18.2.8",
+    "kkt": "^7.5.3"
   },
   "eslintConfig": {
     "extends": [