Skip to content

Commit fcfe7ad

Browse files
committed
Merge master into migrate-portal-wrapper
2 parents 8e8b310 + 9d7cebc commit fcfe7ad

28 files changed

Lines changed: 590 additions & 507 deletions

‎.dumirc.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
// more config: https://d.umijs.org/config
21
import { defineConfig } from 'dumi';
32
import path from 'path';
43

5-
const basePath = process.env.GITHUB_ACTIONS ? '/util/' : '/';
6-
const publicPath = process.env.GITHUB_ACTIONS ? '/util/' : '/';
4+
const basePath = process.env.GH_PAGES ? '/util/' : '/';
5+
const publicPath = basePath;
76

87
export default defineConfig({
8+
alias: {
9+
'@rc-component/util$': path.resolve(__dirname, 'src'),
10+
'@rc-component/util/es': path.resolve(__dirname, 'src'),
11+
'rc-util$': path.resolve(__dirname, 'src'),
12+
'rc-util/es': path.resolve(__dirname, 'src'),
13+
},
14+
mfsu: false,
915
favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
1016
themeConfig: {
1117
name: 'Util',
1218
logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
1319
},
14-
outputPath: '.doc',
15-
exportStatic: {},
20+
outputPath: 'docs-dist',
1621
base: basePath,
1722
publicPath,
18-
alias: {
19-
'rc-util/es': path.resolve(__dirname, 'src'),
20-
},
2123
});

‎.eslintrc.js‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: ant-design
2+
open_collective: ant-design

‎.github/dependabot.yml‎

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,27 @@
11
version: 2
22
updates:
3-
- package-ecosystem: npm
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "21:00"
8-
open-pull-requests-limit: 10
9-
ignore:
10-
- dependency-name: eslint
11-
versions:
12-
- 7.18.0
13-
- 7.19.0
14-
- 7.20.0
15-
- 7.21.0
16-
- 7.22.0
17-
- 7.23.0
18-
- 7.24.0
19-
- dependency-name: "@types/jest"
20-
versions:
21-
- 26.0.20
22-
- 26.0.21
23-
- 26.0.22
24-
- dependency-name: react
25-
versions:
26-
- 17.0.1
27-
- dependency-name: "@types/react"
28-
versions:
29-
- 17.0.0
30-
- 17.0.1
31-
- 17.0.2
32-
- 17.0.3
33-
- dependency-name: "@types/react-dom"
34-
versions:
35-
- 17.0.0
36-
- 17.0.1
37-
- 17.0.2
38-
- dependency-name: react-dom
39-
versions:
40-
- 17.0.1
41-
- dependency-name: np
42-
versions:
43-
- 7.2.0
44-
- 7.3.0
45-
- 7.4.0
46-
- dependency-name: react-is
47-
versions:
48-
- 17.0.1
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: weekly
7+
day: monday
8+
time: '21:00'
9+
timezone: Asia/Shanghai
10+
open-pull-requests-limit: 10
11+
groups:
12+
npm-dependencies:
13+
patterns:
14+
- '*'
15+
16+
- package-ecosystem: github-actions
17+
directory: '/'
18+
schedule:
19+
interval: weekly
20+
day: monday
21+
time: '21:00'
22+
timezone: Asia/Shanghai
23+
open-pull-requests-limit: 10
24+
groups:
25+
github-actions:
26+
patterns:
27+
- '*'

‎.github/workflows/codeql.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: "CodeQL"
1+
name: CodeQL
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [master]
66
pull_request:
7-
branches: [ "master" ]
7+
branches: [master]
88
schedule:
9-
- cron: "4 6 * * 0"
9+
- cron: '40 12 * * 0'
1010

1111
jobs:
1212
analyze:
@@ -20,22 +20,24 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
language: [ javascript ]
23+
language: [javascript]
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v7
28+
with:
29+
persist-credentials: false
2830

2931
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v2
32+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e
3133
with:
3234
languages: ${{ matrix.language }}
3335
queries: +security-and-quality
3436

3537
- name: Autobuild
36-
uses: github/codeql-action/autobuild@v2
38+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e
3739

3840
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v2
41+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e
4042
with:
41-
category: "/language:${{ matrix.language }}"
43+
category: '/language:${{ matrix.language }}'
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
name: ✅ test
2-
on: [push, pull_request]
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
permissions:
10+
contents: read
11+
312
jobs:
413
test:
5-
uses: react-component/rc-test/.github/workflows/test-npm.yml@main
6-
secrets: inherit
14+
uses: react-component/rc-test/.github/workflows/test-utoo.yml@main
15+
secrets:
16+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/react-doctor.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: React Doctor
2+
3+
on:
4+
pull_request:
5+
branches: [master]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
concurrency:
12+
group: react-doctor-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
react-doctor:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v7
20+
with:
21+
persist-credentials: false
22+
- uses: millionco/react-doctor@0b4f4f4bd248a154e64eb508a48347f71154b3f3
23+
with:
24+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/site-deploy.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Surge Preview
2+
3+
on:
4+
pull_request:
5+
branches: [master]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
statuses: write
11+
12+
concurrency:
13+
group: surge-preview-${{ github.event.pull_request.number || github.ref }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
preview:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v7
21+
with:
22+
persist-credentials: false
23+
- name: Check Surge token
24+
id: surge-token
25+
env:
26+
SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
27+
run: |
28+
if [ -n "$SURGE_TOKEN" ]; then
29+
echo "enabled=true" >> "$GITHUB_OUTPUT"
30+
else
31+
echo "enabled=false" >> "$GITHUB_OUTPUT"
32+
fi
33+
- name: Install dependencies
34+
if: ${{ steps.surge-token.outputs.enabled == 'true' }}
35+
run: npm install --legacy-peer-deps --legacy-peer-deps --ignore-scripts --no-audit --loglevel=warn
36+
- name: Build preview
37+
if: ${{ steps.surge-token.outputs.enabled == 'true' }}
38+
run: npm run build
39+
- uses: afc163/surge-preview@bf90a5a86111f6311ca42f0a5a0f80fb0fb03cec
40+
if: ${{ steps.surge-token.outputs.enabled == 'true' }}
41+
env:
42+
SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
43+
NPM_CONFIG_LEGACY_PEER_DEPS: 'true'
44+
with:
45+
dist: docs-dist
46+
failOnError: false
47+
github_token: ${{ secrets.GITHUB_TOKEN }}
48+
surge_token: ${{ env.SURGE_TOKEN }}

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ pnpm-lock.yaml
3030
yarn.lock
3131
.doc
3232
bun.lockb
33-
3433
# umi
3534
.umi
3635
.umi-production
3736
.umi-test
3837
.env.local
39-
4038
.dumi/tmp
4139
.dumi/tmp-test
4240
.dumi/tmp-production
41+
es
42+
docs-dist
43+
.vercel

0 commit comments

Comments
 (0)