fix(babel-preset-app): respect explicit options.targets for modern pr…

…eset
nuxt · May 26, 2021 · 95e255a · 95e255a
1 parent b116d0d
commit 95e255a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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()
     }