Merge branch 'fork-releases' into main

example/middleware.ts

@@ -2,7 +2,7 @@ import {
   MiddlewareRequest,
   MiddlewareResponse,
   MiddlewareFetchEvent,
-} from "vite-vercel/server"
+} from "@cycraft/vite-vercel/server"
 
 export default (req: MiddlewareRequest, event: MiddlewareFetchEvent) => {
   const url = new URL(req.url)

example/package.json

@@ -6,7 +6,7 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "vite": "2.9.7",
-    "vite-vercel": "workspace:*"
+    "vite": "3.1.8",
+    "@cycraft/vite-vercel": "workspace:*"
   }
 }

example/vite.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from "vite"
-import vercel from "vite-vercel"
+import vercel from "@cycraft/vite-vercel"
 
 export default defineConfig({
   plugins: [

package.json

@@ -11,7 +11,7 @@
     "bumpp": "^8.2.1",
     "turbo": "^1.4.4"
   },
-  "version": "0.1.15",
+  "version": "0.1.16-fork.5",
   "pnpm": {
     "peerDependencyRules": {
       "ignoreMissing": [

packages/vercel-utils/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "vercel-utils",
-  "version": "0.1.15",
+  "name": "@cycraft/vercel-utils",
+  "version": "0.1.16-fork.5",
   "description": "Some utils to work with vercel edge function and serverless function",
   "scripts": {
     "prepublishOnly": "pnpm build",
@@ -11,7 +11,7 @@
     "dist",
     "/*.d.ts"
   ],
-  "repository": "github:egoist-labs/vite-vercel",
+  "repository": "github:cycraft/vite-vercel",
   "exports": {
     "./server": {
       "import": "./dist/server.mjs",

packages/vite-vercel/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "vite-vercel",
-  "version": "0.1.15",
+  "name": "@cycraft/vite-vercel",
+  "version": "0.1.16-fork.5",
   "description": "Adding Vercel middleware support to your Vite project",
   "publishConfig": {
     "access": "public"
@@ -20,7 +20,7 @@
       "import": "./dist/server.mjs"
     }
   },
-  "repository": "github:egoist-labs/vite-vercel",
+  "repository": "github:cycraft/vite-vercel",
   "scripts": {
     "build-fast": "tsup --shims",
     "build": "pnpm run build-fast -- --dts-resolve",
@@ -36,13 +36,13 @@
     "prettier": "2.7.1",
     "tsup": "6.2.3",
     "typescript": "4.8.2",
-    "vite": "^3.0.9",
+    "vite": "^3.1.8",
     "vitest": "0.22.1"
   },
   "dependencies": {
+    "@cycraft/vercel-utils": "workspace:*",
     "fs-extra": "^10.1.0",
-    "resolve-from": "^5.0.0",
-    "vercel-utils": "workspace:*"
+    "resolve-from": "^5.0.0"
   },
   "peerDependencies": {
     "vite": "^3 || ^4"

packages/vite-vercel/src/plugin.ts

@@ -38,11 +38,13 @@ export const plugin = (options: Options = {}): Plugin => {
           // at /node_modules/.pnpm/[email protected]/node_modules/fetch-blob/streams.cjs:16:17
           external: ["node-fetch", "@web-std/file"],
           // No sure why sometimes this is externalized
-          noExternal: [/vite-vercel/],
+          noExternal: [/vite-vercel/, /@cycraft\/vite-vercel/],
         },
         resolve: {
           alias: {
-            "vercel-utils": path.dirname(resolve("vercel-utils/polyfills")),
+            "@cycraft/vercel-utils": path.dirname(
+              resolve("@cycraft/vercel-utils/polyfills"),
+            ),
           },
         },
       }
@@ -56,14 +58,16 @@ export const plugin = (options: Options = {}): Plugin => {
     configureServer(server) {
       if (!middlewarePath || process.env.VITE_VERCEL_BUILD) return
 
-      let serverNode: typeof import("vercel-utils/server-node") | undefined
+      let serverNode:
+        | typeof import("@cycraft/vercel-utils/server-node")
+        | undefined
 
       server.middlewares.use(async (req, res, next) => {
         if (serverNode) return next()
 
-        await server.ssrLoadModule("vercel-utils/polyfills")
+        await server.ssrLoadModule("@cycraft/vercel-utils/polyfills")
         serverNode = (await server.ssrLoadModule(
-          "vercel-utils/server-node",
+          "@cycraft/vercel-utils/server-node",
         )) as any
         next()
       })
@@ -135,25 +139,24 @@ export const plugin = (options: Options = {}): Plugin => {
           entrypoint: "index.js",
         })
       }
-
       writeJson(".vercel/output/config.json", {
         version: 3,
         routes: [
           {
-            src: `/assets/.+`,
+            src: `/assets/(.+)`,
             headers: {
-              "cache-control": "public, immutable, max-age=31536000",
+              "Cache-Control": "public, immutable, max-age=31536000",
             },
           },
           {
             handle: "filesystem",
           },
           middlewarePath && {
-            src: "/.*",
+            src: "/(.*)",
             middlewarePath: "main",
             continue: true,
           },
-          { src: "/.*", dest: "/index.html" },
+          { src: "/(.*)", dest: "/index.html" },
         ].filter(Boolean),
       })
     },

packages/vite-vercel/src/polyfills.ts

@@ -1 +1 @@
-import "vercel-utils/polyfills"
+import "@cycraft/vercel-utils/polyfills"

packages/vite-vercel/src/server.ts

@@ -2,4 +2,4 @@ export {
   MiddlewareFetchEvent,
   MiddlewareRequest,
   MiddlewareResponse,
-} from "vercel-utils/server"
+} from "@cycraft/vercel-utils/server"