From 784be1941e131b1e99a68d8b85a2a1ea1877893d Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 30 Nov 2020 14:42:35 +0800 Subject: [PATCH 1/2] fix(mocha): disable SSR optimization for Vue 3 testing --- packages/@vue/cli-plugin-unit-mocha/index.js | 20 +++++++++++--------- packages/@vue/cli-service/package.json | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/@vue/cli-plugin-unit-mocha/index.js b/packages/@vue/cli-plugin-unit-mocha/index.js index cfdec0aa5f..69b3e6e535 100644 --- a/packages/@vue/cli-plugin-unit-mocha/index.js +++ b/packages/@vue/cli-plugin-unit-mocha/index.js @@ -12,16 +12,18 @@ module.exports = api => { // when target === 'node', vue-loader will attempt to generate // SSR-optimized code. We need to turn that off here. - // the `optimizeSSR` option is only available in vue-loader 15 - if (!isVue3) { - webpackConfig.module - .rule('vue') - .use('vue-loader') - .tap(options => { + webpackConfig.module + .rule('vue') + .use('vue-loader') + .tap(options => { + if (isVue3) { + options.isServerBuild = false + } else { options.optimizeSSR = false - return options - }) - } + } + + return options + }) } }) diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json index b684006bd9..ceed3338ca 100644 --- a/packages/@vue/cli-service/package.json +++ b/packages/@vue/cli-service/package.json @@ -72,7 +72,7 @@ "thread-loader": "^3.0.0", "url-loader": "^4.1.1", "vue-loader": "^15.9.2", - "vue-loader-v16": "npm:vue-loader@^16.0.0-beta.7", + "vue-loader-v16": "npm:vue-loader@^16.1.0", "vue-style-loader": "^4.1.2", "webpack": "^4.0.0", "webpack-bundle-analyzer": "^3.8.0", From 13d219a1dcf484019ba4faa5b16b19b28f72826a Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 30 Nov 2020 15:17:59 +0800 Subject: [PATCH 2/2] chore: better indentation [skip ci] --- packages/@vue/cli-plugin-unit-mocha/index.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/@vue/cli-plugin-unit-mocha/index.js b/packages/@vue/cli-plugin-unit-mocha/index.js index 69b3e6e535..ad1975a684 100644 --- a/packages/@vue/cli-plugin-unit-mocha/index.js +++ b/packages/@vue/cli-plugin-unit-mocha/index.js @@ -13,17 +13,17 @@ module.exports = api => { // when target === 'node', vue-loader will attempt to generate // SSR-optimized code. We need to turn that off here. webpackConfig.module - .rule('vue') - .use('vue-loader') - .tap(options => { - if (isVue3) { - options.isServerBuild = false - } else { - options.optimizeSSR = false - } + .rule('vue') + .use('vue-loader') + .tap(options => { + if (isVue3) { + options.isServerBuild = false + } else { + options.optimizeSSR = false + } - return options - }) + return options + }) } })