mirror/vue-cli
1
0
Fork 0
mirror of https://github.com/vuejs/vue-cli.git synced 2026-05-03 18:40:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(invoke): deep merge only plain objects

Browse Source
This commit is contained in:
Guillaume Chau
2018-06-18 10:29:33 +02:00
parent 35cb714b30
commit a7f3c2cc45
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/@vue/cli/lib/util/configTransforms.js
+11 -1
View File
@@ -3,6 +3,8 @@ const stringifyJS = require('./stringifyJS')
const { loadModule } = require('./module')
const merge = require('deepmerge')
const isObject = val => val && typeof val === 'object'
function makeJSTransform (filename) {
return function transformToJS (value, checkExisting, files, context) {
if (checkExisting && files[filename]) {
@@ -12,7 +14,15 @@ function makeJSTransform (filename) {
const originalData = loadModule(filename, context, true)
// We merge only the modified keys
Object.keys(value).forEach(key => {
changedData[key] = merge(originalData[key], value[key])
const originalValue = originalData[key]
const newValue = value[key]
if (Array.isArray(newValue)) {
changedData[key] = newValue
} else if (isObject(originalValue) && isObject(newValue)) {
changedData[key] = merge(originalValue, newValue)
} else {
changedData[key] = newValue
}
})
} catch (e) {
changedData = value