vike 0.4.256-commit-3de784e → 0.4.256-commit-85a5a9e

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

@@ -8,12 +8,12 @@ function getDeployConfigs(pageId, page) {
     if (!route)
         return null;
     // Vercel setting: +edge
-    const { edge } = page.config;
+    const { edge } = page.config?.vercel ?? {};
     if (edge) {
         assertUsage(typeof edge === 'boolean', '+edge must be a boolean');
     }
     // Vercel setting: +isr
-    let { isr } = page.config;
+    let { isr } = page.config?.vercel ?? {};
     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');

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

@@ -6,7 +6,12 @@ export function getServerInfo(vikeConfig) {
     let serverFilePath = null;
     let serverEntryVike;
     // universal-deploy support must be manually enabled
-    const serverConfig = vikeConfig.config.server ?? false;
+    const serverConfig = 
+    // +config.js > `export default { server: true }`
+    vikeConfig.config.server ||
+        // +server.js exists
+        !!vikeConfig._pageConfigGlobal.configValueSources.server ||
+        false;
     if (serverConfig === false)
         return;
     const serverPlusFile = vikeConfig._pageConfigGlobal.configValueSources.server?.[0];

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

@@ -227,7 +227,7 @@ const configDefinitionsBuiltIn = {
         global: true,
     },
     server: {
-        env: { server: true, config: true },
+        env: { server: true },
         global: true,
     },
     cli: {
@@ -311,11 +311,7 @@ const configDefinitionsBuiltIn = {
         global: true,
     },
     // -- Vercel --
-    isr: {
-        env: { server: true, config: true },
-        eager: true,
-    },
-    edge: {
+    vercel: {
         env: { server: true, config: true },
         eager: true,
     },

package/dist/types/Config.d.ts

@@ -54,7 +54,7 @@ type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
 type HookNameGlobal = 'onBeforeRoute' | 'onPrerenderStart' | 'onCreatePageContext' | 'onCreateGlobalContext' | 'onError' | 'onHookCall';
 type HookNameOldDesign = 'render' | 'prerender' | 'onBeforePrerender';
-type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware' | 'server' | 'isr' | 'edge';
+type ConfigNameBuiltIn = Exclude<keyof ConfigBuiltIn, keyof VikeVitePluginOptions | 'onBeforeRoute' | 'onPrerenderStart' | 'vite' | 'redirects'> | 'prerender' | 'hasServerOnlyHook' | 'isClientRuntimeLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'guardEnv' | 'hooksTimeout' | 'clientHooks' | 'middleware' | 'server' | 'vercel';
 type ConfigNameGlobal = 'onPrerenderStart' | 'onBeforeRoute' | 'prerender' | 'disableAutoFullBuild' | 'includeAssetsImportedByServer' | 'baseAssets' | 'baseServer' | 'redirects' | 'trailingSlash' | 'disableUrlNormalization' | 'vite';
 type Config = ConfigBuiltIn & Vike.Config;
 /** @deprecated This type is deprecated, see:
@@ -555,18 +555,23 @@ type ConfigBuiltIn = {
      * https://vike.dev/pricing
      */
     license?: string;
-    /** Incremental Static Regeneration (ISR).
-     *
-     * https://vike.dev/vercel#isr
+    /**
+     * Vercel options
      */
-    isr?: {
-        expiration: number;
+    vercel?: {
+        /** Incremental Static Regeneration (ISR).
+         *
+         * https://vike.dev/vercel#isr
+         */
+        isr?: {
+            expiration: number;
+        };
+        /** Deploy on Vercel Edge.
+         *
+         * https://vike.dev/vercel
+         */
+        edge?: boolean;
     };
-    /** Deploy on Vercel Edge.
-     *
-     * https://vike.dev/vercel
-     */
-    edge?: boolean;
 };
 type PrerenderSetting = boolean | {
     /**

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.256-commit-3de784e";
+export declare const PROJECT_VERSION: "0.4.256-commit-85a5a9e";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.256-commit-3de784e';
+export const PROJECT_VERSION = '0.4.256-commit-85a5a9e';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.256-commit-3de784e",
+  "version": "0.4.256-commit-85a5a9e",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {