Mirror of upstream PR #82095

packages/next/src/build/webpack/config/blocks/css/index.ts

@@ -208,6 +208,30 @@ export const css = curry(async function css(
 
   const fns: ConfigurationFn[] = []
 
+  // Handle raw-loader imports before any CSS processing
+  // This prevents CSS files imported with raw-loader from being processed as CSS
+  fns.push(
+    loader({
+      oneOf: [
+        {
+          test: regexLikeCss,
+          resourceQuery: /raw/,
+          type: 'asset/source',
+        },
+        {
+          test: regexLikeCss,
+          resourceQuery: /raw-loader/,
+          type: 'asset/source',
+        },
+        {
+          test: regexLikeCss,
+          resourceQuery: /!!raw-loader!/,
+          type: 'asset/source',
+        },
+      ],
+    })
+  )
+
   const googleLoader = require.resolve(
     'next/dist/compiled/@next/font/google/loader'
   )

src/app/MdxLoader.jsx

@@ -0,0 +1,24 @@
+'use client'
+
+import React from 'react'
+
+// This will be a mapping object for all your MDX files
+import StuffMdx from './stuff.mdx'
+import AnotherMdx from './another.mdx'
+// ... import all your MDX files
+
+const mdxComponents = {
+  './stuff.mdx': StuffMdx,
+  './another.mdx': AnotherMdx,
+  // ... map all your imports
+}
+
+export default function MdxLoader({ filePath }) {
+  const Component = mdxComponents[filePath]
+
+  if (!Component) {
+    return <div>MDX file not found: {filePath}</div>
+  }
+
+  return <Component />
+}

src/app/MdxWrapper.jsx

@@ -0,0 +1,27 @@
+'use client'
+
+import React, { useState, useEffect } from 'react'
+
+export default function MdxWrapper({ filePath }) {
+  const [Component, setComponent] = useState(null)
+  const [error, setError] = useState(null)
+
+  useEffect(() => {
+    async function loadMdx() {
+      try {
+        const module = await import(`${filePath}`)
+        setComponent(() => module.default)
+      } catch (err) {
+        console.error(`Error loading MDX file: ${filePath}`, err)
+        setError(err)
+      }
+    }
+
+    loadMdx()
+  }, [filePath])
+
+  if (error) return <div>Error loading MDX content</div>
+  if (!Component) return <div>Loading...</div>
+
+  return <Component />
+}

src/app/navigation.ts

@@ -0,0 +1,11 @@
+import { redirect as nextRedirect } from 'next/dist/client/components/redirect'
+
+export function redirect(path: string): ReturnType<typeof nextRedirect> {
+  if (path === '' || path === undefined) {
+    throw new Error(
+      'Redirect path cannot be empty. This would cause an infinite loop.'
+    )
+  }
+
+  return nextRedirect(path)
+}

src/app/page.jsx

@@ -0,0 +1,22 @@
+import { Suspense } from 'react'
+// import { redirect } from './navigation' - removed
+
+// Instead of importing dynamically, create an async component
+async function MdxContent({ filePath }) {
+  // This works in a server component
+  const { default: Content } = await import(`${filePath}`)
+  return <Content />
+}
+
+export default function Home() {
+  // This will now throw an error instead of causing an infinite loop
+  // redirect("");
+
+  return (
+    <div>
+      <Suspense fallback={<div>Loading MDX...</div>}>
+        <MdxContent filePath="./stuff.mdx" />
+      </Suspense>
+    </div>
+  )
+}

src/app/utils/mdxUtils.js

@@ -0,0 +1,14 @@
+import fs from 'fs'
+import path from 'path'
+
+// This function can be used at build time to generate a mapping of MDX files
+export function getMdxFiles(dir) {
+  const mdxDir = path.join(process.cwd(), dir)
+  const filenames = fs.readdirSync(mdxDir)
+  const mdxFiles = filenames.filter((name) => name.endsWith('.mdx'))
+
+  return mdxFiles.map((filename) => ({
+    filename,
+    path: `${dir}/${filename}`,
+  }))
+}

test/integration/css-fixtures/raw-loader-import/next.config.js

@@ -0,0 +1,14 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  webpack: (config) => {
+    // This is the problematic configuration mentioned in the GitHub issue
+    // It should work with our fix
+    config.module.rules.push({
+      resourceQuery: /raw/,
+      type: 'asset/source',
+    })
+    return config
+  },
+}
+
+module.exports = nextConfig

test/integration/css-fixtures/raw-loader-import/pages/index.js

@@ -0,0 +1,44 @@
+import React from 'react'
+
+// Import CSS with raw-loader - this should return raw source, not processed CSS
+const rawCss = require('!!raw-loader!./styles.css')
+
+export default function HomePage() {
+  return (
+    <div>
+      <h1>Raw Loader Test</h1>
+      <p>
+        This page tests that CSS imported with raw-loader returns raw source
+        instead of processed CSS.
+      </p>
+
+      <h2>Raw CSS Content:</h2>
+      <pre
+        style={{
+          backgroundColor: '#f5f5f5',
+          padding: '10px',
+          border: '1px solid #ddd',
+          whiteSpace: 'pre-wrap',
+          fontSize: '12px',
+        }}
+      >
+        {rawCss}
+      </pre>
+
+      <h2>Test Results:</h2>
+      <ul>
+        <li>
+          If the CSS content above shows raw CSS (like{' '}
+          <code>
+            .test {'{'} color: red; {'}'}
+          </code>
+          ), the fix is working ✅
+        </li>
+        <li>
+          If the page has a red background (from the CSS being applied), the fix
+          is not working ❌
+        </li>
+      </ul>
+    </div>
+  )
+}

test/integration/css-fixtures/raw-loader-import/pages/styles.css

@@ -0,0 +1,14 @@
+/* This CSS file is imported with raw-loader */
+/* If the fix is working, this should be returned as raw text, not applied as styles */
+
+body {
+  background-color: red !important;
+  color: white !important;
+}
+
+.test {
+  color: red;
+  font-weight: bold;
+}
+
+/* This should not be applied to the page when imported with raw-loader */

test/integration/css-fixtures/raw-loader-import/test/raw-loader.test.js

@@ -0,0 +1,46 @@
+/* eslint-env jest */
+import { join } from 'path'
+import { createNext, FileRef } from 'e2e-utils'
+import { fetchViaHTTP } from 'next-test-utils'
+
+describe('Raw Loader CSS Import', () => {
+  let next
+
+  beforeAll(async () => {
+    const files = {
+      'pages/index.js': new FileRef(join(__dirname, '../pages/index.js')),
+      'pages/styles.css': new FileRef(join(__dirname, '../pages/styles.css')),
+      'next.config.js': new FileRef(join(__dirname, '../next.config.js')),
+    }
+
+    next = await createNext({
+      files,
+      dependencies: {
+        'raw-loader': '^4.0.2',
+      },
+    })
+  })
+
+  afterAll(async () => {
+    await next.destroy()
+  })
+
+  it('should return raw CSS content instead of applying styles', async () => {
+    const res = await fetchViaHTTP(next.url, '/')
+    const html = await res.text()
+
+    // The page should NOT have a red background (which would indicate CSS was applied)
+    expect(html).not.toContain('background-color: red')
+
+    // The page should contain the raw CSS content
+    expect(html).toContain('/* This CSS file is imported with raw-loader */')
+    expect(html).toContain('body {')
+    expect(html).toContain('background-color: red !important;')
+    expect(html).toContain('.test {')
+    expect(html).toContain('color: red;')
+
+    // The page should show the test instructions
+    expect(html).toContain('Raw Loader Test')
+    expect(html).toContain('If the CSS content above shows raw CSS')
+  })
+})