Merge remote-tracking branch 'origin/main' into e2e-test-skips

pieh · pieh · commit 3e0ff1f8df82 · 2025-09-14T10:35:35.000+02:00
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "5.13.1"
+  ".": "5.13.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.13.2](https://github.com/opennextjs/opennextjs-netlify/compare/v5.13.1...v5.13.2) (2025-09-12)
+
+
+### Bug Fixes
+
+* allow dot files in function bundle ([#3118](https://github.com/opennextjs/opennextjs-netlify/issues/3118)) ([8cd51b5](https://github.com/opennextjs/opennextjs-netlify/commit/8cd51b5633fee4629d12601aac59c637dafa7c9a))
+* revert "fix(perf): exclude /_next/static/* from generated functions ([#3100](https://github.com/opennextjs/opennextjs-netlify/issues/3100))" ([8e14a76](https://github.com/opennextjs/opennextjs-netlify/commit/8e14a760f63fa9ef042fede7c6ab3a703ab5ac7d))
+
 ## [5.13.1](https://github.com/opennextjs/opennextjs-netlify/compare/v5.13.0...v5.13.1) (2025-09-08)
 
 
diff --git a/e2e-report/package-lock.json b/e2e-report/package-lock.json
diff --git a/e2e-report/package.json b/e2e-report/package.json
@@ -9,7 +9,7 @@
     "lint": "eslint"
   },
   "dependencies": {
-    "@netlify/plugin-nextjs": "^5.13.1",
+    "@netlify/plugin-nextjs": "^5.13.2",
     "next": "^15.5.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.13.1",
+  "version": "5.13.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",
diff --git a/src/build/content/server.ts b/src/build/content/server.ts
@@ -111,6 +111,7 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {
       ],
       {
         cwd: srcDir,
+        dot: true,
         extglob: true,
       },
     )
diff --git a/src/build/functions/server.ts b/src/build/functions/server.ts
@@ -106,7 +106,6 @@ const getHandlerFile = async (ctx: PluginContext): Promise<string> => {
 
   const templateVariables: Record<string, string> = {
     '{{useRegionalBlobs}}': ctx.useRegionalBlobs.toString(),
-    '{{excludeStaticPath}}': posixJoin(ctx.buildConfig.basePath || '', '/_next/static/*'),
   }
   // In this case it is a monorepo and we need to use a own template for it
   // as we have to change the process working directory
diff --git a/src/build/templates/handler-monorepo.tmpl.js b/src/build/templates/handler-monorepo.tmpl.js
@@ -49,9 +49,4 @@ export default async function (req, context) {
 export const config = {
   path: '/*',
   preferStatic: true,
-  excludedPath: [
-    // We use `preferStatic: true` so we already won't run this on *existing* static assets,
-    // but by excluding this entire path we also avoid invoking the function just to 404.
-    '{{excludeStaticPath}}',
-  ],
 }
diff --git a/src/build/templates/handler.tmpl.js b/src/build/templates/handler.tmpl.js
@@ -43,9 +43,4 @@ export default async function handler(req, context) {
 export const config = {
   path: '/*',
   preferStatic: true,
-  excludedPath: [
-    // We use `preferStatic: true` so we already won't run this on *existing* static assets,
-    // but by excluding this entire path we also avoid invoking the function just to 404.
-    '{{excludeStaticPath}}',
-  ],
 }
diff --git a/tests/e2e/page-router.test.ts b/tests/e2e/page-router.test.ts
@@ -1,8 +1,6 @@
 import { expect } from '@playwright/test'
 import { nextVersionSatisfies } from '../utils/next-version-helpers.mjs'
 import { test } from '../utils/playwright-helpers.js'
-import { join } from 'node:path'
-import { readdir } from 'node:fs/promises'
 
 export function waitFor(millis: number) {
   return new Promise((resolve) => setTimeout(resolve, millis))
@@ -616,34 +614,6 @@ test.describe('Simple Page Router (no basePath, no i18n)', () => {
       /(s-maxage|max-age)/,
     )
   })
-
-  test.describe('static assets and function invocations', () => {
-    test('should return 200 for an existing static asset without invoking a function', async ({
-      page,
-      pageRouter,
-    }) => {
-      // Since assets are hashed, we can't hardcode anything here. Find something to fetch.
-      const [staticAsset] = await readdir(
-        join(pageRouter.isolatedFixtureRoot, '.next', 'static', 'chunks'),
-      )
-      expect(staticAsset).toBeDefined()
-
-      const response = await page.goto(`${pageRouter.url}/_next/static/chunks/${staticAsset}`)
-
-      expect(response?.status()).toBe(200)
-      expect(response?.headers()).not.toHaveProperty('x-nf-function-type')
-    })
-
-    test('should return 404 for a nonexistent static asset without invoking a function', async ({
-      page,
-      pageRouter,
-    }) => {
-      const response = await page.goto(`${pageRouter.url}/_next/static/stale123abcdef.js`)
-
-      expect(response?.status()).toBe(404)
-      expect(response?.headers()).not.toHaveProperty('x-nf-function-type')
-    })
-  })
 })
 
 test.describe('Page Router with basePath and i18n', () => {
@@ -1421,36 +1391,4 @@ test.describe('Page Router with basePath and i18n', () => {
       expect(headers['cache-control']).toBe('public,max-age=0,must-revalidate')
     }
   })
-
-  test.describe('static assets and function invocations', () => {
-    test('should return 200 for an existing static asset without invoking a function', async ({
-      page,
-      pageRouterBasePathI18n,
-    }) => {
-      // Since assets are hashed, we can't hardcode anything here. Find something to fetch.
-      const [staticAsset] = await readdir(
-        join(pageRouterBasePathI18n.isolatedFixtureRoot, '.next', 'static', 'chunks'),
-      )
-      expect(staticAsset).toBeDefined()
-
-      const response = await page.goto(
-        `${pageRouterBasePathI18n.url}/base/path/_next/static/chunks/${staticAsset}`,
-      )
-
-      expect(response?.status()).toBe(200)
-      expect(response?.headers()).not.toHaveProperty('x-nf-function-type')
-    })
-
-    test('should return 404 for a nonexistent static asset without invoking a function', async ({
-      page,
-      pageRouterBasePathI18n,
-    }) => {
-      const response = await page.goto(
-        `${pageRouterBasePathI18n.url}/base/path/_next/static/stale123abcdef.js`,
-      )
-
-      expect(response?.status()).toBe(404)
-      expect(response?.headers()).not.toHaveProperty('x-nf-function-type')
-    })
-  })
 })
diff --git a/tests/e2e/simple-app.test.ts b/tests/e2e/simple-app.test.ts
@@ -342,3 +342,12 @@ test.describe('RSC cache poisoning', () => {
     expect(htmlResponse?.headers()['debug-netlify-cdn-cache-control']).toMatch(/s-maxage=31536000/)
   })
 })
+
+test('Handles route with a path segment starting with dot correctly', async ({ simple }) => {
+  const response = await fetch(`${simple.url}/.well-known/farcaster`)
+
+  expect(response.status).toBe(200)
+
+  const data = await response.json()
+  expect(data).toEqual({ msg: 'Hi!' })
+})
diff --git a/tests/fixtures/simple/app/.well-known/farcaster/route.js b/tests/fixtures/simple/app/.well-known/farcaster/route.js
@@ -0,0 +1,9 @@
+import { NextResponse } from 'next/server'
+
+export async function GET() {
+  return NextResponse.json({
+    msg: 'Hi!',
+  })
+}
+
+export const dynamic = 'force-dynamic'
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts
@@ -21,7 +21,6 @@ export interface DeployResult {
   deployID: string
   url: string
   logs: string
-  isolatedFixtureRoot: string
 }
 
 type PackageManager = 'npm' | 'pnpm' | 'yarn' | 'bun' | 'berry'
@@ -91,7 +90,6 @@ export const createE2EFixture = async (fixture: string, config: E2EConfig = {})
       cleanup: _cleanup,
       deployID: result.deployID,
       url: result.url,
-      isolatedFixtureRoot: result.isolatedFixtureRoot,
     }
   } catch (error) {
     await _cleanup(true)
@@ -292,7 +290,6 @@ async function deploySite(
     url: `https://${deployID}--${siteName}.netlify.app`,
     deployID,
     logs: output,
-    isolatedFixtureRoot,
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "5.13.1"`
	`2`	`+ ".": "5.13.2"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@netlify/plugin-nextjs",`
`3`		`- "version": "5.13.1",`
	`3`	`+ "version": "5.13.2",`
`4`	`4`	`"description": "Run Next.js seamlessly on Netlify",`
`5`	`5`	`"main": "./dist/index.js",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {`
`111`	`111`	`],`
`112`	`112`	`{`
`113`	`113`	`cwd: srcDir,`
	`114`	`+ dot: true,`
`114`	`115`	`extglob: true,`
`115`	`116`	`},`
`116`	`117`	`)`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,6 @@ const getHandlerFile = async (ctx: PluginContext): Promise<string> => {`
`106`	`106`
`107`	`107`	`const templateVariables: Record<string, string> = {`
`108`	`108`	`'{{useRegionalBlobs}}': ctx.useRegionalBlobs.toString(),`
`109`		`- '{{excludeStaticPath}}': posixJoin(ctx.buildConfig.basePath \|\| '', '/_next/static/*'),`
`110`	`109`	`}`
`111`	`110`	`// In this case it is a monorepo and we need to use a own template for it`
`112`	`111`	`// as we have to change the process working directory`