vike 0.4.256-commit-414bdc0 → 0.4.256-commit-70e9a80

package/dist/node/vite/plugins/pluginDev/optimizeDeps.d.ts

@@ -9,7 +9,7 @@ declare const optimizeDeps: {
     };
     readonly ssr: {
         readonly optimizeDeps: {
-            readonly exclude: ["@brillout/import", "@brillout/json-serializer", "@brillout/picocolors", "@brillout/vite-plugin-server-entry", "vike"];
+            readonly exclude: ["@brillout/import", "@brillout/json-serializer", "@brillout/vite-plugin-server-entry", "vike"];
         };
     };
 };

package/dist/node/vite/plugins/pluginDev/optimizeDeps.js

@@ -55,7 +55,8 @@ const optimizeDeps = {
             exclude: [
                 '@brillout/import',
                 '@brillout/json-serializer',
-                '@brillout/picocolors',
+                // FIXME Breaks @cloudflare/vite-plugin. Remove me if CI passes
+                // '@brillout/picocolors',
                 '@brillout/vite-plugin-server-entry',
                 'vike',
             ],

package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.d.ts

@@ -8,10 +8,10 @@ declare function getDeployConfigs(pageId: string, page: PageConfigPublicWithRout
         isr: {
             expiration: number;
         } | undefined;
-        edge: boolean;
+        edge: boolean | undefined;
     };
 } | null;
-export declare function getPageContextRoute(routeIr: ReturnType<typeof fromVike>): {
+export declare function getRoutePageContextJson(routeIr: ReturnType<typeof fromVike>): {
     pathname: ({
         optional: boolean;
     } & ({

package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.js

@@ -1,59 +1,45 @@
-import pc from '@brillout/picocolors';
 export { getDeployConfigs };
 import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
 import { isObject } from '../../../../utils/isObject.js';
 import '../../assertEnvVite.js';
+import { isCallable } from '../../../../utils/isCallable.js';
 function getDeployConfigs(pageId, page) {
-    const route = typeof page.route === 'string' ? page.route : null;
-    // Vercel specific configs
-    const rawIsr = extractIsr(page.config);
-    let isr = assertIsr(rawIsr);
-    const edge = extractEdge(page.config);
-    const isrOrEdge = isr ? 'isr' : edge ? 'edge' : null;
-    if (typeof page.route === 'function' && isrOrEdge) {
-        assertWarning(false, `Page ${pageId}: ${pc.cyan(isrOrEdge)} is not supported when using route function. Remove ${pc.cyan(isrOrEdge)} config or use a route string if possible.`, { onlyOnce: true });
-        isr = null;
+    const { route } = page;
+    if (!route)
+        return null;
+    // Vercel setting: +edge
+    const { edge } = page.config;
+    if (edge) {
+        assertUsage(typeof edge === 'boolean', '+edge must be a boolean');
     }
-    if (edge && rawIsr !== null && typeof rawIsr === 'object') {
-        assertUsage(false, `Page ${pageId}: ISR cannot be enabled for edge functions. Remove ${pc.cyan('isr')} config or set \`{ edge: false }\`.`);
+    // Vercel setting: +isr
+    let { isr } = page.config;
+    if (isr) {
+        assertUsage(isObject(isr), '+isr must be an object');
+        assertUsage(typeof isr.expiration === 'number' && isr.expiration > 0, '+isr.expiration must be a positive number');
     }
-    if (isrOrEdge && route) {
-        return {
-            route,
-            // route: [...new Set([...toRou3(routeIr), ...getPageContextRoute(routeIr)])],
-            // Supported by vite-plugin-vercel@11
-            vercel: {
-                isr: isr ? { expiration: isr } : undefined,
-                edge: Boolean(edge),
-            },
-        };
+    if (edge) {
+        assertWarning(!isr, `Page ${pageId} — ISR isn't supported for edge functions — remove +isr or +edge`, {
+            onlyOnce: true,
+        });
+        isr = undefined;
     }
-    return null;
-}
-function extractIsr(pageConfig) {
-    if (!pageConfig.isr)
-        return null;
-    const isr = pageConfig.isr;
-    assertUsage(isObject(isr) &&
-        typeof isr.expiration === 'number' &&
-        isr.expiration > 0, ' `{ expiration }` must be a positive number');
-    return isr;
-}
-function assertIsr(isr) {
-    if (isr === null || isr === undefined)
+    if (!edge && !isr)
         return null;
-    return isr.expiration;
-}
-function extractEdge(exports) {
-    if (exports === null || typeof exports !== 'object')
-        return null;
-    if (!('edge' in exports))
+    if (isCallable(route)) {
+        const errMsg = (configName) => `The route of the page ${pageId} is defined via a Route Function — ${configName} isn't supported. Remove ${configName} or define the page's route using a Route String (or Filesytem Routing) instead of a Route Function.`;
+        assertWarning(!isr, errMsg('+isr'), { onlyOnce: true });
+        assertWarning(!edge, errMsg('+edge'), { onlyOnce: true });
         return null;
-    const edge = exports.edge;
-    assertUsage(typeof edge === 'boolean', ' `{ edge }` must be a boolean');
-    return edge;
+    }
+    return {
+        route,
+        // route: [...new Set([...toRou3(routeIr), ...getRoutePageContextJson(routeIr)])],
+        // Supported by vite-plugin-vercel@11
+        vercel: { isr, edge },
+    };
 }
-export function getPageContextRoute(routeIr) {
+export function getRoutePageContextJson(routeIr) {
     const lastSegment = routeIr.pathname.at(-1);
     assert(lastSegment);
     if (lastSegment.catchAll)

package/dist/node/vite/plugins/pluginUniversalDeploy/getServerInfo.js

@@ -4,23 +4,23 @@ import '../../assertEnvVite.js';
 export function getServerInfo(vikeConfig) {
     let serverEntryId;
     let serverFilePath = null;
-    const serverConfig = vikeConfig.config.server;
+    let serverEntryVike;
+    const serverConfig = vikeConfig.config.server ?? true;
     // universal-deploy support manually disabled by user
     if (serverConfig === false)
         return;
     const serverPlusFile = vikeConfig._pageConfigGlobal.configValueSources.server?.[0];
-    if (serverPlusFile) {
+    if (serverPlusFile?.valueIsDefinedByPlusValueFile) {
         assert('filePathAbsoluteFilesystem' in serverPlusFile.definedAt);
         serverFilePath = serverPlusFile.definedAt.filePathAbsoluteFilesystem;
         assert(serverFilePath);
         serverEntryId = serverFilePath;
+        serverEntryVike = serverFilePath;
     }
     else {
         serverEntryId = catchAllEntry;
+        serverEntryVike = 'vike/fetch';
     }
-    if (serverConfig !== true && !serverFilePath)
-        return;
-    const serverEntryVike = serverFilePath ?? 'vike/fetch';
     return {
         // Used to filter which module ID to transform.
         // It points to a fully resolved server entry or the virtual universal-deploy catchAll entry.

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginResolvePlusServer.d.ts

@@ -3,4 +3,4 @@ import '../../assertEnvVite.js';
 /**
  * If +server.js is defined, make virtual:ud:catch-all resolve to +server.js absolute path
  */
-export declare function pluginVikeVirtualEntry(serverFilePath: string): Plugin;
+export declare function pluginServerEntryInject(serverFilePath: string): Plugin;

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginResolvePlusServer.js

@@ -4,7 +4,7 @@ import '../../assertEnvVite.js';
 /**
  * If +server.js is defined, make virtual:ud:catch-all resolve to +server.js absolute path
  */
-export function pluginVikeVirtualEntry(serverFilePath) {
+export function pluginServerEntryInject(serverFilePath) {
     return {
         name: 'vike:pluginUniversalDeploy:server',
         resolveId: {

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryAlias.d.ts

@@ -0,0 +1,4 @@
+export { pluginServerEntryAlias };
+import type { Plugin } from 'vite';
+import '../../assertEnvVite.js';
+declare function pluginServerEntryAlias(): Plugin;

package/dist/node/vite/plugins/pluginUniversalDeploy/{pluginResolveAlias.js → pluginServerEntryAlias.js}

@@ -1,8 +1,9 @@
+export { pluginServerEntryAlias };
 import { pluginCommon } from './common.js';
 import { escapeRegex } from '../../../../utils/escapeRegex.js';
 import { catchAllEntry } from '@universal-deploy/store';
 import '../../assertEnvVite.js';
-export function pluginResolveAlias() {
+function pluginServerEntryAlias() {
     return {
         name: 'vike:pluginUniversalDeploy:alias',
         resolveId: {

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginServerEntryInject.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from 'vite';
+import '../../assertEnvVite.js';
+export declare function pluginServerEntryInject(serverEntryId: string): Plugin;

package/dist/node/vite/plugins/pluginUniversalDeploy/{pluginVikeVirtualEntry.js → pluginServerEntryInject.js}

@@ -1,8 +1,8 @@
 import { getMagicString } from '../../shared/getMagicString.js';
-import { serverEntryVirtualId as vikeVirtualEntry } from '@brillout/vite-plugin-server-entry/plugin';
+import { serverEntryVirtualId } from '@brillout/vite-plugin-server-entry/plugin';
 import { pluginCommon } from './common.js';
 import '../../assertEnvVite.js';
-export function pluginVikeVirtualEntry(serverEntryId) {
+export function pluginServerEntryInject(serverEntryId) {
     return {
         name: 'vike:pluginUniversalDeploy:serverEntry',
         apply: 'build',
@@ -16,7 +16,7 @@ export function pluginVikeVirtualEntry(serverEntryId) {
             handler(code, id) {
                 const { magicString, getMagicStringResult } = getMagicString(code, id);
                 // Inject Vike virtual server entry
-                magicString.prepend(`import "${vikeVirtualEntry}";\n`);
+                magicString.prepend(`import "${serverEntryVirtualId}";\n`);
                 return getMagicStringResult();
             },
         },

package/dist/node/vite/plugins/pluginUniversalDeploy.js

@@ -1,14 +1,14 @@
-import { toRou3 } from 'convert-route';
 export { pluginUniversalDeploy };
+import { toRou3 } from 'convert-route';
 import { addEntry } from '@universal-deploy/store';
 import universalDeploy from '@universal-deploy/vite';
 import { fromVike } from 'convert-route/vike';
-import { pluginVikeVirtualEntry } from './pluginUniversalDeploy/pluginVikeVirtualEntry.js';
-import { getDeployConfigs, getPageContextRoute } from './pluginUniversalDeploy/getDeployConfigs.js';
+import { pluginServerEntryInject } from './pluginUniversalDeploy/pluginServerEntryInject.js';
+import { getDeployConfigs, getRoutePageContextJson } from './pluginUniversalDeploy/getDeployConfigs.js';
 import { pluginCommon } from './pluginUniversalDeploy/common.js';
 import { hasVikeServerOrVikePhoton } from './pluginUniversalDeploy/detectDeprecated.js';
 import { getServerInfo } from './pluginUniversalDeploy/getServerInfo.js';
-import { pluginResolveAlias } from './pluginUniversalDeploy/pluginResolveAlias.js';
+import { pluginServerEntryAlias } from './pluginUniversalDeploy/pluginServerEntryAlias.js';
 import { pluginUnwrapProdOptions } from './pluginUniversalDeploy/pluginUnwrapProdOptions.js';
 import '../assertEnvVite.js';
 import { unique } from '../../../utils/unique.js';
@@ -19,7 +19,7 @@ function pluginUniversalDeploy(vikeConfig) {
     if (!serverInfo)
         return [];
     const { serverEntryVike, serverEntryId, serverFilePath } = serverInfo;
-    const plugins = [
+    return [
         ...universalDeploy(),
         {
             name: 'vike:pluginUniversalDeploy:entries',
@@ -31,12 +31,12 @@ function pluginUniversalDeploy(vikeConfig) {
                     if (deployConfigs !== null) {
                         const { route, ...additionalConfigs } = deployConfigs;
                         const routeIr = fromVike(route);
-                        const pageContextRouteIr = getPageContextRoute(routeIr);
+                        const routeIrPageContextJson = getRoutePageContextJson(routeIr);
                         addEntry({
                             ...additionalConfigs,
                             id: serverEntryVike,
                             // Map Vike routes to rou3 format
-                            route: unique([...toRou3(routeIr), ...(pageContextRouteIr ? toRou3(pageContextRouteIr) : [])]),
+                            route: unique([...toRou3(routeIr), ...(routeIrPageContextJson ? toRou3(routeIrPageContextJson) : [])]),
                         });
                     }
                 }
@@ -48,11 +48,8 @@ function pluginUniversalDeploy(vikeConfig) {
             },
             ...pluginCommon,
         },
-        pluginVikeVirtualEntry(serverFilePath ?? serverEntryId),
-        pluginResolveAlias(),
-    ];
-    if (serverFilePath) {
-        plugins.push(pluginUnwrapProdOptions(serverFilePath));
-    }
-    return plugins;
+        pluginServerEntryInject(serverFilePath ?? serverEntryId),
+        pluginServerEntryAlias(),
+        !serverFilePath ? null : pluginUnwrapProdOptions(serverFilePath),
+    ].filter((p) => p !== null);
 }

package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -227,7 +227,7 @@ const configDefinitionsBuiltIn = {
         global: true,
     },
     server: {
-        env: { server: true },
+        env: { server: true, config: true },
         global: true,
     },
     cli: {

package/dist/types/Server.d.ts

@@ -1,8 +1,12 @@
+export type { Server };
 import type { Fetchable, ServerOptions } from '@universal-deploy/store';
-/** Server options.
+/**
+ * Server settings.
  *
  * https://vike.dev/server
  */
-export interface Server extends Fetchable {
-    prod?: Omit<ServerOptions, 'fetch'>;
+interface Server extends Fetchable {
+    prod?: Omit<ServerOptions, 'fetch'> & {
+        static?: boolean | string;
+    };
 }

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.256-commit-414bdc0";
+export declare const PROJECT_VERSION: "0.4.256-commit-70e9a80";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.256-commit-414bdc0';
+export const PROJECT_VERSION = '0.4.256-commit-70e9a80';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.256-commit-414bdc0",
+  "version": "0.4.256-commit-70e9a80",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -133,7 +133,7 @@
     "@brillout/picocolors": "^1.0.30",
     "@brillout/vite-plugin-server-entry": "0.7.18",
     "@universal-deploy/store": "^0.2.1",
-    "@universal-deploy/vite": "^0.1.1",
+    "@universal-deploy/vite": "^0.1.2",
     "@universal-middleware/core": "^0.4.17",
     "@universal-middleware/node": "^0.1.0",
     "cac": "^6.0.0",

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginResolveAlias.d.ts

@@ -1,3 +0,0 @@
-import type { Plugin } from 'vite';
-import '../../assertEnvVite.js';
-export declare function pluginResolveAlias(): Plugin;

package/dist/node/vite/plugins/pluginUniversalDeploy/pluginVikeVirtualEntry.d.ts

@@ -1,3 +0,0 @@
-import type { Plugin } from 'vite';
-import '../../assertEnvVite.js';
-export declare function pluginVikeVirtualEntry(serverEntryId: string): Plugin;