提交 26271d66 编写于 作者: fxy060608's avatar fxy060608

fix(cli): compatible with @vue/cli-plugin-babel@4.2.3 (remove cache-loader) #1394

上级 72f778f5
...@@ -137,15 +137,16 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt ...@@ -137,15 +137,16 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
} }
} }
} }
const babelLoaderRe = /^babel-loader|(\/|\\)babel-loader/
const cacheLoaderRe = /^cache-loader|(\/|\\)cache-loader/
return function (webpackConfig) { return function (webpackConfig) {
// disable js cache-loader // disable js cache-loader
const rawRules = webpackConfig.module.rules const rawRules = webpackConfig.module.rules
for (let i = rawRules.length - 1; i >= 0; i--) { for (let i = rawRules.length - 1; i >= 0; i--) {
const uses = rawRules[i].use const uses = rawRules[i].use
if (Array.isArray(uses)) { if (Array.isArray(uses)) {
if (uses.find(use => use.loader === 'babel-loader')) { if (uses.find(use => babelLoaderRe.test(use.loader))) {
const index = uses.findIndex(use => use.loader === 'cache-loader') const index = uses.findIndex(use => cacheLoaderRe.test(use.loader))
if (process.env.UNI_USING_CACHE) { if (process.env.UNI_USING_CACHE) {
Object.assign(uses[index].options, api.genCacheConfig( Object.assign(uses[index].options, api.genCacheConfig(
'babel-loader/' + process.env.UNI_PLATFORM, 'babel-loader/' + process.env.UNI_PLATFORM,
...@@ -159,7 +160,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt ...@@ -159,7 +160,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
} }
// js preprocess // js preprocess
updateJsLoader(rawRules, 'foo.js', /^(.*[/\\])?babel-loader/, { updateJsLoader(rawRules, 'foo.js', babelLoaderRe, {
loader: resolve('packages/webpack-preprocess-loader'), loader: resolve('packages/webpack-preprocess-loader'),
options: jsPreprocessOptions options: jsPreprocessOptions
}) })
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册