Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -142,7 +142,7 @@
"@next/third-parties": "workspace:*",
"@opentelemetry/api": "1.4.1",
"@picocss/pico": "1.5.10",
"@rspack/core": "1.6.0",
"@rspack/core": "1.6.7",
"@slack/web-api": "7.9.1",
"@swc/cli": "0.1.55",
"@swc/core": "1.11.24",
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,6 +7,6 @@
},
"types": "index.d.ts",
"dependencies": {
"@next/rspack-core": "1.0.1"
"@next/rspack-core": "npm:@next-rspack/core@1.0.1-beta.4"
}
}
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": "16.1.0-canary.16",
"@opentelemetry/api": "1.6.0",
"@playwright/test": "1.51.1",
"@rspack/core": "1.6.0",
"@rspack/core": "1.6.7",
"@storybook/addon-a11y": "8.6.0",
"@storybook/addon-essentials": "8.6.0",
"@storybook/addon-interactions": "8.6.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/next/src/build/webpack-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2263,6 +2263,15 @@ export default async function getBaseWebpackConfig(
if (isRspack) {
// The layers experiment is now stable in Rspack
delete webpack5Config.experiments!.layers

if (!webpack5Config.node) {
webpack5Config.node = {}
}
// NOTE: Rspack's defaults differ from webpack.
if (isClient || isEdgeServer) {
webpack5Config.node.__dirname = 'mock'
webpack5Config.node.__filename = 'mock'
}
}

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

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions packages/next/src/shared/lib/format-webpack-messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ function formatMessage(
body = body.slice(0, breakingChangeIndex)
}

// TODO: Rspack currently doesn't populate moduleName correctly in some cases,
// fall back to moduleIdentifier as a workaround
if (
process.env.NEXT_RSPACK &&
!message.moduleName &&
!message.file &&
message.moduleIdentifier
) {
const parts = message.moduleIdentifier.split('!')
message.moduleName = parts[parts.length - 1]
}

message =
(message.moduleName ? stripAnsi(message.moduleName) + '\n' : '') +
(message.file ? stripAnsi(message.file) + '\n' : '') +
Expand Down
451 changes: 248 additions & 203 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Loading
Loading