Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code refactoring for loader rules (#46277 #46277

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Code refactoring for loader rules (#46277 #46277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 25 additions & 27 deletions packages/next/src/build/webpack-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ import { FontLoaderManifestPlugin } from './webpack/plugins/font-loader-manifest
import { getSupportedBrowsers } from './utils'
import { METADATA_IMAGE_RESOURCE_QUERY } from './webpack/loaders/metadata/discover'

const EXTERNAL_PACKAGES = require('../lib/server-external-packages.json')
const EXTERNAL_PACKAGES =
require('../lib/server-external-packages.json') as string[]

const NEXT_PROJECT_ROOT = path.join(__dirname, '..', '..')
const NEXT_PROJECT_ROOT_DIST = path.join(NEXT_PROJECT_ROOT, 'dist')
Expand Down Expand Up @@ -100,14 +101,6 @@ const BABEL_CONFIG_FILES = [
'babel.config.cjs',
]

function appDirIssuerLayer(layer: string) {
return (
layer === WEBPACK_LAYERS.client ||
layer === WEBPACK_LAYERS.server ||
layer === WEBPACK_LAYERS.appClient
)
}

export const getBabelConfigFile = async (dir: string) => {
const babelConfigFile = await BABEL_CONFIG_FILES.reduce(
async (memo: Promise<string | undefined>, filename) => {
Expand Down Expand Up @@ -757,12 +750,8 @@ export default async function getBaseWebpackConfig(
}
}

const getBabelOrSwcLoader = () => {
return useSWCLoader ? getSwcLoader() : getBabelLoader()
}

const defaultLoaders = {
babel: getBabelOrSwcLoader(),
babel: useSWCLoader ? getSwcLoader() : getBabelLoader(),
}

const swcLoaderForRSC = hasServerComponents
Expand Down Expand Up @@ -1128,6 +1117,11 @@ export default async function getBaseWebpackConfig(
const optOutBundlingPackages = EXTERNAL_PACKAGES.concat(
...(config.experimental.serverComponentsExternalPackages || [])
)
const optOutBundlingPackageRegex = new RegExp(
`[/\\\\]node_modules[/\\\\](${optOutBundlingPackages
.map((p) => p.replace(/\//g, '[/\\\\]'))
.join('|')})[/\\\\]`
)

let resolvedExternalPackageDirs: Map<string, string>

Expand Down Expand Up @@ -1341,7 +1335,7 @@ export default async function getBaseWebpackConfig(
if (layer === WEBPACK_LAYERS.server) {
// All packages should be bundled for the server layer if they're not opted out.
// This option takes priority over the transpilePackages option.
if (isResourceInPackages(res, optOutBundlingPackages)) {
if (optOutBundlingPackageRegex.test(res)) {
return `${externalType} ${request}`
}

Expand Down Expand Up @@ -1776,7 +1770,13 @@ export default async function getBaseWebpackConfig(
? [
{
test: codeCondition.test,
issuerLayer: appDirIssuerLayer,
issuerLayer: {
or: [
WEBPACK_LAYERS.server,
WEBPACK_LAYERS.client,
WEBPACK_LAYERS.appClient,
],
},
resolve: {
alias: {
// Alias next/head component to noop for RSC
Expand All @@ -1797,17 +1797,15 @@ export default async function getBaseWebpackConfig(
{
exclude: [staticGenerationAsyncStorageRegex],
issuerLayer: WEBPACK_LAYERS.server,
test(req: string) {
// If it's not a source code file, or has been opted out of
// bundling, don't resolve it.
if (
!codeCondition.test.test(req) ||
isResourceInPackages(req, optOutBundlingPackages)
) {
return false
}

return true
test: {
// Resolve it if it is a source code file, and it has NOT been
// opted out of bundling.
and: [
codeCondition.test,
{
not: [optOutBundlingPackageRegex],
},
],
},
resolve: {
// It needs `conditionNames` here to require the proper asset,
Expand Down