Skip to content

Commit e3cff4f

Browse files
committed
Merge branch 'dev'
2 parents 38ac150 + f8e2f42 commit e3cff4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+215
-215
lines changed

DEVELOP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### clone & run project
44
```bash
5-
git clone https://github.com/micro-zoe/micro-app.git
5+
git clone https://github.com/jd-opensource/micro-app.git
66

77
cd micro-app
88

DEVELOP.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### 下载并运行
44
```bash
5-
git clone https://github.com/micro-zoe/micro-app.git
5+
git clone https://github.com/jd-opensource/micro-app.git
66

77
cd micro-app
88

README.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
2-
<a href="https://micro-zoe.github.io/micro-app/">
3-
<img src="https://micro-zoe.github.io/micro-app/home/assets/logo.png" alt="logo" width="200"/>
2+
<a href="https://jd-opensource.github.io/micro-app/">
3+
<img src="https://jd-opensource.github.io/micro-app/home/assets/logo.png" alt="logo" width="200"/>
44
</a>
55
</p>
66

@@ -11,21 +11,21 @@
1111
<a href="https://www.npmjs.com/package/@micro-zoe/micro-app">
1212
<img src="https://img.shields.io/npm/dt/@micro-zoe/micro-app.svg" alt="downloads"/>
1313
</a>
14-
<a href="https://github.com/micro-zoe/micro-app/blob/master/LICENSE">
14+
<a href="https://github.com/jd-opensource/micro-app/blob/master/LICENSE">
1515
<img src="https://img.shields.io/npm/l/@micro-zoe/micro-app.svg" alt="license"/>
1616
</a>
17-
<a href="https://github.com/micro-zoe/micro-app/blob/dev/Contact.md">
17+
<a href="https://github.com/jd-opensource/micro-app/blob/dev/Contact.md">
1818
<img src="https://img.shields.io/badge/chat-wechat-blue" alt="WeChat">
1919
</a>
20-
<a href="https://travis-ci.com/github/micro-zoe/micro-app">
21-
<img src="https://api.travis-ci.com/micro-zoe/micro-app.svg?branch=master" alt="travis"/>
20+
<a href="https://travis-ci.com/github/jd-opensource/micro-app">
21+
<img src="https://api.travis-ci.com/jd-opensource/micro-app.svg?branch=master" alt="travis"/>
2222
</a>
23-
<a href="https://coveralls.io/github/micro-zoe/micro-app?branch=master">
24-
<img src="https://coveralls.io/repos/github/micro-zoe/micro-app/badge.svg?branch=master" alt="coveralls"/>
23+
<a href="https://coveralls.io/github/jd-opensource/micro-app?branch=master">
24+
<img src="https://coveralls.io/repos/github/jd-opensource/micro-app/badge.svg?branch=master" alt="coveralls"/>
2525
</a>
2626
</p>
2727

28-
English|[简体中文](./README.zh-cn.md)[Documentation](https://micro-zoe.github.io/micro-app/)[Discussions](https://github.com/micro-zoe/micro-app/discussions)[WeChat](./Contact.md)
28+
English|[简体中文](./README.zh-cn.md)[Documentation](https://jd-opensource.github.io/micro-app/)[Discussions](https://github.com/jd-opensource/micro-app/discussions)[WeChat](./Contact.md)
2929

3030
# 📖Introduction
3131
micro-app is a micro front-end framework launched by JD Retail. It renders based on webcomponent-like and realizes the micro front-end from component thinking, it aiming to reduce the difficulty of getting started and improve work efficiency.
@@ -72,15 +72,15 @@ The above micro front-end rendering is completed, and the effect is as follows:
7272

7373
![image](https://img10.360buyimg.com/imagetools/jfs/t1/188373/14/17696/41854/6111f4a0E532736ba/4b86f4f8e2044519.png)
7474

75-
More detailed configuration can be viewed [Documentation](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/start).
75+
More detailed configuration can be viewed [Documentation](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/start).
7676

7777
# 🤝 Contribution
7878
If you're interested in this project, you're welcome to mention pull request, and also welcome your "Star" ^_^
7979

8080
### development
8181
1、Clone
8282
```
83-
git clone https://github.com/micro-zoe/micro-app.git
83+
git clone https://github.com/jd-opensource/micro-app.git
8484
```
8585

8686
2、Install dependencies
@@ -93,7 +93,7 @@ yarn bootstrap
9393
yarn start
9494
```
9595

96-
For more commands, see [DEVELOP](https://github.com/micro-zoe/micro-app/blob/master/DEVELOP.md)
96+
For more commands, see [DEVELOP](https://github.com/jd-opensource/micro-app/blob/master/DEVELOP.md)
9797

9898
# FAQ
9999
<details>
@@ -138,19 +138,19 @@ For more commands, see [DEVELOP](https://github.com/micro-zoe/micro-app/blob/mas
138138
<details>
139139
<summary>Does it support vite?</summary>
140140

141-
Yes, please see [adapt vite](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/vite) for details.
141+
Yes, please see [adapt vite](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/vite) for details.
142142
</details>
143143

144144
<details>
145145
<summary>Does it support ssr?</summary>
146146

147-
Yes, please see [nextjs](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/nextjs), [nuxtjs](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/nuxtjs) for details.
147+
Yes, please see [nextjs](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/nextjs), [nuxtjs](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/nuxtjs) for details.
148148
</details>
149149

150150
# Contributors
151-
<a href="https://github.com/micro-zoe/micro-app/graphs/contributors">
151+
<a href="https://github.com/jd-opensource/micro-app/graphs/contributors">
152152
<img src="https://contrib.rocks/image?repo=micro-zoe/micro-app" />
153153
</a>
154154

155155
# License
156-
[MIT License](https://github.com/micro-zoe/micro-app/blob/master/LICENSE)
156+
[MIT License](https://github.com/jd-opensource/micro-app/blob/master/LICENSE)

README.zh-cn.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://micro-zoe.github.io/micro-app/">
2+
<a href="https://jd-opensource.github.io/micro-app/">
33
<img src="https://zeroing.jd.com/micro-app/media/logo.png" alt="logo" width="200"/>
44
</a>
55
</p>
@@ -11,21 +11,21 @@
1111
<a href="https://www.npmjs.com/package/@micro-zoe/micro-app">
1212
<img src="https://img.shields.io/npm/dt/@micro-zoe/micro-app.svg" alt="downloads"/>
1313
</a>
14-
<a href="https://github.com/micro-zoe/micro-app/blob/master/LICENSE">
14+
<a href="https://github.com/jd-opensource/micro-app/blob/master/LICENSE">
1515
<img src="https://img.shields.io/npm/l/@micro-zoe/micro-app.svg" alt="license"/>
1616
</a>
17-
<a href="https://github.com/micro-zoe/micro-app/blob/dev/Contact.md">
17+
<a href="https://github.com/jd-opensource/micro-app/blob/dev/Contact.md">
1818
<img src="https://img.shields.io/badge/chat-wechat-blue" alt="WeChat">
1919
</a>
20-
<a href="https://travis-ci.com/github/micro-zoe/micro-app">
21-
<img src="https://api.travis-ci.com/micro-zoe/micro-app.svg?branch=master" alt="travis"/>
20+
<a href="https://travis-ci.com/github/jd-opensource/micro-app">
21+
<img src="https://api.travis-ci.com/jd-opensource/micro-app.svg?branch=master" alt="travis"/>
2222
</a>
23-
<a href="https://coveralls.io/github/micro-zoe/micro-app?branch=master">
24-
<img src="https://coveralls.io/repos/github/micro-zoe/micro-app/badge.svg?branch=master" alt="coveralls"/>
23+
<a href="https://coveralls.io/github/jd-opensource/micro-app?branch=master">
24+
<img src="https://coveralls.io/repos/github/jd-opensource/micro-app/badge.svg?branch=master" alt="coveralls"/>
2525
</a>
2626
</p>
2727

28-
[English](https://github.com/micro-zoe/micro-app)|简体中文|[官网文档](https://micro-zoe.github.io/micro-app/)[讨论组](https://github.com/micro-zoe/micro-app/discussions)[微信群](./Contact.md)
28+
[English](https://github.com/jd-opensource/micro-app)|简体中文|[官网文档](https://jd-opensource.github.io/micro-app/)[讨论组](https://github.com/jd-opensource/micro-app/discussions)[微信群](./Contact.md)
2929

3030
# 📖简介
3131
micro-app是京东零售推出的一款微前端框架,它基于类WebComponent进行渲染,从组件化的思维实现微前端,旨在降低上手难度、提升工作效率。它是目前接入微前端成本最低的框架,并且提供了JS沙箱、样式隔离、元素隔离、预加载、虚拟路由系统、插件系统、数据通信等一系列完善的功能。
@@ -69,15 +69,15 @@ devServer: {
6969

7070
<img src="https://img12.360buyimg.com/imagetools/jfs/t1/196940/34/1541/38365/610a14fcE46c21374/c321b9f8fa50a8fc.png" alt="result" width='900'/>
7171

72-
更多详细配置可以查看[官网文档](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/start)
72+
更多详细配置可以查看[官网文档](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/start)
7373

7474
# 🤝 参与共建
7575
如果您对这个项目感兴趣,欢迎参与贡献,也欢迎 "Star" 支持一下 ^_^
7676

7777
### 本地运行
7878
1、克隆项目
7979
```
80-
git clone https://github.com/micro-zoe/micro-app.git
80+
git clone https://github.com/jd-opensource/micro-app.git
8181
```
8282

8383
2、安装依赖
@@ -90,16 +90,16 @@ yarn bootstrap
9090
yarn start # 访问 http://localhost:3000
9191
```
9292

93-
更多命令请查看[DEVELP](https://github.com/micro-zoe/micro-app/blob/master/DEVELOP.zh-cn.md)
93+
更多命令请查看[DEVELP](https://github.com/jd-opensource/micro-app/blob/master/DEVELOP.zh-cn.md)
9494

9595
# FAQ
96-
[问题汇总](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/questions)
96+
[问题汇总](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/questions)
9797
<details>
9898

9999
<summary>micro-app的优势在哪里?</summary>
100100
上手简单、侵入性低,只需改动少量的代码即可接入微前端,同时提供丰富的功能。
101101

102-
具体细节请参考文章:[micro-app介绍](https://github.com/micro-zoe/micro-app/issues/8)
102+
具体细节请参考文章:[micro-app介绍](https://github.com/jd-opensource/micro-app/issues/8)
103103

104104
</details>
105105
<details>
@@ -136,21 +136,21 @@ yarn start # 访问 http://localhost:3000
136136
<details>
137137
<summary>支持vite吗?</summary>
138138

139-
支持,详情请查看[适配vite](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/vite)
139+
支持,详情请查看[适配vite](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/vite)
140140
</details>
141141

142142
<details>
143143
<summary>支持ssr吗?</summary>
144144

145-
支持,详情请查看[nextjs](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/nextjs)[nuxtjs](https://micro-zoe.github.io/micro-app/docs.html#/zh-cn/framework/nuxtjs)
145+
支持,详情请查看[nextjs](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/nextjs)[nuxtjs](https://jd-opensource.github.io/micro-app/docs.html#/zh-cn/framework/nuxtjs)
146146
</details>
147147

148148

149149
# 贡献者们
150-
<a href="https://github.com/micro-zoe/micro-app/graphs/contributors">
150+
<a href="https://github.com/jd-opensource/micro-app/graphs/contributors">
151151
<img src="https://contrib.rocks/image?repo=micro-zoe/micro-app" />
152152
</a>
153153

154154

155155
# License
156-
[MIT License](https://github.com/micro-zoe/micro-app/blob/master/LICENSE)
156+
[MIT License](https://github.com/jd-opensource/micro-app/blob/master/LICENSE)

dev/children/react16/src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ document.head.insertAdjacentElement('afterbegin', dynamicScript3)
260260

261261

262262
/* ---------------------- DOMParser --------------------- */
263-
// // BUG TEST: https://github.com/micro-zoe/micro-app/issues/56
263+
// // BUG TEST: https://github.com/jd-opensource/micro-app/issues/56
264264
// const parser = new DOMParser()
265265
// const htmlString = `
266266
// <div>
@@ -556,7 +556,7 @@ console.log('micro-app容器元素document.microAppElement', document.microAppEl
556556

557557

558558
/* ---------------------- 测试unhandledrejection --------------------- */
559-
// https://github.com/micro-zoe/micro-app/issues/1102
559+
// https://github.com/jd-opensource/micro-app/issues/1102
560560
// window.addEventListener('unhandledrejection', (event) => {
561561
// console.error(`子应用Promise报错监听 -- window.addEventListener(unhandledrejection): `, event)
562562
// event.preventDefault()

dev/children/vite2/src/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ window.onclick = function () {
211211

212212

213213
/* ---------------------- DOMParser --------------------- */
214-
// BUG TEST: https://github.com/micro-zoe/micro-app/issues/56
214+
// BUG TEST: https://github.com/jd-opensource/micro-app/issues/56
215215
// const parser = new DOMParser()
216216
// const htmlString = `
217217
// <div>

dev/children/vite4/src/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ setTimeout(() => {
259259

260260

261261
/* ---------------------- DOMParser --------------------- */
262-
// BUG TEST: https://github.com/micro-zoe/micro-app/issues/56
262+
// BUG TEST: https://github.com/jd-opensource/micro-app/issues/56
263263
// const parser = new DOMParser()
264264
// const htmlString = `
265265
// <div>

dev/main-react16/src/components/GlobalHeader/RightContent.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const GlobalHeaderRight = (props) => {
5252
color: 'inherit',
5353
}}
5454
target="_blank"
55-
href="https://github.com/micro-zoe/micro-app/"
55+
href="https://github.com/jd-opensource/micro-app/"
5656
rel="noopener noreferrer"
5757
className={styles.action}
5858
>

docs/0.x/docs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<script>
3737
window.$docsify = {
3838
name: 'micro-app',
39-
nameLink: 'https://micro-zoe.github.io/micro-app/',
39+
nameLink: 'https://jd-opensource.github.io/micro-app/',
4040
logo: './media/logo.png',
41-
repo: 'https://github.com/micro-zoe/micro-app/',
41+
repo: 'https://github.com/jd-opensource/micro-app/',
4242
coverpage: false, // 封面
4343
loadSidebar: true, // 侧边栏
4444
autoHeader: true, // 将sidebar的标题设置为页面标题,如果已经设置了一级标题则不生效

docs/0.x/en-us/changelog.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
- **Bug Fix**
5050

51-
- 🐞 Fixed the conflict of vue, when the base app load Vue through remote link, issue [#234](https://github.com/micro-zoe/micro-app/issues/234)
51+
- 🐞 Fixed the conflict of vue, when the base app load Vue through remote link, issue [#234](https://github.com/jd-opensource/micro-app/issues/234)
5252

5353
- **Update**
5454

@@ -61,12 +61,12 @@
6161

6262
- **Bug Fix**
6363

64-
- 🐞 Fix bug of element-plus dom escape from micro-app element, issue [#157](https://github.com/micro-zoe/micro-app/issues/157), [#121](https://github.com/micro-zoe/micro-app/issues/121).
65-
- 🐞 Fix bug of parser style error when using IE6 and 7 csshack, issue [#232](https://github.com/micro-zoe/micro-app/issues/223).
64+
- 🐞 Fix bug of element-plus dom escape from micro-app element, issue [#157](https://github.com/jd-opensource/micro-app/issues/157), [#121](https://github.com/jd-opensource/micro-app/issues/121).
65+
- 🐞 Fix bug of parser style error when using IE6 and 7 csshack, issue [#232](https://github.com/jd-opensource/micro-app/issues/223).
6666

6767
- **Update**
6868

69-
- 🚀 Optimized plugins logic and code, PR [#224](https://github.com/micro-zoe/micro-app/pull/224) by [LinFeng1997](https://github.com/LinFeng1997).
69+
- 🚀 Optimized plugins logic and code, PR [#224](https://github.com/jd-opensource/micro-app/pull/224) by [LinFeng1997](https://github.com/LinFeng1997).
7070
- 🚀 Optimized sandbox logic and code.
7171

7272

@@ -80,7 +80,7 @@
8080

8181
- **Bug Fix**
8282

83-
- 🐞 修复了在使用css变量时导致样式丢失的问题,issue [#157](https://github.com/micro-zoe/micro-app/issues/157)[#121](https://github.com/micro-zoe/micro-app/issues/121)
83+
- 🐞 修复了在使用css变量时导致样式丢失的问题,issue [#157](https://github.com/jd-opensource/micro-app/issues/157)[#121](https://github.com/jd-opensource/micro-app/issues/121)
8484
- 🐞 修复了在部分浏览器(如:safari)下,css表现有差异的问题。
8585

8686
- **Update**
@@ -95,7 +95,7 @@
9595
- **Bug Fix**
9696

9797
- 🐞 修复了link标签在非head时样式丢失的问题
98-
- 🐞 修复了错误补全svg地址的问题,PR [#207](https://github.com/micro-zoe/micro-app/pull/207) by [icksky](https://github.com/icksky)
98+
- 🐞 修复了错误补全svg地址的问题,PR [#207](https://github.com/jd-opensource/micro-app/pull/207) by [icksky](https://github.com/icksky)
9999
- 🐞 修复了在部分浏览器下报`WeakRef is not defined`错误的问题。
100100

101101

@@ -134,7 +134,7 @@
134134

135135
- **Bug Fix**
136136

137-
- 🐞 修复了通过`new Image()`创建的元素逃离沙箱的问题,issue [#186](https://github.com/micro-zoe/micro-app/issues/186),PR [#187](https://github.com/micro-zoe/micro-app/pull/187) by [asiainfoliwei](https://github.com/asiainfoliwei)
137+
- 🐞 修复了通过`new Image()`创建的元素逃离沙箱的问题,issue [#186](https://github.com/jd-opensource/micro-app/issues/186),PR [#187](https://github.com/jd-opensource/micro-app/pull/187) by [asiainfoliwei](https://github.com/asiainfoliwei)
138138
- 🐞 修复了通过`cloneNode`创建的元素逃离沙箱的问题。
139139

140140
- **Update**
@@ -214,8 +214,8 @@
214214

215215
- **Bug Fix**
216216

217-
- 🐞 修复了在不支持`ShadowRoot`的浏览器中的报错问题,issue [#134](https://github.com/micro-zoe/micro-app/issues/134)
218-
- 🐞 修复了元素查询时带有特殊字符导致报错的问题,issue [#140](https://github.com/micro-zoe/micro-app/issues/140)
217+
- 🐞 修复了在不支持`ShadowRoot`的浏览器中的报错问题,issue [#134](https://github.com/jd-opensource/micro-app/issues/134)
218+
- 🐞 修复了元素查询时带有特殊字符导致报错的问题,issue [#140](https://github.com/jd-opensource/micro-app/issues/140)
219219

220220

221221
### 0.4.2
@@ -226,13 +226,13 @@
226226

227227
- 🆕 新增了数据通信中`getGlobalData`方法,用于主动获取全局数据
228228
- 🆕 新增了对`mount`, `unmount`方法promise类型的支持
229-
- 🆕 新增了`destroy`配置项,用于替换`destory`,但依然保持对低版本的兼容,issue [#132](https://github.com/micro-zoe/micro-app/issues/132)
229+
- 🆕 新增了`destroy`配置项,用于替换`destory`,但依然保持对低版本的兼容,issue [#132](https://github.com/jd-opensource/micro-app/issues/132)
230230

231231
- **Bug Fix**
232232

233233
- 🐞 修复了umd模式下,react16及以下版本二次渲染后路由跳转刷新页面的问题
234234
- 🐞 修复了SSR子应用二次渲染时url不同导致渲染失败的问题
235-
- 🐞 修复了 react-inlinesvg 无法正常渲染的问题,issue [#56](https://github.com/micro-zoe/micro-app/issues/56)
235+
- 🐞 修复了 react-inlinesvg 无法正常渲染的问题,issue [#56](https://github.com/jd-opensource/micro-app/issues/56)
236236
- 🐞 修复了 safari 浏览器中,创建module脚本错误的问题
237237
- 🐞 修复了子应用通过defineProperty重写document.onclick时报错的问题
238238

docs/0.x/zh-cn/advanced.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,4 +287,4 @@ if (window.__MICRO_APP_ENVIRONMENT__) {
287287
>
288288
> 3、因为注册了`unmount`函数,所以卸载监听事件 `window.addEventListener('unmount', () => {})` 就不需要了
289289
>
290-
> 4、umd模式下,因为初次渲染和后续渲染逻辑不同,可能会出现一些问题,如:[#138](https://github.com/micro-zoe/micro-app/issues/138)
290+
> 4、umd模式下,因为初次渲染和后续渲染逻辑不同,可能会出现一些问题,如:[#138](https://github.com/jd-opensource/micro-app/issues/138)

0 commit comments

Comments
 (0)