@netlify/plugin-nextjs 5.15.6 → 5.15.8

package/dist/build/functions/edge.js

@@ -405,7 +405,7 @@ var require_dist = __commonJS({
 // src/build/functions/edge.ts
 var import_fast_glob = __toESM(require_out(), 1);
 var import_path_to_regexp = __toESM(require_dist(), 1);
-import { cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
+import { cp, lstat, mkdir, readdir, readFile, readlink, rm, writeFile } from "node:fs/promises";
 import { dirname, join, relative } from "node:path/posix";
 import { EDGE_HANDLER_NAME } from "../plugin-context.js";
 function nodeMiddlewareDefinitionHasMatcher(definition) {
@@ -562,15 +562,20 @@ Check https://docs.netlify.com/build/frameworks/framework-setup-guides/nextjs/ov
     );
   }
   const commonPrefix = relative(join(srcDir, maxParentDirectoriesPath), srcDir);
-  parts.push(`const virtualModules = new Map();`);
+  parts.push(`const virtualModules = new Map();`, `const virtualSymlinks = new Map();`);
   const handleFileOrDirectory = async (fileOrDir) => {
     const srcPath = join(srcDir, fileOrDir);
-    const stats = await stat(srcPath);
+    const stats = await lstat(srcPath);
     if (stats.isDirectory()) {
       const filesInDir = await readdir(srcPath);
       for (const fileInDir of filesInDir) {
         await handleFileOrDirectory(join(fileOrDir, fileInDir));
       }
+    } else if (stats.isSymbolicLink()) {
+      const symlinkTarget = await readlink(srcPath);
+      parts.push(
+        `virtualSymlinks.set(${JSON.stringify(join(commonPrefix, fileOrDir))}, ${JSON.stringify(symlinkTarget)});`
+      );
     } else {
       const content = await readFile(srcPath, "utf8");
       parts.push(
@@ -581,7 +586,7 @@ Check https://docs.netlify.com/build/frameworks/framework-setup-guides/nextjs/ov
   for (const file of files) {
     await handleFileOrDirectory(file);
   }
-  parts.push(`registerCJSModules(import.meta.url, virtualModules);
+  parts.push(`registerCJSModules(import.meta.url, virtualModules, virtualSymlinks);
 
     const require = createRequire(import.meta.url);
     const handlerMod = require("./${join(commonPrefix, entry)}");

package/dist/run/handlers/cache.cjs

@@ -114,7 +114,7 @@ var NetlifyCacheHandler = class {
     }
     if (cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES" || cacheValue.kind === "APP_PAGE" || cacheValue.kind === "ROUTE" || cacheValue.kind === "APP_ROUTE") {
       if (cacheValue.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]) {
-        const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(/,|%2c/gi);
+        const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(/,|%2c/gi).map(encodeURI);
         requestContext.responseCacheTags = cacheTags;
       } else if ((cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES") && typeof cacheValue.pageData === "object") {
         const cacheTags = [`_N_T_${key === "/index" ? "/" : encodeURI(key)}`];

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

package/edge-runtime/lib/cjs.ts

@@ -1,7 +1,7 @@
 import { Module, createRequire } from 'node:module'
 import vm from 'node:vm'
 import { sep } from 'node:path'
-import { join, dirname, sep as posixSep } from 'node:path/posix'
+import { join, dirname, sep as posixSep, resolve as pathResolve } from 'node:path/posix'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
 const toPosixPath = (path: string) => path.split(sep).join(posixSep)
@@ -13,8 +13,30 @@ type RegisteredModule = {
   // lazily parsed json string
   parsedJson?: any
 }
-type ModuleResolutions = (subpath: string) => string
-const registeredModules = new Map<string, RegisteredModule>()
+type ModuleResolutions = (subpath: string, handleExportMap?: boolean) => string
+
+const registeredSymlinks = new Map<string, string>()
+
+class SymlinkAwareRegisteredModulesMap extends Map<string, RegisteredModule> {
+  private resolveSymlink(path: string) {
+    for (const [symlinkPath, targetPath] of registeredSymlinks) {
+      if (path === symlinkPath) {
+        return targetPath
+      }
+      if (path.startsWith(symlinkPath + '/')) {
+        return targetPath + path.slice(symlinkPath.length)
+      }
+    }
+
+    return path
+  }
+
+  override get(key: string): RegisteredModule | undefined {
+    return super.get(this.resolveSymlink(key))
+  }
+}
+
+const registeredModules = new SymlinkAwareRegisteredModulesMap()
 const memoizedPackageResolvers = new WeakMap<RegisteredModule, ModuleResolutions>()
 
 const require = createRequire(import.meta.url)
@@ -141,8 +163,8 @@ function getPackageResolver(packageJsonMatchedModule: RegisteredModule) {
       : pkgJson.exports
   }
 
-  const resolveInPackage: ModuleResolutions = (subpath: string) => {
-    if (exports) {
+  const resolveInPackage: ModuleResolutions = (subpath: string, handleExportMap = true) => {
+    if (handleExportMap && exports) {
       const normalizedSubpath = subpath.length === 0 ? '.' : './' + subpath
 
       // https://github.com/nodejs/node/blob/6fd67ec6e3ccbdfcfa0300b9b742040a0607a4bc/lib/internal/modules/esm/resolve.js#L594
@@ -186,8 +208,8 @@ function getPackageResolver(packageJsonMatchedModule: RegisteredModule) {
       throw new Error(`Cannot find module '${normalizedSubpath}'`)
     }
 
-    if (subpath.length === 0 && pkgJson.main) {
-      return pkgJson.main
+    if (subpath.length === 0 && pkgJson.main && typeof pkgJson.main === 'string') {
+      return pkgJson.main as string
     }
 
     return subpath
@@ -264,7 +286,11 @@ function tryMatchingWithIndex(target: string) {
   return matchedModule
 }
 
-export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
+export function registerCJSModules(
+  baseUrl: URL,
+  modules: Map<string, string>,
+  symlinks: Map<string, string> = new Map(),
+) {
   const basePath = dirname(toPosixPath(fileURLToPath(baseUrl, { windows: false })))
 
   for (const [filename, source] of modules.entries()) {
@@ -272,6 +298,12 @@ export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
     registeredModules.set(target, { source, loaded: false, filepath: target })
   }
 
+  for (const [symlinkPath, targetPath] of symlinks) {
+    const source = join(basePath, symlinkPath)
+    const target = pathResolve(dirname(source), targetPath)
+    registeredSymlinks.set(source, target)
+  }
+
   if (!hookedIn) {
     // @ts-expect-error - private untyped API
     const original_resolveFilename = Module._resolveFilename.bind(Module)
@@ -309,7 +341,19 @@ export function registerCJSModules(baseUrl: URL, modules: Map<string, string>) {
             relativeTarget = packageResolver(moduleInPackagePath)
           }
 
-          const potentialPath = join(nodeModulePaths, packageName, relativeTarget)
+          let potentialPath = join(nodeModulePaths, packageName, relativeTarget)
+
+          // we need to also check if there is package.json at the potentialPath location
+          // as it might have "main" field that redirects further
+          const potentialNestedPackageJson = join(potentialPath, 'package.json')
+          const maybeNestedPackageJson = registeredModules.get(potentialNestedPackageJson)
+          if (maybeNestedPackageJson) {
+            const packageResolver = getPackageResolver(maybeNestedPackageJson)
+            const maybeMain = packageResolver('', false)
+            if (maybeMain) {
+              potentialPath = join(potentialPath, maybeMain)
+            }
+          }
 
           matchedModule = tryMatchingWithIndex(potentialPath)
           if (matchedModule) {

package/package.json

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