Skip to content

Next.js: Fix module transpilation #31501

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

Merged
merged 2 commits into from
Jun 3, 2025
Merged

Next.js: Fix module transpilation #31501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f7da28
WIP
valentinpalkovic May 16, 2025
599144c
Merge branch 'next' into valentin/fix-nextjs-module-transpilation
valentinpalkovic May 30, 2025
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
15 changes: 13 additions & 2 deletions code/frameworks/nextjs/src/babel/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ import type { Options } from 'storybook/internal/types';

import { getVirtualModules } from '@storybook/builder-webpack5';

export const configureBabelLoader = async (baseConfig: any, options: Options) => {
import type { NextConfig } from 'next';

import { getNodeModulesExcludeRegex } from '../utils';

export const configureBabelLoader = async (
baseConfig: any,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using a more specific type than 'any' for baseConfig

options: Options,
nextConfig: NextConfig
) => {
const { virtualModules } = await getVirtualModules(options);

const babelOptions = await options.presets.apply('babel', {}, options);
Expand All @@ -23,7 +31,10 @@ export const configureBabelLoader = async (baseConfig: any, options: Options) =>
},
],
include: [getProjectRoot()],
exclude: [/node_modules/, ...Object.keys(virtualModules)],
exclude: [
getNodeModulesExcludeRegex(nextConfig.transpilePackages ?? []),
...Object.keys(virtualModules),
],
},
];
};
2 changes: 1 addition & 1 deletion code/frameworks/nextjs/src/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const webpackFinal: StorybookConfig['webpackFinal'] = async (baseConfig,
await configureSWCLoader(baseConfig, options, nextConfig);
} else {
logger.info('=> Using Babel as compiler');
await configureBabelLoader(baseConfig, options);
await configureBabelLoader(baseConfig, options, nextConfig);
}

return baseConfig;
Expand Down
6 changes: 5 additions & 1 deletion code/frameworks/nextjs/src/swc/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import type { NextConfig } from 'next';
import loadJsConfig from 'next/dist/build/load-jsconfig';
import type { Configuration as WebpackConfig } from 'webpack';

import { getNodeModulesExcludeRegex } from '../utils';

export const configureSWCLoader = async (
baseConfig: WebpackConfig,
options: Options,
Expand All @@ -30,10 +32,12 @@ export const configureSWCLoader = async (
rawRule.exclude = /^__barrel_optimize__/;
}

const transpilePackages = nextConfig.transpilePackages ?? [];

baseConfig.module?.rules?.push({
test: /\.((c|m)?(j|t)sx?)$/,
include: [getProjectRoot()],
exclude: [/(node_modules)/, ...Object.keys(virtualModules)],
exclude: [getNodeModulesExcludeRegex(transpilePackages), ...Object.keys(virtualModules)],
use: {
// we use our own patch because we need to remove tracing from the original code
// which is not possible otherwise
Expand Down
17 changes: 17 additions & 0 deletions code/frameworks/nextjs/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,20 @@ export const scopedResolve = (id: string): string => {
const beginningOfMainScriptPath = moduleFolderStrPosition + id.length;
return scopedModulePath.substring(0, beginningOfMainScriptPath);
};

/**
* Returns a RegExp that matches node_modules except for the given transpilePackages.
*
* @param transpilePackages Array of package names to NOT exclude (i.e., to include for
* transpilation)
* @returns RegExp for use in Webpack's exclude
*/
export function getNodeModulesExcludeRegex(transpilePackages: string[]): RegExp {
if (!transpilePackages || transpilePackages.length === 0) {
return /node_modules/;
}
const escaped = transpilePackages
.map((pkg) => pkg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
.join('|');
return new RegExp(`node_modules/(?!(${escaped})/)`);
}
Loading