fix(alita): 修复配置会alita引擎默认配置的bug

areslabs · Dec 11, 2019 · 4847f36 · 4847f36
1 parent 7eea60c
commit 4847f36
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/packByWebpack/index.ts b/src/packByWebpack/index.ts
@@ -74,13 +74,14 @@ export default function packByWebpack() {
     let resolve = null
     if (cco.resolve) {
         resolve = {
+            ...cco.resolve,
+
             alias: {
-                defaultAlias,
+                ...defaultAlias,
                 ...(cco.resolve.alias || {})
             },
-            extensions,
-            mainFields,
-            ...cco.resolve
+            extensions: [...extensions, ...(cco.resolve.extensions || [])],
+            mainFields: [...mainFields, ...(cco.resolve.mainFields || [])]
         }
     } else {
         resolve = {
@@ -106,11 +107,11 @@ export default function packByWebpack() {
     let module = null
     if (cco.module) {
         module = {
+            ...cco.module,
             rules: [
                 ...defaultRules,
                 ...(cco.module.rules || [])
             ],
-            ...cco.module,
         }
     } else {
         module = {