vercel · eps1lon · Jun 25, 2024 · Jun 21, 2024
diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -2276,29 +2276,50 @@ export default async function getBaseWebpackConfig(
     }
   }
 
-  if (!config.images.disableStaticImages) {
-    const rules = webpackConfig.module?.rules || []
-    const hasCustomSvg = rules.some(
-      (rule) =>
-        rule &&
+  const rules = webpackConfig.module?.rules || []
+
+  const customSvgRule = rules.find(
+    (rule): rule is webpack.RuleSetRule =>
+      (rule &&
         typeof rule === 'object' &&
         rule.loader !== 'next-image-loader' &&
         'test' in rule &&
         rule.test instanceof RegExp &&
-        rule.test.test('.svg')
-    )
+        rule.test.test('.svg')) ||
+      false
+  )
+
+  if (customSvgRule && hasAppDir) {
+    // Create React aliases for SVG components that were transformed using a
+    // custom webpack config with e.g. the `@svgr/webpack` loader, or the
+    // `babel-plugin-inline-react-svg` plugin.
+    rules.push({
+      test: customSvgRule.test,
+      oneOf: [
+        WEBPACK_LAYERS.reactServerComponents,
+        WEBPACK_LAYERS.serverSideRendering,
+        WEBPACK_LAYERS.appPagesBrowser,
+      ].map((layer) => ({
+        issuerLayer: layer,
+        resolve: {
+          alias: createRSCAliases(bundledReactChannel, {
+            reactProductionProfiling,
+            layer,
+            isEdgeServer,
+          }),
+        },
+      })),
+    })
+  }
+
+  if (!config.images.disableStaticImages) {
     const nextImageRule = rules.find(
       (rule) =>
         rule && typeof rule === 'object' && rule.loader === 'next-image-loader'
     )
-    if (
-      hasCustomSvg &&
-      nextImageRule &&
-      nextImageRule &&
-      typeof nextImageRule === 'object'
-    ) {
+    if (customSvgRule && nextImageRule && typeof nextImageRule === 'object') {
       // Exclude svg if the user already defined it in custom
-      // webpack config such as `@svgr/webpack` plugin or
+      // webpack config such as the `@svgr/webpack` loader, or
       // the `babel-plugin-inline-react-svg` plugin.
       nextImageRule.test = /\.(png|jpg|jpeg|gif|webp|avif|ico|bmp)$/i
     }

diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/app/layout.tsx b/test/e2e/app-dir/react-owner-stacks-svgr/app/layout.tsx
@@ -0,0 +1,9 @@
+import { ReactNode } from 'react'
+
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/app/page.tsx b/test/e2e/app-dir/react-owner-stacks-svgr/app/page.tsx
@@ -0,0 +1,5 @@
+import Icon from '../public/test.svg'
+
+export default function Page() {
+  return <Icon />
+}
diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/next.config.js b/test/e2e/app-dir/react-owner-stacks-svgr/next.config.js
@@ -0,0 +1,25 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {
+  experimental: {
+    // Enabling PPR to force using the react experimental channel, which
+    // implements React owner stacks.
+    ppr: true,
+    turbo: {
+      rules: {
+        '*.svg': {
+          loaders: ['@svgr/webpack'],
+          as: '*.js',
+        },
+      },
+    },
+  },
+  webpack(config) {
+    config.module.rules.push({ test: /\.svg$/, use: '@svgr/webpack' })
+
+    return config
+  },
+}
+
+module.exports = nextConfig
diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/public/test.svg b/test/e2e/app-dir/react-owner-stacks-svgr/public/test.svg
diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/react-owner-stacks-svgr.test.ts b/test/e2e/app-dir/react-owner-stacks-svgr/react-owner-stacks-svgr.test.ts
@@ -0,0 +1,20 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('react-owner-stacks-svgr', () => {
+  const { next, isNextStart, isTurbopack } = nextTestSetup({
+    files: __dirname,
+    packageJson: { dependencies: { '@svgr/webpack': '8.1.0' } },
+  })
+
+  /* eslint-disable jest/no-standalone-expect */
+  // Turbopack currently only supports `next dev` and does not support `next
+  // build`: https://nextjs.org/docs/architecture/turbopack#unsupported-features
+  ;(isNextStart && isTurbopack ? it.skip : it)(
+    'renders an SVG that is transformed by @svgr/webpack into a React component',
+    async () => {
+      const browser = await next.browser('/')
+      expect(await browser.elementByCss('svg')).toBeDefined()
+    }
+  )
+  /* eslint-enable jest/no-standalone-expect */
+})