@netlify/plugin-nextjs 4.17.1-runtime.1 → 4.17.1-runtime.4

package/lib/helpers/dev.js

@@ -11,15 +11,16 @@ const edge_1 = require("./edge");
 const files_1 = require("./files");
 // The types haven't been updated yet
 const onPreDev = async ({ constants, netlifyConfig }) => {
+    var _a;
+    const base = (_a = netlifyConfig.build.base) !== null && _a !== void 0 ? _a : process.cwd();
     // Need to patch the files, because build might not have been run
-    await (0, files_1.patchNextFiles)((0, path_1.resolve)(netlifyConfig.build.publish, '..'));
+    await (0, files_1.patchNextFiles)(base);
     //  Clean up old functions
     await (0, fs_extra_1.unlink)((0, path_1.resolve)('.netlify', 'middleware.js')).catch(() => {
         // Ignore if it doesn't exist
     });
     await (0, edge_1.writeDevEdgeFunction)(constants);
-    if (!(0, fs_extra_1.existsSync)((0, path_1.resolve)(netlifyConfig.build.base, 'middleware.ts')) &&
-        !(0, fs_extra_1.existsSync)((0, path_1.resolve)(netlifyConfig.build.base, 'middleware.js'))) {
+    if (!(0, fs_extra_1.existsSync)((0, path_1.resolve)(base, 'middleware.ts')) && !(0, fs_extra_1.existsSync)((0, path_1.resolve)(base, 'middleware.js'))) {
         console.log("No middleware found. Create a 'middleware.ts' or 'middleware.js' file in your project root to add custom middleware.");
     }
     else {
@@ -32,8 +33,8 @@ const onPreDev = async ({ constants, netlifyConfig }) => {
         `--format=esm`,
         '--watch',
         // Watch for both, because it can have either ts or js
-        (0, path_1.resolve)(netlifyConfig.build.base, 'middleware.ts'),
-        (0, path_1.resolve)(netlifyConfig.build.base, 'middleware.js'),
+        (0, path_1.resolve)(base, 'middleware.ts'),
+        (0, path_1.resolve)(base, 'middleware.js'),
     ]);
     childProcess.stdout.pipe(process.stdout);
     childProcess.stderr.pipe(process.stderr);

package/lib/helpers/edge.js

@@ -82,7 +82,7 @@ const writeDevEdgeFunction = async ({ INTERNAL_EDGE_FUNCTIONS_SRC = '.netlify/ed
     await (0, fs_extra_1.writeJson)((0, path_1.join)(edgeFunctionRoot, 'manifest.json'), manifest);
     const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'next-dev');
     await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
-    await copyEdgeSourceFile({ edgeFunctionDir, file: 'next-dev.ts', target: 'index.ts' });
+    await copyEdgeSourceFile({ edgeFunctionDir, file: 'next-dev.js', target: 'index.js' });
     await copyEdgeSourceFile({ edgeFunctionDir, file: 'utils.ts' });
 };
 exports.writeDevEdgeFunction = writeDevEdgeFunction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.17.1-runtime.1",
+  "version": "4.17.1-runtime.4",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.14.0",
+    "@netlify/build": "^27.15.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",

package/src/templates/edge/{next-dev.ts → next-dev.js}

@@ -1,81 +1,13 @@
-import type { Context } from 'https://edge.netlify.com'
-import { NextRequest, NextResponse } from 'https://esm.sh/next/server'
-import { fromFileUrl } from 'https://deno.land/std/path/mod.ts'
+import { NextRequest } from 'https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/request.js'
+import { NextResponse } from 'https://esm.sh/v91/next@12.2.5/deno/dist/server/web/spec-extension/response.js'
+import { fromFileUrl } from 'https://deno.land/std@0.151.0/path/mod.ts'
 import { buildResponse } from './utils.ts'
 
-export interface FetchEventResult {
-  response: Response
-  waitUntil: Promise<unknown>
-}
-
-interface I18NConfig {
-  defaultLocale: string
-  domains?: DomainLocale[]
-  localeDetection?: false
-  locales: string[]
-}
-
-interface DomainLocale {
-  defaultLocale: string
-  domain: string
-  http?: true
-  locales?: string[]
-}
-export interface NextRequestInit extends RequestInit {
-  geo?: {
-    city?: string
-    country?: string
-    region?: string
-  }
-  ip?: string
-  nextConfig?: {
-    basePath?: string
-    i18n?: I18NConfig | null
-    trailingSlash?: boolean
-  }
-}
-
-export interface RequestData {
-  geo?: {
-    city?: string
-    country?: string
-    region?: string
-    latitude?: string
-    longitude?: string
-  }
-  headers: Record<string, string>
-  ip?: string
-  method: string
-  nextConfig?: {
-    basePath?: string
-    i18n?: Record<string, unknown>
-    trailingSlash?: boolean
-  }
-  page?: {
-    name?: string
-    params?: { [key: string]: string }
-  }
-  url: string
-  body?: ReadableStream<Uint8Array>
-}
-
-export interface RequestContext {
-  request: Request
-  context: Context
-}
-
-declare global {
-  // deno-lint-ignore no-var
-  var NFRequestContextMap: Map<string, RequestContext>
-  // deno-lint-ignore no-var
-  var __dirname: string
-}
-
 globalThis.NFRequestContextMap ||= new Map()
 globalThis.__dirname = fromFileUrl(new URL('./', import.meta.url)).slice(0, -1)
 
 // Check if a file exists, given a relative path
-const exists = async (relativePath: string) => {
+const exists = async (relativePath) => {
   const path = fromFileUrl(new URL(relativePath, import.meta.url))
   try {
     await Deno.stat(path)
@@ -87,8 +19,9 @@ const exists = async (relativePath: string) => {
     throw error
   }
 }
+let idx = 0
 
-const handler = async (req: Request, context: Context) => {
+const handler = async (req, context) => {
   // Uncomment when CLI update lands
   // if (!Deno.env.get('NETLIFY_DEV')) {
   //   // Only run in dev
@@ -102,8 +35,9 @@ const handler = async (req: Request, context: Context) => {
   // because that would also throw if there's an error in the middleware,
   // which we would want to surface not ignore.
   if (await exists('../../middleware.js')) {
-    // These will be user code
-    const nextMiddleware = await import('../../middleware.js')
+    // We need to cache-bust the import because otherwise it will claim it
+    // doesn't exist if the user creates it after the server starts
+    const nextMiddleware = await import(`../../middleware.js#${idx++}`)
     middleware = nextMiddleware.middleware
   } else {
     //  No middleware, so we silently return
@@ -111,7 +45,7 @@ const handler = async (req: Request, context: Context) => {
   }
 
   //  This is the format expected by Next.js
-  const geo: NextRequestInit['geo'] = {
+  const geo = {
     country: context.geo.country?.code,
     region: context.geo.subdivision?.code,
     city: context.geo.city,
@@ -125,7 +59,7 @@ const handler = async (req: Request, context: Context) => {
     context,
   })
 
-  const request: NextRequestInit = {
+  const request = {
     headers: Object.fromEntries(req.headers.entries()),
     geo,
     method: req.method,
@@ -133,7 +67,7 @@ const handler = async (req: Request, context: Context) => {
     body: req.body || undefined,
   }
 
-  const nextRequest: NextRequest = new NextRequest(req, request)
+  const nextRequest = new NextRequest(req, request)
 
   try {
     const response = await middleware(nextRequest)