@vercel/static-build 2.8.29 → 2.8.30

package/dist/index.js

@@ -19753,6 +19753,7 @@ var require_utils4 = __commonJS({
     __export2(utils_exports, {
       getBuilderForRuntime: () => getBuilderForRuntime,
       inferServiceRuntime: () => inferServiceRuntime,
+      isStaticBuild: () => isStaticBuild2,
       readVercelConfig: () => readVercelConfig
     });
     module2.exports = __toCommonJS2(utils_exports);
@@ -19765,6 +19766,9 @@ var require_utils4 = __commonJS({
       }
       return builder;
     }
+    function isStaticBuild2(service) {
+      return import_types.STATIC_BUILDERS.has(service.builder.use);
+    }
     function inferServiceRuntime(config) {
       if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
         return config.runtime;
@@ -19949,7 +19953,7 @@ var require_resolve = __commonJS({
         builderUse = (0, import_utils.getBuilderForRuntime)(inferredRuntime);
         builderSrc = config.entrypoint;
       }
-      const routePrefix = type === "web" ? config.routePrefix : void 0;
+      const routePrefix = type === "web" && config.routePrefix ? config.routePrefix.startsWith("/") ? config.routePrefix : `/${config.routePrefix}` : void 0;
       const isRoot = workspace === ".";
       if (!isRoot && !builderSrc.startsWith(workspace + "/")) {
         builderSrc = import_path7.posix.join(workspace, builderSrc);
@@ -19963,8 +19967,15 @@ var require_resolve = __commonJS({
         builderConfig.includeFiles = config.includeFiles;
       if (config.excludeFiles)
         builderConfig.excludeFiles = config.excludeFiles;
-      const isStaticBuild = import_types.STATIC_BUILDERS.has(builderUse);
-      const runtime = isStaticBuild ? void 0 : inferredRuntime;
+      const isStaticBuild2 = import_types.STATIC_BUILDERS.has(builderUse);
+      const runtime = isStaticBuild2 ? void 0 : inferredRuntime;
+      if (routePrefix) {
+        const stripped = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
+        builderConfig.routePrefix = stripped || ".";
+      }
+      if (config.framework) {
+        builderConfig.framework = config.framework;
+      }
       return {
         name,
         type,
@@ -20074,33 +20085,34 @@ var require_detect_services = __commonJS({
       const defaults = [];
       const crons = [];
       const workers = [];
-      const webServices = services.filter(
+      const sortedWebServices = services.filter(
         (s) => s.type === "web" && typeof s.routePrefix === "string"
-      );
-      const sortedWebServices = [...webServices].sort((a, b) => {
-        if (a.routePrefix === "/")
-          return 1;
-        if (b.routePrefix === "/")
-          return -1;
-        return b.routePrefix.length - a.routePrefix.length;
-      });
+      ).sort((a, b) => b.routePrefix.length - a.routePrefix.length);
       for (const service of sortedWebServices) {
-        const { routePrefix, builder } = service;
-        const builderSrc = builder.src || routePrefix;
-        const functionPath = builderSrc.startsWith("/") ? builderSrc : `/${builderSrc}`;
-        if (routePrefix === "/") {
-          defaults.push({
-            src: "^/(.*)$",
-            dest: functionPath,
-            check: true
-          });
+        const { routePrefix } = service;
+        const normalizedPrefix = routePrefix.slice(1);
+        if ((0, import_utils.isStaticBuild)(service)) {
+          if (routePrefix === "/") {
+            defaults.push({ handle: "filesystem" });
+            defaults.push({ src: "/(.*)", dest: "/index.html" });
+          } else {
+            rewrites.push({
+              src: `^/${normalizedPrefix}(?:/.*)?$`,
+              dest: `/${normalizedPrefix}/index.html`
+            });
+          }
         } else {
-          const normalizedPrefix = routePrefix.startsWith("/") ? routePrefix.slice(1) : routePrefix;
-          rewrites.push({
-            src: `^/${normalizedPrefix}(?:/.*)?$`,
-            dest: functionPath,
-            check: true
-          });
+          const builderSrc = service.builder.src || routePrefix;
+          const functionPath = builderSrc.startsWith("/") ? builderSrc : `/${builderSrc}`;
+          if (routePrefix === "/") {
+            defaults.push({ src: "^/(.*)$", dest: functionPath, check: true });
+          } else {
+            rewrites.push({
+              src: `^/${normalizedPrefix}(?:/.*)?$`,
+              dest: functionPath,
+              check: true
+            });
+          }
         }
       }
       return { rewrites, defaults, crons, workers };
@@ -28931,6 +28943,7 @@ var require_dist4 = __commonJS({
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
       getWorkspaces: () => import_get_workspaces.getWorkspaces,
       isOfficialRuntime: () => import_is_official_runtime.isOfficialRuntime,
+      isStaticBuild: () => import_utils.isStaticBuild,
       isStaticRuntime: () => import_is_official_runtime.isStaticRuntime,
       monorepoManagers: () => import_monorepo_managers.monorepoManagers,
       packageManagers: () => import_package_managers.packageManagers,
@@ -28939,6 +28952,7 @@ var require_dist4 = __commonJS({
     module2.exports = __toCommonJS2(src_exports2);
     var import_detect_builders = require_detect_builders();
     var import_detect_services = require_detect_services();
+    var import_utils = require_utils4();
     var import_get_services_builders = require_get_services_builders();
     var import_detect_file_system_api = require_detect_file_system_api();
     var import_detect_framework = require_detect_framework();
@@ -30044,8 +30058,9 @@ var build = async ({
   meta = {}
 }) => {
   await (0, import_build_utils4.download)(files, workPath, meta);
-  const mountpoint = import_path6.default.dirname(entrypoint);
-  const entrypointDir = import_path6.default.join(workPath, mountpoint);
+  const routePrefix = config.routePrefix;
+  const mountpoint = routePrefix ? routePrefix.replace(/^\//, "") || "." : import_path6.default.dirname(entrypoint);
+  const entrypointDir = import_path6.default.join(workPath, import_path6.default.dirname(entrypoint));
   let distPath = import_path6.default.join(
     workPath,
     import_path6.default.dirname(entrypoint),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.29",
+  "version": "2.8.30",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,8 +15,8 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.128",
-    "@vercel/static-config": "3.1.2"
+    "@vercel/static-config": "3.1.2",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.128"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -39,9 +39,9 @@
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
     "@vercel/build-utils": "13.2.17",
-    "@vercel/frameworks": "3.16.1",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/fs-detectors": "5.7.21",
+    "@vercel/fs-detectors": "5.7.22",
+    "@vercel/frameworks": "3.16.1",
     "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {