@netlify/plugin-nextjs 4.29.2-alpha-isr-404.1 → 4.29.2

package/lib/helpers/files.js

@@ -298,9 +298,12 @@ const getDependenciesOfFile = async (file) => {
 exports.getDependenciesOfFile = getDependenciesOfFile;
 const baseServerReplacements = [
     // force manual revalidate during cache fetches
-    [`let ssgCacheKey = `, `let ssgCacheKey = process.env._BYPASS_SSG || `],
+    [
+        `checkIsManualRevalidate(req, this.renderOpts.previewProps)`,
+        `checkIsManualRevalidate(process.env._REVALIDATE_SSG ? { headers: { 'x-prerender-revalidate': this.renderOpts.previewProps.previewModeId } } : req, this.renderOpts.previewProps)`,
+    ],
     // ensure ISR 404 pages send the correct SWR cache headers
-    [`private: isPreviewMode || is404Page`, `private: isPreviewMode || false`],
+    [`private: isPreviewMode || is404Page && cachedData`, `private: isPreviewMode && cachedData`],
 ];
 const nextServerReplacements = [
     [

package/lib/templates/getHandler.js

@@ -33,7 +33,7 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
     conf.experimental.isrFlushToDisk = false;
     // This is our flag that we use when patching the source
     // eslint-disable-next-line no-underscore-dangle
-    process.env._BYPASS_SSG = 'true';
+    process.env._REVALIDATE_SSG = 'true';
     for (const [key, value] of Object.entries(conf.env)) {
         process.env[key] = String(value);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.29.2-alpha-isr-404.1",
+  "version": "4.29.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.1.15",
+    "@netlify/build": "^28.2.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

package/src/templates/edge/next-dev.js

@@ -43,11 +43,14 @@ const handler = async (req, context) => {
     return
   }
 
-  //  This is the format expected by Next.js
+  //  This is the format expected by Next.js along with the timezone which we support.
   const geo = {
     country: context.geo.country?.code,
     region: context.geo.subdivision?.code,
     city: context.geo.city,
+    latitude: context.geo.latitude?.toString(),
+    longitude: context.geo.longitude?.toString(),
+    timezone: context.geo.timezone,
   }
 
   // A default request id is fine locally

package/src/templates/edge/runtime.ts

@@ -20,6 +20,7 @@ export interface RequestData {
     region?: string
     latitude?: string
     longitude?: string
+    timezone?: string
   }
   headers: Record<string, string>
   ip?: string
@@ -63,10 +64,13 @@ const handler = async (req: Request, context: Context) => {
     return
   }
 
-  const geo = {
+  const geo: RequestData['geo'] = {
     country: context.geo.country?.code,
     region: context.geo.subdivision?.code,
     city: context.geo.city,
+    latitude: context.geo.latitude?.toString(),
+    longitude: context.geo.longitude?.toString(),
+    timezone: context.geo.timezone,
   }
 
   const requestId = req.headers.get('x-nf-request-id')