From cf156deaa117fea922ed159a15c8700592583ea1 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 20 Nov 2019 20:10:31 +0800
Subject: [PATCH] refactor(cli): module-alias

---
 .../vue-cli-plugin-hbuilderx/module-alias.js     | 13 -------------
 packages/vue-cli-plugin-uni/lib/env.js           | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/module-alias.js b/packages/vue-cli-plugin-hbuilderx/module-alias.js
index 385c14839..f29af6402 100644
--- a/packages/vue-cli-plugin-hbuilderx/module-alias.js
+++ b/packages/vue-cli-plugin-hbuilderx/module-alias.js
@@ -19,19 +19,6 @@ moduleAlias.addAlias('./templateLoader', (fromPath, request, alias) => {
   }
   return request
 })
-// vue cache
-if ( // 非 h5 ,非 v3,非 native
-  process.env.UNI_PLATFORM !== 'h5' &&
-  !process.env.UNI_USING_V3 &&
-  !process.env.UNI_USING_NATIVE
-) {
-  moduleAlias.addAlias('./loaders/pitcher', (fromPath, request, alias) => {
-    if (fromPath.indexOf('vue-loader') !== -1) {
-      return path.resolve(__dirname, 'packages/vue-loader/lib/loaders/pitcher')
-    }
-    return request
-  })
-}
 
 if (isInHBuilderX) {
   moduleAlias.addAlias('typescript', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index 0aae5ad24..022e6e104 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -245,6 +245,20 @@ const moduleAlias = require('module-alias')
 moduleAlias.addAlias('vue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/vue-template-compiler')
 moduleAlias.addAlias('@megalo/template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/@megalo/template-compiler')
 moduleAlias.addAlias('mpvue-template-compiler', '@dcloudio/vue-cli-plugin-uni/packages/mpvue-template-compiler')
+
+// vue cache
+if ( // 非 h5 ,非 v3,非 native
+  process.env.UNI_PLATFORM !== 'h5' &&
+  !process.env.UNI_USING_V3 &&
+  !process.env.UNI_USING_NATIVE
+) {
+  moduleAlias.addAlias('./loaders/pitcher', (fromPath, request, alias) => {
+    if (fromPath.indexOf('vue-loader') !== -1) {
+      return path.resolve(__dirname, '@dcloudio/vue-cli-plugin-hbuilderx/packages/vue-loader/lib/loaders/pitcher')
+    }
+    return request
+  })
+}
 
 if (process.env.UNI_PLATFORM === 'mp-toutiao') {
   // !important 始终带有一个空格
@@ -272,7 +286,7 @@ if (runByHBuilderX) {
 
 if (
   process.env.UNI_USING_CACHE &&
-  process.env.UNI_PLATFORM !== 'h5' &&
+  process.env.UNI_PLATFORM !== 'h5' &&
   !process.env.UNI_USING_V3 &&
   !process.env.UNI_USING_NATIVE
 ) { // 使用 cache, 拷贝 cache 的 json
-- 
GitLab