Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
cbcda2d
chore: update rspack to 1.4.2
SyMind Jul 3, 2025
b10df6d
chore: update rspack to 1.4.4
SyMind Jul 7, 2025
97b405e
Merge branch 'canary' into rspack-1.4.2
SyMind Jul 7, 2025
d864ef3
update to 1.4.5
SyMind Jul 8, 2025
913f571
chore: merge origin canary
SyMind Jul 8, 2025
3a5986b
update snapshot
SyMind Jul 8, 2025
84989f7
types-and-precompiled
SyMind Jul 8, 2025
a453c91
feat: open persistent cache by default in rspack
SyMind Jul 8, 2025
00003e2
update snapshot
SyMind Jul 8, 2025
1bf056f
chore: try rspack canary version
SyMind Jul 11, 2025
73cc6e6
chore: merge origin canary
SyMind Jul 11, 2025
7e36e8b
update canary
SyMind Jul 11, 2025
5233590
merge origin canary
SyMind Jul 11, 2025
0c9642d
update snapshot
SyMind Jul 14, 2025
30aafa1
chore: merge origin canary
SyMind Jul 14, 2025
cabc286
rspack 1.4.8
SyMind Jul 16, 2025
e508d20
buildDependencies add babelConfigFile and jsConfigPath
SyMind Jul 16, 2025
0912af3
fix: telemetry test case
SyMind Jul 17, 2025
6089206
upgrade rspack
SyMind Jul 18, 2025
91d3b18
chore: merge canary
SyMind Jul 18, 2025
5fb33c2
feat: merge origin canary
SyMind Jul 18, 2025
adaf7c2
types-and-precompiled
SyMind Jul 18, 2025
d8503c2
chore: update rspack to 1.4.9
SyMind Jul 22, 2025
0974c8f
chore: merge origin canary
SyMind Jul 22, 2025
e5e623d
types-and-precompiled
SyMind Jul 22, 2025
2651036
init
SyMind Aug 18, 2025
8098c80
HotReloaderRspack for Rspack
SyMind Aug 19, 2025
61cad65
fix: should await super.start
SyMind Aug 19, 2025
bbf1b28
add lazy compilation middleware
SyMind Aug 19, 2025
61aebda
chore: merge persisent cache
SyMind Aug 20, 2025
4e07e55
builtEntriesCachePath
SyMind Aug 20, 2025
4fc60d5
add hash for built entries cache
SyMind Aug 20, 2025
1efdf43
merge
SyMind Aug 20, 2025
bfc2720
fix prettier
SyMind Aug 20, 2025
a688c81
fix: should not use createEntries
SyMind Aug 20, 2025
bd01aec
short hash
SyMind Aug 20, 2025
9923d54
fix: typo
SyMind Aug 20, 2025
6fbb92d
only cache entries that enabled cache
SyMind Aug 20, 2025
b8879c4
upgrade rspack
SyMind Aug 20, 2025
62ed5cd
remove outdata entries
SyMind Aug 20, 2025
f769ce4
fix: file removed
SyMind Aug 20, 2025
b057a76
fix: test/integration/amphtml/test/index.test.js
SyMind Aug 20, 2025
77f0dc6
chore: merge origin canary
SyMind Nov 6, 2025
2a5a9d2
fix: pnpm lock
SyMind Nov 10, 2025
a34ffa9
fix: merge conflicts
SyMind Nov 10, 2025
edfa059
types-and-precompiled
SyMind Nov 10, 2025
c39c7e5
feat: using HotReloaderRspack
SyMind Nov 10, 2025
a098942
fix: cache buildDependencies
SyMind Nov 10, 2025
64e191c
chore: rm test/integration/amphtml/test/index.test.js
SyMind Nov 10, 2025
37fb20e
fix: cache for middleware
SyMind Nov 10, 2025
ba670a6
update rspack 1.6.5
SyMind Nov 26, 2025
b9f9000
update @next/rspack-core
SyMind Nov 26, 2025
5239a8d
chore: merge origin canary
SyMind Nov 26, 2025
5618d0a
chore: update snapshot
SyMind Nov 28, 2025
714fa8d
chore: merge origin main
SyMind Nov 28, 2025
a657db5
lint
SyMind Nov 28, 2025
21f31e6
udpate snapshot
SyMind Nov 28, 2025
dc4c455
Merge branch 'canary' into rspack-persistent-cache
SyMind Dec 1, 2025
9c3bbcf
chore: merge origin canary
SyMind Dec 17, 2025
fa8f4ab
revert snapshot
SyMind Dec 17, 2025
5861ba2
fix: mcp-server test case
SyMind Dec 17, 2025
5549bc0
update snapshopt
SyMind Dec 17, 2025
ff21d1f
pnpm types-and-precompiled
SyMind Dec 17, 2025
824879c
fix: buildFallbackError
SyMind Dec 17, 2025
26eac3b
Merge branch 'canary' into rspack-persistent-cache
SyMind Dec 17, 2025
dc9af8a
add some comments
SyMind Dec 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"@next/third-parties": "workspace:*",
"@opentelemetry/api": "1.4.1",
"@picocss/pico": "1.5.10",
"@rspack/core": "1.3.12",
"@rspack/core": "npm:@rspack-canary/core@1.4.7-canary-8029c1db-20250711030541",
"@rspack/plugin-react-refresh": "1.2.0",
"@slack/web-api": "7.9.1",
"@swc/cli": "0.1.55",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-rspack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"types": "index.d.ts",
"dependencies": {
"@rspack/core": "1.3.12",
"@rspack/core": "npm:@rspack-canary/core@1.4.7-canary-8029c1db-20250711030541",
"@rspack/plugin-react-refresh": "1.2.0",
"react-refresh": "0.12.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
"@next/swc": "15.4.0-canary.117",
"@opentelemetry/api": "1.6.0",
"@playwright/test": "1.51.1",
"@rspack/core": "1.3.12",
"@rspack/core": "npm:@rspack-canary/core@1.4.7-canary-8029c1db-20250711030541",
"@storybook/addon-a11y": "8.6.0",
"@storybook/addon-essentials": "8.6.0",
"@storybook/addon-interactions": "8.6.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/next/src/build/webpack-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,13 @@ export default async function getBaseWebpackConfig(
: undefined,
}

if (isRspack) {
// @ts-ignore
webpack5Config.experiments.cache = {
type: 'persistent',
}
}
Comment thread
SyMind marked this conversation as resolved.

webpack5Config.module!.parser = {
javascript: {
url: 'relative',
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/compiled/sass-loader/cjs.js

Large diffs are not rendered by default.

250 changes: 151 additions & 99 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

127 changes: 63 additions & 64 deletions test/development/basic/hmr/run-error-recovery-hmr-test.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,31 +177,30 @@ export function runErrorRecoveryHmrTest(nextConfig: {
`)
} else if (process.env.NEXT_RSPACK) {
expect(trimEndMultiline(source)).toMatchInlineSnapshot(`
"./pages/hmr/about2.js
× Module build failed:
├─▶ ×
│ │ x Unexpected token. Did you mean \`{'}'}\` or \`}\`?
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:1]
│ │ 4 | <p>This is the about page.</p>
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ : ^
│ │ \`----
│ │
│ │ x Unexpected eof
│ │ ,-[TEST_DIR/pages/hmr/about2.js:7:3]
│ │ 5 | div
│ │ 6 | )
│ │ 7 | }
│ │ \`----
│ │
╰─▶ Syntax Error

Import trace for requested module:
./pages/hmr/about2.js"
`)
"./pages/hmr/about2.js
× Module build failed:
╰─▶ × Error: x Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`?
│ ,-[7:1]
│ 4 | <p>This is the about page.</p>
│ 5 | div
│ 6 | )
│ 7 | }
│ : ^
│ \`----
│ x Unexpected eof
│ ,-[7:3]
│ 5 | div
│ 6 | )
│ 7 | }
│ \`----
│ Caused by:
│ Syntax Error

Import trace for requested module:
./pages/hmr/about2.js"
`)
} else {
expect(source).toMatchInlineSnapshot(`
"./pages/hmr/about2.js
Expand Down Expand Up @@ -517,25 +516,25 @@ export function runErrorRecoveryHmrTest(nextConfig: {
} else if (process.env.NEXT_RSPACK) {
expect(trimEndMultiline(await getRedboxSource(browser)))
.toMatchInlineSnapshot(`
"./components/parse-error.xyz
× Module parse failed:
╰─▶ × JavaScript parsing error: Expression expected
╭─[3:0]
1 │ This
2 │ is
3 │ }}}
· ─
4 │ invalid
5 │ js
╰────

help:
You may need an appropriate loader to handle this file type.

Import trace for requested module:
./components/parse-error.xyz
./pages/hmr/about8.js"
`)
"./components/parse-error.xyz
× Module parse failed:
╰─▶ × JavaScript parse error: Expression expected
╭─[3:0]
1 │ This
2 │ is
3 │ }}}
· ─
4 │ invalid
5 │ js
╰────

help:
You may need an appropriate loader to handle this file type.

Import trace for requested module:
./components/parse-error.xyz
./pages/hmr/about8.js"
`)
} else {
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"./components/parse-error.xyz
Expand Down Expand Up @@ -625,26 +624,26 @@ export function runErrorRecoveryHmrTest(nextConfig: {
} else if (process.env.NEXT_RSPACK) {
expect(trimEndMultiline(next.normalizeTestDirContent(redboxSource)))
.toMatchInlineSnapshot(`
"./components/parse-error.js
× Module build failed:
─▶ ×
x Expression expected
,-[./components/parse-error.js:3:1]
1 | This
2 | is
3 | }}}
: ^
4 | invalid
5 | js
│ \`----
╰─▶ Syntax Error

Import trace for requested module:
./components/parse-error.js
./pages/hmr/about9.js"
`)
"./components/parse-error.js
× Module build failed:
─▶ × Error: x Expression expected
,-[3:1]
1 | This
2 | is
3 | }}}
: ^
4 | invalid
5 | js
\`----
│ Caused by:
Syntax Error

Import trace for requested module:
./components/parse-error.js
./pages/hmr/about9.js"
`)
} else {
redboxSource = redboxSource.substring(0, redboxSource.indexOf('`----'))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ describe('app-dir - error-on-next-codemod-comment', () => {
You have an unresolved @next/codemod comment "remove jsx of next line" that needs review.
After review, either remove the comment if you made the necessary changes or replace "@next-codemod-error" with "@next-codemod-ignore" to bypass the build error if no action at this line can be taken."
`)
} else if (process.env.NEXT_RSPACK) {
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"./app/page.tsx
× Module build failed:
╰─▶ × Error: x You have an unresolved @next/codemod comment "remove jsx of next line" that needs review.
│ | After review, either remove the comment if you made the necessary changes or replace "@next-codemod-error" with "@next-codemod-ignore" to bypass the build error if no action at this line can be taken.
│ ,-[2:1]
│ 1 | export default function Page() {
│ 2 | // @next-codemod-error remove jsx of next line
│ : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
│ 3 | return <p>hello world</p>
│ 4 | }
│ \`----
│"
`)
} else {
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
"./app/page.tsx
Expand Down