Unverified Commit cf1a099f authored by Gengkun's avatar Gengkun Committed by GitHub

Alternate bundler: pass more tests and update to 1.3.0-beta (#77269)

1. pass more tests
-
`test/production/app-dir/subresource-integrity/subresource-integrity.test.ts`
    - `production/app-dir/no-mangling/no-mangling.test.ts`
    - `test/integration/jsconfig-empty/test/index.test.js`
    - `integration/tsconfig-verifier/test/index.test.js`
    - `test/production/app-dir/mangle-reserved/mangle-reserved.test.ts`
2. update to 1.3.0-beta.0 (released from the main branch)

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent 74d6e51a
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"@next/third-parties": "workspace:*", "@next/third-parties": "workspace:*",
"@opentelemetry/api": "1.4.1", "@opentelemetry/api": "1.4.1",
"@picocss/pico": "1.5.10", "@picocss/pico": "1.5.10",
"@rspack/core": "npm:@rspack-canary/core@1.2.9-canary-c009cfc1-20250313053424", "@rspack/core": "1.3.0-beta.0",
"@rspack/plugin-react-refresh": "1.0.1", "@rspack/plugin-react-refresh": "1.0.1",
"@svgr/webpack": "5.5.0", "@svgr/webpack": "5.5.0",
"@swc/cli": "0.1.55", "@swc/cli": "0.1.55",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
}, },
"types": "index.d.ts", "types": "index.d.ts",
"dependencies": { "dependencies": {
"@rspack/core": "npm:@rspack-canary/core@1.2.9-canary-c009cfc1-20250313053424", "@rspack/core": "1.3.0-beta.0",
"@rspack/plugin-react-refresh": "1.0.1", "@rspack/plugin-react-refresh": "1.0.1",
"react-refresh": "0.12.0" "react-refresh": "0.12.0"
} }
......
...@@ -1097,8 +1097,7 @@ export default async function getBaseWebpackConfig( ...@@ -1097,8 +1097,7 @@ export default async function getBaseWebpackConfig(
}): boolean { }): boolean {
return ( return (
!module.type?.startsWith('css') && !module.type?.startsWith('css') &&
// rspack doesn't support module.size module.size() > 160000 &&
(isRspack || module.size() > 160000) &&
/node_modules[/\\]/.test(module.nameForCondition() || '') /node_modules[/\\]/.test(module.nameForCondition() || '')
) )
}, },
...@@ -1112,15 +1111,12 @@ export default async function getBaseWebpackConfig( ...@@ -1112,15 +1111,12 @@ export default async function getBaseWebpackConfig(
if (isModuleCSS(module)) { if (isModuleCSS(module)) {
module.updateHash(hash) module.updateHash(hash)
} else { } else {
// rspack doesn't support this if (!module.libIdent) {
if (!isRspack) { throw new Error(
if (!module.libIdent) { `Encountered unknown module type: ${module.type}. Please open an issue.`
throw new Error( )
`Encountered unknown module type: ${module.type}. Please open an issue.`
)
}
hash.update(module.libIdent({ context: dir }))
} }
hash.update(module.libIdent({ context: dir }))
} }
// Ensures the name of the chunk is not the same between two modules in different layers // Ensures the name of the chunk is not the same between two modules in different layers
...@@ -1174,9 +1170,22 @@ export default async function getBaseWebpackConfig( ...@@ -1174,9 +1170,22 @@ export default async function getBaseWebpackConfig(
? [ ? [
new (getRspackCore().SwcJsMinimizerRspackPlugin)({ new (getRspackCore().SwcJsMinimizerRspackPlugin)({
// JS minimizer configuration // JS minimizer configuration
// options should align with crates/napi/src/minify.rs#patch_opts
minimizerOptions: {
compress: {
inline: 2,
global_defs: {
'process.env.__NEXT_PRIVATE_MINIMIZE_MACRO_FALSE': false,
},
},
mangle: !noMangling && { reserved: ['AbortSignal'] },
},
}), }),
new (getRspackCore().LightningCssMinimizerRspackPlugin)({ new (getRspackCore().LightningCssMinimizerRspackPlugin)({
// CSS minimizer configuration // CSS minimizer configuration
minimizerOptions: {
targets: supportedBrowsers,
},
}), }),
] ]
: [ : [
......
...@@ -524,11 +524,7 @@ export class ClientReferenceManifestPlugin { ...@@ -524,11 +524,7 @@ export class ClientReferenceManifestPlugin {
} else { } else {
// If this is a concatenation, register each child to the parent ID. // If this is a concatenation, register each child to the parent ID.
if ( if (
connection.module?.constructor.name === connection.module?.constructor.name === 'ConcatenatedModule'
'ConcatenatedModule' ||
(Boolean(process.env.NEXT_RSPACK) &&
(connection.module as any)?.constructorName ===
'ConcatenatedModule')
) { ) {
const concatenatedMod = connection.module const concatenatedMod = connection.module
const concatenatedModId = const concatenatedModId =
......
...@@ -11,7 +11,7 @@ export class SubresourceIntegrityPlugin { ...@@ -11,7 +11,7 @@ export class SubresourceIntegrityPlugin {
public apply(compiler: webpack.Compiler) { public apply(compiler: webpack.Compiler) {
compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => { compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
compilation.hooks.afterOptimizeAssets.tap( compilation.hooks.afterProcessAssets.tap(
{ {
name: PLUGIN_NAME, name: PLUGIN_NAME,
stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS, stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment