vite-plugin-vercel 0.3.2 → 0.3.4

package/README.md

@@ -13,7 +13,7 @@ Its purpose is to help you bundle your application in `.vercel` folder as suppor
   - `.[jt]s` files under the `<root>/api` folder of your project are automatically bundled as Serverless functions under `.vercel/output/functions/api/*.func`
   - see [`additionalEndpoints` config](/packages/vercel/src/types.ts#L62)
 - [x] [ISR/Prerender functions support](https://vercel.com/docs/build-output-api/v3/primitives#prerender-functions)
-  - see [`isr` config](/packages/vercel/src/types.ts#L89). Also see implementation of [vite-plugin-ssr](/packages/vike-integration/vite-plugin-ssr.ts) for example
+  - see [`isr` config](/packages/vercel/src/types.ts#L89). Also see implementation of [vike](/packages/vike-integration/vike.ts) for example
 - [x] [Edge functions support](https://vercel.com/docs/build-output-api/v3/primitives#edge-functions)
 - [ ] [Images optimization support](https://vercel.com/docs/build-output-api/v3/configuration#images)
 - [ ] [Preview mode support](https://vercel.com/docs/build-output-api/v3/features#preview-mode)
@@ -37,9 +37,9 @@ export default defineConfig({
 });
 ```
 
-## Usage with vite-plugin-ssr
+## Usage with vike
 
-[vite-plugin-ssr](https://vite-plugin-ssr.com/) is supported through [@vite-plugin-vercel/vike](/packages/vike-integration/README.md) plugin.
+[vike](https://vike.dev/) is supported through [@vite-plugin-vercel/vike](/packages/vike-integration/README.md) plugin.
 
 You only need to install `@vite-plugin-vercel/vike`, the Vite config stays the same as above.
 
@@ -47,16 +47,16 @@ You only need to install `@vite-plugin-vercel/vike`, the Vite config stays the s
 > `@vite-plugin-vercel/vike` supersedes the old `@magne4000/vite-plugin-vercel-ssr` package.
 > As such, you should remove `@magne4000/vite-plugin-vercel-ssr` from your package.json and vite config file.
 
-### vite-plugin-ssr V1 design
+### vike V1 design
 
-`vite-plugin-vercel` fully supports [vite-plugin-ssr V1 design](https://vite-plugin-ssr.com/migration/v1-design),
-and thus you can leverage [config files](https://vite-plugin-ssr.com/config) to customize ISR configuration:
+`vite-plugin-vercel` fully supports [vike V1 design](https://vike.dev/migration/v1-design),
+and thus you can leverage [config files](https://vike.dev/config) to customize ISR configuration:
 
 ```ts
 // /pages/product/+config.h.ts
 
 import Page from './Page';
-import type { Config } from 'vite-plugin-ssr/types';
+import type { Config } from 'vike/types';
 
 // Customize ISR config for this page
 export default {
@@ -64,13 +64,13 @@ export default {
 } satisfies Config;
 ```
 
-You will also need to extend the [renderer config](https://vite-plugin-ssr.com/config#renderer) so that `vite-plugin-ssr` is aware of the new parameter:
+You will also need to extend the [renderer config](https://vike.dev/config#renderer) so that `vike` is aware of the new parameter:
 
 ```ts
 // /renderer/+config.h.ts
 
 import config from '@vite-plugin-vercel/vike/config';
-import type { Config } from 'vite-plugin-ssr/types';
+import type { Config } from 'vike/types';
 
 export default {
   extends: config,
@@ -105,7 +105,7 @@ export default defineConfig({
      * Defaults to `false`, which disables prerendering.
      */
     prerender(resolvedConfig) {
-      // Check `/packages/vite-plugin-ssr/vite-plugin-ssr.ts` `prerender` for an example
+      // Check `/packages/vike/vike.ts` `prerender` for an example
     },
     /**
      * See https://vercel.com/docs/projects/project-configuration#rewrites
@@ -160,7 +160,7 @@ export default defineConfig({
      *
      * Can be an object or a function returning an object (or a Promise of an object).
      *
-     * Check `/packages/vite-plugin-ssr/vite-plugin-ssr.ts` `vitePluginVercelVpsIsrPlugin` for advanced usage.
+     * Check `/packages/vike/vike.ts` `vitePluginVercelVpsIsrPlugin` for advanced usage.
      */
     isr: {
       // `symlink: 'ssr_'` means that a function is available under `.vercel/output/functions/ssr_.func`

package/dist/index.cjs

@@ -284,13 +284,40 @@ function getEntries(resolvedConfig) {
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
+var wasmPlugin = {
+  name: "wasm",
+  setup(build2) {
+    build2.onResolve({ filter: /\.wasm/ }, (args) => {
+      return {
+        path: args.path.replace(/\.wasm\?module$/i, ".wasm"),
+        external: true
+      };
+    });
+  }
+};
+var vercelOgPlugin = (ctx) => {
+  return {
+    name: "vercel-og",
+    setup(build2) {
+      build2.onResolve({ filter: /@vercel\/og/ }, () => {
+        ctx.found = true;
+        return void 0;
+      });
+      build2.onLoad({ filter: /@vercel\/og/ }, (args) => {
+        ctx.index = args.path;
+        return void 0;
+      });
+    }
+  };
+};
 var standardBuildOptions = {
   bundle: true,
   target: "es2020",
   format: "cjs",
   platform: "node",
   logLevel: "info",
-  minify: true
+  minify: true,
+  plugins: [wasmPlugin]
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
   assert(
@@ -329,8 +356,25 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       "import",
       "require"
     ];
+    options.format = "esm";
   }
+  const ctx = { found: false, index: "" };
+  options.plugins.push(vercelOgPlugin(ctx));
   await (0, import_esbuild.build)(options);
+  if (ctx.found && ctx.index) {
+    const dir = (0, import_path3.dirname)(ctx.index);
+    const externalFiles = await (0, import_fast_glob.default)(`${dir}/*.{ttf,wasm}`);
+    for (const f of externalFiles) {
+      await (0, import_promises2.copyFile)(
+        f,
+        import_path3.default.join(
+          getOutput(resolvedConfig, "functions"),
+          entry.destination,
+          (0, import_path3.basename)(f)
+        )
+      );
+    }
+  }
   await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
 }
 async function writeVcConfig(resolvedConfig, destination, edge) {
@@ -557,11 +601,17 @@ async function getStaticHtmlFiles(src) {
 }
 async function tryImportVpvv() {
   try {
-    await import("vite-plugin-ssr/plugin");
+    await import("vike/plugin");
     const vpvv = await import("@vite-plugin-vercel/vike");
     return vpvv.default();
   } catch (e) {
-    return null;
+    try {
+      await import("vite-plugin-ssr/plugin");
+      const vpvv = await import("@vite-plugin-vercel/vike");
+      return vpvv.default();
+    } catch (e2) {
+      return null;
+    }
   }
 }
 function allPlugins(options = {}) {

package/dist/index.js

@@ -175,7 +175,7 @@ async function writeConfig(resolvedConfig, rewrites, overrides) {
 
 // src/build.ts
 import glob from "fast-glob";
-import path3 from "path";
+import path3, { basename, dirname } from "path";
 import { build } from "esbuild";
 
 // src/assert.ts
@@ -217,7 +217,7 @@ var vercelOutputVcConfigSchema = z2.union([
 ]);
 
 // src/build.ts
-import fs2 from "fs/promises";
+import fs2, { copyFile } from "fs/promises";
 function getAdditionalEndpoints(resolvedConfig) {
   var _a;
   return (((_a = resolvedConfig.vercel) == null ? void 0 : _a.additionalEndpoints) ?? []).map((e) => ({
@@ -250,13 +250,40 @@ function getEntries(resolvedConfig) {
     return entryPoints;
   }, getAdditionalEndpoints(resolvedConfig));
 }
+var wasmPlugin = {
+  name: "wasm",
+  setup(build2) {
+    build2.onResolve({ filter: /\.wasm/ }, (args) => {
+      return {
+        path: args.path.replace(/\.wasm\?module$/i, ".wasm"),
+        external: true
+      };
+    });
+  }
+};
+var vercelOgPlugin = (ctx) => {
+  return {
+    name: "vercel-og",
+    setup(build2) {
+      build2.onResolve({ filter: /@vercel\/og/ }, () => {
+        ctx.found = true;
+        return void 0;
+      });
+      build2.onLoad({ filter: /@vercel\/og/ }, (args) => {
+        ctx.index = args.path;
+        return void 0;
+      });
+    }
+  };
+};
 var standardBuildOptions = {
   bundle: true,
   target: "es2020",
   format: "cjs",
   platform: "node",
   logLevel: "info",
-  minify: true
+  minify: true,
+  plugins: [wasmPlugin]
 };
 async function buildFn(resolvedConfig, entry, buildOptions) {
   assert(
@@ -295,8 +322,25 @@ async function buildFn(resolvedConfig, entry, buildOptions) {
       "import",
       "require"
     ];
+    options.format = "esm";
   }
+  const ctx = { found: false, index: "" };
+  options.plugins.push(vercelOgPlugin(ctx));
   await build(options);
+  if (ctx.found && ctx.index) {
+    const dir = dirname(ctx.index);
+    const externalFiles = await glob(`${dir}/*.{ttf,wasm}`);
+    for (const f of externalFiles) {
+      await copyFile(
+        f,
+        path3.join(
+          getOutput(resolvedConfig, "functions"),
+          entry.destination,
+          basename(f)
+        )
+      );
+    }
+  }
   await writeVcConfig(resolvedConfig, entry.destination, Boolean(entry.edge));
 }
 async function writeVcConfig(resolvedConfig, destination, edge) {
@@ -523,11 +567,17 @@ async function getStaticHtmlFiles(src) {
 }
 async function tryImportVpvv() {
   try {
-    await import("vite-plugin-ssr/plugin");
+    await import("vike/plugin");
     const vpvv = await import("@vite-plugin-vercel/vike");
     return vpvv.default();
   } catch (e) {
-    return null;
+    try {
+      await import("vite-plugin-ssr/plugin");
+      const vpvv = await import("@vite-plugin-vercel/vike");
+      return vpvv.default();
+    } catch (e2) {
+      return null;
+    }
   }
 }
 function allPlugins(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "type": "module",
   "files": [
     "dist",
@@ -21,14 +21,14 @@
   "license": "MIT",
   "peerDependencies": {
     "vite": "^4.2.0",
-    "vite-plugin-ssr": "*",
-    "@vite-plugin-vercel/vike": "0.3.3"
+    "vike": "*",
+    "@vite-plugin-vercel/vike": "0.4.0"
   },
   "peerDependenciesMeta": {
     "@vite-plugin-vercel/vike": {
       "optional": true
     },
-    "vite-plugin-ssr": {
+    "vike": {
       "optional": true
     }
   },
@@ -40,8 +40,8 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vite-plugin-ssr": "^0.4.141",
-    "@vite-plugin-vercel/vike": "0.3.3"
+    "vike": "^0.4.142",
+    "@vite-plugin-vercel/vike": "0.4.0"
   },
   "dependencies": {
     "@brillout/libassert": "^0.5.8",