Skip to content

Commit a4cc853

Browse files
authored
Merge pull request #44 from micro-zoe/optimizationEnvironment
环境变量兼容1.0版本变量显示
2 parents d919c59 + ba0a446 commit a4cc853

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

src/pages/devtools/config/index.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ export const MICRO_APP_ENV_INFO = {
1818
describe: '子应用的静态资源前缀',
1919
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/env?id=__micro_app_public_path__',
2020
},
21+
__MICRO_APP_URL__: {
22+
describe: '子应用的网址',
23+
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/env?id=__micro_app_base_route__',
24+
},
2125
__MICRO_APP_BASE_URL__: {
2226
describe: '子应用的基础网址',
2327
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/env?id=__micro_app_base_route__',
@@ -26,4 +30,20 @@ export const MICRO_APP_ENV_INFO = {
2630
describe: '子应用的基础路由',
2731
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/env?id=__micro_app_base_route__',
2832
},
33+
__MICRO_APP_SANDBOX_TYPE__: {
34+
describe: '子应用沙箱模式',
35+
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/configure?id=iframe',
36+
},
37+
__MICRO_APP_UMD_MODE__: {
38+
describe: '是否开启UMD模式',
39+
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/vue?id=_1%e3%80%81%e5%bc%80%e5%90%afumd%e6%a8%a1%e5%bc%8f%ef%bc%8c%e4%bc%98%e5%8c%96%e5%86%85%e5%ad%98%e5%92%8c%e6%80%a7%e8%83%bd',
40+
},
41+
__MICRO_APP_PRE_RENDER__: {
42+
describe: '是否开启预渲染',
43+
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/router',
44+
},
45+
__MICRO_APP_BASE_APPLICATION__: {
46+
describe: '是否是主应用',
47+
url: 'https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/env?id=__micro_app_base_application__',
48+
},
2949
};

src/pages/devtools/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DevToolsPage extends React.PureComponent<DevToolsPageProps, DevToolsPageSt
3333
const allKey = JSON.stringify(Object.keys(thisWindow));
3434
let microAppInfo = {};
3535
for (let el of JSON.parse(allKey)){
36-
if (el.indexOf('__MICRO_APP') > -1){
36+
if (el.indexOf('__MICRO_APP') > -1 && ['__MICRO_APP_WINDOW__', '__MICRO_APP_SANDBOX__'].indexOf(el) == -1){
3737
microAppInfo[el] = thisWindow[el];
3838
}
3939
}

webpack.config.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ const webpackConfigs = [{
7171
'popup-app': utils.fullPath('src/app/popup/index.tsx'),
7272
'devtools-app': utils.fullPath('src/app/devtools/index.tsx'),
7373
'simulation-app': utils.fullPath('src/app/simulation/index.tsx'),
74-
'popup-open': utils.fullPath('src/app/popup-open/index.tsx'),
7574
},
7675
output: {
7776
path: process.env.DIST_PATH,
@@ -226,12 +225,6 @@ const webpackConfigs = [{
226225
chunks: ['simulation-app'],
227226
cache: false,
228227
}),
229-
new HtmlWebpackPlugin({
230-
template: utils.fullPath('src/app/popup-open/index.html'),
231-
filename: 'popup-open.html',
232-
chunks: ['popup-open'],
233-
cache: false,
234-
}),
235228
// Webpack plugin that runs TypeScript type checker on a separate process.
236229
new ForkTsCheckerWebpackPlugin(),
237230
],

0 commit comments

Comments
 (0)