Unverified Commit 56e5acc0 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

webpack: fix swcPlugins with relative paths (#92770)

Webpack didn't correctly load relative paths for `swcPlugins`.

https://github.com/vercel/next.js/pull/92579 will add a test
parent 6413e523
...@@ -142,6 +142,7 @@ export default function nextJest(options: { dir?: string } = {}) { ...@@ -142,6 +142,7 @@ export default function nextJest(options: { dir?: string } = {}) {
isEsmProject, isEsmProject,
pagesDir, pagesDir,
imageConfig, imageConfig,
configDir: options.dir,
} }
return { return {
......
...@@ -43,6 +43,7 @@ export interface JestTransformerConfig extends TransformerConfig { ...@@ -43,6 +43,7 @@ export interface JestTransformerConfig extends TransformerConfig {
jsConfig: any jsConfig: any
resolvedBaseUrl?: ResolvedBaseUrl resolvedBaseUrl?: ResolvedBaseUrl
pagesDir?: string pagesDir?: string
configDir?: string
serverComponents?: boolean serverComponents?: boolean
isEsmProject: boolean isEsmProject: boolean
modularizeImports?: NextConfig['modularizeImports'] modularizeImports?: NextConfig['modularizeImports']
...@@ -90,6 +91,7 @@ const createTransformer: TransformerCreator< ...@@ -90,6 +91,7 @@ const createTransformer: TransformerCreator<
jestConfig.testEnvironment === 'node' || jestConfig.testEnvironment === 'node' ||
jestConfig.testEnvironment.includes('jest-environment-node'), jestConfig.testEnvironment.includes('jest-environment-node'),
filename, filename,
configDir: inputOptions?.configDir,
jsConfig: inputOptions?.jsConfig, jsConfig: inputOptions?.jsConfig,
resolvedBaseUrl: inputOptions?.resolvedBaseUrl, resolvedBaseUrl: inputOptions?.resolvedBaseUrl,
pagesDir: inputOptions?.pagesDir, pagesDir: inputOptions?.pagesDir,
......
...@@ -60,6 +60,7 @@ function getBaseSWCOptions({ ...@@ -60,6 +60,7 @@ function getBaseSWCOptions({
hasReactRefresh, hasReactRefresh,
globalWindow, globalWindow,
esm, esm,
configDir,
modularizeImports, modularizeImports,
swcPlugins, swcPlugins,
compilerOptions, compilerOptions,
...@@ -83,6 +84,7 @@ function getBaseSWCOptions({ ...@@ -83,6 +84,7 @@ function getBaseSWCOptions({
hasReactRefresh: boolean hasReactRefresh: boolean
globalWindow: boolean globalWindow: boolean
esm: boolean esm: boolean
configDir?: string
modularizeImports?: NextConfig['modularizeImports'] modularizeImports?: NextConfig['modularizeImports']
compilerOptions: NextConfig['compiler'] compilerOptions: NextConfig['compiler']
swcPlugins: ExperimentalConfig['swcPlugins'] swcPlugins: ExperimentalConfig['swcPlugins']
...@@ -115,7 +117,10 @@ function getBaseSWCOptions({ ...@@ -115,7 +117,10 @@ function getBaseSWCOptions({
) )
const plugins = (swcPlugins ?? []) const plugins = (swcPlugins ?? [])
.filter(Array.isArray) .filter(Array.isArray)
.map(([name, options]: any) => [require.resolve(name), options]) .map(([name, options]: any) => [
require.resolve(name, configDir ? { paths: [configDir] } : undefined),
options,
])
return { return {
jsc: { jsc: {
...@@ -311,6 +316,7 @@ export function getJestSWCOptions({ ...@@ -311,6 +316,7 @@ export function getJestSWCOptions({
filename, filename,
esm, esm,
modularizeImports, modularizeImports,
configDir,
swcPlugins, swcPlugins,
compilerOptions, compilerOptions,
jsConfig, jsConfig,
...@@ -322,6 +328,7 @@ export function getJestSWCOptions({ ...@@ -322,6 +328,7 @@ export function getJestSWCOptions({
isServer: boolean isServer: boolean
filename: string filename: string
esm: boolean esm: boolean
configDir?: string
modularizeImports?: NextConfig['modularizeImports'] modularizeImports?: NextConfig['modularizeImports']
swcPlugins: ExperimentalConfig['swcPlugins'] swcPlugins: ExperimentalConfig['swcPlugins']
compilerOptions: NextConfig['compiler'] compilerOptions: NextConfig['compiler']
...@@ -337,6 +344,7 @@ export function getJestSWCOptions({ ...@@ -337,6 +344,7 @@ export function getJestSWCOptions({
jest: true, jest: true,
development: false, development: false,
hasReactRefresh: false, hasReactRefresh: false,
configDir,
globalWindow: !isServer, globalWindow: !isServer,
modularizeImports, modularizeImports,
swcPlugins, swcPlugins,
...@@ -393,6 +401,8 @@ export function getLoaderSWCOptions({ ...@@ -393,6 +401,8 @@ export function getLoaderSWCOptions({
isPageFile, isPageFile,
isCacheComponents, isCacheComponents,
hasReactRefresh, hasReactRefresh,
// The folder containing the next.config.js, used for resolving relative config paths.
configDir,
modularizeImports, modularizeImports,
optimizeServerReact, optimizeServerReact,
optimizePackageImports, optimizePackageImports,
...@@ -420,6 +430,7 @@ export function getLoaderSWCOptions({ ...@@ -420,6 +430,7 @@ export function getLoaderSWCOptions({
appDir?: string appDir?: string
isPageFile: boolean isPageFile: boolean
hasReactRefresh: boolean hasReactRefresh: boolean
configDir: string
optimizeServerReact?: boolean optimizeServerReact?: boolean
modularizeImports: NextConfig['modularizeImports'] modularizeImports: NextConfig['modularizeImports']
isCacheComponents?: boolean isCacheComponents?: boolean
...@@ -448,6 +459,7 @@ export function getLoaderSWCOptions({ ...@@ -448,6 +459,7 @@ export function getLoaderSWCOptions({
development, development,
globalWindow: !isServer, globalWindow: !isServer,
hasReactRefresh, hasReactRefresh,
configDir,
modularizeImports, modularizeImports,
swcPlugins, swcPlugins,
compilerOptions, compilerOptions,
......
...@@ -152,6 +152,7 @@ async function loaderTransform( ...@@ -152,6 +152,7 @@ async function loaderTransform(
!!nextConfig.experimental?.allowDevelopmentBuild, !!nextConfig.experimental?.allowDevelopmentBuild,
isCacheComponents: nextConfig.cacheComponents, isCacheComponents: nextConfig.cacheComponents,
hasReactRefresh, hasReactRefresh,
configDir: rootDir,
modularizeImports: nextConfig?.modularizeImports, modularizeImports: nextConfig?.modularizeImports,
optimizePackageImports: nextConfig?.experimental?.optimizePackageImports, optimizePackageImports: nextConfig?.experimental?.optimizePackageImports,
swcPlugins: nextConfig?.experimental?.swcPlugins, swcPlugins: nextConfig?.experimental?.swcPlugins,
......
...@@ -19,6 +19,7 @@ describe('swcEnvOptions', () => { ...@@ -19,6 +19,7 @@ describe('swcEnvOptions', () => {
serverReferenceHashSalt: 'test-salt', serverReferenceHashSalt: 'test-salt',
bundleLayer: undefined, bundleLayer: undefined,
cacheHandlers: undefined, cacheHandlers: undefined,
configDir: '/',
} }
it('should not include extra env options when swcEnvOptions is not set', () => { it('should not include extra env options when swcEnvOptions is not set', () => {
......
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