@next-community/adapter-vercel 0.0.1-beta.23 → 0.0.1-beta.24

package/dist/index.js

@@ -9665,7 +9665,7 @@ async function handleStaticOutputs(outputs, {
       const srcExtension = import_node_path.default.extname(output.filePath);
       const isHtml = srcExtension === ".html";
       if (isHtml) {
-        vercelConfig2.overrides[import_node_path.default.posix.join("./", output.pathname + ".html")] = {
+        vercelConfig2.overrides[import_node_path.default.posix.join("./", `${output.pathname}.html`)] = {
           contentType: "text/html; charset=utf-8",
           path: import_node_path.default.posix.join("./", output.pathname)
         };
@@ -9856,6 +9856,7 @@ async function handleNodeOutputs(nodeOutputs, {
       nextEnvLoaderPath
     );
   }
+  const usesSrcDir = await usesSrcDirectory(projectDir);
   await Promise.all(
     nodeOutputs.map(async (output) => {
       await fsSema.acquire();
@@ -9918,7 +9919,8 @@ async function handleNodeOutputs(nodeOutputs, {
       const sourceFile = await getSourceFilePathFromPage({
         workPath: projectDir,
         page: output.sourcePage,
-        pageExtensions: config.pageExtensions || []
+        pageExtensions: config.pageExtensions || [],
+        usesSrcDir
       });
       const vercelConfigOpts = await (0, import_build_utils.getLambdaOptionsFromFunction)({
         sourceFile,
@@ -10229,42 +10231,29 @@ async function handleMiddleware(output, ctx) {
   }
   return routes;
 }
-var _usesSrcCache;
 async function usesSrcDirectory(workPath) {
-  if (_usesSrcCache === void 0) {
-    const sourcePages = import_node_path.default.join(workPath, "src", "pages");
-    try {
-      if ((await import_promises.default.stat(sourcePages)).isDirectory()) {
-        _usesSrcCache = true;
-      }
-    } catch (_err) {
-      _usesSrcCache = false;
-    }
-  }
-  if (_usesSrcCache === void 0) {
-    const sourceAppdir = import_node_path.default.join(workPath, "src", "app");
+  for (const dir of [
+    import_node_path.default.join(workPath, "src", "pages"),
+    import_node_path.default.join(workPath, "src", "app")
+  ]) {
     try {
-      if ((await import_promises.default.stat(sourceAppdir)).isDirectory()) {
-        _usesSrcCache = true;
+      if ((await import_promises.default.stat(dir)).isDirectory()) {
+        return true;
       }
     } catch (_err) {
-      _usesSrcCache = false;
     }
   }
-  if (_usesSrcCache === void 0) {
-    _usesSrcCache = false;
-  }
-  return _usesSrcCache;
+  return false;
 }
 function isDirectory(path3) {
-  return import_fs_extra3.default.existsSync(path3) && import_fs_extra3.default.lstatSync(path3).isDirectory();
+  return import_fs_extra3.default.lstatSync(path3, { throwIfNoEntry: false })?.isDirectory() ?? false;
 }
 async function getSourceFilePathFromPage({
   workPath,
   page,
-  pageExtensions
+  pageExtensions,
+  usesSrcDir
 }) {
-  const usesSrcDir = await usesSrcDirectory(workPath);
   const extensionsToTry = pageExtensions || ["js", "jsx", "ts", "tsx"];
   for (const pageType of [
     // middleware is not nested in pages/app
@@ -10379,10 +10368,10 @@ function modifyWithRewriteHeaders(rewrites, {
     rewrite.headers = {
       ...rewrite.headers,
       ...pathname ? {
-        ["x-nextjs-rewritten-path"]: pathname
+        "x-nextjs-rewritten-path": pathname
       } : {},
       ...query ? {
-        ["x-nextjs-rewritten-query"]: query
+        "x-nextjs-rewritten-query": query
       } : {}
     };
   }

package/dist/node-handler.js

@@ -43,7 +43,7 @@ const getHandlerSource = (ctx) => `
     return fromSymbol[SYMBOL_FOR_REQ_CONTEXT]?.get?.() ?? {};
   }
   return async function handler(request) {
-    let middlewareHandler = await require("./" + path.posix.join(relativeDistDir, "server", "middleware.js"));
+    let middlewareHandler = await require(`./${path.posix.join(relativeDistDir, "server", "middleware.js")}`);
     middlewareHandler = middlewareHandler.handler || middlewareHandler;
     const context = getRequestContext();
     const response = await middlewareHandler(request, {
@@ -65,7 +65,7 @@ const getHandlerSource = (ctx) => `
     dynamicRoutes: dynamicRoutesRaw,
     staticRoutes: staticRoutesRaw,
     i18n
-  } = require("./" + path.posix.join(relativeDistDir, "routes-manifest.json"));
+  } = require(`./${path.posix.join(relativeDistDir, "routes-manifest.json")}`);
   const matchOperatorsRegex = /[|\\{}()[\]^$+*?.-]/g;
   function escapeStringRegexp(str) {
     return str.replace(matchOperatorsRegex, "\\$&");
@@ -79,9 +79,7 @@ const getHandlerSource = (ctx) => `
   const staticRoutes = staticRoutesRaw.map((route) => {
     return {
       ...route,
-      namedRegex: new RegExp(
-        "^" + escapeStringRegexp(route.page) + "$"
-      )
+      namedRegex: new RegExp(`^${escapeStringRegexp(route.page)}$`)
     };
   });
   let appPathRoutesManifest = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-community/adapter-vercel",
-  "version": "0.0.1-beta.23",
+  "version": "0.0.1-beta.24",
   "type": "commonjs",
   "main": "dist/index.js",
   "files": [
@@ -13,7 +13,7 @@
     "@types/bytes": "3.1.1",
     "@types/convert-source-map": "1.5.2",
     "@types/fs-extra": "8.0.0",
-    "@types/node": "14.18.33",
+    "@types/node": "20.6.5",
     "@types/picomatch": "2.3.3",
     "@types/webpack-sources": "3.2.0",
     "@vercel/build-utils": "13.6.2",
@@ -28,9 +28,6 @@
     "source-map": "0.7.4",
     "webpack-sources": "3.2.3"
   },
-  "peerDependencies": {
-    "next": ">= 16.1.1-canary.18"
-  },
   "engines": {
     "node": ">= 20.6.0"
   },