Skip to content

Commit 970b7e2

Browse files
authored
Merge pull request #475 from easyops-cn/steve/react-19
feat: support React 19
2 parents 8b49aba + e7888c4 commit 970b7e2

File tree

9 files changed

+3966
-1466
lines changed

9 files changed

+3966
-1466
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [18.x]
17+
node-version: [20.x]
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919

2020
steps:
@@ -23,18 +23,18 @@ jobs:
2323
with:
2424
timezone: Asia/Shanghai
2525

26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727

2828
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node-version }}
3232

3333
- name: Get yarn cache directory path
3434
id: yarn-cache-dir-path
3535
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
3636

37-
- uses: actions/cache@v3
37+
- uses: actions/cache@v4
3838
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
3939
with:
4040
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [18.x]
17+
node-version: [20.x]
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v3
24+
uses: actions/setup-node@v4
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727

2828
- name: Get yarn cache directory path
2929
id: yarn-cache-dir-path
3030
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
3131

32-
- uses: actions/cache@v3
32+
- uses: actions/cache@v4
3333
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
3434
with:
3535
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -42,7 +42,7 @@ jobs:
4242
- run: yarn build:i18n
4343

4444
- name: Deploy
45-
uses: peaceiris/actions-gh-pages@v3
45+
uses: peaceiris/actions-gh-pages@v4
4646
with:
4747
github_token: ${{ secrets.GITHUB_TOKEN }}
4848
publish_dir: ./website/build

.github/workflows/release-please.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
node-version: [18.x]
13+
node-version: [20.x]
1414
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1515

1616
steps:
17-
- uses: google-github-actions/release-please-action@v3
17+
- uses: googleapis/release-please-action@v4
1818
id: release
1919
with:
2020
token: ${{ secrets.GH_TOKEN_EVE }}
@@ -24,13 +24,13 @@ jobs:
2424
bump-minor-pre-major: true
2525

2626
# The logic below handles the npm publication:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
# these if statements ensure that a publication only occurs when
2929
# a new release is created:
3030
if: ${{ steps.release.outputs.docusaurus-search-local--release_created }}
3131

3232
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v3
33+
uses: actions/setup-node@v4
3434
with:
3535
node-version: ${{ matrix.node-version }}
3636
if: ${{ steps.release.outputs.docusaurus-search-local--release_created }}
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
4141
if: ${{ steps.release.outputs.docusaurus-search-local--release_created }}
4242

43-
- uses: actions/cache@v3
43+
- uses: actions/cache@v4
4444
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
4545
with:
4646
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

docusaurus-search-local/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@easyops-cn/autocomplete.js": "^0.38.1",
3939
"@node-rs/jieba": "^1.6.0",
4040
"cheerio": "^1.0.0",
41-
"clsx": "^1.1.1",
41+
"clsx": "^2.1.1",
4242
"comlink": "^4.4.2",
4343
"debug": "^4.2.0",
4444
"fs-extra": "^10.0.0",
@@ -60,8 +60,8 @@
6060
"@types/klaw-sync": "^6.0.0",
6161
"@types/lunr": "^2.3.3",
6262
"@types/node": "^18.0.0",
63-
"@types/react": "^18.2.37",
64-
"@types/react-helmet": "^6.1.0",
63+
"@types/react": "^19.0.3",
64+
"@types/react-helmet": "^6.1.1",
6565
"@types/react-router-dom": "^5.1.6",
6666
"concurrently": "^7.0.0",
6767
"copyfiles": "^2.4.0",
@@ -70,7 +70,7 @@
7070
},
7171
"peerDependencies": {
7272
"@docusaurus/theme-common": "^2 || ^3",
73-
"react": "^16.14.0 || ^17 || ^18",
74-
"react-dom": "^16.14.0 || 17 || ^18"
73+
"react": "^16.14.0 || ^17 || ^18 || ^19",
74+
"react-dom": "^16.14.0 || 17 || ^18 || ^19"
7575
}
7676
}

docusaurus-search-local/src/client/theme/SearchBar/SearchBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default function SearchBar({
8080
// eslint-disable-next-line react-hooks/rules-of-hooks
8181
const { preferredVersion } = useDocsPreferredVersion(
8282
activePlugin?.pluginId ?? docsPluginIdForPreferredVersion
83-
);
83+
) as { preferredVersion: { path: string; isLast: boolean } };
8484
if (preferredVersion && !preferredVersion.isLast) {
8585
versionUrl = preferredVersion.path + "/";
8686
}

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
],
4848
"packageManager": "[email protected]",
4949
"resolutions": {
50-
"@docusaurus/core": "3.0.0",
51-
"@docusaurus/module-type-aliases": "3.0.0",
52-
"@docusaurus/preset-classic": "3.0.0",
53-
"@docusaurus/theme-classic": "3.0.0",
54-
"@docusaurus/theme-common": "3.0.0",
55-
"@docusaurus/plugin-content-docs": "3.0.0",
56-
"@types/react": "18.2.37"
50+
"@docusaurus/core": "3.7.0",
51+
"@docusaurus/module-type-aliases": "3.7.0",
52+
"@docusaurus/preset-classic": "3.7.0",
53+
"@docusaurus/theme-classic": "3.7.0",
54+
"@docusaurus/theme-common": "3.7.0",
55+
"@docusaurus/plugin-content-docs": "3.7.0",
56+
"@types/react": "19.0.3"
5757
},
5858
"engines": {
59-
"node": ">=18"
59+
"node": ">=20"
6060
}
6161
}

website-multi-docs/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414
"write-heading-ids": "docusaurus write-heading-ids"
1515
},
1616
"dependencies": {
17-
"@docusaurus/core": "^3.0.0",
18-
"@docusaurus/plugin-content-docs": "^3.0.0",
19-
"@docusaurus/preset-classic": "^3.0.0",
20-
"@docusaurus/theme-classic": "^3.0.0",
21-
"@docusaurus/theme-common": "^3.0.0",
17+
"@docusaurus/core": "^3.7.0",
18+
"@docusaurus/plugin-content-docs": "^3.7.0",
19+
"@docusaurus/preset-classic": "^3.7.0",
20+
"@docusaurus/theme-classic": "^3.7.0",
21+
"@docusaurus/theme-common": "^3.7.0",
2222
"@easyops-cn/docusaurus-search-local": "^workspace:*",
23-
"@mdx-js/react": "^3.0.0",
24-
"clsx": "^1.1.1",
23+
"@mdx-js/react": "^3.1.0",
24+
"clsx": "^2.1.1",
2525
"prism-react-renderer": "^2.1.0",
26-
"react": "^18.2.0",
27-
"react-dom": "^18.2.0"
26+
"react": "^19.0.0",
27+
"react-dom": "^19.0.0"
2828
},
2929
"devDependencies": {
30-
"@docusaurus/module-type-aliases": "^3.0.0"
30+
"@docusaurus/module-type-aliases": "^3.7.0"
3131
},
3232
"browserslist": {
3333
"production": [

website/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
"serve": "docusaurus serve"
1212
},
1313
"dependencies": {
14-
"@docusaurus/core": "^3.0.0",
15-
"@docusaurus/preset-classic": "^3.0.0",
16-
"@docusaurus/theme-classic": "^3.0.0",
17-
"@docusaurus/theme-common": "^3.0.0",
14+
"@docusaurus/core": "^3.7.0",
15+
"@docusaurus/plugin-content-docs": "^3.7.0",
16+
"@docusaurus/preset-classic": "^3.7.0",
17+
"@docusaurus/theme-classic": "^3.7.0",
18+
"@docusaurus/theme-common": "^3.7.0",
1819
"@easyops-cn/docusaurus-search-local": "workspace:*",
19-
"@mdx-js/react": "^3.0.0",
20-
"clsx": "^1.1.1",
21-
"react": "^18.2.0",
22-
"react-dom": "^18.2.0"
20+
"@mdx-js/react": "^3.1.0",
21+
"clsx": "^2.1.1",
22+
"react": "^19.0.0",
23+
"react-dom": "^19.0.0"
2324
},
2425
"browserslist": {
2526
"production": [

0 commit comments

Comments
 (0)