Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
timhub66 committed Dec 16, 2024
2 parents 38ac150 + f8e2f42 commit e3cff4f
Show file tree
Hide file tree
Showing 42 changed files with 215 additions and 215 deletions.
2 changes: 1 addition & 1 deletion DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

cd micro-app

Expand Down
2 changes: 1 addition & 1 deletion DEVELOP.zh-cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

cd micro-app

Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://micro-zoe.github.io/micro-app/">
<img src="https://micro-zoe.github.io/micro-app/home/assets/logo.png" alt="logo" width="200"/>
<a href="https://jd-opensource.github.io/micro-app/">
<img src="https://jd-opensource.github.io/micro-app/home/assets/logo.png" alt="logo" width="200"/>
</a>
</p>

Expand All @@ -11,21 +11,21 @@
<a href="https://www.npmjs.com/package/@micro-zoe/micro-app">
<img src="https://img.shields.io/npm/dt/@micro-zoe/micro-app.svg" alt="downloads"/>
</a>
<a href="https://github.com/micro-zoe/micro-app/blob/master/LICENSE">
<a href="https://github.com/jd-opensource/micro-app/blob/master/LICENSE">
<img src="https://img.shields.io/npm/l/@micro-zoe/micro-app.svg" alt="license"/>
</a>
<a href="https://github.com/micro-zoe/micro-app/blob/dev/Contact.md">
<a href="https://github.com/jd-opensource/micro-app/blob/dev/Contact.md">
<img src="https://img.shields.io/badge/chat-wechat-blue" alt="WeChat">
</a>
<a href="https://travis-ci.com/github/micro-zoe/micro-app">
<img src="https://api.travis-ci.com/micro-zoe/micro-app.svg?branch=master" alt="travis"/>
<a href="https://travis-ci.com/github/jd-opensource/micro-app">
<img src="https://api.travis-ci.com/jd-opensource/micro-app.svg?branch=master" alt="travis"/>
</a>
<a href="https://coveralls.io/github/micro-zoe/micro-app?branch=master">
<img src="https://coveralls.io/repos/github/micro-zoe/micro-app/badge.svg?branch=master" alt="coveralls"/>
<a href="https://coveralls.io/github/jd-opensource/micro-app?branch=master">
<img src="https://coveralls.io/repos/github/jd-opensource/micro-app/badge.svg?branch=master" alt="coveralls"/>
</a>
</p>

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)
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)

# 📖Introduction
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.
Expand Down Expand Up @@ -72,15 +72,15 @@ The above micro front-end rendering is completed, and the effect is as follows:

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

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

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

### development
1、Clone
```
git clone https://github.com/micro-zoe/micro-app.git
git clone https://github.com/jd-opensource/micro-app.git
```

2、Install dependencies
Expand All @@ -93,7 +93,7 @@ yarn bootstrap
yarn start
```

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

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

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

<details>
<summary>Does it support ssr?</summary>

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.
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.
</details>

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

# License
[MIT License](https://github.com/micro-zoe/micro-app/blob/master/LICENSE)
[MIT License](https://github.com/jd-opensource/micro-app/blob/master/LICENSE)
34 changes: 17 additions & 17 deletions README.zh-cn.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<a href="https://micro-zoe.github.io/micro-app/">
<a href="https://jd-opensource.github.io/micro-app/">
<img src="https://zeroing.jd.com/micro-app/media/logo.png" alt="logo" width="200"/>
</a>
</p>
Expand All @@ -11,21 +11,21 @@
<a href="https://www.npmjs.com/package/@micro-zoe/micro-app">
<img src="https://img.shields.io/npm/dt/@micro-zoe/micro-app.svg" alt="downloads"/>
</a>
<a href="https://github.com/micro-zoe/micro-app/blob/master/LICENSE">
<a href="https://github.com/jd-opensource/micro-app/blob/master/LICENSE">
<img src="https://img.shields.io/npm/l/@micro-zoe/micro-app.svg" alt="license"/>
</a>
<a href="https://github.com/micro-zoe/micro-app/blob/dev/Contact.md">
<a href="https://github.com/jd-opensource/micro-app/blob/dev/Contact.md">
<img src="https://img.shields.io/badge/chat-wechat-blue" alt="WeChat">
</a>
<a href="https://travis-ci.com/github/micro-zoe/micro-app">
<img src="https://api.travis-ci.com/micro-zoe/micro-app.svg?branch=master" alt="travis"/>
<a href="https://travis-ci.com/github/jd-opensource/micro-app">
<img src="https://api.travis-ci.com/jd-opensource/micro-app.svg?branch=master" alt="travis"/>
</a>
<a href="https://coveralls.io/github/micro-zoe/micro-app?branch=master">
<img src="https://coveralls.io/repos/github/micro-zoe/micro-app/badge.svg?branch=master" alt="coveralls"/>
<a href="https://coveralls.io/github/jd-opensource/micro-app?branch=master">
<img src="https://coveralls.io/repos/github/jd-opensource/micro-app/badge.svg?branch=master" alt="coveralls"/>
</a>
</p>

[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)
[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)

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

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

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

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

### 本地运行
1、克隆项目
```
git clone https://github.com/micro-zoe/micro-app.git
git clone https://github.com/jd-opensource/micro-app.git
```

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

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

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

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

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

</details>
<details>
Expand Down Expand Up @@ -136,21 +136,21 @@ yarn start # 访问 http://localhost:3000
<details>
<summary>支持vite吗?</summary>

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

<details>
<summary>支持ssr吗?</summary>

支持,详情请查看[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)
支持,详情请查看[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)
</details>


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


# License
[MIT License](https://github.com/micro-zoe/micro-app/blob/master/LICENSE)
[MIT License](https://github.com/jd-opensource/micro-app/blob/master/LICENSE)
4 changes: 2 additions & 2 deletions dev/children/react16/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ document.head.insertAdjacentElement('afterbegin', dynamicScript3)


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


/* ---------------------- 测试unhandledrejection --------------------- */
// https://github.com/micro-zoe/micro-app/issues/1102
// https://github.com/jd-opensource/micro-app/issues/1102
// window.addEventListener('unhandledrejection', (event) => {
// console.error(`子应用Promise报错监听 -- window.addEventListener(unhandledrejection): `, event)
// event.preventDefault()
Expand Down
2 changes: 1 addition & 1 deletion dev/children/vite2/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ window.onclick = function () {


/* ---------------------- DOMParser --------------------- */
// BUG TEST: https://github.com/micro-zoe/micro-app/issues/56
// BUG TEST: https://github.com/jd-opensource/micro-app/issues/56
// const parser = new DOMParser()
// const htmlString = `
// <div>
Expand Down
2 changes: 1 addition & 1 deletion dev/children/vite4/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ setTimeout(() => {


/* ---------------------- DOMParser --------------------- */
// BUG TEST: https://github.com/micro-zoe/micro-app/issues/56
// BUG TEST: https://github.com/jd-opensource/micro-app/issues/56
// const parser = new DOMParser()
// const htmlString = `
// <div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const GlobalHeaderRight = (props) => {
color: 'inherit',
}}
target="_blank"
href="https://github.com/micro-zoe/micro-app/"
href="https://github.com/jd-opensource/micro-app/"
rel="noopener noreferrer"
className={styles.action}
>
Expand Down
4 changes: 2 additions & 2 deletions docs/0.x/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<script>
window.$docsify = {
name: 'micro-app',
nameLink: 'https://micro-zoe.github.io/micro-app/',
nameLink: 'https://jd-opensource.github.io/micro-app/',
logo: './media/logo.png',
repo: 'https://github.com/micro-zoe/micro-app/',
repo: 'https://github.com/jd-opensource/micro-app/',
coverpage: false, // 封面
loadSidebar: true, // 侧边栏
autoHeader: true, // 将sidebar的标题设置为页面标题,如果已经设置了一级标题则不生效
Expand Down
22 changes: 11 additions & 11 deletions docs/0.x/en-us/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

- **Bug Fix**

- 🐞 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)
- 🐞 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)

- **Update**

Expand All @@ -61,12 +61,12 @@

- **Bug Fix**

- 🐞 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).
- 🐞 Fix bug of parser style error when using IE6 and 7 csshack, issue [#232](https://github.com/micro-zoe/micro-app/issues/223).
- 🐞 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).
- 🐞 Fix bug of parser style error when using IE6 and 7 csshack, issue [#232](https://github.com/jd-opensource/micro-app/issues/223).

- **Update**

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


Expand All @@ -80,7 +80,7 @@

- **Bug Fix**

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

- **Update**
Expand All @@ -95,7 +95,7 @@
- **Bug Fix**

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


Expand Down Expand Up @@ -134,7 +134,7 @@

- **Bug Fix**

- 🐞 修复了通过`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)
- 🐞 修复了通过`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)
- 🐞 修复了通过`cloneNode`创建的元素逃离沙箱的问题。

- **Update**
Expand Down Expand Up @@ -214,8 +214,8 @@

- **Bug Fix**

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


### 0.4.2
Expand All @@ -226,13 +226,13 @@

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

- **Bug Fix**

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

Expand Down
2 changes: 1 addition & 1 deletion docs/0.x/zh-cn/advanced.md
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,4 @@ if (window.__MICRO_APP_ENVIRONMENT__) {
>
> 3、因为注册了`unmount`函数,所以卸载监听事件 `window.addEventListener('unmount', () => {})` 就不需要了
>
> 4、umd模式下,因为初次渲染和后续渲染逻辑不同,可能会出现一些问题,如:[#138](https://github.com/micro-zoe/micro-app/issues/138)
> 4、umd模式下,因为初次渲染和后续渲染逻辑不同,可能会出现一些问题,如:[#138](https://github.com/jd-opensource/micro-app/issues/138)
Loading

0 comments on commit e3cff4f

Please sign in to comment.