@netlify/plugin-nextjs 5.14.2 → 5.14.4

package/dist/build/functions/edge.js

@@ -463,7 +463,7 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
     basePath: nextConfig.basePath,
     i18n: nextConfig.i18n,
     trailingSlash: nextConfig.trailingSlash,
-    skipMiddlewareUrlNormalize: nextConfig.skipMiddlewareUrlNormalize
+    skipMiddlewareUrlNormalize: nextConfig.skipProxyUrlNormalize ?? nextConfig.skipMiddlewareUrlNormalize
   };
   await writeFile(
     join(handlerRuntimeDirectory, "next.config.json"),
@@ -534,7 +534,7 @@ var copyHandlerDependenciesForNodeMiddleware = async (ctx) => {
   const parts = [shim];
   const entry = "server/middleware.js";
   const nft = `${entry}.nft.json`;
-  const nftFilesPath = join(process.cwd(), ctx.nextDistDir, nft);
+  const nftFilesPath = join(process.cwd(), ctx.distDir, nft);
   const nftManifest = JSON.parse(await readFile(nftFilesPath, "utf8"));
   const files = nftManifest.files.map((file) => join("server", file));
   files.push(entry);

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.14.2";
+var version = "5.14.4";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/dist/run/next.cjs

@@ -498,6 +498,7 @@ var import_request_context = require("./handlers/request-context.cjs");
 var import_tracer = require("./handlers/tracer.cjs");
 var import_storage = require("./storage/storage.cjs");
 process.env.NODE_ENV = "production";
+process.env.NEXT_OTEL_FETCH_DISABLED = "1";
 var { getRequestHandlers } = require("next/dist/server/lib/start-server.js");
 var ResponseCache = require("next/dist/server/response-cache/index.js").default;
 var originalGet = ResponseCache.prototype.get;

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

@@ -25,7 +25,7 @@ __export(regional_blob_store_exports, {
 });
 module.exports = __toCommonJS(regional_blob_store_exports);
 
-// node_modules/@netlify/blobs/node_modules/@netlify/runtime-utils/dist/main.js
+// node_modules/@netlify/runtime-utils/dist/main.js
 var getString = (input) => typeof input === "string" ? input : JSON.stringify(input);
 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));
@@ -337,6 +337,22 @@ 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/";
@@ -369,154 +385,229 @@ var Store = class _Store {
     }
   }
   async get(key, options) {
-    const { consistency, type } = options ?? {};
-    const res = await this.client.makeRequest({ consistency, key, method: "get", storeName: this.name });
-    if (res.status === 404) {
-      return null;
-    }
-    if (res.status !== 200) {
+    return withActiveSpan(getTracer(), "blobs.get", async (span) => {
+      const { consistency, type } = options ?? {};
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.type": type,
+        "blobs.method": "GET",
+        "blobs.consistency": consistency
+      });
+      const res = await this.client.makeRequest({
+        consistency,
+        key,
+        method: "get",
+        storeName: this.name
+      });
+      span?.setAttributes({
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200) {
+        throw new BlobsInternalError(res);
+      }
+      if (type === void 0 || type === "text") {
+        return res.text();
+      }
+      if (type === "arrayBuffer") {
+        return res.arrayBuffer();
+      }
+      if (type === "blob") {
+        return res.blob();
+      }
+      if (type === "json") {
+        return res.json();
+      }
+      if (type === "stream") {
+        return res.body;
+      }
       throw new BlobsInternalError(res);
-    }
-    if (type === void 0 || type === "text") {
-      return res.text();
-    }
-    if (type === "arrayBuffer") {
-      return res.arrayBuffer();
-    }
-    if (type === "blob") {
-      return res.blob();
-    }
-    if (type === "json") {
-      return res.json();
-    }
-    if (type === "stream") {
-      return res.body;
-    }
-    throw new BlobsInternalError(res);
+    });
   }
   async getMetadata(key, { consistency } = {}) {
-    const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
-    if (res.status === 404) {
-      return null;
-    }
-    if (res.status !== 200 && res.status !== 304) {
-      throw new BlobsInternalError(res);
-    }
-    const etag = res?.headers.get("etag") ?? void 0;
-    const metadata = getMetadataFromResponse(res);
-    const result = {
-      etag,
-      metadata
-    };
-    return result;
+    return withActiveSpan(getTracer(), "blobs.getMetadata", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "HEAD",
+        "blobs.consistency": consistency
+      });
+      const res = await this.client.makeRequest({ consistency, key, method: "head", storeName: this.name });
+      span?.setAttributes({
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200 && res.status !== 304) {
+        throw new BlobsInternalError(res);
+      }
+      const etag = res?.headers.get("etag") ?? void 0;
+      const metadata = getMetadataFromResponse(res);
+      const result = {
+        etag,
+        metadata
+      };
+      return result;
+    });
   }
   async getWithMetadata(key, options) {
-    const { consistency, etag: requestETag, type } = options ?? {};
-    const headers = requestETag ? { "if-none-match": requestETag } : void 0;
-    const res = await this.client.makeRequest({
-      consistency,
-      headers,
-      key,
-      method: "get",
-      storeName: this.name
+    return withActiveSpan(getTracer(), "blobs.getWithMetadata", async (span) => {
+      const { consistency, etag: requestETag, type } = options ?? {};
+      const headers = requestETag ? { "if-none-match": requestETag } : void 0;
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "GET",
+        "blobs.consistency": options?.consistency,
+        "blobs.type": type,
+        "blobs.request.etag": requestETag
+      });
+      const res = await this.client.makeRequest({
+        consistency,
+        headers,
+        key,
+        method: "get",
+        storeName: this.name
+      });
+      const responseETag = res?.headers.get("etag") ?? void 0;
+      span?.setAttributes({
+        "blobs.response.etag": responseETag,
+        "blobs.response.status": res.status
+      });
+      if (res.status === 404) {
+        return null;
+      }
+      if (res.status !== 200 && res.status !== 304) {
+        throw new BlobsInternalError(res);
+      }
+      const metadata = getMetadataFromResponse(res);
+      const result = {
+        etag: responseETag,
+        metadata
+      };
+      if (res.status === 304 && requestETag) {
+        return { data: null, ...result };
+      }
+      if (type === void 0 || type === "text") {
+        return { data: await res.text(), ...result };
+      }
+      if (type === "arrayBuffer") {
+        return { data: await res.arrayBuffer(), ...result };
+      }
+      if (type === "blob") {
+        return { data: await res.blob(), ...result };
+      }
+      if (type === "json") {
+        return { data: await res.json(), ...result };
+      }
+      if (type === "stream") {
+        return { data: res.body, ...result };
+      }
+      throw new Error(`Invalid 'type' property: ${type}. Expected: arrayBuffer, blob, json, stream, or text.`);
     });
-    if (res.status === 404) {
-      return null;
-    }
-    if (res.status !== 200 && res.status !== 304) {
-      throw new BlobsInternalError(res);
-    }
-    const responseETag = res?.headers.get("etag") ?? void 0;
-    const metadata = getMetadataFromResponse(res);
-    const result = {
-      etag: responseETag,
-      metadata
-    };
-    if (res.status === 304 && requestETag) {
-      return { data: null, ...result };
-    }
-    if (type === void 0 || type === "text") {
-      return { data: await res.text(), ...result };
-    }
-    if (type === "arrayBuffer") {
-      return { data: await res.arrayBuffer(), ...result };
-    }
-    if (type === "blob") {
-      return { data: await res.blob(), ...result };
-    }
-    if (type === "json") {
-      return { data: await res.json(), ...result };
-    }
-    if (type === "stream") {
-      return { data: res.body, ...result };
-    }
-    throw new Error(`Invalid 'type' property: ${type}. Expected: arrayBuffer, blob, json, stream, or text.`);
   }
   list(options = {}) {
-    const iterator = this.getListIterator(options);
-    if (options.paginate) {
-      return iterator;
-    }
-    return collectIterator(iterator).then(
-      (items) => items.reduce(
-        (acc, item) => ({
-          blobs: [...acc.blobs, ...item.blobs],
-          directories: [...acc.directories, ...item.directories]
-        }),
-        { blobs: [], directories: [] }
-      )
-    );
+    return withActiveSpan(getTracer(), "blobs.list", (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.method": "GET",
+        "blobs.list.paginate": options.paginate ?? false
+      });
+      const iterator = this.getListIterator(options);
+      if (options.paginate) {
+        return iterator;
+      }
+      return collectIterator(iterator).then(
+        (items) => items.reduce(
+          (acc, item) => ({
+            blobs: [...acc.blobs, ...item.blobs],
+            directories: [...acc.directories, ...item.directories]
+          }),
+          { blobs: [], directories: [] }
+        )
+      );
+    });
   }
   async set(key, data, options = {}) {
-    _Store.validateKey(key);
-    const conditions = _Store.getConditions(options);
-    const res = await this.client.makeRequest({
-      conditions,
-      body: data,
-      key,
-      metadata: options.metadata,
-      method: "put",
-      storeName: this.name
+    return withActiveSpan(getTracer(), "blobs.set", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "PUT",
+        "blobs.data.size": typeof data == "string" ? data.length : data instanceof Blob ? data.size : data.byteLength,
+        "blobs.data.type": typeof data == "string" ? "string" : data instanceof Blob ? "blob" : "arrayBuffer",
+        "blobs.atomic": Boolean(options.onlyIfMatch ?? options.onlyIfNew)
+      });
+      _Store.validateKey(key);
+      const conditions = _Store.getConditions(options);
+      const res = await this.client.makeRequest({
+        conditions,
+        body: data,
+        key,
+        metadata: options.metadata,
+        method: "put",
+        storeName: this.name
+      });
+      const etag = res.headers.get("etag") ?? "";
+      span?.setAttributes({
+        "blobs.response.etag": etag,
+        "blobs.response.status": res.status
+      });
+      if (conditions) {
+        return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
+      }
+      if (res.status === STATUS_OK) {
+        return {
+          etag,
+          modified: true
+        };
+      }
+      throw new BlobsInternalError(res);
     });
-    const etag = res.headers.get("etag") ?? "";
-    if (conditions) {
-      return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
-    }
-    if (res.status === STATUS_OK) {
-      return {
-        etag,
-        modified: true
-      };
-    }
-    throw new BlobsInternalError(res);
   }
   async setJSON(key, data, options = {}) {
-    _Store.validateKey(key);
-    const conditions = _Store.getConditions(options);
-    const payload = JSON.stringify(data);
-    const headers = {
-      "content-type": "application/json"
-    };
-    const res = await this.client.makeRequest({
-      ...conditions,
-      body: payload,
-      headers,
-      key,
-      metadata: options.metadata,
-      method: "put",
-      storeName: this.name
-    });
-    const etag = res.headers.get("etag") ?? "";
-    if (conditions) {
-      return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
-    }
-    if (res.status === STATUS_OK) {
-      return {
-        etag,
-        modified: true
+    return withActiveSpan(getTracer(), "blobs.setJSON", async (span) => {
+      span?.setAttributes({
+        "blobs.store": this.name,
+        "blobs.key": key,
+        "blobs.method": "PUT",
+        "blobs.data.type": "json"
+      });
+      _Store.validateKey(key);
+      const conditions = _Store.getConditions(options);
+      const payload = JSON.stringify(data);
+      const headers = {
+        "content-type": "application/json"
       };
-    }
-    throw new BlobsInternalError(res);
+      const res = await this.client.makeRequest({
+        ...conditions,
+        body: payload,
+        headers,
+        key,
+        metadata: options.metadata,
+        method: "put",
+        storeName: this.name
+      });
+      const etag = res.headers.get("etag") ?? "";
+      span?.setAttributes({
+        "blobs.response.etag": etag,
+        "blobs.response.status": res.status
+      });
+      if (conditions) {
+        return res.status === STATUS_PRE_CONDITION_FAILED ? { modified: false } : { etag, modified: true };
+      }
+      if (res.status === STATUS_OK) {
+        return {
+          etag,
+          modified: true
+        };
+      }
+      throw new BlobsInternalError(res);
+    });
   }
   static formatListResultBlob(result) {
     if (!result.key) {
@@ -595,42 +686,54 @@ var Store = class _Store {
         let done = false;
         return {
           async next() {
-            if (done) {
-              return { done: true, value: void 0 };
-            }
-            const nextParameters = { ...parameters };
-            if (currentCursor !== null) {
-              nextParameters.cursor = currentCursor;
-            }
-            const res = await client.makeRequest({
-              method: "get",
-              parameters: nextParameters,
-              storeName
-            });
-            let blobs = [];
-            let directories = [];
-            if (![200, 204, 404].includes(res.status)) {
-              throw new BlobsInternalError(res);
-            }
-            if (res.status === 404) {
-              done = true;
-            } else {
-              const page = await res.json();
-              if (page.next_cursor) {
-                currentCursor = page.next_cursor;
-              } else {
-                done = true;
+            return withActiveSpan(getTracer(), "blobs.list.next", async (span) => {
+              span?.setAttributes({
+                "blobs.store": storeName,
+                "blobs.method": "GET",
+                "blobs.list.paginate": options?.paginate ?? false,
+                "blobs.list.done": done,
+                "blobs.list.cursor": currentCursor ?? void 0
+              });
+              if (done) {
+                return { done: true, value: void 0 };
+              }
+              const nextParameters = { ...parameters };
+              if (currentCursor !== null) {
+                nextParameters.cursor = currentCursor;
+              }
+              const res = await client.makeRequest({
+                method: "get",
+                parameters: nextParameters,
+                storeName
+              });
+              span?.setAttributes({
+                "blobs.response.status": res.status
+              });
+              let blobs = [];
+              let directories = [];
+              if (![200, 204, 404].includes(res.status)) {
+                throw new BlobsInternalError(res);
               }
-              blobs = (page.blobs ?? []).map(_Store.formatListResultBlob).filter(Boolean);
-              directories = page.directories ?? [];
-            }
-            return {
-              done: false,
-              value: {
-                blobs,
-                directories
+              if (res.status === 404) {
+                done = true;
+              } else {
+                const page = await res.json();
+                if (page.next_cursor) {
+                  currentCursor = page.next_cursor;
+                } else {
+                  done = true;
+                }
+                blobs = (page.blobs ?? []).map(_Store.formatListResultBlob).filter(Boolean);
+                directories = page.directories ?? [];
               }
-            };
+              return {
+                done: false,
+                value: {
+                  blobs,
+                  directories
+                }
+              };
+            });
           }
         };
       }

package/package.json

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