Merge branch 'main' into feat/node-middleware-support

Author: pieh

src/index.ts

@@ -24,9 +24,17 @@ import {
   verifyPublishDir,
 } from './build/verification.js'
 
+const skipPlugin =
+  process.env.NETLIFY_NEXT_PLUGIN_SKIP === 'true' || process.env.NETLIFY_NEXT_PLUGIN_SKIP === '1'
+const skipText = 'Skipping Next.js plugin due to NETLIFY_NEXT_PLUGIN_SKIP environment variable.'
 const tracer = wrapTracer(trace.getTracer('Next.js runtime'))
 
 export const onPreDev = async (options: NetlifyPluginOptions) => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onPreDev', async () => {
     const context = new PluginContext(options)
 
@@ -36,6 +44,11 @@ export const onPreDev = async (options: NetlifyPluginOptions) => {
 }
 
 export const onPreBuild = async (options: NetlifyPluginOptions) => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onPreBuild', async () => {
     // Enable Next.js standalone mode at build time
     process.env.NEXT_PRIVATE_STANDALONE = 'true'
@@ -53,6 +66,11 @@ export const onPreBuild = async (options: NetlifyPluginOptions) => {
 }
 
 export const onBuild = async (options: NetlifyPluginOptions) => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onBuild', async (span) => {
     const ctx = new PluginContext(options)
 
@@ -86,12 +104,22 @@ export const onBuild = async (options: NetlifyPluginOptions) => {
 }
 
 export const onPostBuild = async (options: NetlifyPluginOptions) => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onPostBuild', async () => {
     await publishStaticDir(new PluginContext(options))
   })
 }
 
 export const onSuccess = async () => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onSuccess', async () => {
     const prewarm = [process.env.DEPLOY_URL, process.env.DEPLOY_PRIME_URL, process.env.URL].filter(
       // If running locally then the deploy ID is a placeholder value. Filtering for `https://0--` removes it.
@@ -102,6 +130,11 @@ export const onSuccess = async () => {
 }
 
 export const onEnd = async (options: NetlifyPluginOptions) => {
+  if (skipPlugin) {
+    console.warn(skipText)
+    return
+  }
+
   await tracer.withActiveSpan('onEnd', async () => {
     await unpublishStaticDir(new PluginContext(options))
   })

tests/utils/fixture.ts

@@ -32,7 +32,8 @@ import { BLOB_TOKEN } from './constants.mjs'
 import { type FixtureTestContext } from './contexts.js'
 import { setNextVersionInFixture } from './next-version-helpers.mjs'
 
-const bootstrapURL = 'https://edge.netlify.com/bootstrap/index-combined.ts'
+const bootstrapURL =
+  'https://6877afcf20679a00086bab1c--edge.netlify.com/bootstrap/index-combined.ts'
 const actualCwd = await vi.importActual<typeof import('process')>('process').then((p) => p.cwd())
 const eszipHelper = join(actualCwd, 'tools/deno/eszip.ts')