Unverified Commit da31ac70 authored by Zack Jackson's avatar Zack Jackson Committed by GitHub

fix: alternate bundler support for dropping client pages in AMP (#77601)

<!-- 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 #

-->

Fix failing tests for in DropClientPages mode for alternative bundler

---------
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 304c54ad
...@@ -1944,7 +1944,7 @@ export default async function getBaseWebpackConfig( ...@@ -1944,7 +1944,7 @@ export default async function getBaseWebpackConfig(
dev, dev,
}), }),
// rspack doesn't support the parser hooks used here // rspack doesn't support the parser hooks used here
!isRspack && (isClient || isEdgeServer) && new DropClientPage(), (isClient || isEdgeServer) && new DropClientPage(),
isNodeServer && isNodeServer &&
!dev && !dev &&
new (require('./webpack/plugins/next-trace-entrypoints-plugin') new (require('./webpack/plugins/next-trace-entrypoints-plugin')
......
import type { webpack } from 'next/dist/compiled/webpack/webpack' import type { webpack } from 'next/dist/compiled/webpack/webpack'
import { STRING_LITERAL_DROP_BUNDLE } from '../../../shared/lib/constants' import { STRING_LITERAL_DROP_BUNDLE } from '../../../shared/lib/constants'
import { extname } from 'path'
export const ampFirstEntryNamesMap: WeakMap<webpack.Compilation, string[]> = export const ampFirstEntryNamesMap: WeakMap<webpack.Compilation, string[]> =
new WeakMap() new WeakMap()
...@@ -8,9 +9,36 @@ const PLUGIN_NAME = 'DropAmpFirstPagesPlugin' ...@@ -8,9 +9,36 @@ const PLUGIN_NAME = 'DropAmpFirstPagesPlugin'
// Prevents outputting client pages when they are not needed // Prevents outputting client pages when they are not needed
export class DropClientPage implements webpack.WebpackPluginInstance { export class DropClientPage implements webpack.WebpackPluginInstance {
ampPages = new Set() ampPages = new Set<string>()
apply(compiler: webpack.Compiler) { apply(compiler: webpack.Compiler) {
const isRspack = !!(compiler as any).rspack
if (isRspack) {
// For Rspack, use a simpler emit hook-based approach
compiler.hooks.emit.tap(PLUGIN_NAME, (compilation: any) => {
Object.keys(compilation.assets).forEach((assetKey) => {
const asset = compilation.assets[assetKey]
if (asset?._value?.includes?.(STRING_LITERAL_DROP_BUNDLE)) {
const cleanAssetKey = assetKey.replace(/\\/g, '/')
const page = '/' + cleanAssetKey.split('pages/')[1]
const pageNoExt = page.split(extname(page))[0]
delete compilation.assets[assetKey]
// Detect being re-ran through a child compiler and don't re-mark the
// page as AMP
if (!pageNoExt.endsWith('.module')) {
this.ampPages.add(pageNoExt.replace(/\/index$/, '') || '/')
}
}
})
})
return
}
compiler.hooks.compilation.tap( compiler.hooks.compilation.tap(
PLUGIN_NAME, PLUGIN_NAME,
(compilation: any, { normalModuleFactory }: any) => { (compilation: any, { normalModuleFactory }: any) => {
...@@ -39,6 +67,7 @@ export class DropClientPage implements webpack.WebpackPluginInstance { ...@@ -39,6 +67,7 @@ export class DropClientPage implements webpack.WebpackPluginInstance {
} }
// @ts-ignore buildInfo exists on Module // @ts-ignore buildInfo exists on Module
entryModule.buildInfo = entryModule.buildInfo || {}
entryModule.buildInfo.NEXT_ampFirst = true entryModule.buildInfo.NEXT_ampFirst = true
} }
......
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