@netlify/plugin-nextjs 5.14.1 → 5.14.3

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"),

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -2,7 +2,7 @@ import {
   createRequestContext,
   runWithRequestContext,
 } from '{{cwd}}/.netlify/dist/run/handlers/request-context.cjs'
-import { getTracer } from '{{cwd}}/.netlify/dist/run/handlers/tracer.cjs'
+import { getTracer, withActiveSpan } from '{{cwd}}/.netlify/dist/run/handlers/tracer.cjs'
 
 process.chdir('{{cwd}}')
 
@@ -15,8 +15,8 @@ export default async function (req, context) {
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {
-    return tracer.withActiveSpan('Next.js Server Handler', async (span) => {
-      span.setAttributes({
+    return withActiveSpan(tracer, 'Next.js Server Handler', async (span) => {
+      span?.setAttributes({
         'account.id': context.account.id,
         'deploy.id': context.deploy.id,
         'request.id': context.requestId,
@@ -32,7 +32,7 @@ export default async function (req, context) {
         cachedHandler = handler
       }
       const response = await cachedHandler(req, context, span, requestContext)
-      span.setAttributes({
+      span?.setAttributes({
         'http.status_code': response.status,
       })
       return response

package/dist/build/templates/handler.tmpl.js

@@ -3,7 +3,7 @@ import {
   runWithRequestContext,
 } from './.netlify/dist/run/handlers/request-context.cjs'
 import serverHandler from './.netlify/dist/run/handlers/server.js'
-import { getTracer } from './.netlify/dist/run/handlers/tracer.cjs'
+import { getTracer, withActiveSpan } from './.netlify/dist/run/handlers/tracer.cjs'
 
 // Set feature flag for regional blobs
 process.env.USE_REGIONAL_BLOBS = '{{useRegionalBlobs}}'
@@ -13,8 +13,8 @@ export default async function handler(req, context) {
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {
-    return tracer.withActiveSpan('Next.js Server Handler', async (span) => {
-      span.setAttributes({
+    return withActiveSpan(tracer, 'Next.js Server Handler', async (span) => {
+      span?.setAttributes({
         'account.id': context.account.id,
         'deploy.id': context.deploy.id,
         'request.id': context.requestId,
@@ -26,7 +26,7 @@ export default async function handler(req, context) {
         cwd: process.cwd(),
       })
       const response = await serverHandler(req, context, span, requestContext)
-      span.setAttributes({
+      span?.setAttributes({
         'http.status_code': response.status,
       })
       return response

package/dist/run/handlers/cache.cjs

@@ -181,18 +181,18 @@ var NetlifyCacheHandler = class {
     }
   }
   async get(...args) {
-    return this.tracer.withActiveSpan("get cache key", async (span) => {
+    return (0, import_tracer.withActiveSpan)(this.tracer, "get cache key", async (span) => {
       const [key, context = {}] = args;
       (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.get]: ${key}`);
-      span.setAttributes({ key });
+      span?.setAttributes({ key });
       const blob = await this.cacheStore.get(key, "blobStore.get");
       if (!blob) {
-        span.addEvent("Cache miss", { key });
+        span?.addEvent("Cache miss", { key });
         return null;
       }
       const ttl = this.getTTL(blob);
       if ((0, import_request_context.getRequestContext)()?.isBackgroundRevalidation && typeof ttl === "number" && ttl < 0) {
-        span.addEvent("Discarding stale entry due to SWR background revalidation request", {
+        span?.addEvent("Discarding stale entry due to SWR background revalidation request", {
           key,
           ttl
         });
@@ -210,12 +210,12 @@ var NetlifyCacheHandler = class {
         context.softTags
       );
       if (expiredByTags) {
-        span.addEvent("Expired", { expiredByTags, key, ttl });
+        span?.addEvent("Expired", { expiredByTags, key, ttl });
         return null;
       }
       this.captureResponseCacheLastModified(blob, key, span);
       if (staleByTags) {
-        span.addEvent("Stale", { staleByTags, key, ttl });
+        span?.addEvent("Stale", { staleByTags, key, ttl });
         blob.lastModified = -1;
       }
       const isDataRequest = Boolean(context.fetchUrl);
@@ -224,7 +224,7 @@ var NetlifyCacheHandler = class {
       }
       switch (blob.value?.kind) {
         case "FETCH":
-          span.addEvent("FETCH", {
+          span?.addEvent("FETCH", {
             lastModified: blob.lastModified,
             revalidate: context.revalidate,
             ttl
@@ -235,7 +235,7 @@ var NetlifyCacheHandler = class {
           };
         case "ROUTE":
         case "APP_ROUTE": {
-          span.addEvent(blob.value?.kind, {
+          span?.addEvent(blob.value?.kind, {
             lastModified: blob.lastModified,
             status: blob.value.status,
             revalidate: blob.value.revalidate,
@@ -257,7 +257,7 @@ var NetlifyCacheHandler = class {
           if (requestContext) {
             requestContext.pageHandlerRevalidate = revalidate;
           }
-          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
+          span?.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
           await this.injectEntryToPrerenderManifest(key, blob.value);
           return {
             lastModified: blob.lastModified,
@@ -270,7 +270,7 @@ var NetlifyCacheHandler = class {
             requestContext.isCacheableAppPage = true;
           }
           const { revalidate, rscData, segmentData, ...restOfPageValue } = blob.value;
-          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
+          span?.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
           await this.injectEntryToPrerenderManifest(key, blob.value);
           return {
             lastModified: blob.lastModified,
@@ -287,7 +287,7 @@ var NetlifyCacheHandler = class {
           };
         }
         default:
-          span.recordException(new Error(`Unknown cache entry kind: ${blob.value?.kind}`));
+          span?.recordException(new Error(`Unknown cache entry kind: ${blob.value?.kind}`));
       }
       return null;
     });
@@ -328,10 +328,10 @@ var NetlifyCacheHandler = class {
     return data;
   }
   async set(...args) {
-    return this.tracer.withActiveSpan("set cache key", async (span) => {
+    return (0, import_tracer.withActiveSpan)(this.tracer, "set cache key", async (span) => {
       const [key, data, context] = args;
       const lastModified = Date.now();
-      span.setAttributes({ key, lastModified });
+      span?.setAttributes({ key, lastModified });
       (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.set]: ${key}`);
       const value = this.transformToStorableObject(data, context);
       const isDataReq = Boolean(context.fetchUrl);

package/dist/run/handlers/server.js

@@ -3102,7 +3102,7 @@ import {
 import { nextResponseProxy } from "../revalidate.js";
 import { setFetchBeforeNextPatchedIt } from "../storage/storage.cjs";
 import { getLogger } from "./request-context.cjs";
-import { getTracer, recordWarning } from "./tracer.cjs";
+import { getTracer, recordWarning, withActiveSpan } from "./tracer.cjs";
 import { configureUseCacheHandlers } from "./use-cache-handler.js";
 import { setupWaitUntil } from "./wait-until.cjs";
 setFetchBeforeNextPatchedIt(globalThis.fetch);
@@ -3130,7 +3130,7 @@ var disableFaultyTransferEncodingHandling = (res) => {
 var server_default = async (request, _context, topLevelSpan, requestContext) => {
   const tracer = getTracer();
   if (!nextHandler) {
-    await tracer.withActiveSpan("initialize next server", async () => {
+    await withActiveSpan(tracer, "initialize next server", async () => {
       const { getMockedRequestHandler } = await nextImportPromise;
       const url = new URL(request.url);
       nextHandler = await getMockedRequestHandler(nextConfig, {
@@ -3141,7 +3141,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       });
     });
   }
-  return await tracer.withActiveSpan("generate response", async (span) => {
+  return await withActiveSpan(tracer, "generate response", async (span) => {
     const { req, res } = toReqRes(request);
     Object.defineProperty(req, "connection", {
       get() {
@@ -3159,12 +3159,12 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       getLogger().withError(error).error("next handler error");
       console.error(error);
       resProxy.statusCode = 500;
-      span.setAttribute("http.status_code", 500);
+      span?.setAttribute("http.status_code", 500);
       resProxy.end("Internal Server Error");
     });
     const response = await toComputeResponse(resProxy);
     if (requestContext.responseCacheKey) {
-      topLevelSpan.setAttribute("responseCacheKey", requestContext.responseCacheKey);
+      topLevelSpan?.setAttribute("responseCacheKey", requestContext.responseCacheKey);
     }
     const nextCache = response.headers.get("x-nextjs-cache");
     const isServedFromNextCache = nextCache === "HIT" || nextCache === "STALE";
@@ -3182,7 +3182,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     setCacheStatusHeader(response.headers, nextCache);
     const netlifyVary = response.headers.get("netlify-vary") ?? void 0;
     const netlifyCdnCacheControl = response.headers.get("netlify-cdn-cache-control") ?? void 0;
-    topLevelSpan.setAttributes({
+    topLevelSpan?.setAttributes({
       "x-nextjs-cache": nextCache ?? void 0,
       isServedFromNextCache,
       netlifyVary,
@@ -3192,7 +3192,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       const isRSCRequest = request.headers.get("rsc") === "1";
       const contentType = response.headers.get("content-type") ?? void 0;
       const isExpectedContentType = (isRSCRequest && contentType?.includes("text/x-component") || !isRSCRequest && contentType?.includes("text/html")) ?? false;
-      topLevelSpan.setAttributes({
+      topLevelSpan?.setAttributes({
         isRSCRequest,
         isCacheableAppPage: true,
         contentType,

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