From 1e8c6c99eb58d373a7071f119ddb4edc241e46b1 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 11 May 2020 09:35:03 +0800
Subject: [PATCH] feat: multi pages

---
 packages/vue-cli-plugin-uni/index.js          |  4 ++++
 .../lib/platforms/h5.js                       | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/index.js b/packages/vue-cli-plugin-uni/index.js
index d64d1f116..4d62acda9 100644
--- a/packages/vue-cli-plugin-uni/index.js
+++ b/packages/vue-cli-plugin-uni/index.js
@@ -53,6 +53,10 @@ module.exports = (api, options) => {
     vueConfig = vueConfig(options, api)
   }
 
+  if (options.pages) { // 允许 vue.config.js pages 覆盖
+    delete vueConfig.pages
+  }
+
   Object.assign(options, { // TODO 考虑非 HBuilderX 运行时，可以支持自定义输出目录
     outputDir: process.env.UNI_OUTPUT_TMP_DIR || process.env.UNI_OUTPUT_DIR,
     assetsDir
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/h5.js b/packages/webpack-uni-pages-loader/lib/platforms/h5.js
index b42548ae7..a6b1bfc1b 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/h5.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/h5.js
@@ -362,15 +362,17 @@ module.exports = function (pagesJson, manifestJson, loader) {
     configurePages(pagesJson, manifestJson, loader)
   })
 
-  const loaderUtils = require('loader-utils')
-  const params = loaderUtils.parseQuery(loader.resourceQuery)
-  if (params.pages) {
-    try {
-      const pages = JSON.parse(params.pages)
-      if (Array.isArray(pages)) {
-        filterPages(pagesJson, pages)
-      }
-    } catch (e) {}
+  if (loader.resourceQuery) {
+    const loaderUtils = require('loader-utils')
+    const params = loaderUtils.parseQuery(loader.resourceQuery)
+    if (params.pages) {
+      try {
+        const pages = JSON.parse(params.pages)
+        if (Array.isArray(pages)) {
+          filterPages(pagesJson, pages)
+        }
+      } catch (e) {}
+    }
   }
 
   const pageComponents = getPageComponents(inputDir, pagesJson)
-- 
GitLab