From ce934705ea661f072f8af94fa0183ab341d8faf9 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 12 Nov 2020 12:13:49 +0800
Subject: [PATCH] refactor(cli): revert uni_modules

---
 packages/uni-cli-shared/lib/pages.js           | 11 ++++++-----
 packages/webpack-uni-pages-loader/lib/index.js | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/uni-cli-shared/lib/pages.js b/packages/uni-cli-shared/lib/pages.js
index 6bdc944b47..965591a88e 100644
--- a/packages/uni-cli-shared/lib/pages.js
+++ b/packages/uni-cli-shared/lib/pages.js
@@ -8,14 +8,11 @@ const {
   capitalize
 } = require('./util')
 
-const {
+const {
+  getJson,
   parseJson
 } = require('./json')
 
-const {
-  getPagesJson
-} = require('./uni_modules')
-
 let mainEntry = ''
 let nvueMainEntry = ''
 
@@ -35,6 +32,10 @@ function getNVueMainEntry () {
   }
   return nvueMainEntry
 }
+
+function getPagesJson () {
+  return processPagesJson(getJson('pages.json', true))
+}
 
 function parsePagesJson (content, loader) {
   return processPagesJson(parseJson(content, true), loader)
diff --git a/packages/webpack-uni-pages-loader/lib/index.js b/packages/webpack-uni-pages-loader/lib/index.js
index 18e614484e..93e61ebf99 100644
--- a/packages/webpack-uni-pages-loader/lib/index.js
+++ b/packages/webpack-uni-pages-loader/lib/index.js
@@ -30,7 +30,7 @@ function checkEmitFile (filePath, jsonObj, changedEmitFiles) {
 }
 
 module.exports = function (content, map) {
-  content = JSON.stringify(require('@dcloudio/uni-cli-shared/lib/uni_modules').getPagesJson(content))
+  // content = JSON.stringify(require('@dcloudio/uni-cli-shared/lib/uni_modules').getPagesJson(content))
   if (this.resourceQuery) {
     const params = loaderUtils.parseQuery(this.resourceQuery)
     if (params) {
@@ -42,12 +42,12 @@ module.exports = function (content, map) {
     }
   }
   // add deps
-  global.uniModules.forEach(module => {
-    const uniModulePagesJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', module, 'pages.json')
-    if (fs.existsSync(uniModulePagesJsonPath)) {
-      this.addDependency(uniModulePagesJsonPath)
-    }
-  })
+  // global.uniModules.forEach(module => {
+  //   const uniModulePagesJsonPath = path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules', module, 'pages.json')
+  //   if (fs.existsSync(uniModulePagesJsonPath)) {
+  //     this.addDependency(uniModulePagesJsonPath)
+  //   }
+  // })
 
   if (
     process.env.UNI_USING_COMPONENTS ||
-- 
GitLab