vike 0.4.176 → 0.4.177-commit-f4a92e0

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

@@ -21,6 +21,7 @@ import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import { loadPageRoutes } from '../../../shared/route/loadPageRoutes.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
+import { assertV1Design } from '../../shared/assertV1Design.js';
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -170,8 +171,9 @@ async function getRenderContext() {
     const globalContext = getGlobalContext();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await getPageFilesAll(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    // We assume assertV1Design() was already called at build-time
-    assert(pageFilesAll.length === 0 || pageConfigs.length === 0);
+    assertV1Design(
+    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
+    pageConfigs.length > 0, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,

package/dist/esm/node/shared/assertV1Design.d.ts

@@ -1,4 +1,4 @@
 export { assertV1Design };
 import { PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigBuildTime } from '../../shared/page-configs/PageConfig.js';
-declare function assertV1Design(isOldDesign: boolean, pageConfigs: PageConfigBuildTime[], pageFilesAll?: PageFile[]): void;
+declare function assertV1Design(pageConfigs: PageConfigBuildTime[] | boolean, pageFilesAll: PageFile[] | boolean): void;

package/dist/esm/node/shared/assertV1Design.js

@@ -1,20 +1,25 @@
 export { assertV1Design };
 import { assert, assertUsage, assertWarning, isNotNullish, unique } from './utils.js';
-function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
-    const isV1Design = pageConfigs.length > 0;
+function assertV1Design(pageConfigs, pageFilesAll) {
+    const isOldDesign = pageFilesAll === true || (pageFilesAll !== false && pageFilesAll.length > 0);
+    const isV1Design = pageConfigs === true || (pageConfigs !== false && pageConfigs.length > 0);
     if (isV1Design && isOldDesign) {
         const lines = ['Mixing the new V1 design with the old V0.4 design is forbidden.'];
-        if (pageFilesAll) {
-            assert(pageFilesAll.length > 0);
-            const indent = '- ';
+        const indent = '- ';
+        if (typeof pageConfigs !== 'boolean') {
+            assert(pageConfigs.length > 0);
             const filesV1 = unique(pageConfigs
                 .map((p) => Object.values(p.configValueSources).map((sources) => sources
                 .map((c) => c.definedAtFilePath.filePathAbsoluteUserRootDir)
                 .filter(isNotNullish)
                 .map((filePathToShowToUser) => indent + filePathToShowToUser)))
                 .flat(2));
+            lines.push(...['V1 design files:', ...filesV1]);
+        }
+        if (typeof pageFilesAll !== 'boolean') {
+            assert(pageFilesAll.length > 0);
             const filesOld = pageFilesAll.map((p) => indent + p.filePath);
-            lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);
+            lines.push(...['Old design files:', ...filesOld]);
         }
         assertUsage(false, lines.join('\n'));
     }

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

@@ -67,9 +67,9 @@ type ConfigEnv = {
 /** For Vike internal use */
 type ConfigEnvInternal = Omit<ConfigEnv, 'client'> & {
     client?: boolean | 'if-client-routing';
-    /** Always load value, not matter what page is loaded. */
-    eager?: boolean;
-    /** Load value only in production or only in development. */
+    /** Always load value, no matter which page is loaded. */
+    eager?: true;
+    /** Load value only in production, or only in development. */
     production?: boolean;
 };
 type ConfigValueSource = {

package/dist/esm/shared/page-configs/getConfigValueBuildTime.js

@@ -22,7 +22,6 @@ function getConfigValue(pageConfig, configName) {
     const sources = configValueSources[configName];
     if (!sources)
         return null;
-    assert(sources.every((s) => s.configEnv.config === true));
     const configDef = configDefinitions[configName];
     assert(configDef);
     if (!configDef.cumulative) {

package/dist/esm/utils/assertSingleInstance.js

@@ -7,6 +7,7 @@ export { onAssertModuleLoad };
 import { unique } from './unique.js';
 import { getGlobalObject } from './getGlobalObject.js';
 import { projectInfo } from './projectInfo.js';
+import pc from '@brillout/picocolors';
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
@@ -21,7 +22,7 @@ function assertSingleInstance() {
         const versions = unique(globalObject.instances);
         assertUsage(versions.length <= 1, 
         // DO *NOT* patch vike to remove this error: because of multiple conflicting versions, you *will* eventually encounter insidious issues that hard to debug and potentially a security hazard, see for example https://github.com/vikejs/vike/issues/1108
-        `Both vike@${versions[0]} and vike@${versions[1]} loaded. Only one version should be loaded.`);
+        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded but only one version should be loaded`);
     }
     if (globalObject.checkSingleInstance && globalObject.instances.length > 1) {
         /*/ Not sure whether circular dependency can cause problems? In principle not since client-side code is ESM.

package/dist/esm/utils/parseUrl.js

@@ -18,7 +18,9 @@ const PROTOCOLS = [
     // For [Tauri](https://tauri.app/)
     'tauri://',
     // For Electron: https://github.com/vikejs/vike/issues/1557
-    'file://'
+    'file://',
+    // For Capacitor: https://github.com/vikejs/vike/issues/1706
+    'capacitor://'
 ];
 function isParsable(url) {
     // `parseUrl()` works with these URLs

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.176";
+declare const PROJECT_VERSION: "0.4.177-commit-f4a92e0";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.176";
+    projectVersion: "0.4.177-commit-f4a92e0";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.176';
+const PROJECT_VERSION = '0.4.177-commit-f4a92e0';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.176",
+  "version": "0.4.177-commit-f4a92e0",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",