Merge branch 'develop'

Former-commit-id: 2d8557830a7f92608ad7a4465891e36882461b35 [formerly 2d8557830a7f92608ad7a4465891e36882461b35 [formerly 2d8557830a7f92608ad7a4465891e36882461b35 [formerly 2d8557830a7f92608ad7a4465891e36882461b35 [formerly 59a9e4ec35e19671c92ee2feec48884aabee74fa [formerly 69a839d327f0944bf04c5736e1e6df46a4d2f899]]]]]
Former-commit-id: ab2591b998bb8a6d98b7ddc08cbdf4b69adae332
Former-commit-id: f0535fbb0fae596006b54d68d1ecbd67b668e91e
Former-commit-id: d5d853b99048ad6843db7e431feb6336c4418c05 [formerly cab26e71532eef71180d9bbbf0a5d4dd43b19bdf]
Former-commit-id: 21d0a5b1adc5bc8930913222e45021f43dea8701
Former-commit-id: 30b67917463435fd344d934a1d001a032bcbca5a
Former-commit-id: bc27e3d9ae74b6dfc361e6e2c317f0d7bceccb31
Former-commit-id: bb47e30bb2cb1596198fc1413ed53f269f1687bc
Former-commit-id: 473cb8f3d06885d65c84cc44a0b94b9deb90f6a6
This commit is contained in:
liyang
2019-01-17 11:09:49 +08:00

View File

@@ -103,9 +103,8 @@ module.exports = {
config.node config.node
.set('__dirname', true) .set('__dirname', true)
.set('__filename', true) .set('__filename', true)
// babel-polyfill 加入 entry
const entry = config.entry('app')
// 判断环境加入模拟数据 // 判断环境加入模拟数据
const entry = config.entry('app')
if (process.env.VUE_APP_BUILD_MODE !== 'nomock') { if (process.env.VUE_APP_BUILD_MODE !== 'nomock') {
entry entry
.add('@/mock') .add('@/mock')