Unverified Commit b32b656a authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Built-in app loader plugin for additional bundler (#76017)

Ported from https://github.com/vercel/next.js/tree/wbinnssmith/try-ci-test, originally by @hardfist.

Adds support for a built-in app loader through the `BUILTIN_APP_LOADER` environment variable.
parent 2491b7ea
...@@ -13,7 +13,7 @@ import * as Log from './output/log' ...@@ -13,7 +13,7 @@ import * as Log from './output/log'
import type { LoadedEnvFiles } from '@next/env' import type { LoadedEnvFiles } from '@next/env'
import type { AppLoaderOptions } from './webpack/loaders/next-app-loader' import type { AppLoaderOptions } from './webpack/loaders/next-app-loader'
import { posix, join, dirname, extname } from 'path' import { posix, join, dirname, extname, normalize } from 'path'
import { stringify } from 'querystring' import { stringify } from 'querystring'
import fs from 'fs' import fs from 'fs'
import { import {
...@@ -474,9 +474,18 @@ export function getInstrumentationEntry(opts: { ...@@ -474,9 +474,18 @@ export function getInstrumentationEntry(opts: {
} }
} }
export function getAppLoader() {
return process.env.BUILTIN_APP_LOADER
? `builtin:next-app-loader`
: 'next-app-loader'
}
export function getAppEntry(opts: Readonly<AppLoaderOptions>) { export function getAppEntry(opts: Readonly<AppLoaderOptions>) {
if (process.env.NEXT_RSPACK && process.env.BUILTIN_APP_LOADER) {
;(opts as any).projectRoot = normalize(join(__dirname, '../../..'))
}
return { return {
import: `next-app-loader?${stringify(opts)}!`, import: `${getAppLoader()}?${stringify(opts)}!`,
layer: WEBPACK_LAYERS.reactServerComponents, layer: WEBPACK_LAYERS.reactServerComponents,
} }
} }
......
import type { webpack } from 'next/dist/compiled/webpack/webpack' import type { webpack } from 'next/dist/compiled/webpack/webpack'
import { relative } from 'path' import { relative } from 'path'
import { SimpleWebpackError } from './simpleWebpackError' import { SimpleWebpackError } from './simpleWebpackError'
import { getAppLoader } from '../../../entries'
export function getNextAppLoaderError( export function getNextAppLoaderError(
err: Error, err: Error,
...@@ -8,7 +9,7 @@ export function getNextAppLoaderError( ...@@ -8,7 +9,7 @@ export function getNextAppLoaderError(
compiler: webpack.Compiler compiler: webpack.Compiler
): SimpleWebpackError | false { ): SimpleWebpackError | false {
try { try {
if (!module.loaders[0].loader.includes('next-app-loader')) { if (!module.loaders[0].loader.includes(getAppLoader())) {
return false return false
} }
......
...@@ -7,6 +7,7 @@ import type { ...@@ -7,6 +7,7 @@ import type {
ModuleGraph, ModuleGraph,
} from 'webpack' } from 'webpack'
import type { ModuleGraphConnection } from 'webpack' import type { ModuleGraphConnection } from 'webpack'
import { getAppLoader } from '../entries'
export function traverseModules( export function traverseModules(
compilation: Compilation, compilation: Compilation,
...@@ -61,7 +62,7 @@ export function forEachEntryModule( ...@@ -61,7 +62,7 @@ export function forEachEntryModule(
if ( if (
!request.startsWith('next-edge-ssr-loader?') && !request.startsWith('next-edge-ssr-loader?') &&
!request.startsWith('next-edge-app-route-loader?') && !request.startsWith('next-edge-app-route-loader?') &&
!request.startsWith('next-app-loader?') !request.startsWith(`${getAppLoader()}?`)
) )
continue continue
...@@ -74,7 +75,7 @@ export function forEachEntryModule( ...@@ -74,7 +75,7 @@ export function forEachEntryModule(
) { ) {
entryModule.dependencies.forEach((dependency) => { entryModule.dependencies.forEach((dependency) => {
const modRequest: string | undefined = (dependency as any).request const modRequest: string | undefined = (dependency as any).request
if (modRequest?.includes('next-app-loader')) { if (modRequest?.includes(getAppLoader())) {
entryModule = compilation.moduleGraph.getResolvedModule(dependency) entryModule = compilation.moduleGraph.getResolvedModule(dependency)
} }
}) })
......
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