chore: narrows regexp to enable middleware source maps

vercel · Jun 9, 2022 · 3c385e6 · 3c385e6
1 parent 0c986cd
commit 3c385e6
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 44 deletions.
diff --git a/packages/next/build/webpack/loaders/next-middleware-loader.ts b/packages/next/build/webpack/loaders/next-middleware-loader.ts
@@ -1,6 +1,6 @@
 import { getModuleBuildInfo } from './get-module-build-info'
 import { stringifyRequest } from '../stringify-request'
-import { MIDDLEWARE_FILENAME } from '../../../lib/constants'
+import { MIDDLEWARE_LOCATION_REGEXP } from '../../../lib/constants'
 
 export type MiddlewareLoaderOptions = {
   absolutePagePath: string
@@ -16,7 +16,7 @@ export default function middlewareLoader(this: any) {
   buildInfo.nextEdgeMiddleware = {
     matcherRegexp,
     page:
-      page.replace(new RegExp(`/(?:src/)?${MIDDLEWARE_FILENAME}$`), '') || '/',
+      page.replace(new RegExp(`/${MIDDLEWARE_LOCATION_REGEXP}$`), '') || '/',
   }
 
   return `

diff --git a/packages/next/build/webpack/plugins/middleware-source-maps-plugin.ts b/packages/next/build/webpack/plugins/middleware-source-maps-plugin.ts
@@ -1,5 +1,5 @@
 import { webpack } from 'next/dist/compiled/webpack/webpack'
-import { MIDDLEWARE_FILENAME } from '../../../lib/constants'
+import { MIDDLEWARE_LOCATION_REGEXP } from '../../../lib/constants'
 import type { webpack5 } from 'next/dist/compiled/webpack/webpack'
 
 /**
@@ -10,7 +10,10 @@ export const getMiddlewareSourceMapPlugins = () => {
   return [
     new webpack.SourceMapDevToolPlugin({
       filename: '[file].map',
-      include: [new RegExp(`${MIDDLEWARE_FILENAME}.`), /^edge-chunks\//],
+      include: [
+        new RegExp(`^${MIDDLEWARE_LOCATION_REGEXP}\\.`),
+        /^edge-chunks\//,
+      ],
     }),
     new MiddlewareSourceMapsPlugin(),
   ]

diff --git a/packages/next/lib/constants.ts b/packages/next/lib/constants.ts
@@ -18,8 +18,9 @@ export const NEXT_PROJECT_ROOT_DIST_SERVER = join(
 // Regex for API routes
 export const API_ROUTE = /^\/api(?:\/|$)/
 
-// Regex for middleware
+// Patterns to detect middleware files
 export const MIDDLEWARE_FILENAME = 'middleware'
+export const MIDDLEWARE_LOCATION_REGEXP = `(?:src/)?${MIDDLEWARE_FILENAME}`
 
 // Because on Windows absolute paths in the generated code can break because of numbers, eg 1 in the path,
 // we have to use a private alias

diff --git a/test/production/generate-middleware-source-maps/index.test.ts b/test/production/generate-middleware-source-maps/index.test.ts
@@ -3,64 +3,63 @@ import { NextInstance } from 'test/lib/next-modes/base'
 import fs from 'fs-extra'
 import path from 'path'
 
+const files = {
+  'pages/index.js': `
+    export default function () { return <div>Hello, world!</div> }
+  `,
+  'middleware.js': `
+    import { NextResponse } from "next/server";
+    export default function middleware() { 
+      return NextResponse.next();
+    } 
+  `,
+}
+
 describe('experimental.middlewareSourceMaps: true', () => {
   let next: NextInstance
 
-  beforeAll(async () => {
-    next = await createNext({
-      nextConfig: {
-        experimental: {
-          middlewareSourceMaps: true,
-        },
-      },
-      files: {
-        'pages/index.js': `
-          export default function () { return <div>Hello, world!</div> }
-        `,
-        'middleware.js': `
-          import { NextResponse } from "next/server";
-          export default function middleware() { 
-            return NextResponse.next();
-          } 
-        `,
-      },
-      dependencies: {},
-    })
-  })
-  afterAll(() => next.destroy())
+  const nextConfig = { experimental: { middlewareSourceMaps: true } }
+
+  afterEach(() => next.destroy())
 
   it('generates a source map', async () => {
+    next = await createNext({ nextConfig, files })
+
     const middlewarePath = path.resolve(
       next.testDir,
       '.next/server/middleware.js'
     )
     expect(await fs.pathExists(middlewarePath)).toEqual(true)
     expect(await fs.pathExists(`${middlewarePath}.map`)).toEqual(true)
   })
+
+  it('generates a source map from src', async () => {
+    next = await createNext({
+      nextConfig,
+      files: Object.fromEntries(
+        Object.entries(files).map(([filename, content]) => [
+          `src/${filename}`,
+          content,
+        ])
+      ),
+    })
+
+    const middlewarePath = path.resolve(
+      next.testDir,
+      '.next/server/src/middleware.js'
+    )
+    expect(await fs.pathExists(middlewarePath)).toEqual(true)
+    expect(await fs.pathExists(`${middlewarePath}.map`)).toEqual(true)
+  })
 })
 
 describe('experimental.middlewareSourceMaps: false', () => {
   let next: NextInstance
 
-  beforeAll(async () => {
-    next = await createNext({
-      files: {
-        'pages/index.js': `
-          export default function () { return <div>Hello, world!</div> }
-        `,
-        'middleware.js': `
-          import { NextResponse } from "next/server";
-          export default function middleware() {
-            return NextResponse.next();
-          }
-        `,
-      },
-      dependencies: {},
-    })
-  })
-  afterAll(() => next.destroy())
+  afterEach(() => next.destroy())
 
   it('does not generate a source map', async () => {
+    next = await createNext({ files })
     const middlewarePath = path.resolve(
       next.testDir,
       '.next/server/middleware.js'