vite-plugin-vercel 0.1.6 → 0.2.0

package/README.md

@@ -29,7 +29,7 @@ Then, install this package as a dev dependency and add it to your Vite config li
 ```ts
 import { defineConfig } from 'vite';
 import vercel from 'vite-plugin-vercel';
-import ssr from 'vite-plugin-ssr';
+import ssr from 'vite-plugin-ssr/plugin';
 
 export default defineConfig({
   plugins: [ssr(), vercel()],

package/dist/index.cjs

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -50,7 +54,9 @@ function getPublic(config) {
 }
 function pathRelativeTo(filePath, config, rel) {
   const root = getRoot(config);
-  return (0, import_vite.normalizePath)(import_path.default.relative(import_path.default.join(root, rel), filePath));
+  return (0, import_vite.normalizePath)(
+    import_path.default.relative((0, import_vite.normalizePath)(import_path.default.join(root, rel)), filePath)
+  );
 }
 
 // src/config.ts
@@ -155,6 +161,7 @@ function reorderEnforce(arr) {
 function getConfig(resolvedConfig, rewrites, overrides) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const _rewrites = [
+    // User provided config always comes first
     ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
     ...rewrites ?? []
   ];
@@ -250,7 +257,8 @@ function getAdditionalEndpoints(resolvedConfig) {
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
     ...e,
     addRoute: e.addRoute ?? true,
-    destination: import_path3.default.resolve("/", e.destination) + ".func"
+    // path.resolve removes the trailing slash if any
+    destination: import_path3.default.posix.resolve("/", e.destination) + ".func"
   }));
 }
 function getEntries(resolvedConfig) {
@@ -267,7 +275,7 @@ function getEntries(resolvedConfig) {
       resolvedConfig,
       filePath.includes("/_api/") ? "_api" : "api"
     );
-    const parsed = import_path3.default.parse(outFilePath);
+    const parsed = import_path3.default.posix.parse(outFilePath);
     entryPoints.push({
       source: filePath,
       destination: `api/${import_path3.default.posix.join(parsed.dir, parsed.name)}.func`,
@@ -313,6 +321,9 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       options.stdin = entry.source;
     }
   }
+  if (entry.edge) {
+    options.conditions = ["edge-light", ...options.conditions ?? []];
+  }
   await (0, import_esbuild.build)(options);
   await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
 }
@@ -542,5 +553,3 @@ async function getStaticHtmlFiles(src) {
 function allPlugins() {
   return [vercelPlugin()];
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/index.d.ts

@@ -32,37 +32,37 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "header";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "header";
             key: string;
+            value?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"cookie">;
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "cookie";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "cookie";
             key: string;
+            value?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"query">;
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "query";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "query";
             key: string;
+            value?: string | undefined;
         }>]>, "many">>;
         has: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
             type: z.ZodLiteral<"host">;
@@ -78,154 +78,154 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "header";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "header";
             key: string;
+            value?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"cookie">;
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "cookie";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "cookie";
             key: string;
+            value?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"query">;
             key: z.ZodString;
             value: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            value?: string | undefined;
             type: "query";
             key: string;
-        }, {
             value?: string | undefined;
+        }, {
             type: "query";
             key: string;
+            value?: string | undefined;
         }>]>, "many">>;
         locale: z.ZodOptional<z.ZodObject<{
             redirect: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
             cookie: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            cookie?: string | undefined;
             redirect?: Record<string, string> | undefined;
-        }, {
             cookie?: string | undefined;
+        }, {
             redirect?: Record<string, string> | undefined;
+            cookie?: string | undefined;
         }>>;
         middlewarePath: z.ZodOptional<z.ZodString>;
     }, "strict", z.ZodTypeAny, {
-        status?: number | undefined;
+        src: string;
         dest?: string | undefined;
         headers?: Record<string, string> | undefined;
         methods?: string[] | undefined;
+        status?: number | undefined;
         continue?: boolean | undefined;
         check?: boolean | undefined;
         missing?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         has?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         locale?: {
-            cookie?: string | undefined;
             redirect?: Record<string, string> | undefined;
+            cookie?: string | undefined;
         } | undefined;
         middlewarePath?: string | undefined;
-        src: string;
     }, {
-        status?: number | undefined;
+        src: string;
         dest?: string | undefined;
         headers?: Record<string, string> | undefined;
         methods?: string[] | undefined;
+        status?: number | undefined;
         continue?: boolean | undefined;
         check?: boolean | undefined;
         missing?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         has?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         locale?: {
-            cookie?: string | undefined;
             redirect?: Record<string, string> | undefined;
+            cookie?: string | undefined;
         } | undefined;
         middlewarePath?: string | undefined;
-        src: string;
     }>, z.ZodObject<{
         handle: z.ZodUnion<[z.ZodLiteral<"rewrite">, z.ZodLiteral<"filesystem">, z.ZodLiteral<"resource">, z.ZodLiteral<"miss">, z.ZodLiteral<"hit">, z.ZodLiteral<"error">]>;
         src: z.ZodOptional<z.ZodString>;
         dest: z.ZodOptional<z.ZodString>;
         status: z.ZodOptional<z.ZodNumber>;
     }, "strict", z.ZodTypeAny, {
-        status?: number | undefined;
+        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
         src?: string | undefined;
         dest?: string | undefined;
-        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
-    }, {
         status?: number | undefined;
+    }, {
+        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
         src?: string | undefined;
         dest?: string | undefined;
-        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
+        status?: number | undefined;
     }>]>, "many">>;
     images: z.ZodOptional<z.ZodObject<{
         sizes: z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>;
@@ -235,19 +235,19 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
         dangerouslyAllowSVG: z.ZodOptional<z.ZodBoolean>;
         contentSecurityPolicy: z.ZodOptional<z.ZodString>;
     }, "strict", z.ZodTypeAny, {
+        sizes: [number, number];
         domains?: [string, ...string[]] | undefined;
         minimumCacheTTL?: number | undefined;
         formats?: ["image/avif" | "image/webp", ...("image/avif" | "image/webp")[]] | undefined;
         dangerouslyAllowSVG?: boolean | undefined;
         contentSecurityPolicy?: string | undefined;
-        sizes: [number, number];
     }, {
+        sizes: [number, number];
         domains?: [string, ...string[]] | undefined;
         minimumCacheTTL?: number | undefined;
         formats?: ["image/avif" | "image/webp", ...("image/avif" | "image/webp")[]] | undefined;
         dangerouslyAllowSVG?: boolean | undefined;
         contentSecurityPolicy?: string | undefined;
-        sizes: [number, number];
     }>>;
     wildcard: z.ZodOptional<z.ZodArray<z.ZodObject<{
         domain: z.ZodString;
@@ -271,64 +271,65 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
     }>>>;
     cache: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
+    version: 3;
     routes?: ({
-        status?: number | undefined;
+        src: string;
         dest?: string | undefined;
         headers?: Record<string, string> | undefined;
         methods?: string[] | undefined;
+        status?: number | undefined;
         continue?: boolean | undefined;
         check?: boolean | undefined;
         missing?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         has?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         locale?: {
-            cookie?: string | undefined;
             redirect?: Record<string, string> | undefined;
+            cookie?: string | undefined;
         } | undefined;
         middlewarePath?: string | undefined;
-        src: string;
     } | {
-        status?: number | undefined;
+        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
         src?: string | undefined;
         dest?: string | undefined;
-        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
+        status?: number | undefined;
     })[] | undefined;
     images?: {
+        sizes: [number, number];
         domains?: [string, ...string[]] | undefined;
         minimumCacheTTL?: number | undefined;
         formats?: ["image/avif" | "image/webp", ...("image/avif" | "image/webp")[]] | undefined;
         dangerouslyAllowSVG?: boolean | undefined;
         contentSecurityPolicy?: string | undefined;
-        sizes: [number, number];
     } | undefined;
     wildcard?: {
         value: string;
@@ -339,66 +340,66 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
         contentType?: string | undefined;
     }> | undefined;
     cache?: string[] | undefined;
-    version: 3;
 }, {
+    version: 3;
     routes?: ({
-        status?: number | undefined;
+        src: string;
         dest?: string | undefined;
         headers?: Record<string, string> | undefined;
         methods?: string[] | undefined;
+        status?: number | undefined;
         continue?: boolean | undefined;
         check?: boolean | undefined;
         missing?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         has?: ({
             value: string;
             type: "host";
         } | {
-            value?: string | undefined;
             type: "header";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "cookie";
             key: string;
-        } | {
             value?: string | undefined;
+        } | {
             type: "query";
             key: string;
+            value?: string | undefined;
         })[] | undefined;
         locale?: {
-            cookie?: string | undefined;
             redirect?: Record<string, string> | undefined;
+            cookie?: string | undefined;
         } | undefined;
         middlewarePath?: string | undefined;
-        src: string;
     } | {
-        status?: number | undefined;
+        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
         src?: string | undefined;
         dest?: string | undefined;
-        handle: "error" | "rewrite" | "filesystem" | "resource" | "miss" | "hit";
+        status?: number | undefined;
     })[] | undefined;
     images?: {
+        sizes: [number, number];
         domains?: [string, ...string[]] | undefined;
         minimumCacheTTL?: number | undefined;
         formats?: ["image/avif" | "image/webp", ...("image/avif" | "image/webp")[]] | undefined;
         dangerouslyAllowSVG?: boolean | undefined;
         contentSecurityPolicy?: string | undefined;
-        sizes: [number, number];
     } | undefined;
     wildcard?: {
         value: string;
@@ -409,7 +410,6 @@ declare const vercelOutputConfigSchema: z.ZodObject<{
         contentType?: string | undefined;
     }> | undefined;
     cache?: string[] | undefined;
-    version: 3;
 }>;
 type VercelOutputConfig = z.infer<typeof vercelOutputConfigSchema>;
 
@@ -423,13 +423,13 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     entrypoint: z.ZodString;
     envVarsInUse: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
-    envVarsInUse?: string[] | undefined;
     runtime: "edge";
     entrypoint: string;
-}, {
     envVarsInUse?: string[] | undefined;
+}, {
     runtime: "edge";
     entrypoint: string;
+    envVarsInUse?: string[] | undefined;
 }>, z.ZodObject<{
     runtime: z.ZodString;
     handler: z.ZodString;
@@ -438,32 +438,34 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     regions: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
+    runtime: string;
+    handler: string;
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
+}, {
     runtime: string;
     handler: string;
-}, {
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
     regions?: string[] | undefined;
-    runtime: string;
-    handler: string;
-}>, z.ZodObject<z.extendShape<{
+}>, z.ZodObject<{
     runtime: z.ZodString;
     handler: z.ZodString;
     memory: z.ZodOptional<z.ZodNumber>;
     maxDuration: z.ZodOptional<z.ZodNumber>;
     environment: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     regions: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-}, {
     launcherType: z.ZodLiteral<"Nodejs">;
     shouldAddHelpers: z.ZodOptional<z.ZodBoolean>;
     shouldAddSourcemapSupport: z.ZodOptional<z.ZodBoolean>;
     awsLambdaHandler: z.ZodOptional<z.ZodString>;
-}>, "strict", z.ZodTypeAny, {
+}, "strict", z.ZodTypeAny, {
+    runtime: string;
+    handler: string;
+    launcherType: "Nodejs";
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
@@ -471,10 +473,10 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddHelpers?: boolean | undefined;
     shouldAddSourcemapSupport?: boolean | undefined;
     awsLambdaHandler?: string | undefined;
+}, {
     runtime: string;
     handler: string;
     launcherType: "Nodejs";
-}, {
     memory?: number | undefined;
     maxDuration?: number | undefined;
     environment?: Record<string, string> | undefined;
@@ -482,9 +484,6 @@ declare const vercelOutputVcConfigSchema: z.ZodUnion<[z.ZodObject<{
     shouldAddHelpers?: boolean | undefined;
     shouldAddSourcemapSupport?: boolean | undefined;
     awsLambdaHandler?: string | undefined;
-    runtime: string;
-    handler: string;
-    launcherType: "Nodejs";
 }>]>;
 type VercelOutputVcConfig = z.infer<typeof vercelOutputVcConfigSchema>;
 
@@ -500,17 +499,17 @@ declare const vercelOutputPrerenderConfigSchema: z.ZodObject<{
     fallback: z.ZodOptional<z.ZodString>;
     allowQuery: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strict", z.ZodTypeAny, {
+    expiration: number | false;
     group?: number | undefined;
     bypassToken?: string | undefined;
     fallback?: string | undefined;
     allowQuery?: string[] | undefined;
-    expiration: number | false;
 }, {
+    expiration: number | false;
     group?: number | undefined;
     bypassToken?: string | undefined;
     fallback?: string | undefined;
     allowQuery?: string[] | undefined;
-    expiration: number | false;
 }>;
 type VercelOutputPrerenderConfig = z.infer<typeof vercelOutputPrerenderConfigSchema>;
 

package/dist/index.js

@@ -20,7 +20,9 @@ function getPublic(config) {
 }
 function pathRelativeTo(filePath, config, rel) {
   const root = getRoot(config);
-  return normalizePath(path.relative(path.join(root, rel), filePath));
+  return normalizePath(
+    path.relative(normalizePath(path.join(root, rel)), filePath)
+  );
 }
 
 // src/config.ts
@@ -125,6 +127,7 @@ function reorderEnforce(arr) {
 function getConfig(resolvedConfig, rewrites, overrides) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const _rewrites = [
+    // User provided config always comes first
     ...((_a = resolvedConfig.vercel) == null ? void 0 : _a.rewrites) ?? [],
     ...rewrites ?? []
   ];
@@ -220,7 +223,8 @@ function getAdditionalEndpoints(resolvedConfig) {
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
     ...e,
     addRoute: e.addRoute ?? true,
-    destination: path3.resolve("/", e.destination) + ".func"
+    // path.resolve removes the trailing slash if any
+    destination: path3.posix.resolve("/", e.destination) + ".func"
   }));
 }
 function getEntries(resolvedConfig) {
@@ -237,7 +241,7 @@ function getEntries(resolvedConfig) {
       resolvedConfig,
       filePath.includes("/_api/") ? "_api" : "api"
     );
-    const parsed = path3.parse(outFilePath);
+    const parsed = path3.posix.parse(outFilePath);
     entryPoints.push({
       source: filePath,
       destination: `api/${path3.posix.join(parsed.dir, parsed.name)}.func`,
@@ -283,6 +287,9 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       options.stdin = entry.source;
     }
   }
+  if (entry.edge) {
+    options.conditions = ["edge-light", ...options.conditions ?? []];
+  }
   await build(options);
   await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
 }

package/index.d.ts

@@ -4,7 +4,7 @@ export * from './dist';
 export { default } from './dist';
 
 declare module 'vite' {
-  interface UserConfig {
+  export interface UserConfig {
     vercel?: ViteVercelConfig;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "type": "module",
   "files": [
     "dist",
@@ -10,6 +10,7 @@
   "module": "./dist/index.js",
   "exports": {
     ".": {
+      "types": "./index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
@@ -20,23 +21,23 @@
   "repository": "https://github.com/magne4000/vite-plugin-vercel",
   "license": "MIT",
   "peerDependencies": {
-    "vite": "^3.0.0"
+    "vite": "^4.2.0"
   },
   "devDependencies": {
-    "@types/node": "^16.18.11",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
-    "eslint": "^8.31.0",
-    "tsup": "^6.5.0",
-    "typescript": "^4.9.4",
-    "vite": "^3.2.5"
+    "@types/node": "^16.18.30",
+    "@typescript-eslint/eslint-plugin": "^5.59.5",
+    "@typescript-eslint/parser": "^5.59.5",
+    "eslint": "^8.40.0",
+    "tsup": "^6.7.0",
+    "typescript": "^5.0.4",
+    "vite": "^4.3.5"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
-    "@vercel/routing-utils": "^2.1.3",
-    "esbuild": "^0.16.16",
+    "@vercel/routing-utils": "^2.2.1",
+    "esbuild": "^0.17.19",
     "fast-glob": "^3.2.12",
-    "zod": "^3.20.2"
+    "zod": "^3.21.4"
   },
   "scripts": {
     "build": "tsup",