Merge branch 'main' into rs/frp-761-imiddleware-locale

Author: pieh

tests/netlify-deploy.ts

@@ -2,6 +2,7 @@
 import execa from 'execa'
 import fs from 'fs-extra'
 import { Span } from 'next/src/trace'
+import { tmpdir } from 'node:os'
 import path from 'path'
 import { NextInstance } from './base'
 
@@ -14,6 +15,31 @@ type NetlifyDeployResponse = {
   logs: string
 }
 
+async function packNextRuntimeImpl() {
+  const runtimePackDir = await fs.mkdtemp(path.join(tmpdir(), 'next-runtime-pack'))
+
+  const { stdout } = await execa(
+    'npm',
+    ['pack', '--json', '--ignore-scripts', `--pack-destination=${runtimePackDir}`],
+    { cwd: process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime` },
+  )
+  const [{ filename, name }] = JSON.parse(stdout)
+
+  return {
+    runtimePackageName: name,
+    runtimePackageTarballPath: path.join(runtimePackDir, filename),
+  }
+}
+
+let packNextRuntimePromise: ReturnType<typeof packNextRuntimeImpl> | null = null
+function packNextRuntime() {
+  if (!packNextRuntimePromise) {
+    packNextRuntimePromise = packNextRuntimeImpl()
+  }
+
+  return packNextRuntimePromise
+}
+
 export class NextDeployInstance extends NextInstance {
   private _cliOutput: string
   private _buildId: string
@@ -45,8 +71,10 @@ export class NextDeployInstance extends NextInstance {
       await fs.rename(nodeModules, nodeModulesBak)
     }
 
+    const { runtimePackageName, runtimePackageTarballPath } = await packNextRuntime()
+
     // install dependencies
-    await execa('npm', ['i', '--legacy-peer-deps'], {
+    await execa('npm', ['i', runtimePackageTarballPath, '--legacy-peer-deps'], {
       cwd: this.testDir,
       stdio: 'inherit',
     })
@@ -68,10 +96,7 @@ export class NextDeployInstance extends NextInstance {
           publish = ".next"
 
           [[plugins]]
-          package = "${path.relative(
-            this.testDir,
-            process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime`,
-          )}"
+          package = "${runtimePackageName}"
           `
 
       await fs.writeFile(path.join(this.testDir, 'netlify.toml'), toml)

tests/utils/fixture.ts

@@ -54,6 +54,20 @@ async function installDependencies(cwd: string) {
 export const getFixtureSourceDirectory = (fixture: string) =>
   fileURLToPath(new URL(`../fixtures/${fixture}`, import.meta.url))
 
+// https://github.com/vercel/next.js/pull/67539 added more imports to "globals" modules which does have a side effect at import time
+// that defines NOT configurable global property ( https://github.com/vercel/next.js/blob/ba3959bb46f4d0e92403304579b8fb30d3ecc3d1/packages/next/src/server/web/globals.ts#L87-L107 ).
+// Running multiple fixtures in the same process then would evaluate copy of that module
+// and attempt to redefine that not configurable property which result in an error. We can't delete that property either, so
+// this "patch" to Object.defineProperty is making that property configurable when running our tests to avoid that error.
+const originalDefineProperty = Object.defineProperty
+Object.defineProperty = function (target, property, descriptor) {
+  if (property === '__import_unsupported' && descriptor?.configurable === false) {
+    descriptor.configurable = true
+  }
+
+  return originalDefineProperty.call(this, target, property, descriptor)
+}
+
 /**
  * Copies a fixture to a temp folder on the system and runs the tests inside.
  * @param fixture name of the folder inside the fixtures folder