Exclude existing swc-loader

storybookjs · Nov 20, 2023 · 3fb18f1 · 3fb18f1
1 parent d66e210
commit 3fb18f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/code/builders/builder-webpack5/src/preview/loaders.ts b/code/builders/builder-webpack5/src/preview/loaders.ts
@@ -49,12 +49,8 @@ export const createSWCLoader = async (excludes: string[] = [], options: Options)
   };
   return {
     test: typescriptOptions.skipCompiler ? /\.(mjs|cjs|jsx?)$/ : /\.(mjs|cjs|tsx?|jsx?)$/,
-    use: [
-      {
-        loader: require.resolve('swc-loader'),
-        options: config,
-      },
-    ],
+    loader: require.resolve('swc-loader'),
+    options: config,
     include: [getProjectRoot()],
     exclude: [/node_modules/, ...excludes],
   };

diff --git a/code/frameworks/nextjs/src/swc/loader.ts b/code/frameworks/nextjs/src/swc/loader.ts
@@ -43,10 +43,9 @@ export const configureSWCLoader = async (
 
   baseConfig.module.rules = [
     // TODO: Remove filtering in Storybook 8.0
-    ...baseConfig.module.rules.filter(
-      (r: RuleSetRule) =>
-        !(typeof r.use === 'object' && 'loader' in r.use && r.use.loader?.includes('swc-loader'))
-    ),
+    ...baseConfig.module.rules.filter((r: RuleSetRule) => {
+      return !r.loader?.includes('swc-loader');
+    }),
     {
       test: /\.(m?(j|t)sx?)$/,
       include: [getProjectRoot()],
@@ -62,14 +61,12 @@ export const configureSWCLoader = async (
           pagesDir: `${dir}/pages`,
           appDir: `${dir}/apps`,
           hasReactRefresh: isDevelopment,
-          hasServerComponents: true,
           nextConfig,
           supportedBrowsers: require('next/dist/build/utils').getSupportedBrowsers(
             dir,
             isDevelopment
           ),
           swcCacheDir: path.join(dir, nextConfig?.distDir ?? '.next', 'cache', 'swc'),
-          isServerLayer: false,
           bundleTarget: 'default',
         },
       },