Unverified Commit e6b103b8 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Simplify options passed to createWebpackAliases (#57239)

Reducing the options so it becomes easier to call it outside of
webpack-config.ts, which would be needed to pass it to Turbopack.

<!-- 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 c2ba7e6a
...@@ -24,37 +24,39 @@ interface CompilerAliases { ...@@ -24,37 +24,39 @@ interface CompilerAliases {
} }
export function createWebpackAliases({ export function createWebpackAliases({
dev, isClient,
pageExtensions,
isEdgeServer, isEdgeServer,
isNodeServer,
dev,
config, config,
pagesDir, pagesDir,
appDir, appDir,
dir, dir,
distDir,
isClient,
reactProductionProfiling, reactProductionProfiling,
isNodeServer,
clientResolveRewrites,
hasRewrites, hasRewrites,
}: { }: {
dev: boolean isClient: boolean
pageExtensions: string[]
isEdgeServer: boolean isEdgeServer: boolean
isNodeServer: boolean
dev: boolean
config: NextConfigComplete config: NextConfigComplete
pagesDir: string | undefined pagesDir: string | undefined
appDir: string | undefined appDir: string | undefined
dir: string dir: string
distDir: string
isClient: boolean
reactProductionProfiling: boolean reactProductionProfiling: boolean
isNodeServer: boolean
clientResolveRewrites: string
hasRewrites: boolean hasRewrites: boolean
}): CompilerAliases { }): CompilerAliases {
const distDir = path.join(dir, config.distDir)
const pageExtensions = config.pageExtensions
const clientResolveRewrites = require.resolve(
'../shared/lib/router/utils/resolve-rewrites'
)
const customAppAliases: CompilerAliases = {} const customAppAliases: CompilerAliases = {}
const customDocumentAliases: CompilerAliases = {} const customDocumentAliases: CompilerAliases = {}
// tell webpack where to look for _app and _document
// using aliases to allow falling back to the default
// version when removed or not present
if (dev) { if (dev) {
const nextDistPath = 'next/dist/' + (isEdgeServer ? 'esm/' : '') const nextDistPath = 'next/dist/' + (isEdgeServer ? 'esm/' : '')
customAppAliases[`${PAGES_DIR_ALIAS}/_app`] = [ customAppAliases[`${PAGES_DIR_ALIAS}/_app`] = [
......
...@@ -601,13 +601,6 @@ export default async function getBaseWebpackConfig( ...@@ -601,13 +601,6 @@ export default async function getBaseWebpackConfig(
} satisfies ClientEntries) } satisfies ClientEntries)
: undefined : undefined
// tell webpack where to look for _app and _document
// using aliases to allow falling back to the default
// version when removed or not present
const clientResolveRewrites = require.resolve(
'../shared/lib/router/utils/resolve-rewrites'
)
const resolveConfig: webpack.Configuration['resolve'] = { const resolveConfig: webpack.Configuration['resolve'] = {
// Disable .mjs for node_modules bundling // Disable .mjs for node_modules bundling
extensions: isNodeServer extensions: isNodeServer
...@@ -619,18 +612,15 @@ export default async function getBaseWebpackConfig( ...@@ -619,18 +612,15 @@ export default async function getBaseWebpackConfig(
...nodePathList, // Support for NODE_PATH environment variable ...nodePathList, // Support for NODE_PATH environment variable
], ],
alias: createWebpackAliases({ alias: createWebpackAliases({
dev, isClient,
pageExtensions,
isEdgeServer, isEdgeServer,
isNodeServer,
dev,
config, config,
pagesDir, pagesDir,
appDir, appDir,
dir, dir,
distDir,
isClient,
reactProductionProfiling, reactProductionProfiling,
isNodeServer,
clientResolveRewrites,
hasRewrites, hasRewrites,
}), }),
...(isClient || isEdgeServer ...(isClient || isEdgeServer
......
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