diff --git a/packages/babel-preset-app/src/index.js b/packages/babel-preset-app/src/index.js index 3a1f7d3406da..76df87fd56bf 100644 --- a/packages/babel-preset-app/src/index.js +++ b/packages/babel-preset-app/src/index.js @@ -97,12 +97,7 @@ module.exports = (api, options = {}) => { modern: { esmodules: true } } - let { targets = defaultTargets[envName] } = options - - // modern mode can only be { esmodules: true } - if (envName === 'modern') { - targets = defaultTargets.modern - } + const { targets = defaultTargets[envName] } = options const polyfills = [] diff --git a/packages/config/src/config/build.js b/packages/config/src/config/build.js index 739ca30b1fa8..02df903af138 100644 --- a/packages/config/src/config/build.js +++ b/packages/config/src/config/build.js @@ -14,12 +14,12 @@ export default () => ({ serverURLPolyfill: 'url', filenames: { // { isDev, isClient, isServer } - app: ({ isDev, isModern }) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`, - chunk: ({ isDev, isModern }) => isDev ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`, - css: ({ isDev }) => isDev ? '[name].css' : 'css/[contenthash:7].css', - img: ({ isDev }) => isDev ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]', - font: ({ isDev }) => isDev ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]', - video: ({ isDev }) => isDev ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]' + app: ({ isDev, isModern }) => true ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`, + chunk: ({ isDev, isModern }) => true ? `[name]${isModern ? '.modern' : ''}.js` : `[contenthash:7]${isModern ? '.modern' : ''}.js`, + css: ({ isDev }) => true ? '[name].css' : 'css/[contenthash:7].css', + img: ({ isDev }) => true ? '[path][name].[ext]' : 'img/[name].[contenthash:7].[ext]', + font: ({ isDev }) => true ? '[path][name].[ext]' : 'fonts/[name].[contenthash:7].[ext]', + video: ({ isDev }) => true ? '[path][name].[ext]' : 'videos/[name].[contenthash:7].[ext]' }, loaders: { file: { esModule: false }, diff --git a/packages/vue-app/template/router.js b/packages/vue-app/template/router.js index 6c3d6a50f0f3..b83db128c7e3 100644 --- a/packages/vue-app/template/router.js +++ b/packages/vue-app/template/router.js @@ -77,7 +77,7 @@ const _routes = recursiveRoutes(router.routes, ' ', _components, 1) const name = route._name if (splitChunks.pages) { - return `const ${name} = () => interopDefault(import('${path}' /* webpackChunkName: "${chunkName}" */))` + return `const ${name} = () => interopDefault(import('${path}' /* webpackChunkName: "${chunkName}", webpackPreload: true */))` } else { return `import ${name} from '${path}'` } diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js index 73d35b6df528..12b4abee696b 100644 --- a/packages/webpack/src/config/base.js +++ b/packages/webpack/src/config/base.js @@ -215,7 +215,7 @@ export default class WebpackBaseConfig { optimization () { const optimization = cloneDeep(this.buildContext.buildOptions.optimization) - + optimization.minimize = false if (optimization.minimize && optimization.minimizer === undefined) { optimization.minimizer = this.minimizer() }