fix: merge custom externals config correctly, supports array (#4429)

closes #4413 (cherry picked from commit 348e36e)
vuejs · Aug 21, 2019 · e79133b · e79133b
1 parent a0e8a6a
commit e79133b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/packages/@vue/cli-service/lib/commands/build/resolveLibConfig.js b/packages/@vue/cli-service/lib/commands/build/resolveLibConfig.js
@@ -53,17 +53,6 @@ module.exports = (api, { entry, name, formats, filename }, options) => {
       config.optimization.minimize(false)
     }
 
-    // externalize Vue in case user imports it
-    config
-      .externals({
-        ...config.get('externals'),
-        vue: {
-          commonjs: 'vue',
-          commonjs2: 'vue',
-          root: 'Vue'
-        }
-      })
-
     // inject demo page for umd
     if (genHTML) {
       const template = isVueEntry ? 'demo-lib.html' : 'demo-lib-js.html'
@@ -101,6 +90,18 @@ module.exports = (api, { entry, name, formats, filename }, options) => {
       }
     }
 
+    // externalize Vue in case user imports it
+    rawConfig.externals = [
+      ...(Array.isArray(rawConfig.externals) ? rawConfig.externals : [rawConfig.externals]),
+      {
+        vue: {
+          commonjs: 'vue',
+          commonjs2: 'vue',
+          root: 'Vue'
+        }
+      }
+    ].filter(Boolean)
+
     rawConfig.entry = {
       [entryName]: realEntry
     }

diff --git a/packages/@vue/cli-service/lib/commands/build/resolveWcConfig.js b/packages/@vue/cli-service/lib/commands/build/resolveWcConfig.js
@@ -53,13 +53,6 @@ module.exports = (api, { target, entry, name }) => {
       config.optimization.minimize(false)
     }
 
-    // externalize Vue in case user imports it
-    config
-      .externals({
-        ...config.get('externals'),
-        vue: 'Vue'
-      })
-
     config
       .plugin('web-component-options')
         .use(require('webpack/lib/DefinePlugin'), [{
@@ -104,6 +97,14 @@ module.exports = (api, { target, entry, name }) => {
 
     const rawConfig = api.resolveWebpackConfig(config)
 
+    // externalize Vue in case user imports it
+    rawConfig.externals = [
+      ...(Array.isArray(rawConfig.externals) ? rawConfig.externals : [rawConfig.externals]),
+      {
+        vue: 'Vue'
+      }
+    ].filter(Boolean)
+
     const entryName = `${libName}${minify ? `.min` : ``}`
     rawConfig.entry = {
       [entryName]: dynamicEntry