Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
zizi-2019 committed Dec 16, 2024
2 parents 38ac150 + 69d3612 commit b898089
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 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 @@ -25,7 +25,7 @@
</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/micro-zoe/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,7 +72,7 @@ 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" ^_^
Expand Down Expand Up @@ -138,13 +138,13 @@ 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
Expand Down
12 changes: 6 additions & 6 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 @@ -25,7 +25,7 @@
</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/micro-zoe/micro-app)|简体中文|[官网文档](https://jd-opensource.github.io/micro-app/)[讨论组](https://github.com/micro-zoe/micro-app/discussions)[微信群](./Contact.md)

# 📖简介
micro-app是京东零售推出的一款微前端框架,它基于类WebComponent进行渲染,从组件化的思维实现微前端,旨在降低上手难度、提升工作效率。它是目前接入微前端成本最低的框架,并且提供了JS沙箱、样式隔离、元素隔离、预加载、虚拟路由系统、插件系统、数据通信等一系列完善的功能。
Expand Down Expand Up @@ -69,7 +69,7 @@ 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" 支持一下 ^_^
Expand All @@ -93,7 +93,7 @@ yarn start # 访问 http://localhost:3000
更多命令请查看[DEVELP](https://github.com/micro-zoe/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>
Expand Down Expand Up @@ -136,13 +136,13 @@ 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>


Expand Down
2 changes: 1 addition & 1 deletion docs/0.x/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<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/',
coverpage: false, // 封面
Expand Down
2 changes: 1 addition & 1 deletion docs/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<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/',
coverpage: false, // 封面
Expand Down
2 changes: 1 addition & 1 deletion src/sandbox/scoped_css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class CSSParser {

return matchRes.replace(/(^|,[\n\s]*)([^,]+)/g, (_, separator, selector) => {
selector = trim(selector)
selector = selector.replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match:string, p1: string) => {
selector = selector.replace(/\[[^\]=]+(?:=([^\]]+))?\]/g, (match:string, p1: string) => {
if (attributeValues[p1]) {
return match.replace(p1, attributeValues[p1])
}
Expand Down

0 comments on commit b898089

Please sign in to comment.