Skip to content

Commit b02b6c5

Browse files
authored
bump rspack 1.3.5 and fix rspack types (#1016)
1 parent 02e6cc4 commit b02b6c5

File tree

12 files changed

+257
-490
lines changed

12 files changed

+257
-490
lines changed

.github/workflows/test-ubuntu.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ on:
99
push:
1010
branches: [main]
1111
paths-ignore:
12-
- "document/**"
13-
- "*.md"
14-
- "*.mdx"
12+
- 'document/**'
13+
- '*.md'
14+
- '*.mdx'
1515

1616
merge_group:
1717

1818
# Allows you to run this workflow manually from the Actions tab
1919
workflow_dispatch:
2020

21-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
21+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2222
jobs:
2323
# ======== ut ========
2424
ut-ubuntu:
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
strategy:
2727
matrix:
28-
node-version: [22.x]
28+
node-version: [22.x]
2929

3030
# Steps represent a sequence of tasks that will be executed as part of the job
3131
steps:
@@ -60,13 +60,12 @@ jobs:
6060
- name: Unit Test
6161
if: ${{steps.skip-ci.outputs.RESULT != 'true'}}
6262
run: pnpm run test:all
63-
6463
# ======== e2e ========
6564
# e2e-ubuntu:
6665
# runs-on: ubuntu-latest
6766
# strategy:
6867
# matrix:
69-
# node-version: [18.x]
68+
# node-version: [18.x]
7069

7170
# # Steps represent a sequence of tasks that will be executed as part of the job
7271
# steps:

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
"**/.DS_Store": true
1414
},
1515
"editor.defaultFormatter": "biomejs.biome",
16-
"editor.defaultFoldingRangeProvider": "biomejs.biome"
16+
"editor.defaultFoldingRangeProvider": "biomejs.biome",
17+
"[yaml]": {
18+
"editor.defaultFormatter": "esbenp.prettier-vscode"
19+
}
1720
}

e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@rsdoctor/types": "workspace:*",
2020
"@rsdoctor/utils": "workspace:*",
2121
"@rsdoctor/webpack-plugin": "workspace:*",
22-
"@rspack/core": "^1.2.8",
22+
"@rspack/core": "1.3.5",
2323
"@types/lodash": "^4.17.16",
2424
"@types/node": "^16",
2525
"@types/react": "^18.3.20",

examples/rspack-banner-minimal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
},
2020
"devDependencies": {
2121
"@rsdoctor/rspack-plugin": "workspace:*",
22-
"@rspack/cli": "^1.2.7",
23-
"@rspack/core": "^1.2.7",
22+
"@rspack/cli": "1.3.5",
23+
"@rspack/core": "1.3.5",
2424
"@rspack/plugin-react-refresh": "1.0.0",
2525
"@types/react": "^18.0.25",
2626
"@types/react-dom": "^18.0.8",

examples/rspack-layers-minimal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"devDependencies": {
2020
"tsm": "2.3.0",
2121
"@rsdoctor/rspack-plugin": "workspace:*",
22-
"@rspack/cli": "^1.2.7",
23-
"@rspack/core": "^1.2.7",
22+
"@rspack/cli": "1.3.5",
23+
"@rspack/core": "1.3.5",
2424
"@rspack/plugin-react-refresh": "^1.0.1",
2525
"@types/react": "^18.0.25",
2626
"@types/react-dom": "^18.0.8",

examples/rspack-minimal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"devDependencies": {
2323
"@rsdoctor/rspack-plugin": "workspace:*",
24-
"@rspack/cli": "^1.2.7",
25-
"@rspack/core": "^1.2.7",
24+
"@rspack/cli": "1.3.5",
25+
"@rspack/core": "1.3.5",
2626
"@rspack/plugin-react-refresh": "^1.0.1",
2727
"@types/react": "^18.0.25",
2828
"@types/react-dom": "^18.0.8",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"browserslist-load-config": "^1.0.0"
8686
},
8787
"devDependencies": {
88-
"@rspack/core": "^1.2.8",
88+
"@rspack/core": "1.3.5",
8989
"@scripts/test-helper": "workspace:*",
9090
"@types/fs-extra": "^11.0.4",
9191
"@types/lodash": "^4.17.16",

packages/rspack-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"lodash": "^4.17.21"
2828
},
2929
"devDependencies": {
30-
"@rspack/core": "^1.2.8",
30+
"@rspack/core": "1.3.5",
3131
"@types/lodash": "^4.17.16",
3232
"@types/node": "^16",
3333
"@types/tapable": "2.2.7",

packages/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"source-map": "^0.7.4"
2525
},
2626
"devDependencies": {
27-
"@rspack/core": "^1.2.8",
27+
"@rspack/core": "1.3.5",
2828
"@types/node": "^16",
2929
"@types/react": "^18.3.20",
3030
"tslib": "2.8.1",

packages/types/src/plugin/baseCompiler.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ export type BaseStats = Stats | RspackStatsWrapper;
5959

6060
export interface JsStatsError {
6161
message: string;
62-
formatted: string;
63-
title: string;
62+
formatted?: string;
63+
title?: string;
6464
}
6565

6666
export interface JsStatsWarning extends JsRspackError {
6767
message: string;
68-
formatted: string;
68+
formatted?: string;
6969
}
7070

7171
export interface JsRspackError {
72-
name: string;
72+
name?: string;
7373
message: string;
7474
moduleIdentifier?: string;
7575
loc?: string;

0 commit comments

Comments
 (0)