Unverified Commit fbe1ffb6 authored by Shu Ding's avatar Shu Ding Committed by GitHub

Include resolved external package dirs (#41706)

We currently assume that external packages are installed via a package
manager, but actually in a monorepo they can be in local.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 13f6eff4
...@@ -120,11 +120,19 @@ function errorIfEnvConflicted(config: NextConfigComplete, key: string) { ...@@ -120,11 +120,19 @@ function errorIfEnvConflicted(config: NextConfigComplete, key: string) {
} }
} }
function isResourceInPackages(resource: string, packageNames?: string[]) { function isResourceInPackages(
resource: string,
packageNames?: string[],
packageDirMapping?: Map<string, string>
) {
return packageNames?.some((p: string) => return packageNames?.some((p: string) =>
resource.includes( packageDirMapping && packageDirMapping.has(p)
path.sep + pathJoin('node_modules', p.replace(/\//g, path.sep)) + path.sep ? resource.startsWith(packageDirMapping.get(p)! + path.sep)
) : resource.includes(
path.sep +
pathJoin('node_modules', p.replace(/\//g, path.sep)) +
path.sep
)
) )
} }
...@@ -1028,6 +1036,8 @@ export default async function getBaseWebpackConfig( ...@@ -1028,6 +1036,8 @@ export default async function getBaseWebpackConfig(
...(config.experimental.serverComponentsExternalPackages || []) ...(config.experimental.serverComponentsExternalPackages || [])
) )
let resolvedExternalPackageDirs: Map<string, string>
async function handleExternals( async function handleExternals(
context: string, context: string,
request: string, request: string,
...@@ -1194,9 +1204,30 @@ export default async function getBaseWebpackConfig( ...@@ -1194,9 +1204,30 @@ export default async function getBaseWebpackConfig(
// If a package should be transpiled by Next.js, we skip making it external. // If a package should be transpiled by Next.js, we skip making it external.
// It doesn't matter what the extension is, as we'll transpile it anyway. // It doesn't matter what the extension is, as we'll transpile it anyway.
if (config.experimental.transpilePackages && !resolvedExternalPackageDirs) {
resolvedExternalPackageDirs = new Map()
// We need to reoslve all the external package dirs initially.
for (const pkg of config.experimental.transpilePackages) {
const pkgRes = await resolveExternal(
dir,
config.experimental.esmExternals,
context,
pkg + '/package.json',
hasAppDir,
isEsmRequested,
getResolve,
isLocal ? isLocalCallback : undefined
)
if (pkgRes.res) {
resolvedExternalPackageDirs.set(pkg, path.dirname(pkgRes.res))
}
}
}
const shouldBeBundled = isResourceInPackages( const shouldBeBundled = isResourceInPackages(
res, res,
config.experimental.transpilePackages config.experimental.transpilePackages,
resolvedExternalPackageDirs
) )
if (/node_modules[/\\].*\.[mc]?js$/.test(res)) { if (/node_modules[/\\].*\.[mc]?js$/.test(res)) {
...@@ -1240,9 +1271,12 @@ export default async function getBaseWebpackConfig( ...@@ -1240,9 +1271,12 @@ export default async function getBaseWebpackConfig(
// Default behavior: bundle the code! // Default behavior: bundle the code!
} }
const shouldIncludeExternalDirs =
config.experimental.externalDir || !!config.experimental.transpilePackages
const codeCondition = { const codeCondition = {
test: /\.(tsx|ts|js|cjs|mjs|jsx)$/, test: /\.(tsx|ts|js|cjs|mjs|jsx)$/,
...(config.experimental.externalDir ...(shouldIncludeExternalDirs
? // Allowing importing TS/TSX files from outside of the root dir. ? // Allowing importing TS/TSX files from outside of the root dir.
{} {}
: { include: [dir, ...babelIncludeRegexes] }), : { include: [dir, ...babelIncludeRegexes] }),
......
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