vite-plugin-vercel 0.2.2 → 0.3.0

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/vite-plugin-ssr/vite-plugin-ssr.ts) for example
+  - 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
 - [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)
@@ -39,26 +39,13 @@ export default defineConfig({
 
 ## Usage with vite-plugin-ssr
 
-[vite-plugin-ssr](https://vite-plugin-ssr.com/) is supported through [@magne4000/vite-plugin-vercel-ssr](/packages/vite-plugin-ssr/README.md) plugin.
+[vite-plugin-ssr](https://vite-plugin-ssr.com/) is supported through [@vite-plugin-vercel/vike](/packages/vike-integration/README.md) plugin.
 
-Install `@magne4000/vite-plugin-vercel-ssr` package, and update your vite config:
+You only need to install `@vite-plugin-vercel/vike`, the config stays the same as above.
 
-```ts
-// vite.config.ts
-import { defineConfig } from 'vite';
-import ssr from 'vite-plugin-ssr/plugin';
-import vercel from 'vite-plugin-vercel';
-import vercelSsr from '@magne4000/vite-plugin-vercel-ssr';
-
-export default defineConfig(async ({ command, mode }) => {
-  return {
-    plugins: [ssr(), vercel(), vercelSsr()],
-    vercel: {
-      // optional configuration options, see below for details
-    },
-  };
-});
-```
+> [!IMPORTANT]  
+> `@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.
 
 ## Advanced usage
 

package/dist/index.cjs

@@ -487,22 +487,22 @@ async function getIsrConfig(resolvedConfig) {
 var import_path5 = __toESM(require("path"), 1);
 function vercelPlugin() {
   let resolvedConfig;
-  let vpsFound = false;
+  let vikeFound = false;
   return {
     apply: "build",
     name: "vite-plugin-vercel",
     enforce: "post",
     configResolved(config) {
       resolvedConfig = config;
-      vpsFound = resolvedConfig.plugins.some(
-        (p) => p.name.startsWith("vite-plugin-ssr:")
+      vikeFound = resolvedConfig.plugins.some(
+        (p) => p.name.match("^vite-plugin-ssr:|^vike:")
       );
     },
     async writeBundle() {
       var _a;
       if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
         await cleanOutputDirectory(resolvedConfig);
-        if (vpsFound) {
+        if (vikeFound) {
           return;
         }
       }
@@ -555,6 +555,15 @@ async function getStaticHtmlFiles(src) {
   }
   return htmlFiles;
 }
-function allPlugins() {
-  return [vercelPlugin()];
+async function tryImportVpvv() {
+  try {
+    await import("vite-plugin-ssr/plugin");
+    const vpvv = await import("@vite-plugin-vercel/vike");
+    return vpvv.default();
+  } catch (e) {
+    return null;
+  }
+}
+function allPlugins(options = {}) {
+  return [vercelPlugin(), options.smart !== false ? tryImportVpvv() : null];
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ResolvedConfig, Plugin } from 'vite';
+import { ResolvedConfig, PluginOption } from 'vite';
 import { StdinOptions, BuildOptions } from 'esbuild';
 import { z } from 'zod';
 import { Rewrite, Redirect } from '@vercel/routing-utils';
@@ -641,6 +641,8 @@ interface ViteVercelApiEntry {
     edge?: boolean;
 }
 
-declare function allPlugins(): Plugin[];
+declare function allPlugins(options?: {
+    smart?: boolean;
+}): PluginOption[];
 
 export { VercelOutputConfig, VercelOutputIsr, VercelOutputPrerenderConfig, VercelOutputVcConfig, ViteVercelApiEntry, ViteVercelConfig, ViteVercelPrerenderFn, ViteVercelPrerenderRoute, ViteVercelRedirect, ViteVercelRewrite, allPlugins as default };

package/dist/index.js

@@ -453,22 +453,22 @@ async function getIsrConfig(resolvedConfig) {
 import path5 from "path";
 function vercelPlugin() {
   let resolvedConfig;
-  let vpsFound = false;
+  let vikeFound = false;
   return {
     apply: "build",
     name: "vite-plugin-vercel",
     enforce: "post",
     configResolved(config) {
       resolvedConfig = config;
-      vpsFound = resolvedConfig.plugins.some(
-        (p) => p.name.startsWith("vite-plugin-ssr:")
+      vikeFound = resolvedConfig.plugins.some(
+        (p) => p.name.match("^vite-plugin-ssr:|^vike:")
       );
     },
     async writeBundle() {
       var _a;
       if (!((_a = resolvedConfig.build) == null ? void 0 : _a.ssr)) {
         await cleanOutputDirectory(resolvedConfig);
-        if (vpsFound) {
+        if (vikeFound) {
           return;
         }
       }
@@ -521,8 +521,17 @@ async function getStaticHtmlFiles(src) {
   }
   return htmlFiles;
 }
-function allPlugins() {
-  return [vercelPlugin()];
+async function tryImportVpvv() {
+  try {
+    await import("vite-plugin-ssr/plugin");
+    const vpvv = await import("@vite-plugin-vercel/vike");
+    return vpvv.default();
+  } catch (e) {
+    return null;
+  }
+}
+function allPlugins(options = {}) {
+  return [vercelPlugin(), options.smart !== false ? tryImportVpvv() : null];
 }
 export {
   allPlugins as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-vercel",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "type": "module",
   "files": [
     "dist",
@@ -21,7 +21,17 @@
   "repository": "https://github.com/magne4000/vite-plugin-vercel",
   "license": "MIT",
   "peerDependencies": {
-    "vite": "^4.2.0"
+    "vite": "^4.2.0",
+    "vite-plugin-ssr": "*",
+    "@vite-plugin-vercel/vike": "0.3.1"
+  },
+  "peerDependenciesMeta": {
+    "@vite-plugin-vercel/vike": {
+      "optional": true
+    },
+    "vite-plugin-ssr": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@types/node": "^16.18.48",