diff --git a/packages/webpack-uni-pages-loader/lib/platforms/mp.js b/packages/webpack-uni-pages-loader/lib/platforms/mp.js index ebb59dfcf942c068153d2b6b3db082290b6cff83..abaa02bb993671f4b257cc253a4664029ea3a837 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 47cd573f9a58ac2a187a85b202cc1db9516bc128..1db3c0a2911f090f21148d72554076f2654f1c7f 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 }