vite-plugin-vercel 0.1.3 → 0.1.4

package/README.md

@@ -38,8 +38,7 @@ export default defineConfig({
 
 ### Usage with vite-plugin-ssr
 
-[vite-plugin-ssr](https://vite-plugin-ssr.com/) will support this plugin when stable.
-In the meantime, you can add experimental support yourself.
+[vite-plugin-ssr](https://vite-plugin-ssr.com/) is supported through [@magne4000/vite-plugin-vercel-ssr](/packages/vite-plugin-ssr/README.md) plugin.
 
 Install `@magne4000/vite-plugin-vercel-ssr` package, and update your vite config:
 
@@ -53,9 +52,6 @@ import vercelSsr from '@magne4000/vite-plugin-vercel-ssr';
 export default defineConfig(async ({ command, mode }) => {
   return {
     plugins: [ssr(), vercel(), vercelSsr()],
-    build: {
-      polyfillDynamicImport: false,
-    },
     vercel: {
       // Tweak what you need, check TS definition for details
     },

package/dist/index.cjs

@@ -26,38 +26,25 @@ __export(src_exports, {
   default: () => allPlugins
 });
 module.exports = __toCommonJS(src_exports);
-var import_promises5 = __toESM(require("fs/promises"), 1);
+var import_promises4 = __toESM(require("fs/promises"), 1);
 
 // src/utils.ts
 var import_vite = require("vite");
 var import_path = __toESM(require("path"), 1);
-var import_promises = __toESM(require("fs/promises"), 1);
 function getRoot(config) {
   return (0, import_vite.normalizePath)(config.root || process.cwd());
 }
-function getOutDir(config, force) {
-  const p = (0, import_vite.normalizePath)(config.build.outDir);
-  if (!force)
-    return p;
-  return import_path.default.join(import_path.default.dirname(p), force);
-}
 function getOutput(config, suffix) {
   var _a, _b;
   return import_path.default.join(((_a = config.vercel) == null ? void 0 : _a.outDir) ? "" : getRoot(config), ((_b = config.vercel) == null ? void 0 : _b.outDir) ?? ".vercel/output", suffix ?? "");
 }
+function getPublic(config) {
+  return import_path.default.join(getRoot(config), config.publicDir || "public");
+}
 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));
 }
-async function copyDir(src, dest) {
-  await import_promises.default.mkdir(dest, { recursive: true });
-  const entries = await import_promises.default.readdir(src, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = import_path.default.join(src, entry.name);
-    const destPath = import_path.default.join(dest, entry.name);
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : await import_promises.default.copyFile(srcPath, destPath);
-  }
-}
 
 // src/config.ts
 var import_path2 = __toESM(require("path"), 1);
@@ -141,7 +128,7 @@ var vercelOutputConfigSchema = import_zod.z.object({
 }).strict();
 
 // src/config.ts
-var import_promises2 = __toESM(require("fs/promises"), 1);
+var import_promises = __toESM(require("fs/promises"), 1);
 var import_routing_utils = require("@vercel/routing-utils");
 function reorderEnforce(arr) {
   return [
@@ -187,7 +174,7 @@ function getConfigDestination(resolvedConfig) {
   return import_path2.default.join(getOutput(resolvedConfig), "config.json");
 }
 async function writeConfig(resolvedConfig, rewrites, overrides) {
-  await import_promises2.default.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
+  await import_promises.default.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
 }
 
 // src/build.ts
@@ -234,7 +221,7 @@ var vercelOutputVcConfigSchema = import_zod2.z.union([
 ]);
 
 // src/build.ts
-var import_promises3 = __toESM(require("fs/promises"), 1);
+var import_promises2 = __toESM(require("fs/promises"), 1);
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
@@ -290,7 +277,7 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
 async function writeVcConfig(resolvedConfig, destination) {
   var _a;
   const vcConfig = import_path3.default.join(getOutput(resolvedConfig, "functions"), destination, ".vc-config.json");
-  await import_promises3.default.writeFile(vcConfig, JSON.stringify(vercelOutputVcConfigSchema.parse({
+  await import_promises2.default.writeFile(vcConfig, JSON.stringify(vercelOutputVcConfigSchema.parse({
     runtime: "nodejs16.x",
     handler: "index.js",
     maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
@@ -329,7 +316,7 @@ var vercelOutputPrerenderConfigSchema = import_zod3.z.object({
 }).strict();
 
 // src/prerender.ts
-var import_promises4 = __toESM(require("fs/promises"), 1);
+var import_promises3 = __toESM(require("fs/promises"), 1);
 function execPrerender(resolvedConfig) {
   var _a;
   const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
@@ -342,8 +329,8 @@ var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
   const parsed = import_path4.default.parse(destination);
   const outfile = import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir, parsed.name + ".prerender-config.json");
-  await import_promises4.default.mkdir(import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
-  await import_promises4.default.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
+  await import_promises3.default.mkdir(import_path4.default.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
+  await import_promises3.default.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
     group: group++,
     ...isr
   }), void 0, 2), "utf-8");
@@ -375,6 +362,15 @@ async function buildPrerenderConfigs(resolvedConfig) {
   }
   return rewrites;
 }
+async function copyDir(src, dest) {
+  await import_promises3.default.mkdir(dest, { recursive: true });
+  const entries = await import_promises3.default.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = import_path4.default.join(src, entry.name);
+    const destPath = import_path4.default.join(dest, entry.name);
+    entry.isDirectory() ? await copyDir(srcPath, destPath) : await import_promises3.default.copyFile(srcPath, destPath);
+  }
+}
 async function getIsrConfig(resolvedConfig) {
   var _a;
   const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
@@ -399,18 +395,15 @@ function vercelPlugin() {
       if (process.env.VERCEL_ENV === "production" && !process.env.ENABLE_VC_BUILD) {
         throw new Error("Missing ENABLE_VC_BUILD=1 to your environment variables in your project settings");
       }
-      if (!resolvedConfig.build.ssr) {
-        await cleanOutputDirectory(resolvedConfig);
-      } else {
-        await copyDistClientToOutputStatic(resolvedConfig);
-      }
     },
     async writeBundle() {
       var _a;
-      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr))
+      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        await cleanOutputDirectory(resolvedConfig);
         return;
-      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
+      }
       const overrides = await execPrerender(resolvedConfig);
+      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
       const rewrites = await buildEndpoints(resolvedConfig);
       rewrites.push(...await buildPrerenderConfigs(resolvedConfig));
       await writeConfig(resolvedConfig, rewrites, {
@@ -420,18 +413,18 @@ function vercelPlugin() {
     }
   };
 }
-async function copyDistClientToOutputStatic(resolvedConfig) {
-  await copyDir(getOutDir(resolvedConfig, "client"), getOutput(resolvedConfig, "static"));
-}
 async function cleanOutputDirectory(resolvedConfig) {
-  await import_promises5.default.rm(getOutput(resolvedConfig), {
+  await import_promises4.default.rm(getOutput(resolvedConfig), {
     recursive: true,
     force: true
   });
 }
 async function computeStaticHtmlOverrides(resolvedConfig) {
   const staticAbsolutePath = getOutput(resolvedConfig, "static");
-  const files = await getStaticHtmlFiles(resolvedConfig, staticAbsolutePath);
+  const files = await getStaticHtmlFiles(staticAbsolutePath);
+  const publicDir = getPublic(resolvedConfig);
+  const publicFiles = await getStaticHtmlFiles(publicDir);
+  files.push(...publicFiles.map((f) => f.replace(publicDir, staticAbsolutePath)));
   return files.reduce((acc, curr) => {
     const relPath = import_path5.default.relative(staticAbsolutePath, curr);
     const parsed = import_path5.default.parse(relPath);
@@ -442,12 +435,17 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
     return acc;
   }, {});
 }
-async function getStaticHtmlFiles(resolvedConfig, src) {
-  const entries = await import_promises5.default.readdir(src, { withFileTypes: true });
+async function getStaticHtmlFiles(src) {
+  try {
+    await import_promises4.default.stat(src);
+  } catch (e) {
+    return [];
+  }
+  const entries = await import_promises4.default.readdir(src, { withFileTypes: true });
   const htmlFiles = [];
   for (const entry of entries) {
     const srcPath = import_path5.default.join(src, entry.name);
-    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(resolvedConfig, srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
+    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
   }
   return htmlFiles;
 }

package/dist/index.js

@@ -1,38 +1,23 @@
-"use strict";
-
 // src/index.ts
-import fs5 from "fs/promises";
+import fs4 from "fs/promises";
 
 // src/utils.ts
 import { normalizePath } from "vite";
 import path from "path";
-import fs from "fs/promises";
 function getRoot(config) {
   return normalizePath(config.root || process.cwd());
 }
-function getOutDir(config, force) {
-  const p = normalizePath(config.build.outDir);
-  if (!force)
-    return p;
-  return path.join(path.dirname(p), force);
-}
 function getOutput(config, suffix) {
   var _a, _b;
   return path.join(((_a = config.vercel) == null ? void 0 : _a.outDir) ? "" : getRoot(config), ((_b = config.vercel) == null ? void 0 : _b.outDir) ?? ".vercel/output", suffix ?? "");
 }
+function getPublic(config) {
+  return path.join(getRoot(config), config.publicDir || "public");
+}
 function pathRelativeTo(filePath, config, rel) {
   const root = getRoot(config);
   return normalizePath(path.relative(path.join(root, rel), filePath));
 }
-async function copyDir(src, dest) {
-  await fs.mkdir(dest, { recursive: true });
-  const entries = await fs.readdir(src, { withFileTypes: true });
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-    entry.isDirectory() ? await copyDir(srcPath, destPath) : await fs.copyFile(srcPath, destPath);
-  }
-}
 
 // src/config.ts
 import path2 from "path";
@@ -116,7 +101,7 @@ var vercelOutputConfigSchema = z.object({
 }).strict();
 
 // src/config.ts
-import fs2 from "fs/promises";
+import fs from "fs/promises";
 import { getTransformedRoutes } from "@vercel/routing-utils";
 function reorderEnforce(arr) {
   return [
@@ -162,7 +147,7 @@ function getConfigDestination(resolvedConfig) {
   return path2.join(getOutput(resolvedConfig), "config.json");
 }
 async function writeConfig(resolvedConfig, rewrites, overrides) {
-  await fs2.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
+  await fs.writeFile(getConfigDestination(resolvedConfig), JSON.stringify(getConfig(resolvedConfig, rewrites, overrides), void 0, 2), "utf-8");
 }
 
 // src/build.ts
@@ -209,7 +194,7 @@ var vercelOutputVcConfigSchema = z2.union([
 ]);
 
 // src/build.ts
-import fs3 from "fs/promises";
+import fs2 from "fs/promises";
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
@@ -265,7 +250,7 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
 async function writeVcConfig(resolvedConfig, destination) {
   var _a;
   const vcConfig = path3.join(getOutput(resolvedConfig, "functions"), destination, ".vc-config.json");
-  await fs3.writeFile(vcConfig, JSON.stringify(vercelOutputVcConfigSchema.parse({
+  await fs2.writeFile(vcConfig, JSON.stringify(vercelOutputVcConfigSchema.parse({
     runtime: "nodejs16.x",
     handler: "index.js",
     maxDuration: (_a = resolvedConfig.vercel) == null ? void 0 : _a.defaultMaxDuration,
@@ -304,7 +289,7 @@ var vercelOutputPrerenderConfigSchema = z3.object({
 }).strict();
 
 // src/prerender.ts
-import fs4 from "fs/promises";
+import fs3 from "fs/promises";
 function execPrerender(resolvedConfig) {
   var _a;
   const prerender = (_a = resolvedConfig.vercel) == null ? void 0 : _a.prerender;
@@ -317,8 +302,8 @@ var group = 1;
 async function writePrerenderConfig(resolvedConfig, destination, isr) {
   const parsed = path4.parse(destination);
   const outfile = path4.join(getOutput(resolvedConfig, "functions"), parsed.dir, parsed.name + ".prerender-config.json");
-  await fs4.mkdir(path4.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
-  await fs4.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
+  await fs3.mkdir(path4.join(getOutput(resolvedConfig, "functions"), parsed.dir), { recursive: true });
+  await fs3.writeFile(outfile, JSON.stringify(vercelOutputPrerenderConfigSchema.parse({
     group: group++,
     ...isr
   }), void 0, 2), "utf-8");
@@ -350,6 +335,15 @@ async function buildPrerenderConfigs(resolvedConfig) {
   }
   return rewrites;
 }
+async function copyDir(src, dest) {
+  await fs3.mkdir(dest, { recursive: true });
+  const entries = await fs3.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path4.join(src, entry.name);
+    const destPath = path4.join(dest, entry.name);
+    entry.isDirectory() ? await copyDir(srcPath, destPath) : await fs3.copyFile(srcPath, destPath);
+  }
+}
 async function getIsrConfig(resolvedConfig) {
   var _a;
   const isr = ((_a = resolvedConfig.vercel) == null ? void 0 : _a.isr) ?? {};
@@ -374,18 +368,15 @@ function vercelPlugin() {
       if (process.env.VERCEL_ENV === "production" && !process.env.ENABLE_VC_BUILD) {
         throw new Error("Missing ENABLE_VC_BUILD=1 to your environment variables in your project settings");
       }
-      if (!resolvedConfig.build.ssr) {
-        await cleanOutputDirectory(resolvedConfig);
-      } else {
-        await copyDistClientToOutputStatic(resolvedConfig);
-      }
     },
     async writeBundle() {
       var _a;
-      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr))
+      if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
+        await cleanOutputDirectory(resolvedConfig);
         return;
-      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
+      }
       const overrides = await execPrerender(resolvedConfig);
+      const userOverrides = await computeStaticHtmlOverrides(resolvedConfig);
       const rewrites = await buildEndpoints(resolvedConfig);
       rewrites.push(...await buildPrerenderConfigs(resolvedConfig));
       await writeConfig(resolvedConfig, rewrites, {
@@ -395,18 +386,18 @@ function vercelPlugin() {
     }
   };
 }
-async function copyDistClientToOutputStatic(resolvedConfig) {
-  await copyDir(getOutDir(resolvedConfig, "client"), getOutput(resolvedConfig, "static"));
-}
 async function cleanOutputDirectory(resolvedConfig) {
-  await fs5.rm(getOutput(resolvedConfig), {
+  await fs4.rm(getOutput(resolvedConfig), {
     recursive: true,
     force: true
   });
 }
 async function computeStaticHtmlOverrides(resolvedConfig) {
   const staticAbsolutePath = getOutput(resolvedConfig, "static");
-  const files = await getStaticHtmlFiles(resolvedConfig, staticAbsolutePath);
+  const files = await getStaticHtmlFiles(staticAbsolutePath);
+  const publicDir = getPublic(resolvedConfig);
+  const publicFiles = await getStaticHtmlFiles(publicDir);
+  files.push(...publicFiles.map((f) => f.replace(publicDir, staticAbsolutePath)));
   return files.reduce((acc, curr) => {
     const relPath = path5.relative(staticAbsolutePath, curr);
     const parsed = path5.parse(relPath);
@@ -417,12 +408,17 @@ async function computeStaticHtmlOverrides(resolvedConfig) {
     return acc;
   }, {});
 }
-async function getStaticHtmlFiles(resolvedConfig, src) {
-  const entries = await fs5.readdir(src, { withFileTypes: true });
+async function getStaticHtmlFiles(src) {
+  try {
+    await fs4.stat(src);
+  } catch (e) {
+    return [];
+  }
+  const entries = await fs4.readdir(src, { withFileTypes: true });
   const htmlFiles = [];
   for (const entry of entries) {
     const srcPath = path5.join(src, entry.name);
-    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(resolvedConfig, srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
+    entry.isDirectory() ? htmlFiles.push(...await getStaticHtmlFiles(srcPath)) : srcPath.endsWith(".html") ? htmlFiles.push(srcPath) : void 0;
   }
   return htmlFiles;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "files": [
     "dist",
@@ -20,23 +20,23 @@
   "repository": "https://github.com/magne4000/vite-plugin-vercel",
   "license": "MIT",
   "peerDependencies": {
-    "vite": "^2.9.9"
+    "vite": "^3.0.0"
   },
   "devDependencies": {
-    "@types/node": "^16.11.41",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.29.0",
-    "eslint": "^8.18.0",
-    "tsup": "^6.1.2",
+    "@types/node": "^16.11.45",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
+    "eslint": "^8.20.0",
+    "tsup": "^6.2.0",
     "typescript": "^4.7.4",
-    "vite": "^2.9.12"
+    "vite": "^3.0.3"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",
-    "@vercel/routing-utils": "^1.13.4",
-    "esbuild": "^0.14.47",
+    "@vercel/routing-utils": "^1.13.5",
+    "esbuild": "^0.14.50",
     "fast-glob": "^3.2.11",
-    "zod": "^3.17.3"
+    "zod": "^3.17.10"
   },
   "scripts": {
     "build": "tsup",