@vercel/gatsby-plugin-vercel-builder 2.0.7 → 2.0.9

package/dist/index.js

@@ -105,7 +105,8 @@ var import_esbuild = require("esbuild");
 var import_fs_extra2 = require("fs-extra");
 var writeHandler = async ({
   outDir,
-  handlerFile
+  handlerFile,
+  prefix = ""
 }) => {
   const { major } = await (0, import_build_utils.getNodeVersion)(process.cwd());
   try {
@@ -119,7 +120,8 @@ var writeHandler = async ({
       bundle: true,
       minify: true,
       define: {
-        "process.env.NODE_ENV": "'production'"
+        "process.env.NODE_ENV": "'production'",
+        vercel_pathPrefix: JSON.stringify(prefix)
       }
     });
   } catch (e) {
@@ -203,7 +205,7 @@ async function createServerlessFunctions(ssrRoutes, prefix) {
         functionDir = (0, import_path3.join)(".vercel/output/functions", functionName);
         await (0, import_fs_extra3.ensureDir)(functionDir);
         await Promise.all([
-          writeHandler({ outDir: functionDir, handlerFile }),
+          writeHandler({ outDir: functionDir, handlerFile, prefix }),
           copyFunctionLibs({ functionDir }),
           copyHTMLFiles({ functionDir }),
           writeVCConfig({ functionDir })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "7.2.2",
-    "@vercel/routing-utils": "3.0.0",
+    "@vercel/build-utils": "7.2.3",
+    "@vercel/routing-utils": "3.1.0",
     "esbuild": "0.14.47",
     "etag": "1.8.1",
     "fs-extra": "11.1.0"
@@ -23,12 +23,16 @@
   "devDependencies": {
     "@types/etag": "1.8.0",
     "@types/fs-extra": "11.0.1",
+    "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/react": "18.0.26",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"
   },
   "scripts": {
-    "build": "node ../../utils/build-builder.mjs"
+    "build": "node ../../utils/build-builder.mjs",
+    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
+    "test-unit": "pnpm test test/unit.*test.*",
+    "type-check": "tsc --noEmit"
   }
 }

package/templates/ssr-handler.js

@@ -1,8 +1,8 @@
 import os from 'os';
 import etag from 'etag';
-import { parse } from 'url';
+import { join } from 'path';
 import { copySync, existsSync } from 'fs-extra';
-import { join, dirname, basename } from 'path';
+import { getPageName } from './utils';
 
 const TMP_DATA_PATH = join(os.tmpdir(), 'data/datastore');
 const CUR_DATA_PATH = join(__dirname, '.cache/data/datastore');
@@ -25,34 +25,14 @@ async function getPageSSRHelpers() {
 }
 
 export default async function handler(req, res) {
-  let pageName;
-  const pathname = parse(req.url).pathname || '/';
-  const isPageData = pathname.startsWith('/page-data/');
-  if (isPageData) {
-    // /page-data/index/page-data.json
-    // /page-data/using-ssr/page-data.json
-    pageName = basename(dirname(pathname));
-    if (pageName === 'index') {
-      pageName = '/';
-    }
-  } else {
-    // /using-ssr
-    // /using-ssr/
-    // /using-ssr/index.html
-    pageName = basename(pathname);
-    if (pageName === 'index.html') {
-      pageName = basename(dirname(pathname));
-    }
-    if (!pageName) {
-      pageName = '/';
-    }
-  }
+  // eslint-disable-next-line no-undef
+  const { pathName, isPageData } = getPageName(req.url, vercel_pathPrefix);
 
   const [graphqlEngine, { getData, renderHTML, renderPageData }] =
     await Promise.all([getGraphQLEngine(), getPageSSRHelpers()]);
 
   const data = await getData({
-    pathName: pageName,
+    pathName,
     graphqlEngine,
     req,
   });

package/templates/utils.ts

@@ -0,0 +1,29 @@
+import { parse } from 'url';
+import { basename, dirname } from 'path';
+
+export function getPageName(url: string, pathPrefix = '') {
+  let pathName = (parse(url).pathname || '/').slice(pathPrefix.length);
+  const isPageData = pathName.startsWith('/page-data/');
+  if (isPageData) {
+    // "/page-data/index/page-data.json" -> "/"
+    // "/page-data/using-ssr/page-data.json" -> "using-ssr"
+    // "/page-data/foo/bar/ssr/page-data.json" -> "foo/bar/ssr"
+    pathName = pathName.split('/').slice(2, -1).join('/');
+    if (pathName === 'index') {
+      pathName = '/';
+    }
+  } else {
+    // "/using-ssr" -> "using-ssr"
+    // "/using-ssr/" -> "using-ssr"
+    // "/using-ssr/index.html" -> "using-ssr"
+    // "/foo/bar/ssr" -> "foo/bar/ssr"
+    if (basename(pathName) === 'index.html') {
+      pathName = dirname(pathName);
+    }
+    if (pathName !== '/') {
+      // Remove leading and trailing "/"
+      pathName = pathName.replace(/(^\/|\/$)/g, '');
+    }
+  }
+  return { isPageData, pathName };
+}