@netlify/plugin-nextjs 5.15.1 → 5.15.3

package/dist/build/content/prerendered.js

@@ -7,13 +7,13 @@
 import {
   trace,
   wrapTracer
-} from "../../esm-chunks/chunk-5V5HA6YA.js";
+} from "../../esm-chunks/chunk-QCOH52QC.js";
 import {
   require_out
 } from "../../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../../esm-chunks/chunk-TVEBGDAB.js";
+} from "../../esm-chunks/chunk-JNOKXHJS.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-6BT4RYQJ.js";

package/dist/build/content/server.js

@@ -7,13 +7,13 @@
 import {
   trace,
   wrapTracer
-} from "../../esm-chunks/chunk-5V5HA6YA.js";
+} from "../../esm-chunks/chunk-QCOH52QC.js";
 import {
   require_out
 } from "../../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../../esm-chunks/chunk-TVEBGDAB.js";
+} from "../../esm-chunks/chunk-JNOKXHJS.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-6BT4RYQJ.js";
@@ -31,13 +31,13 @@ import {
   writeFile
 } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { dirname, join, resolve, sep } from "node:path";
-import { join as posixJoin, sep as posixSep } from "node:path/posix";
+import { dirname, join, sep } from "node:path";
+import { join as posixJoin, relative as posixRelative, sep as posixSep } from "node:path/posix";
 var import_fast_glob = __toESM(require_out(), 1);
 var import_semver = __toESM(require_semver(), 1);
 import { RUN_CONFIG_FILE } from "../../run/constants.js";
 var tracer = wrapTracer(trace.getTracer("Next runtime"));
-var toPosixPath = (path) => path.split(sep).join(posixSep);
+var toPosixPath = (path) => path.replace(/^\\+\?\\+/, "").split(sep).join(posixSep);
 function isError(error) {
   return error instanceof Error;
 }
@@ -98,29 +98,39 @@ var copyNextServerCode = async (ctx) => {
         extglob: true
       }
     );
-    await Promise.all(
-      paths.map(async (path) => {
-        const srcPath = join(srcDir, path);
-        const destPath = join(destDir, path);
-        if (path === "server/middleware-manifest.json") {
-          try {
-            await replaceMiddlewareManifest(srcPath, destPath);
-          } catch (error) {
-            throw new Error("Could not patch middleware manifest file", { cause: error });
-          }
-          return;
+    const promises = paths.map(async (path) => {
+      const srcPath = join(srcDir, path);
+      const destPath = join(destDir, path);
+      if (path === "server/middleware-manifest.json") {
+        try {
+          await replaceMiddlewareManifest(srcPath, destPath);
+        } catch (error) {
+          throw new Error("Could not patch middleware manifest file", { cause: error });
         }
-        if (path === "server/functions-config-manifest.json") {
-          try {
-            await replaceFunctionsConfigManifest(srcPath, destPath);
-          } catch (error) {
-            throw new Error("Could not patch functions config manifest file", { cause: error });
-          }
-          return;
+        return;
+      }
+      if (path === "server/functions-config-manifest.json") {
+        try {
+          await replaceFunctionsConfigManifest(srcPath, destPath);
+        } catch (error) {
+          throw new Error("Could not patch functions config manifest file", { cause: error });
         }
-        await cp(srcPath, destPath, { recursive: true, force: true });
-      })
-    );
+        return;
+      }
+      await cp(srcPath, destPath, { recursive: true, force: true });
+    });
+    if (existsSync(join(srcDir, "node_modules"))) {
+      const filter = ctx.constants.IS_LOCAL ? void 0 : nodeModulesFilter;
+      const src = join(srcDir, "node_modules");
+      const dest = join(destDir, "node_modules");
+      await cp(src, dest, {
+        recursive: true,
+        verbatimSymlinks: true,
+        force: true,
+        filter
+      });
+    }
+    await Promise.all(promises);
   });
 };
 async function recreateNodeModuleSymlinks(src, dest, org) {
@@ -188,32 +198,37 @@ async function patchNextModules(ctx, nextVersion, serverHandlerRequireResolve) {
 }
 var copyNextDependencies = async (ctx) => {
   await tracer.withActiveSpan("copyNextDependencies", async () => {
-    const entries = await readdir(ctx.standaloneDir);
-    const filter = ctx.constants.IS_LOCAL ? void 0 : nodeModulesFilter;
-    const promises = entries.map(async (entry) => {
-      if (entry === ctx.nextDistDir) {
-        return;
-      }
-      const src = join(ctx.standaloneDir, entry);
-      const dest = join(ctx.serverHandlerDir, entry);
-      await cp(src, dest, {
-        recursive: true,
-        verbatimSymlinks: true,
-        force: true,
-        filter
-      });
-      if (entry === "node_modules") {
-        await recreateNodeModuleSymlinks(ctx.resolveFromSiteDir("node_modules"), dest);
+    const promises = [];
+    const nodeModulesLocations = /* @__PURE__ */ new Set();
+    const commonFilter = ctx.constants.IS_LOCAL ? void 0 : nodeModulesFilter;
+    const dotNextDir = toPosixPath(join(ctx.standaloneDir, ctx.nextDistDir));
+    const standaloneRootDir = toPosixPath(ctx.standaloneRootDir);
+    const outputFileTracingRoot = toPosixPath(ctx.outputFileTracingRoot);
+    await cp(ctx.standaloneRootDir, ctx.serverHandlerRootDir, {
+      recursive: true,
+      verbatimSymlinks: true,
+      force: true,
+      filter: async (sourcePath, destination) => {
+        const posixSourcePath = toPosixPath(sourcePath);
+        if (posixSourcePath === dotNextDir) {
+          return false;
+        }
+        if (sourcePath.endsWith("node_modules")) {
+          nodeModulesLocations.add({
+            source: posixSourcePath,
+            destination: toPosixPath(destination)
+          });
+        }
+        return commonFilter?.(sourcePath) ?? true;
       }
     });
-    const rootSrcDir = join(ctx.standaloneRootDir, "node_modules");
-    const rootDestDir = join(ctx.serverHandlerRootDir, "node_modules");
-    if (existsSync(rootSrcDir) && ctx.standaloneRootDir !== ctx.standaloneDir) {
-      promises.push(
-        cp(rootSrcDir, rootDestDir, { recursive: true, verbatimSymlinks: true, filter }).then(
-          () => recreateNodeModuleSymlinks(resolve("node_modules"), rootDestDir)
-        )
-      );
+    for (const {
+      source: nodeModulesLocationInStandalone,
+      destination: locationInServerHandler
+    } of nodeModulesLocations) {
+      const relativeToRoot = posixRelative(standaloneRootDir, nodeModulesLocationInStandalone);
+      const locationInProject = posixJoin(outputFileTracingRoot, relativeToRoot);
+      promises.push(recreateNodeModuleSymlinks(locationInProject, locationInServerHandler));
     }
     await Promise.all(promises);
     const serverHandlerRequire = createRequire(posixJoin(ctx.serverHandlerDir, ":internal:"));
@@ -301,7 +316,7 @@ var verifyHandlerDirStructure = async (ctx) => {
     );
   }
 };
-var nodeModulesFilter = async (sourcePath) => {
+var nodeModulesFilter = (sourcePath) => {
   if (sourcePath.includes(".pnpm") && (sourcePath.includes("linuxmusl-x64") || sourcePath.includes("linux-x64-musl"))) {
     return false;
   }

package/dist/build/content/static.js

@@ -7,7 +7,7 @@
 import {
   trace,
   wrapTracer
-} from "../../esm-chunks/chunk-5V5HA6YA.js";
+} from "../../esm-chunks/chunk-QCOH52QC.js";
 import {
   require_out
 } from "../../esm-chunks/chunk-YUXQHOYO.js";

package/dist/build/functions/server.js

@@ -7,7 +7,7 @@
 import {
   trace,
   wrapTracer
-} from "../../esm-chunks/chunk-5V5HA6YA.js";
+} from "../../esm-chunks/chunk-QCOH52QC.js";
 import {
   require_out
 } from "../../esm-chunks/chunk-YUXQHOYO.js";

package/dist/build/plugin-context.js

@@ -6,7 +6,7 @@
     
 import {
   require_semver
-} from "../esm-chunks/chunk-TVEBGDAB.js";
+} from "../esm-chunks/chunk-JNOKXHJS.js";
 import {
   __toESM
 } from "../esm-chunks/chunk-6BT4RYQJ.js";
@@ -16,7 +16,7 @@ var import_semver = __toESM(require_semver(), 1);
 import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { join, relative, resolve } from "node:path";
+import { join, relative, resolve, sep } from "node:path";
 import { join as posixJoin, relative as posixRelative } from "node:path/posix";
 import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
@@ -54,6 +54,25 @@ var PluginContext = class {
   get relativeAppDir() {
     return this.requiredServerFiles.relativeAppDir ?? "";
   }
+  /**
+   * The root directory for output file tracing. Paths inside standalone directory preserve paths of project, relative to this directory.
+   */
+  get outputFileTracingRoot() {
+    const outputFileTracingRootFromRequiredServerFiles = this.requiredServerFiles.config.outputFileTracingRoot ?? // fallback for older Next.js versions that don't have outputFileTracingRoot in the config, but had it in config.experimental
+    this.requiredServerFiles.config.experimental.outputFileTracingRoot;
+    if (outputFileTracingRootFromRequiredServerFiles) {
+      return outputFileTracingRootFromRequiredServerFiles;
+    }
+    if (!this.relativeAppDir.includes("..")) {
+      const depth = this.relativeAppDir === "" ? 0 : this.relativeAppDir.split(sep).length;
+      const computedOutputFileTracingRoot = resolve(
+        this.requiredServerFiles.appDir,
+        ...Array.from({ length: depth }).fill("..")
+      );
+      return computedOutputFileTracingRoot;
+    }
+    return process.cwd();
+  }
   /**
    * The working directory inside the lambda that is used for monorepos to execute the serverless function
    */

package/dist/build/verification.js

@@ -9,7 +9,7 @@ import {
 } from "../esm-chunks/chunk-YUXQHOYO.js";
 import {
   require_semver
-} from "../esm-chunks/chunk-TVEBGDAB.js";
+} from "../esm-chunks/chunk-JNOKXHJS.js";
 import {
   __toESM
 } from "../esm-chunks/chunk-6BT4RYQJ.js";

package/dist/esm-chunks/{chunk-TVEBGDAB.js → chunk-JNOKXHJS.js}

@@ -1259,7 +1259,7 @@ var require_range = __commonJS({
 var require_comparator = __commonJS({
   "node_modules/semver/classes/comparator.js"(exports, module) {
     "use strict";
-    var ANY = Symbol("SemVer ANY");
+    var ANY = /* @__PURE__ */ Symbol("SemVer ANY");
     var Comparator = class _Comparator {
       static get ANY() {
         return ANY;

package/dist/esm-chunks/{chunk-5V5HA6YA.js → chunk-QCOH52QC.js}

@@ -80,7 +80,7 @@ var isCompatible = _makeCompatibilityCheck(VERSION);
 
 // node_modules/@opentelemetry/api/build/esm/internal/global-utils.js
 var major = VERSION.split(".")[0];
-var GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for("opentelemetry.js.api." + major);
+var GLOBAL_OPENTELEMETRY_API_KEY = /* @__PURE__ */ Symbol.for("opentelemetry.js.api." + major);
 var _global = _globalThis;
 function registerGlobal(type, instance, diag, allowOverride) {
   var _a;

package/dist/index.js

@@ -7,7 +7,7 @@
 import {
   trace,
   wrapTracer
-} from "./esm-chunks/chunk-5V5HA6YA.js";
+} from "./esm-chunks/chunk-QCOH52QC.js";
 import "./esm-chunks/chunk-6BT4RYQJ.js";
 
 // src/index.ts

package/dist/run/{revalidate.js → augment-next-response.js}

@@ -6,12 +6,15 @@
     
 import "../esm-chunks/chunk-6BT4RYQJ.js";
 
-// src/run/revalidate.ts
+// src/run/augment-next-response.ts
 import { isPromise } from "node:util/types";
 function isRevalidateMethod(key, nextResponseField) {
   return key === "revalidate" && typeof nextResponseField === "function";
 }
-var nextResponseProxy = (response, requestContext) => {
+function isAppendHeaderMethod(key, nextResponseField) {
+  return key === "appendHeader" && typeof nextResponseField === "function";
+}
+var augmentNextResponse = (response, requestContext) => {
   return new Proxy(response, {
     get(target, key) {
       const originalValue = Reflect.get(target, key);
@@ -25,10 +28,26 @@ var nextResponseProxy = (response, requestContext) => {
           return result;
         };
       }
+      if (isAppendHeaderMethod(key, originalValue)) {
+        return function patchedAppendHeader(...args) {
+          if (typeof args[0] === "string" && (args[0] === "location" || args[0] === "Location")) {
+            let existing = target.getHeader("location");
+            if (typeof existing !== "undefined") {
+              if (!Array.isArray(existing)) {
+                existing = [String(existing)];
+              }
+              if (existing.includes(String(args[1]))) {
+                return target;
+              }
+            }
+          }
+          return originalValue.apply(target, args);
+        };
+      }
       return originalValue;
     }
   });
 };
 export {
-  nextResponseProxy
+  augmentNextResponse
 };

package/dist/run/handlers/request-context.cjs

@@ -96,8 +96,8 @@ var SystemLogger = class _SystemLogger {
 var systemLogger = new SystemLogger();
 
 // src/run/handlers/request-context.cts
-var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
-var REQUEST_COUNTER_KEY = Symbol.for("nf-request-counter");
+var REQUEST_CONTEXT_GLOBAL_KEY = /* @__PURE__ */ Symbol.for("nf-request-context-async-local-storage");
+var REQUEST_COUNTER_KEY = /* @__PURE__ */ Symbol.for("nf-request-counter");
 var extendedGlobalThis = globalThis;
 function getFallbackRequestID() {
   const requestNumber = extendedGlobalThis[REQUEST_COUNTER_KEY] ?? 0;

package/dist/run/handlers/server.js

@@ -1069,7 +1069,7 @@ var require_inspect = __commonJS({
           });
         }, 719: (t2) => {
           var e2 = /\u001b\[\d\d?m/g;
-          t2.exports = { customInspectSymbol: Symbol.for("nodejs.util.inspect.custom"), isError: function(t3) {
+          t2.exports = { customInspectSymbol: /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom"), isError: function(t3) {
             return t3 instanceof Error;
           }, join: Array.prototype.join.call.bind(Array.prototype.join), removeColors: function(t3) {
             return String.prototype.replace.call(t3, e2, "");
@@ -1438,7 +1438,7 @@ var require_inspect = __commonJS({
             for (var r3 = 0, n2 = new Array(e3); r3 < e3; r3++) n2[r3] = t3[r3];
             return n2;
           }
-          var l = r2(906), u = Symbol("kPending"), f = Symbol("kRejected");
+          var l = r2(906), u = /* @__PURE__ */ Symbol("kPending"), f = /* @__PURE__ */ Symbol("kRejected");
           t2.exports = { getOwnNonIndexProperties: function(t3) {
             for (var e3 = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : 2, r3 = Object.getOwnPropertyDescriptors(t3), n2 = [], a2 = 0, c2 = Object.entries(r3); a2 < c2.length; a2++) {
               var l2 = i(c2[a2], 2), u2 = l2[0], f2 = l2[1];
@@ -1697,12 +1697,12 @@ var _c;
 var _d;
 var _e;
 var _f;
-var kHeaders = Symbol("kHeaders");
-var kHeadersDistinct = Symbol("kHeadersDistinct");
-var kHeadersCount = Symbol("kHeadersCount");
-var kTrailers = Symbol("kTrailers");
-var kTrailersDistinct = Symbol("kTrailersDistinct");
-var kTrailersCount = Symbol("kTrailersCount");
+var kHeaders = /* @__PURE__ */ Symbol("kHeaders");
+var kHeadersDistinct = /* @__PURE__ */ Symbol("kHeadersDistinct");
+var kHeadersCount = /* @__PURE__ */ Symbol("kHeadersCount");
+var kTrailers = /* @__PURE__ */ Symbol("kTrailers");
+var kTrailersDistinct = /* @__PURE__ */ Symbol("kTrailersDistinct");
+var kTrailersCount = /* @__PURE__ */ Symbol("kTrailersCount");
 var ComputeJsIncomingMessage = class extends Readable {
   constructor() {
     const streamOptions = {};
@@ -2008,8 +2008,8 @@ function isUint8Array(value) {
 }
 
 // node_modules/@fastly/http-compute-js/dist/http-compute-js/internal-http.js
-var kNeedDrain = Symbol("kNeedDrain");
-var kOutHeaders = Symbol("kOutHeaders");
+var kNeedDrain = /* @__PURE__ */ Symbol("kNeedDrain");
+var kOutHeaders = /* @__PURE__ */ Symbol("kOutHeaders");
 function utcDate() {
   return (/* @__PURE__ */ new Date()).toUTCString();
 }
@@ -2032,8 +2032,8 @@ var chunkExpression = /(?:^|\W)chunked(?:$|\W)/i;
 
 // node_modules/@fastly/http-compute-js/dist/http-compute-js/http-outgoing.js
 var _a2;
-var kCorked = Symbol("corked");
-var kUniqueHeaders = Symbol("kUniqueHeaders");
+var kCorked = /* @__PURE__ */ Symbol("corked");
+var kUniqueHeaders = /* @__PURE__ */ Symbol("kUniqueHeaders");
 function debug(format2) {
 }
 var nop = () => {
@@ -3091,6 +3091,7 @@ function toComputeResponse(res) {
 }
 
 // src/run/handlers/server.ts
+import { augmentNextResponse } from "../augment-next-response.js";
 import { getRunConfig, setRunConfig } from "../config.js";
 import {
   adjustDateHeader,
@@ -3099,7 +3100,6 @@ import {
   setCacheTagsHeaders,
   setVaryHeaders
 } from "../headers.js";
-import { nextResponseProxy } from "../revalidate.js";
 import { setFetchBeforeNextPatchedIt } from "../storage/storage.cjs";
 import { getLogger } from "./request-context.cjs";
 import { getTracer, recordWarning, withActiveSpan } from "./tracer.cjs";
@@ -3154,7 +3154,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       }
     });
     disableFaultyTransferEncodingHandling(res);
-    const resProxy = nextResponseProxy(res, requestContext);
+    const resProxy = augmentNextResponse(res, requestContext);
     const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
       getLogger().withError(error).error("next handler error");
       console.error(error);

package/dist/run/handlers/tags-handler.cjs

@@ -86,7 +86,7 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.15.1";
+var version = "5.15.3";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/dist/run/handlers/tracer.cjs

@@ -117,7 +117,7 @@ var isCompatible = _makeCompatibilityCheck(VERSION);
 
 // node_modules/@netlify/otel/node_modules/@opentelemetry/api/build/esm/internal/global-utils.js
 var major = VERSION.split(".")[0];
-var GLOBAL_OPENTELEMETRY_API_KEY = Symbol.for("opentelemetry.js.api." + major);
+var GLOBAL_OPENTELEMETRY_API_KEY = /* @__PURE__ */ Symbol.for("opentelemetry.js.api." + major);
 var _global = _globalThis;
 function registerGlobal(type, instance, diag, allowOverride) {
   var _a;

package/dist/run/handlers/use-cache-handler.js

@@ -53,7 +53,6 @@ if (typeof AC === "undefined") {
   };
 }
 var shouldWarn = (code) => !warned.has(code);
-var TYPE = Symbol("type");
 var isPosInt = (n) => n && n === Math.floor(n) && n > 0 && isFinite(n);
 var getUintArray = (max) => !isPosInt(max) ? null : max <= Math.pow(2, 8) ? Uint8Array : max <= Math.pow(2, 16) ? Uint16Array : max <= Math.pow(2, 32) ? Uint32Array : max <= Number.MAX_SAFE_INTEGER ? ZeroArray : null;
 var ZeroArray = class extends Array {
@@ -1386,9 +1385,9 @@ import {
   markTagsAsStaleAndPurgeEdgeCache
 } from "./tags-handler.cjs";
 import { getTracer, withActiveSpan } from "./tracer.cjs";
-var LRU_CACHE_GLOBAL_KEY = Symbol.for("nf-use-cache-handler-lru-cache");
-var PENDING_SETS_GLOBAL_KEY = Symbol.for("nf-use-cache-handler-pending-sets");
-var cacheHandlersSymbol = Symbol.for("@next/cache-handlers");
+var LRU_CACHE_GLOBAL_KEY = /* @__PURE__ */ Symbol.for("nf-use-cache-handler-lru-cache");
+var PENDING_SETS_GLOBAL_KEY = /* @__PURE__ */ Symbol.for("nf-use-cache-handler-pending-sets");
+var cacheHandlersSymbol = /* @__PURE__ */ Symbol.for("@next/cache-handlers");
 var extendedGlobalThis = globalThis;
 function getLRUCache() {
   if (extendedGlobalThis[LRU_CACHE_GLOBAL_KEY]) {

package/dist/run/handlers/wait-until.cjs

@@ -24,7 +24,7 @@ __export(wait_until_exports, {
 });
 module.exports = __toCommonJS(wait_until_exports);
 var import_request_context = require("./request-context.cjs");
-var NEXT_REQUEST_CONTEXT_SYMBOL = Symbol.for("@next/request-context");
+var NEXT_REQUEST_CONTEXT_SYMBOL = /* @__PURE__ */ Symbol.for("@next/request-context");
 function setupWaitUntil() {
   ;
   globalThis[NEXT_REQUEST_CONTEXT_SYMBOL] = {

package/dist/run/headers.js

@@ -9,7 +9,7 @@ import "../esm-chunks/chunk-6BT4RYQJ.js";
 // src/run/headers.ts
 import { recordWarning } from "./handlers/tracer.cjs";
 import { getMemoizedKeyValueStoreBackedByRegionalBlobStore } from "./storage/storage.cjs";
-var ALL_VARIATIONS = Symbol.for("ALL_VARIATIONS");
+var ALL_VARIATIONS = /* @__PURE__ */ Symbol.for("ALL_VARIATIONS");
 var NetlifyVaryKeys = /* @__PURE__ */ new Set(["header", "language", "cookie", "query", "country"]);
 var isNetlifyVaryKey = (key) => NetlifyVaryKeys.has(key);
 var generateNetlifyVaryValues = ({

package/dist/run/storage/regional-blob-store.cjs

@@ -30,7 +30,23 @@ var getString = (input) => typeof input === "string" ? input : JSON.stringify(in
 var base64Decode = globalThis.Buffer ? (input) => Buffer.from(input, "base64").toString() : (input) => atob(input);
 var base64Encode = globalThis.Buffer ? (input) => Buffer.from(getString(input)).toString("base64") : (input) => btoa(getString(input));
 
-// node_modules/@netlify/blobs/dist/chunk-HN33TXZT.js
+// node_modules/@netlify/otel/dist/main.js
+var GET_TRACER = "__netlify__getTracer";
+var getTracer = (name, version) => {
+  return globalThis[GET_TRACER]?.(name, version);
+};
+function withActiveSpan(tracer, name, optionsOrFn, contextOrFn, fn) {
+  const func = typeof contextOrFn === "function" ? contextOrFn : typeof optionsOrFn === "function" ? optionsOrFn : fn;
+  if (!func) {
+    throw new Error("function to execute with active span is missing");
+  }
+  if (!tracer) {
+    return func();
+  }
+  return tracer.withActiveSpan(name, optionsOrFn, contextOrFn, func);
+}
+
+// node_modules/@netlify/blobs/dist/chunk-3OMJJ4EG.js
 var getEnvironment = () => {
   const { Deno, Netlify, process: process2 } = globalThis;
   return Netlify?.env ?? Deno?.env ?? {
@@ -123,6 +139,12 @@ var collectIterator = async (iterator) => {
   }
   return result;
 };
+function withSpan(span, name, fn) {
+  if (span) return fn(span);
+  return withActiveSpan(getTracer(), name, (span2) => {
+    return fn(span2);
+  });
+}
 var BlobsConsistencyError = class extends Error {
   constructor() {
     super(
@@ -337,22 +359,6 @@ var getClientOptions = (options, contextOverride) => {
   return clientOptions;
 };
 
-// node_modules/@netlify/otel/dist/main.js
-var GET_TRACER = "__netlify__getTracer";
-var getTracer = (name, version) => {
-  return globalThis[GET_TRACER]?.(name, version);
-};
-function withActiveSpan(tracer, name, optionsOrFn, contextOrFn, fn) {
-  const func = typeof contextOrFn === "function" ? contextOrFn : typeof optionsOrFn === "function" ? optionsOrFn : fn;
-  if (!func) {
-    throw new Error("function to execute with active span is missing");
-  }
-  if (!tracer) {
-    return func();
-  }
-  return tracer.withActiveSpan(name, optionsOrFn, contextOrFn, func);
-}
-
 // node_modules/@netlify/blobs/dist/main.js
 var DEPLOY_STORE_PREFIX = "deploy:";
 var LEGACY_STORE_INTERNAL_PREFIX = "netlify-internal/legacy-namespace/";
@@ -404,7 +410,7 @@ var Store = class _Store {
     };
   }
   async get(key, options) {
-    return withActiveSpan(getTracer(), "blobs.get", async (span) => {
+    return withSpan(options?.span, "blobs.get", async (span) => {
       const { consistency, type } = options ?? {};
       span?.setAttributes({
         "blobs.store": this.name,
@@ -447,15 +453,20 @@ var Store = class _Store {
       throw new BlobsInternalError(res);
     });
   }
-  async getMetadata(key, { consistency } = {}) {
-    return withActiveSpan(getTracer(), "blobs.getMetadata", async (span) => {
+  async getMetadata(key, options = {}) {
+    return withSpan(options?.span, "blobs.getMetadata", async (span) => {
       span?.setAttributes({
         "blobs.store": this.name,
         "blobs.key": key,
         "blobs.method": "HEAD",
-        "blobs.consistency": consistency
+        "blobs.consistency": options.consistency
+      });
+      const res = await this.client.makeRequest({
+        consistency: options.consistency,
+        key,
+        method: "head",
+        storeName: this.name
       });
-      const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
       span?.setAttributes({
         "blobs.response.status": res.status
       });
@@ -475,7 +486,7 @@ var Store = class _Store {
     });
   }
   async getWithMetadata(key, options) {
-    return withActiveSpan(getTracer(), "blobs.getWithMetadata", async (span) => {
+    return withSpan(options?.span, "blobs.getWithMetadata", async (span) => {
       const { consistency, etag: requestETag, type } = options ?? {};
       const headers = requestETag ? { "if-none-match": requestETag } : void 0;
       span?.setAttributes({
@@ -532,7 +543,7 @@ var Store = class _Store {
     });
   }
   list(options = {}) {
-    return withActiveSpan(getTracer(), "blobs.list", (span) => {
+    return withSpan(options.span, "blobs.list", (span) => {
       span?.setAttributes({
         "blobs.store": this.name,
         "blobs.method": "GET",
@@ -554,7 +565,7 @@ var Store = class _Store {
     });
   }
   async set(key, data, options = {}) {
-    return withActiveSpan(getTracer(), "blobs.set", async (span) => {
+    return withSpan(options.span, "blobs.set", async (span) => {
       span?.setAttributes({
         "blobs.store": this.name,
         "blobs.key": key,
@@ -591,7 +602,7 @@ var Store = class _Store {
     });
   }
   async setJSON(key, data, options = {}) {
-    return withActiveSpan(getTracer(), "blobs.setJSON", async (span) => {
+    return withSpan(options.span, "blobs.setJSON", async (span) => {
       span?.setAttributes({
         "blobs.store": this.name,
         "blobs.key": key,
@@ -707,7 +718,7 @@ var Store = class _Store {
         let done = false;
         return {
           async next() {
-            return withActiveSpan(getTracer(), "blobs.list.next", async (span) => {
+            return withSpan(options?.span, "blobs.list.next", async (span) => {
               span?.setAttributes({
                 "blobs.store": storeName,
                 "blobs.method": "GET",
@@ -786,7 +797,7 @@ var getDeployStore = (input = {}) => {
 };
 
 // src/run/storage/regional-blob-store.cts
-var FETCH_BEFORE_NEXT_PATCHED_IT = Symbol.for("nf-not-patched-fetch");
+var FETCH_BEFORE_NEXT_PATCHED_IT = /* @__PURE__ */ Symbol.for("nf-not-patched-fetch");
 var extendedGlobalThis = globalThis;
 function attemptToGetOriginalFetch(fetch) {
   return fetch._nextOriginalFetch ?? fetch;

package/dist/run/storage/request-scoped-in-memory-cache.cjs

@@ -70,7 +70,6 @@ if (typeof AC === "undefined") {
   };
 }
 var shouldWarn = (code) => !warned.has(code);
-var TYPE = Symbol("type");
 var isPosInt = (n) => n && n === Math.floor(n) && n > 0 && isFinite(n);
 var getUintArray = (max) => !isPosInt(max) ? null : max <= Math.pow(2, 8) ? Uint8Array : max <= Math.pow(2, 16) ? Uint16Array : max <= Math.pow(2, 32) ? Uint32Array : max <= Number.MAX_SAFE_INTEGER ? ZeroArray : null;
 var ZeroArray = class extends Array {
@@ -1399,12 +1398,12 @@ var LRUCache = class _LRUCache {
 var import_blob_types = require("../../shared/blob-types.cjs");
 var import_request_context = require("../handlers/request-context.cjs");
 var import_tracer = require("../handlers/tracer.cjs");
-var NullValue = Symbol.for("null-value");
+var NullValue = /* @__PURE__ */ Symbol.for("null-value");
 var isDataWithEtag = (value) => {
   return typeof value === "object" && value !== null && "data" in value && "etag" in value;
 };
-var IN_MEMORY_CACHE_MAX_SIZE = Symbol.for("nf-in-memory-cache-max-size");
-var IN_MEMORY_LRU_CACHE = Symbol.for("nf-in-memory-lru-cache");
+var IN_MEMORY_CACHE_MAX_SIZE = /* @__PURE__ */ Symbol.for("nf-in-memory-cache-max-size");
+var IN_MEMORY_LRU_CACHE = /* @__PURE__ */ Symbol.for("nf-in-memory-lru-cache");
 var extendedGlobalThis = globalThis;
 var DEFAULT_FALLBACK_MAX_SIZE = 50 * 1024 * 1024;
 function setInMemoryCacheMaxSizeFromNextConfig(size) {

package/dist/run/storage/storage.cjs

@@ -57,10 +57,11 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
       const blobKey = await encodeBlobKey(key);
       const getPromise = (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
         const { etag: previousEtag, globalValue: previousBlob } = memoizedValue?.conditional ? memoizedValue : {};
-        span?.setAttributes({ key, blobKey, previousEtag });
+        span?.setAttributes({ key });
         const result = await store.getWithMetadata(blobKey, {
           type: "json",
-          etag: previousEtag
+          etag: previousEtag,
+          span
         });
         const shouldReuseMemoizedBlob = result?.etag && previousEtag === result?.etag;
         const blob = shouldReuseMemoizedBlob ? previousBlob : result?.data;
@@ -72,11 +73,6 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
         } else {
           inMemoryCache.set(key, blob);
         }
-        span?.setAttributes({
-          etag: result?.etag,
-          reusingPreviouslyFetchedBlob: shouldReuseMemoizedBlob,
-          status: blob ? shouldReuseMemoizedBlob ? "Hit, no change" : "Hit" : "Miss"
-        });
         return blob;
       });
       inMemoryCache.set(key, getPromise);
@@ -87,8 +83,8 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
       inMemoryCache.set(key, value);
       const blobKey = await encodeBlobKey(key);
       return (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
-        span?.setAttributes({ key, blobKey });
-        const writeResult = await store.setJSON(blobKey, value);
+        span?.setAttributes({ key });
+        const writeResult = await store.setJSON(blobKey, value, { span });
         if (writeResult?.etag) {
           inMemoryCache.set(key, {
             data: value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.15.1",
+  "version": "5.15.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",