Skip to content

Commit

Permalink
Merge branch 'next' into feat/webpack_plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
kuitos authored Oct 23, 2023
2 parents 5760f84 + 317961e commit 24ba3c2
Show file tree
Hide file tree
Showing 101 changed files with 6,405 additions and 5,615 deletions.
5 changes: 5 additions & 0 deletions .changeset/green-tools-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@qiankunjs/shared": patch
---

🐛fix findDependency logic while peerDeps is undefined
5 changes: 5 additions & 0 deletions .changeset/large-jokes-smile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@qiankunjs/shared": patch
---

🐛fix preload is invalid while reused dependency is working
5 changes: 5 additions & 0 deletions .changeset/long-flies-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@qiankunjs/sandbox": patch
---

🔀 merge master
5 changes: 5 additions & 0 deletions .changeset/loud-penguins-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@qiankunjs/sandbox": patch
---

feat: set proxy appendChild/insertBefore method for every sandbox rather than modify prototype on HTMLElement
5 changes: 5 additions & 0 deletions .changeset/metal-cougars-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@qiankunjs/sandbox": patch
---

🐛parallel sandbox should use different compartment id
6 changes: 6 additions & 0 deletions .changeset/ninety-rivers-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@qiankunjs/loader": patch
"qiankun": patch
---

feat: add transformer options for app loader
6 changes: 5 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
},
"changesets": [
"clever-dragons-ring",
"green-tools-wonder",
"large-jokes-smile",
"long-flies-repair",
"rare-lobsters-marry",
"short-kings-explain"
"short-kings-explain",
"warm-chefs-chew"
]
}
6 changes: 6 additions & 0 deletions .changeset/sour-roses-smile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@qiankunjs/sandbox": patch
"@qiankunjs/react": patch
---

feat: not rebind non-native global properties
8 changes: 8 additions & 0 deletions .changeset/tough-phones-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@qiankunjs/loader": patch
"qiankun": patch
"@qiankunjs/sandbox": patch
"@qiankunjs/shared": patch
---

🐛 compatible with webpack chunk cache logic
5 changes: 5 additions & 0 deletions .changeset/warm-chefs-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"qiankun": patch
---

✨ set data-name on micro app container
61 changes: 61 additions & 0 deletions .dumirc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { defineConfig } from 'dumi';

export default defineConfig({
publicPath: process.env.NOW_DEPLOY ? '/' : '/qiankun/',
base: process.env.NOW_DEPLOY ? '/' : '/qiankun',
resolve: {
docDirs: ['docs'],
codeBlockMode: 'passive',
},
locales: [
{ id: 'en-US', name: 'English' },
{ id: 'zh-CN', name: '中文' },
],
themeConfig: {
name: 'qiankun',
logo: 'https://gw.alipayobjects.com/zos/bmw-prod/8a74c1d3-16f3-4719-be63-15e467a68a24/km0cv8vn_w500_h500.png',
nav: {
mode: 'append',
value: {
'zh-CN': [
{
title: '版本公告',
children: [
{ title: '发布日志', link: 'https://github.com/umijs/qiankun/releases' },
{ title: '升级指南', link: '/zh/cookbook#从-1x-版本升级到-2x-版本' },
{ title: '1.x 版本', link: 'https://v1.qiankun.umijs.org/zh/' },
],
},
],
'en-US': [
{
title: 'Version Notice',
children: [
{ title: 'Changelog', link: 'https://github.com/umijs/qiankun/releases' },
{ title: 'Upgrade Guide', link: '/cookbook#upgrade-from-1x-version-to-2x-version' },
{ title: '1.x Version', link: 'https://v1.qiankun.umijs.org/' },
],
},
],
},
},
socialLinks: {
github: 'https://github.com/umijs/dumi',
},
},
metas: [
{
name: 'keywords',
content:
'microfrontend, micro frontend, micro frontends, micro-frontend, micro-frontends, microservice, javascript',
},
],
analytics: {
ga: 'UA-157295698-1',
baidu: '0f738d9b0ac90574c09183ea85bcfa2e',
},
favicons: ['https://gw.alipayobjects.com/mdn/rms_655822/afts/img/A*4sIUQpcos_gAAAAAAAAAAAAAARQnAQ'],
theme: {
'@c-primary': '#6451AB',
},
});
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
examples
dist
writable-dom

# TODO not linting test files temporary
__tests__/
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ module.exports = {
tsconfigRootDir: __dirname,
project: ['./tsconfig.eslint.json', './packages/*/tsconfig.json'],
},
ignorePatterns: ['.eslintrc.cjs'],
rules: {
'@typescript-eslint/no-unnecessary-condition': 'error',
'@typescript-eslint/no-explicit-any': ['error', { fixToUnknown: true }],
'@typescript-eslint/consistent-type-imports': ['error', { prefer: 'type-imports' }],
'@typescript-eslint/consistent-type-exports': ['error', { fixMixedExportsWithInlineTypeSpecifier: true }],
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ assignees: ''
## 最小可复现仓库

为节约大家的时间,无复现步骤的 ISSUE 会被关闭,提供之后再 REOPEN

<!-- https://github.com/YOUR_REPOSITORY_URL -->

## 复现步骤,错误日志以及相关配置
Expand Down
28 changes: 11 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,21 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [lts/*, latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/[email protected]

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn
- run: yarn ci
- run: yarn docs:build
- run: corepack enable # https://nodejs.org/api/corepack.html
- run: pnpm install
- run: pnpm run ci
# - run: pnpm run docs:build #执行报错,暂时关闭
4 changes: 2 additions & 2 deletions .github/workflows/emoji-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
steps:
- uses: actions-cool/[email protected]
with:
type: 'release'
emoji: '+1, laugh, heart, hooray, rocket, eyes'
type: "release"
emoji: "+1, laugh, heart, hooray, rocket, eyes"
4 changes: 2 additions & 2 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
node-version: "14"
check-latest: true
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"
- name: build
run: |
yarn
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/issue-close-inactive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- name: close inactive issue without reprodction
uses: actions-cool/[email protected]
with:
actions: 'close-issues'
labels: 'Need Reproduction'
actions: "close-issues"
labels: "Need Reproduction"
inactive-day: 30
body: |
Since the issue was labeled with `Need Reproduction`, but no response in 30 days. This issue will be close. If you have any questions, you can comment and reply.
Expand All @@ -21,8 +21,8 @@ jobs:
- name: close inactive issue not use template
uses: actions-cool/[email protected]
with:
actions: 'close-issues'
labels: 'pls use issue template'
actions: "close-issues"
labels: "pls use issue template"
inactive-day: 30
body: |
Since the issue was labeled with `pls use issue template`, but no response in 30 days. This issue will be close. If you have any questions, you can comment and reply.
Expand All @@ -31,8 +31,8 @@ jobs:
- name: close inactive issue out of scope
uses: actions-cool/[email protected]
with:
actions: 'close-issues'
labels: 'out-of-scope'
actions: "close-issues"
labels: "out-of-scope"
inactive-day: 30
body: |
Since the issue was labeled with `out-of-scope`, but no response in 30 days. This issue will be close. If you have any questions, you can comment and reply.
Expand All @@ -41,8 +41,8 @@ jobs:
- name: close inactive issue
uses: actions-cool/[email protected]
with:
actions: 'close-issues'
labels: 'inactive'
actions: "close-issues"
labels: "inactive"
inactive-day: 7
body: |
Since the issue was labeled with `inactive`, but no response in 7 days. This issue will be close. If you have any questions, you can comment and reply.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/issue-reply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: github.event.label.name == 'pr welcome' || github.event.label.name == 'help wanted'
uses: actions-cool/[email protected]
with:
actions: 'create-comment'
actions: "create-comment"
issue-number: ${{ github.event.issue.number }}
body: |
Hello @${{ github.event.issue.user.login }}. We totally like your proposal/feedback, welcome to send us a Pull Request for it. Please be sure to fill in the default template in the Pull Request, provide changelog/documentation/test cases if needed and make sure CI passed, we will review it soon. We appreciate your effort in advance and looking forward to your contribution!
Expand All @@ -23,7 +23,7 @@ jobs:
if: github.event.label.name == 'pls use issue template'
uses: actions-cool/[email protected]
with:
actions: 'create-comment, close-issue'
actions: "create-comment, close-issue"
issue-number: ${{ github.event.issue.number }}
body: |
Hello @${{ github.event.issue.user.login }}. To save both time, please use the issue template to report. This issue will be closed.
Expand All @@ -34,7 +34,7 @@ jobs:
if: github.event.label.name == 'Need Reproduction'
uses: actions-cool/[email protected]
with:
actions: 'create-comment'
actions: "create-comment"
issue-number: ${{ github.event.issue.number }}
body: |
Hello @${{ github.event.issue.user.login }}. In order to facilitate location and troubleshooting, we need you to provide a realistic example. Please forking these link [codesandbox](https://codesandbox.io/) or clone [qiankun examples](https://github.com/umijs/qiankun/tree/master/examples) to your GitHub repository.
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/now.yml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/publish-1.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ on:

jobs:
publish:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: '14.x'
node-version: "14.x"
check-latest: true
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"

- run: yarn
- run: yarn publish --tag qiankun1
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/publish-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ on:

jobs:
publish:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: '14.x'
node-version: "14.x"
check-latest: true
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"

- run: yarn
- run: yarn publish --tag latest
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ config.local.js
.umi
.umi-production
.idea/
.vscode/
.cache
yarn.lock
es
Expand All @@ -21,3 +22,8 @@ package-lock.json
.now
.pnpm-store
*.log
packages/qiankun/src/version.ts
packages/sandbox/src/core/sandbox/globals.ts
.dumi/tmp
.dumi/tmp-test
.dumi/tmp-production
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,14 @@
/coverage
.cache
examples
.umi
.dumi
.umi-production

.changeset/*
pnpm-lock.yaml
packages/sandbox/src/core/sandbox/globals.ts

# changeset 会修改这个文件,导致 prettier:check 失败
packages/*/package.json

Loading

0 comments on commit 24ba3c2

Please sign in to comment.