fix: glob subdirectories in server/chunks to support turbopack builds (#2987)

timneutkens · pieh · web-flow · commit e7bf18fdb6e4 · 2025-07-10T09:51:56.000+02:00
* Glob all server files instead of specific subdirectories

* Add fixture for Turbopack app

* Add test

* scale back the globs to only allow sub directories in server/(edge-)chunks

* test: make sure all ways to build turbopack fixture would set --turbopack cli toggle

---------

Co-authored-by: Michal Piechowiak &lt;misiek.piechowiak@gmail.com&gt;
diff --git a/src/build/content/server.ts b/src/build/content/server.ts
@@ -100,7 +100,13 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {
     const destDir = join(ctx.serverHandlerDir, nextFolder)
 
     const paths = await glob(
-      [`*`, `server/*`, `server/chunks/*`, `server/edge-chunks/*`, `server/+(app|pages)/**/*.js`],
+      [
+        `*`,
+        `server/*`,
+        `server/chunks/**/*`,
+        `server/edge-chunks/**/*`,
+        `server/+(app|pages)/**/*.js`,
+      ],
       {
         cwd: srcDir,
         extglob: true,
diff --git a/tests/fixtures/hello-world-turbopack/app/layout.js b/tests/fixtures/hello-world-turbopack/app/layout.js
@@ -0,0 +1,7 @@
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/tests/fixtures/hello-world-turbopack/app/page.js b/tests/fixtures/hello-world-turbopack/app/page.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>Hello, Next.js!</h1>
+}
diff --git a/tests/fixtures/hello-world-turbopack/next.config.ts b/tests/fixtures/hello-world-turbopack/next.config.ts
@@ -0,0 +1,9 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  output: 'standalone',
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+}
+
+module.exports = nextConfig
diff --git a/tests/fixtures/hello-world-turbopack/package.json b/tests/fixtures/hello-world-turbopack/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "hello-world-app",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "postinstall": "next build --turbopack",
+    "dev": "next dev --turbopack",
+    "build": "next build --turbopack"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
+  }
+}
diff --git a/tests/integration/hello-world-turbopack.test.ts b/tests/integration/hello-world-turbopack.test.ts
@@ -0,0 +1,72 @@
+import { load } from 'cheerio'
+import { getLogger } from 'lambda-local'
+import { cp } from 'node:fs/promises'
+import { HttpResponse, http, passthrough } from 'msw'
+import { setupServer } from 'msw/node'
+import { v4 } from 'uuid'
+import { Mock, afterAll, afterEach, beforeAll, beforeEach, expect, test, vi } from 'vitest'
+import { type FixtureTestContext } from '../utils/contexts.js'
+import { createFixture, invokeFunction, runPlugin } from '../utils/fixture.js'
+import { generateRandomObjectID, startMockBlobStore } from '../utils/helpers.js'
+
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const fsPromisesModule = (await importOriginal()) as typeof import('node:fs/promises')
+  return {
+    ...fsPromisesModule,
+    cp: vi.fn(fsPromisesModule.cp.bind(fsPromisesModule)),
+  }
+})
+
+let server: ReturnType<typeof setupServer>
+
+// Disable the verbose logging of the lambda-local runtime
+getLogger().level = 'alert'
+
+const purgeAPI = vi.fn()
+
+beforeAll(() => {
+  server = setupServer(
+    http.post('https://api.netlify.com/api/v1/purge', async ({ request }) => {
+      purgeAPI(await request.json())
+
+      return HttpResponse.json({
+        ok: true,
+      })
+    }),
+    http.all(/.*/, () => passthrough()),
+  )
+  server.listen()
+})
+
+afterAll(() => {
+  // Disable API mocking after the tests are done.
+  server.close()
+})
+
+beforeEach<FixtureTestContext>(async (ctx) => {
+  // set for each test a new deployID and siteID
+  ctx.deployID = generateRandomObjectID()
+  ctx.siteID = v4()
+  vi.stubEnv('SITE_ID', ctx.siteID)
+  vi.stubEnv('DEPLOY_ID', ctx.deployID)
+  // hide debug logs in tests
+  vi.spyOn(console, 'debug').mockImplementation(() => {})
+
+  purgeAPI.mockClear()
+
+  await startMockBlobStore(ctx)
+})
+
+afterEach(() => {
+  vi.unstubAllEnvs()
+})
+
+test<FixtureTestContext>('Test that the hello-world-turbopack next app is working', async (ctx) => {
+  await createFixture('hello-world-turbopack', ctx)
+  await runPlugin(ctx)
+
+  // test the function call
+  const home = await invokeFunction(ctx)
+  expect(home.statusCode).toBe(200)
+  expect(load(home.body)('h1').text()).toBe('Hello, Next.js!')
+})
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts
@@ -316,6 +316,10 @@ async function cleanup(dest: string, deployId?: string): Promise<void> {
 
 export const fixtureFactories = {
   simple: () => createE2EFixture('simple'),
+  helloWorldTurbopack: () =>
+    createE2EFixture('hello-world-turbopack', {
+      buildCommand: 'next build --turbopack',
+    }),
   outputExport: () => createE2EFixture('output-export'),
   ouputExportPublishOut: () =>
     createE2EFixture('output-export', {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function Page() {`
	`2`	`+ return <h1>Hello, Next.js!</h1>`
	`3`	`+}`