Merge remote-tracking branch 'upstream/dev' into feat/esm

appveyor.yml

@@ -22,7 +22,7 @@ test_script:
   - npm --version
   - yarn --version
   # run tests
-  - yarn test-appveyor
+  - yarn test
 
 # Don't actually build.
 build: off

lib/builder/webpack/client.config.mjs

@@ -17,8 +17,6 @@ import VueSSRClientPlugin from './plugins/vue/client'
 const debug = Debug('nuxt:build')
 debug.color = 2 // Force green color
 
-const isWindows = /^win/.test(process.platform)
-
 /*
 |--------------------------------------------------------------------------
 | Webpack Client Config
@@ -94,7 +92,7 @@ export default function webpackClientConfig() {
   config.optimization.splitChunks = {
     chunks: 'all',
     // TODO: remove spa after https://github.com/jantimon/html-webpack-plugin/issues/878 solved
-    name: this.options.dev || (this.options.mode === 'spa' && isWindows),
+    name: this.options.dev || this.options.mode === 'spa',
 
     // Explicit cache groups
     cacheGroups: {
@@ -131,7 +129,7 @@ export default function webpackClientConfig() {
   }
 
   // Create additional runtime chunk for cache boosting
-  config.optimization.runtimeChunk = true
+  // config.optimization.runtimeChunk = true
 
   // CSS extraction
   const extractCSS = this.options.build.extractCSS

package.json

@@ -46,8 +46,7 @@
     ]
   },
   "scripts": {
-    "test": "npm run lint && nyc ava --fail-fast -v -T 60000 test/ -- && nyc report --reporter=html",
-    "test-appveyor": "yarn test",
+    "test": "npm run lint && nyc ava -v test -- && nyc report --reporter=html",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
     "lint": "eslint --ext .js,.mjs,.vue bin/* build/ lib/ test/ examples/",
     "precommit": "npm run lint",