From 26271d66447d94c27f925f1f7ea81c14d7e436c8 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 12 Mar 2020 16:02:19 +0800
Subject: [PATCH] fix(cli): compatible with @vue/cli-plugin-babel@4.2.3 (remove
 cache-loader) #1394

---
 packages/vue-cli-plugin-uni/lib/configure-webpack.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/lib/configure-webpack.js b/packages/vue-cli-plugin-uni/lib/configure-webpack.js
index f7a0cbeaa..de7681b4b 100644
--- a/packages/vue-cli-plugin-uni/lib/configure-webpack.js
+++ b/packages/vue-cli-plugin-uni/lib/configure-webpack.js
@@ -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) {
     // disable js cache-loader
     const rawRules = webpackConfig.module.rules
     for (let i = rawRules.length - 1; i >= 0; i--) {
       const uses = rawRules[i].use
       if (Array.isArray(uses)) {
-        if (uses.find(use => use.loader === 'babel-loader')) {
-          const index = uses.findIndex(use => use.loader === 'cache-loader')
+        if (uses.find(use => babelLoaderRe.test(use.loader))) {
+          const index = uses.findIndex(use => cacheLoaderRe.test(use.loader))
           if (process.env.UNI_USING_CACHE) {
             Object.assign(uses[index].options, api.genCacheConfig(
               'babel-loader/' + process.env.UNI_PLATFORM,
@@ -159,7 +160,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
     }
 
     // js preprocess
-    updateJsLoader(rawRules, 'foo.js', /^(.*[/\\])?babel-loader/, {
+    updateJsLoader(rawRules, 'foo.js', babelLoaderRe, {
       loader: resolve('packages/webpack-preprocess-loader'),
       options: jsPreprocessOptions
     })
-- 
GitLab