Skip to content

Commit 0525c53

Browse files
committed
Merge branch 'main' into lint_ci_0303
2 parents 3be2f54 + 3a321d3 commit 0525c53

7 files changed

Lines changed: 37 additions & 155 deletions

File tree

.github/renovate.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["github>rstackjs/renovate"],
4+
"ignoreDeps": ["@rspack/core", "@rspack/cli"]
5+
}

.github/renovate.json5

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

example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"preview": "rspack preview"
99
},
1010
"devDependencies": {
11-
"@rspack/cli": "2.0.0-canary-20260116",
12-
"@rspack/core": "2.0.0-canary-20260116",
11+
"@rspack/cli": "2.0.0-beta.4",
12+
"@rspack/core": "2.0.0-beta.4",
1313
"@rspack/dev-server": "workspace:*"
1414
}
1515
}

pnpm-lock.yaml

Lines changed: 10 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/e2e/__snapshots__/built-in-routes.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exports[`Built in routes > with simple config > should handle GET request to inv
4646

4747
exports[`Built in routes > with simple config > should handle GET request to magic async chunk > console messages 1`] = `[]`;
4848

49-
exports[`Built in routes > with simple config > should handle GET request to magic async chunk > response headers content-type 1`] = `"application/javascript; charset=utf-8"`;
49+
exports[`Built in routes > with simple config > should handle GET request to magic async chunk > response headers content-type 1`] = `"text/javascript; charset=utf-8"`;
5050

5151
exports[`Built in routes > with simple config > should handle GET request to magic async chunk > response status 1`] = `200`;
5252

@@ -62,7 +62,7 @@ exports[`Built in routes > with simple config > should handle HEAD request to di
6262

6363
exports[`Built in routes > with simple config > should handle HEAD request to magic async chunk > console messages 1`] = `[]`;
6464

65-
exports[`Built in routes > with simple config > should handle HEAD request to magic async chunk > response headers content-type 1`] = `"application/javascript; charset=utf-8"`;
65+
exports[`Built in routes > with simple config > should handle HEAD request to magic async chunk > response headers content-type 1`] = `"text/javascript; charset=utf-8"`;
6666

6767
exports[`Built in routes > with simple config > should handle HEAD request to magic async chunk > response status 1`] = `200`;
6868

tests/e2e/__snapshots__/client-reconnect.test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ exports[`client.reconnect option > specified as number > should try to reconnect
2121
"[rspack-dev-server] Disconnected!",
2222
"[rspack-dev-server] Trying to reconnect...",
2323
"WebSocket connection to 'ws://127.0.0.1:8161/ws' failed: Error in connection establishment: net::ERR_CONNECTION_REFUSED",
24-
"[rspack-dev-server] JSHandle@object",
24+
"[rspack-dev-server] [object Event]",
2525
"[rspack-dev-server] Trying to reconnect...",
2626
"WebSocket connection to 'ws://127.0.0.1:8161/ws' failed: Error in connection establishment: net::ERR_CONNECTION_REFUSED",
27-
"[rspack-dev-server] JSHandle@object",
27+
"[rspack-dev-server] [object Event]",
2828
]
2929
`;
3030

0 commit comments

Comments
 (0)