From 29370eb88ab430f37a714d4100adffb833608732 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 13 Nov 2020 13:46:57 +0800
Subject: [PATCH] fix(mp):  remove invalid property

---
 .../lib/platforms/mp.js                         | 17 ++++++-----------
 packages/webpack-uni-pages-loader/lib/util.js   | 12 ++++++++++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp.js b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
index ebb59dfcf..abaa02bb9 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/mp.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/mp.js
@@ -13,13 +13,14 @@ const {
 } = require('@dcloudio/uni-cli-shared/lib/cache')
 
 const {
-  darkmode,
+  darkmode,
   hasTheme
 } = require('@dcloudio/uni-cli-shared/lib/theme')
 
 const {
   hasOwn,
-  parseStyle
+  parseStyle,
+  trimMPJson
 } = require('../util')
 
 function defaultCopy (name, value, json) {
@@ -171,12 +172,6 @@ function getCondition (pagesJson) {
   }
   return false
 }
-
-function trimAppJson (app) {
-  delete app.topWindow
-  delete app.leftWindow
-  delete app.rightWindow
-}
 
 module.exports = function (pagesJson, manifestJson, project = {}) {
   const app = {
@@ -251,14 +246,14 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
       return {
         app: {
           name: 'app',
-          content: trimAppJson(app)
+          content: trimMPJson(app)
         }
       }
     }
     return {
       app: {
         name: 'app',
-        content: trimAppJson(app)
+        content: trimMPJson(app)
       },
       project: {
         name: 'project.config',
@@ -317,7 +312,7 @@ module.exports = function (pagesJson, manifestJson, project = {}) {
     return {
       app: {
         name: 'app',
-        content: trimAppJson(app)
+        content: trimMPJson(app)
       },
       project: {
         name: 'project.config',
diff --git a/packages/webpack-uni-pages-loader/lib/util.js b/packages/webpack-uni-pages-loader/lib/util.js
index 47cd573f9..1db3c0a29 100644
--- a/packages/webpack-uni-pages-loader/lib/util.js
+++ b/packages/webpack-uni-pages-loader/lib/util.js
@@ -41,9 +41,16 @@ function hasOwn (obj, key) {
   return _hasOwnProperty.call(obj, key)
 }
 
+function trimMPJson (json) {
+  delete json.topWindow
+  delete json.leftWindow
+  delete json.rightWindow
+  return json
+}
+
 function parseStyle (style = {}, root = '') {
   // TODO pages.json 触发了两次，需要排查
-  style = JSON.parse(JSON.stringify(style))
+  style = trimMPJson(JSON.parse(JSON.stringify(style)))
 
   let platformStyle = {}
 
@@ -117,5 +124,6 @@ function parseTabBar (style = {}) {
 module.exports = {
   hasOwn,
   parseStyle,
-  parseTabBar
+  parseTabBar,
+  trimMPJson
 }
-- 
GitLab