vike 0.4.172-commit-605b4a5 → 0.4.172-commit-c1dcd5f

package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configDefinitionsBuiltInGlobal = exports.configDefinitionsBuiltIn = void 0;
 const utils_js_1 = require("../../../../utils.js");
+const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -55,6 +56,9 @@ const configDefinitionsBuiltIn = {
         // We could make it { client: false } but we don't yet because of some legacy V0.4 design code
         env: { server: true, client: true, config: true, eager: true }
     },
+    clientHooks: {
+        env: { config: true }
+    },
     prerender: {
         env: { config: true }
     },
@@ -70,11 +74,22 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true }
     },
-    isClientSideRenderable: {
+    clientEntryLoaded: {
         env: { server: true, client: true, eager: true },
-        _computed: (configValueSources) => isConfigSet(configValueSources, 'onRenderClient') &&
-            isConfigSet(configValueSources, 'Page') &&
-            !!getConfigEnv(configValueSources, 'Page')?.client
+        _computed: (configValueSources) => {
+            {
+                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                if (source && source.value !== null) {
+                    const { value } = source;
+                    const definedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', 'clientHooks', source.definedAtFilePath);
+                    (0, utils_js_1.assertUsage)(typeof value === 'boolean', `${definedAt} should be a boolean`);
+                    return value;
+                }
+            }
+            return (isConfigSet(configValueSources, 'onRenderClient') &&
+                isConfigSet(configValueSources, 'Page') &&
+                !!getConfigEnv(configValueSources, 'Page')?.client);
+        }
     },
     onBeforeRenderEnv: {
         env: { client: true },

package/dist/cjs/node/runtime/renderPage/analyzePage.js

@@ -9,17 +9,17 @@ const globalContext_js_1 = require("../globalContext.js");
 const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { isClientSideRenderable, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
+        const { clientEntryLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (isClientSideRenderable)
+        if (clientEntryLoaded)
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
-            onlyAssets: isClientSideRenderable ? false : true,
+            onlyAssets: clientEntryLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -55,7 +55,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !isClientSideRenderable,
+            isHtmlOnly: !clientEntryLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

package/dist/cjs/shared/getPageFiles/analyzeClientSide.js

@@ -7,14 +7,14 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
         const isClientRouting = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
-        return { isClientSideRenderable, isClientRouting };
+        const clientEntryLoaded = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'clientEntryLoaded', 'boolean')?.value ?? false;
+        return { clientEntryLoaded, isClientRouting };
     }
     else {
         // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = (0, analyzePageClientSide_js_1.analyzePageClientSide)(pageFilesAll, pageId);
-        return { isClientSideRenderable: !isHtmlOnly, isClientRouting };
+        return { clientEntryLoaded: !isHtmlOnly, isClientRouting };
     }
 }
 exports.analyzeClientSide = analyzeClientSide;

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.172-commit-605b4a5';
+const PROJECT_VERSION = '0.4.172-commit-c1dcd5f';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/client/client-routing-runtime/isClientSideRoutable.js

@@ -7,6 +7,6 @@ async function isClientSideRoutable(pageId, pageContext) {
         sharedPageFilesAlreadyLoaded: false
     });
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageId);
-    const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
-    return isClientSideRenderable && isClientRouting;
+    const { clientEntryLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
+    return clientEntryLoaded && isClientRouting;
 }

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts

@@ -7,7 +7,7 @@ export type { ConfigNameGlobal };
 export type { ConfigEffect };
 import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFilePath } from '../../../../../../shared/page-configs/PageConfig.js';
 import type { Config, ConfigNameBuiltIn } from '../../../../../../shared/page-configs/Config.js';
-import type { ConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
+import { type ConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
 /** The meta definition of a config.
  *
  * https://vike.dev/meta

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -1,6 +1,7 @@
 export { configDefinitionsBuiltIn };
 export { configDefinitionsBuiltInGlobal };
-import { assert } from '../../../../utils.js';
+import { assert, assertUsage } from '../../../../utils.js';
+import { getConfigDefinedAt } from '../../../../../../shared/page-configs/getConfigDefinedAt.js';
 const configDefinitionsBuiltIn = {
     onRenderHtml: {
         env: { server: true }
@@ -54,6 +55,9 @@ const configDefinitionsBuiltIn = {
         // We could make it { client: false } but we don't yet because of some legacy V0.4 design code
         env: { server: true, client: true, config: true, eager: true }
     },
+    clientHooks: {
+        env: { config: true }
+    },
     prerender: {
         env: { config: true }
     },
@@ -69,11 +73,22 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true }
     },
-    isClientSideRenderable: {
+    clientEntryLoaded: {
         env: { server: true, client: true, eager: true },
-        _computed: (configValueSources) => isConfigSet(configValueSources, 'onRenderClient') &&
-            isConfigSet(configValueSources, 'Page') &&
-            !!getConfigEnv(configValueSources, 'Page')?.client
+        _computed: (configValueSources) => {
+            {
+                const source = getConfigValueSource(configValueSources, 'clientHooks');
+                if (source && source.value !== null) {
+                    const { value } = source;
+                    const definedAt = getConfigDefinedAt('Config', 'clientHooks', source.definedAtFilePath);
+                    assertUsage(typeof value === 'boolean', `${definedAt} should be a boolean`);
+                    return value;
+                }
+            }
+            return (isConfigSet(configValueSources, 'onRenderClient') &&
+                isConfigSet(configValueSources, 'Page') &&
+                !!getConfigEnv(configValueSources, 'Page')?.client);
+        }
     },
     onBeforeRenderEnv: {
         env: { client: true },

package/dist/esm/node/runtime/renderPage/analyzePage.js

@@ -7,17 +7,17 @@ import { getGlobalContext } from '../globalContext.js';
 import { getConfigValueRuntime } from '../../../shared/page-configs/getConfigValue.js';
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { isClientSideRenderable, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
+        const { clientEntryLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = getConfigValueRuntime(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (isClientSideRenderable)
+        if (clientEntryLoaded)
             clientEntries.push(getVikeClientEntry(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: getVirtualFileIdPageConfigValuesAll(pageConfig.pageId, true),
-            onlyAssets: isClientSideRenderable ? false : true,
+            onlyAssets: clientEntryLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -53,7 +53,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !isClientSideRenderable,
+            isHtmlOnly: !clientEntryLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts

@@ -2,6 +2,6 @@ export { analyzeClientSide };
 import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
 import type { PageFile } from './getPageFileObject.js';
 declare function analyzeClientSide(pageConfig: PageConfigRuntime | null, pageFilesAll: PageFile[], pageId: string): {
-    isClientSideRenderable: boolean;
+    clientEntryLoaded: boolean;
     isClientRouting: boolean;
 };

package/dist/esm/shared/getPageFiles/analyzeClientSide.js

@@ -5,13 +5,13 @@ function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
         const isClientRouting = getConfigValueRuntime(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = getConfigValueRuntime(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
-        return { isClientSideRenderable, isClientRouting };
+        const clientEntryLoaded = getConfigValueRuntime(pageConfig, 'clientEntryLoaded', 'boolean')?.value ?? false;
+        return { clientEntryLoaded, isClientRouting };
     }
     else {
         // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = analyzePageClientSide(pageFilesAll, pageId);
-        return { isClientSideRenderable: !isHtmlOnly, isClientRouting };
+        return { clientEntryLoaded: !isHtmlOnly, isClientRouting };
     }
 }

package/dist/esm/shared/page-configs/Config.d.ts

@@ -40,7 +40,7 @@ type HookName = HookNamePage | HookNameGlobal | HookNameOldDesign;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data';
 type HookNameGlobal = 'onBeforePrerender' | 'onBeforeRoute' | 'onPrerenderStart';
 type HookNameOldDesign = 'render' | 'prerender';
-type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'isClientSideRenderable' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout';
+type ConfigNameBuiltIn = Exclude<keyof Config, keyof ConfigVikeUserProvided | 'onBeforeRoute' | 'onPrerenderStart'> | 'prerender' | 'clientEntryLoaded' | 'onBeforeRenderEnv' | 'dataEnv' | 'hooksTimeout' | 'clientHooks';
 type Config = ConfigBuiltIn & Vike.Config & (VikePackages.ConfigVikeReact | VikePackages.ConfigVikeVue | VikePackages.ConfigVikeSolid | VikePackages.ConfigVikeSvelte | VikePackages.ConfigVikeAngular);
 /** Hook for fetching data.
  *
@@ -326,6 +326,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/clientRouting
      */
     clientRouting?: boolean | ImportString;
+    /**
+     * Whether hooks are loaded on the client-side.
+     *
+     * https://vike.dev/clientHooks
+     */
+    clientHooks?: boolean | null | ImportString;
     /** Create new or modify existing configurations.
      *
      * https://vike.dev/meta

package/dist/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.172-commit-605b4a5";
+declare const PROJECT_VERSION: "0.4.172-commit-c1dcd5f";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.172-commit-605b4a5";
+    projectVersion: "0.4.172-commit-c1dcd5f";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.172-commit-605b4a5';
+const PROJECT_VERSION = '0.4.172-commit-c1dcd5f';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.172-commit-605b4a5",
+  "version": "0.4.172-commit-c1dcd5f",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",