From 9ebe23b7562d76665fb11a5d3dca808cb7232c1c Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Fri, 15 Jan 2021 17:00:42 +0800 Subject: [PATCH] fix(unit-mocha): shouldn't require webpack-4 plugin with cli-service v4 Note this plugin is compatible with cli-service v4, therefore users can upgrade to it separately for mocha major version upgrades --- packages/@vue/cli-plugin-unit-mocha/generator/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-plugin-unit-mocha/generator/index.js b/packages/@vue/cli-plugin-unit-mocha/generator/index.js index 7dfc5b6123..d00bf954ac 100644 --- a/packages/@vue/cli-plugin-unit-mocha/generator/index.js +++ b/packages/@vue/cli-plugin-unit-mocha/generator/index.js @@ -1,3 +1,4 @@ +/** @type {import('@vue/cli').GeneratorPlugin} */ module.exports = (api, options, rootOptions, invoking) => { const isVue3 = rootOptions && rootOptions.vueVersion === '3' @@ -7,8 +8,12 @@ module.exports = (api, options, rootOptions, invoking) => { hasRouter: api.hasPlugin('router') }) - // mochapack currently does not support webpack 5 yet - require('@vue/cli-plugin-webpack-4/generator')(api, {}, rootOptions, invoking) + const { semver } = require('@vue/cli-shared-utils') + const cliServiceVersion = require('@vue/cli-service/package.json').version + if (semver.gte(cliServiceVersion, '5.0.0-0')) { + // mochapack currently does not support webpack 5 yet + require('@vue/cli-plugin-webpack-4/generator')(api, {}, rootOptions, invoking) + } api.extendPackage({ devDependencies: {