Skip to content

Commit 1d241e2

Browse files
authored
Merge branch 'main' into id
2 parents 38737d4 + 190ca7c commit 1d241e2

File tree

38 files changed

+1272
-1100
lines changed

38 files changed

+1272
-1100
lines changed

.github/workflows/test-windows.yml

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

.github/workflows/test-ubuntu.yml renamed to .github/workflows/test.yml

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test (Ubuntu)
1+
name: Test
22

33
# Controls when the action will run.
44
on:
@@ -47,13 +47,17 @@ jobs:
4747
- "!**/dictionary.txt"
4848
4949
# ======== ut ========
50-
ut-ubuntu:
51-
runs-on: ubuntu-latest
50+
ut:
51+
runs-on: ${{ matrix.os }}
5252
needs: changes
5353
if: ${{ needs.changes.outputs.changed == 'true' }}
5454
strategy:
5555
matrix:
56+
os: [ubuntu-latest]
5657
node-version: [18, 20, 22]
58+
include:
59+
- node-version: 18
60+
os: windows-latest
5761

5862
# Steps represent a sequence of tasks that will be executed as part of the job
5963
steps:
@@ -62,6 +66,12 @@ jobs:
6266
with:
6367
fetch-depth: 10
6468

69+
- name: Git config
70+
if: ${{ matrix.os == 'windows-latest' }}
71+
shell: bash
72+
run: |
73+
git config --system core.longpaths true
74+
6575
- name: Install Pnpm
6676
run: corepack enable
6777

@@ -78,16 +88,26 @@ jobs:
7888
run: pnpm run test:unit
7989

8090
# ======== integration && e2e ========
81-
integration-e2e-ubuntu:
82-
runs-on: ubuntu-latest
91+
integration-e2e:
92+
runs-on: ${{ matrix.os }}
8393
needs: changes
8494
if: ${{ needs.changes.outputs.changed == 'true' }}
8595
strategy:
8696
matrix:
97+
os: [ubuntu-latest]
8798
node-version: [18, 20, 22]
99+
include:
100+
- node-version: 18
101+
os: windows-latest
88102

89103
# Steps represent a sequence of tasks that will be executed as part of the job
90104
steps:
105+
- name: Git config
106+
if: ${{ matrix.os == 'windows-latest' }}
107+
shell: bash
108+
run: |
109+
git config --system core.longpaths true
110+
91111
- name: Checkout
92112
uses: actions/checkout@v4
93113
with:
@@ -103,7 +123,7 @@ jobs:
103123
cache: 'pnpm'
104124

105125
- name: Install Dependencies
106-
run: pnpm install && cd ./tests && npx playwright install
126+
run: pnpm install && cd ./tests && pnpx playwright install chromium
107127

108128
- name: Integration Test (Vitest)
109129
run: pnpm run test:integration
@@ -112,11 +132,11 @@ jobs:
112132
run: pnpm run test:e2e
113133

114134
# ======== benchmark ========
115-
benchmark-ubuntu:
135+
benchmark:
116136
# Only Ubuntu 20.04 and 22.04 are supported at the moment.
117137
# See https://github.com/CodSpeedHQ/action/blob/016456b513677f9d4a1c509c7f8a38d8dd55b2b0/.github/workflows/ci.yml#L19.
118138
runs-on: ubuntu-22.04
119-
needs: [integration-e2e-ubuntu]
139+
needs: [integration-e2e]
120140
strategy:
121141
matrix:
122142
node-version: [20]
@@ -151,8 +171,8 @@ jobs:
151171
# ======== exit ========
152172
pr-check-required:
153173
if: (!cancelled() && !failure())
154-
needs: [ut-ubuntu, integration-e2e-ubuntu, benchmark-ubuntu]
174+
needs: [ut, integration-e2e, benchmark]
155175
runs-on: ubuntu-latest
156-
name: Test passed or skipped (Ubuntu)
176+
name: Test passed or skipped
157177
steps:
158-
- run: echo "All tests passed or skipped (Ubuntu)."
178+
- run: echo "All tests passed or skipped."

examples/module-federation/mf-host/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^18.3.1"
1313
},
1414
"devDependencies": {
15-
"@module-federation/rsbuild-plugin": "^0.7.1",
16-
"@rsbuild/core": "~1.1.0",
15+
"@module-federation/rsbuild-plugin": "^0.7.5",
16+
"@rsbuild/core": "~1.1.3",
1717
"@rsbuild/plugin-react": "^1.0.7",
1818
"@types/react": "^18.3.12",
1919
"@types/react-dom": "^18.3.1",

examples/module-federation/mf-react-component/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"storybook": "storybook dev -p 6006"
1919
},
2020
"devDependencies": {
21-
"@module-federation/enhanced": "^0.7.1",
22-
"@module-federation/rsbuild-plugin": "^0.7.1",
23-
"@module-federation/storybook-addon": "^3.0.5",
21+
"@module-federation/enhanced": "^0.7.5",
22+
"@module-federation/rsbuild-plugin": "^0.7.5",
23+
"@module-federation/storybook-addon": "^3.0.8",
2424
"@rsbuild/plugin-react": "^1.0.7",
2525
"@rslib/core": "workspace:*",
2626
"@types/react": "^18.3.12",
2727
"http-server": "^14.1.1",
2828
"react": "^18.3.1",
2929
"react-dom": "^18.3.1",
30-
"storybook": "^8.3.6",
30+
"storybook": "^8.4.4",
3131
"storybook-addon-rslib": "^0.1.4",
3232
"storybook-react-rsbuild": "^0.1.4"
3333
},

examples/module-federation/mf-remote/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^18.3.1"
1313
},
1414
"devDependencies": {
15-
"@module-federation/rsbuild-plugin": "^0.7.1",
16-
"@rsbuild/core": "~1.1.0",
15+
"@module-federation/rsbuild-plugin": "^0.7.5",
16+
"@rsbuild/core": "~1.1.3",
1717
"@rsbuild/plugin-react": "^1.0.7",
1818
"@types/react": "^18.3.12",
1919
"@types/react-dom": "^18.3.1",

examples/react-component-bundle-false/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@rsbuild/plugin-react": "^1.0.7",
12-
"@rsbuild/plugin-sass": "^1.1.0",
12+
"@rsbuild/plugin-sass": "^1.1.1",
1313
"@rslib/core": "workspace:*",
1414
"@types/react": "^18.3.12",
1515
"react": "^18.3.1"

examples/react-component-bundle/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@rsbuild/plugin-react": "^1.0.7",
12-
"@rsbuild/plugin-sass": "^1.1.0",
12+
"@rsbuild/plugin-sass": "^1.1.1",
1313
"@rslib/core": "workspace:*",
1414
"@types/react": "^18.3.12",
1515
"react": "^18.3.1"

examples/react-component-umd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"@rsbuild/plugin-react": "^1.0.7",
11-
"@rsbuild/plugin-sass": "^1.1.0",
11+
"@rsbuild/plugin-sass": "^1.1.1",
1212
"@rslib/core": "workspace:*",
1313
"@types/react": "^18.3.12",
1414
"react": "^18.3.1"

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "rslib-monorepo",
33
"private": true,
44
"scripts": {
5-
"build": "cross-env NX_DAEMON=false nx run-many -t build --exclude @examples/* --parallel=10",
5+
"build": "cross-env NX_DAEMON=false nx run-many -t build --exclude @examples/* rslib-website --parallel=10",
66
"build:examples": "cross-env NX_DAEMON=false nx run-many -t build --projects @examples/* --parallel=10",
77
"change": "changeset",
88
"changeset": "changeset",
@@ -49,13 +49,13 @@
4949
"cspell-ban-words": "^0.0.4",
5050
"fs-extra": "^11.2.0",
5151
"nano-staged": "^0.8.0",
52-
"nx": "^20.0.12",
52+
"nx": "^20.1.2",
5353
"prettier": "^3.3.3",
5454
"prettier-plugin-packagejson": "^2.5.3",
5555
"simple-git-hooks": "^2.11.1",
5656
"typescript": "^5.6.3",
57-
"vitest": "^2.1.4",
58-
"zx": "^8.2.1"
57+
"vitest": "^2.1.5",
58+
"zx": "^8.2.2"
5959
},
6060
"packageManager": "[email protected]",
6161
"engines": {

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"prebundle": "prebundle"
3838
},
3939
"dependencies": {
40-
"@rsbuild/core": "~1.1.0",
40+
"@rsbuild/core": "~1.1.3",
4141
"rsbuild-plugin-dts": "workspace:*",
4242
"tinyglobby": "^0.2.10"
4343
},
@@ -49,7 +49,7 @@
4949
"memfs": "^4.14.0",
5050
"picocolors": "1.1.1",
5151
"prebundle": "1.2.5",
52-
"rslib": "npm:@rslib/[email protected].17",
52+
"rslib": "npm:@rslib/[email protected].18",
5353
"rslog": "^1.2.3",
5454
"tsconfck": "3.1.4",
5555
"typescript": "^5.6.3"

0 commit comments

Comments
 (0)