mirror/vue-cli
1
0
Fork 0
mirror of https://github.com/vuejs/vue-cli.git synced 2026-01-25 08:38:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
closes #4413
This commit is contained in:
Haoqun Jiang
2019-08-15 17:48:48 +08:00
committed by Pavan Kumar Sunkara
parent 94b07fb8b2
commit 348e36eedb
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/@vue/cli-service/lib/commands/build/resolveLibConfig.js
View File

@@ -56,17 +56,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'
@@ -104,6 +93,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
}

15
packages/@vue/cli-service/lib/commands/build/resolveWcConfig.js
View File

@@ -54,13 +54,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(webpack.EnvironmentPlugin, [{
@@ -103,6 +96,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