vike 0.4.222 → 0.4.223

package/dist/esm/shared/page-configs/serialize/parsePageConfigs.js

@@ -12,15 +12,9 @@ function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);
-        const { pageId, isErrorPage, routeFilesystem, loadConfigValuesAll } = pageConfigSerialized;
         assertRouteConfigValue(configValues);
-        return {
-            pageId,
-            isErrorPage,
-            routeFilesystem,
-            configValues,
-            loadConfigValuesAll
-        };
+        const pageConfig = { ...pageConfigSerialized, configValues };
+        return pageConfig;
     });
     // pageConfigsGlobal
     const pageConfigGlobal = { configValues: {} };

package/dist/esm/shared/route/executeGuardHook.d.ts

@@ -1,7 +1,7 @@
 export { executeGuardHook };
-import type { PageConfigUserFriendly, PageFile } from '../getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../getPageFiles.js';
 import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
-declare function executeGuardHook<T extends PageConfigUserFriendly & {
+declare function executeGuardHook<T extends PageConfigUserFriendlyOld & {
     pageId: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];

package/dist/esm/shared/route/loadPageRoutes.js

@@ -8,7 +8,7 @@ import { getDefinedAtString } from '../page-configs/getConfigDefinedAt.js';
 import { warnDeprecatedAllowKey } from './resolveRouteFunction.js';
 import { getHookFromPageConfigGlobal, getHookTimeoutDefault } from '../hooks/getHook.js';
 async function loadPageRoutes(
-// Remove all arguments and use GlobalContext instead?
+// Remove all arguments and use GlobalContextInternal instead?
 pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds) {
     // TODO/next-major: remove & make this function sync
     await Promise.all(pageFilesAll.filter((p) => p.fileType === '.page.route').map((p) => p.loadFile?.()));

package/dist/esm/shared/types.d.ts

@@ -131,6 +131,12 @@ type PageContextBuiltInCommon<Data> = {
     url: string;
     /** @deprecated */
     pageExports: Record<string, unknown>;
+    /**
+     * Whether the Base URL is missing in the URL of the HTTP request made to the SSR server.
+     *
+     * https://vike.dev/base-url#setup
+     */
+    isBaseMissing?: true;
 };
 type PageContextBuiltInServer<Data> = PageContextBuiltInCommon<Data> & PageContextUrlServer;
 type PageContextBuiltInClientWithClientRouting<Data> = Partial<PageContextBuiltInCommon<Data>> & Pick<PageContextBuiltInCommon<Data>, 'Page' | 'routeParams' | 'pageExports' | 'config' | 'configEntries' | 'exports' | 'exportsAll' | 'abortReason' | 'data' | 'pageId' | 'source' | 'sources' | 'from'> & {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.222";
+export declare const PROJECT_VERSION: "0.4.223";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.222';
+export const PROJECT_VERSION = '0.4.223';

package/dist/esm/utils/assert.js

@@ -42,7 +42,7 @@ function assert(condition, debugInfo) {
         const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
         return pc.dim(`Debug info (for Vike maintainers; you can ignore this): ${debugInfoSerialized}`);
     })();
-    const link = pc.blue('https://github.com/vikejs/vike/issues/new');
+    const link = pc.blue('https://github.com/vikejs/vike/issues/new?template=bug.yml');
     let errMsg = [
         `You stumbled upon a Vike bug. Go to ${link} and copy-paste this error. A maintainer will fix the bug (usually within 24 hours).`,
         debugStr

package/dist/esm/utils/assertSetup.js

@@ -16,7 +16,7 @@ import { isVitest } from './isVitest.js';
 import pc from '@brillout/picocolors';
 assertIsNotBrowser();
 const debug = createDebugger('vike:setup');
-const setup = getGlobalObject('utils/assertIsNotProductionRuntime.ts', {});
+const setup = getGlobalObject('utils/assertSetup.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
     if (debug.isActivated)

package/dist/esm/utils/assertSingleInstance.js

@@ -11,7 +11,7 @@ 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'
 */
-const globalObject = getGlobalObject('assertSingleInstance.ts', {
+const globalObject = getGlobalObject('utils/assertSingleInstance.ts', {
     instances: [],
     alreadyLogged: new Set()
 });
@@ -22,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
-        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded but only one version should be loaded`);
+        `vike@${pc.bold(versions[0])} and vike@${pc.bold(versions[1])} loaded but it's forbidden to load different versions`);
     }
     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/getGlobalObject.d.ts

@@ -1,6 +1,7 @@
 export { getGlobalObject };
 export { assertIsSingleModuleInstance };
+type Key = `${string}/${string}.ts`;
 /** Share information across module instances. */
-declare function getGlobalObject<T extends Record<string, unknown> = never>(key: `${string}.ts`, defaultValue: T): T;
+declare function getGlobalObject<T extends Record<string, unknown> = never>(key: Key, defaultValue: T): T;
 /** Assert that the module is instantiated only once. */
-declare function assertIsSingleModuleInstance(key: `${string}.ts`): void;
+declare function assertIsSingleModuleInstance(key: Key): void;

package/dist/esm/utils/getGlobalObject.js

@@ -2,17 +2,13 @@ export { getGlobalObject };
 export { assertIsSingleModuleInstance };
 import { assert } from './assert.js';
 /** Share information across module instances. */
-function getGlobalObject(
-// We use the filename (or file path) as key. There should be only one getGlobalObject() usage per file. Thus the key should be unique, assuming the filename (or file path) is unique.
-key, defaultValue) {
+function getGlobalObject(key, defaultValue) {
     const globalObjects = getGlobalObjects();
     const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
     return globalObject;
 }
 /** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(
-// We use the filename (or file path) as key.
-key) {
+function assertIsSingleModuleInstance(key) {
     const globalObjects = getGlobalObjects();
     assert(!(key in globalObjects));
 }

package/dist/esm/utils/parseUrl-extras.js

@@ -28,8 +28,8 @@ function prependBase(url, baseServer) {
     return `${baseServerNormalized}${url}`;
 }
 function removeBaseServer(url, baseServer) {
-    const { hasBaseServer, origin, pathname, pathnameOriginal, searchOriginal, hashOriginal } = parseUrl(url, baseServer);
-    assert(hasBaseServer);
+    const { isBaseMissing, origin, pathname, pathnameOriginal, searchOriginal, hashOriginal } = parseUrl(url, baseServer);
+    assert(!isBaseMissing);
     assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal);
     const urlWithoutBase = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal);
     return urlWithoutBase;

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

@@ -10,7 +10,6 @@ export { isBaseServer };
 export { assertUrlComponents };
 export { createUrlFromComponents };
 export type { UrlPublic };
-export type { UrlPrivate };
 type UrlPublic = {
     /** The full URL. */
     href: string;
@@ -41,10 +40,10 @@ type UrlPublic = {
     /** @deprecated */
     searchString: null | string;
 };
-type UrlPrivate = Omit<UrlPublic, 'hashString' | 'searchString'> & {
-    hasBaseServer: boolean;
+type UrlInternal = Omit<UrlPublic, 'hashString' | 'searchString'> & {
+    isBaseMissing: boolean;
 };
-declare function parseUrl(url: string, baseServer: string): UrlPrivate;
+declare function parseUrl(url: string, baseServer: string): UrlInternal;
 declare function isBaseServer(baseServer: string): boolean;
 declare function assertUrlComponents(url: string, origin: string | null, pathnameOriginal: string, searchOriginal: string | null, hashOriginal: string | null): void;
 declare function createUrlFromComponents(origin: string | null, pathname: string, search: string | null, hash: string | null): string;

package/dist/esm/utils/parseUrl.js

@@ -45,7 +45,7 @@ function parseUrl(url, baseServer) {
     const pathnameOriginal = urlWithoutHashNorSearch.slice((origin || '').length);
     assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal);
     // Base URL
-    let { pathname, hasBaseServer } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
+    let { pathname, isBaseMissing } = removeBaseServer(pathnameAbsoluteWithBase, baseServer);
     // pageContext.urlParsed.href
     const href = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal);
     // pageContext.urlParsed.{hostname, port}
@@ -62,7 +62,7 @@ function parseUrl(url, baseServer) {
         origin,
         pathname,
         pathnameOriginal: pathnameOriginal,
-        hasBaseServer,
+        isBaseMissing,
         search,
         searchAll,
         searchOriginal,
@@ -231,7 +231,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     assert(baseServer.startsWith('/'));
     if (baseServer === '/') {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: true };
+        return { pathname, isBaseMissing: false };
     }
     // Support `url === '/some-base-url' && baseServer === '/some-base-url/'`
     let baseServerNormalized = baseServer;
@@ -241,7 +241,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     }
     if (!urlPathname.startsWith(baseServerNormalized)) {
         const pathname = pathnameAbsoluteWithBase;
-        return { pathname, hasBaseServer: false };
+        return { pathname, isBaseMissing: true };
     }
     assert(urlPathname.startsWith('/') || urlPathname.startsWith('http'));
     assert(urlPathname.startsWith(baseServerNormalized));
@@ -249,7 +249,7 @@ function removeBaseServer(pathnameAbsoluteWithBase, baseServer) {
     if (!urlPathname.startsWith('/'))
         urlPathname = '/' + urlPathname;
     assert(urlPathname.startsWith('/'));
-    return { pathname: urlPathname, hasBaseServer: true };
+    return { pathname: urlPathname, isBaseMissing: false };
 }
 function isBaseServer(baseServer) {
     return baseServer.startsWith('/');

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.222";
+    projectVersion: "0.4.223";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.222",
+  "version": "0.4.223",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -96,6 +96,15 @@
       "types": "./dist/esm/shared/modifyUrl.d.ts",
       "default": "./dist/esm/shared/modifyUrl.js"
     },
+    "./universal-middleware": {
+      "worker": "./dist/esm/node/runtime/universal-middleware.js",
+      "edge-light": "./dist/esm/node/runtime/universal-middleware.js",
+      "require": "./dist/cjs/node/runtime/universal-middleware.js",
+      "node": "./dist/esm/node/runtime/universal-middleware.js",
+      "browser": "./dist/esm/client/node.js",
+      "types": "./dist/esm/node/runtime/universal-middleware.d.ts",
+      "default": "./dist/esm/node/runtime/universal-middleware.js"
+    },
     "./__internal": {
       "require": "./dist/cjs/__internal/index.js",
       "node": "./dist/esm/__internal/index.js",
@@ -203,6 +212,9 @@
       "modifyUrl": [
         "./dist/esm/shared/modifyUrl.d.ts"
       ],
+      "universal-middleware": [
+        "./dist/esm/node/runtime/universal-middleware.d.ts"
+      ],
       "__internal": [
         "./dist/esm/__internal/index.d.ts"
       ],
@@ -235,7 +247,8 @@
     "./RenderErrorPage.js",
     "./routing.js",
     "./server.js",
-    "./types.js"
+    "./types.js",
+    "./universal-middleware.js"
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.5.3",

package/universal-middleware.js

@@ -0,0 +1,3 @@
+// Some tools still need this as of January 2025
+export * from './dist/esm/node/runtime/universal-middleware.js'
+export { default } from './dist/esm/node/runtime/universal-middleware.js'

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

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConfigInvalid_set = exports.isConfigInvalid = void 0;
-const utils_js_1 = require("../utils.js");
-let isConfigInvalid;
-const isConfigInvalid_set = (val) => {
-    (0, utils_js_1.assert)(val === false || val.err);
-    exports.isConfigInvalid = isConfigInvalid = val;
-};
-exports.isConfigInvalid_set = isConfigInvalid_set;

package/dist/esm/node/runtime/renderPage/isConfigInvalid.d.ts

@@ -1,6 +0,0 @@
-export { isConfigInvalid };
-export { isConfigInvalid_set };
-declare let isConfigInvalid: false | {
-    err: unknown;
-};
-declare const isConfigInvalid_set: (val: typeof isConfigInvalid) => void;

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

@@ -1,8 +0,0 @@
-export { isConfigInvalid };
-export { isConfigInvalid_set };
-import { assert } from '../utils.js';
-let isConfigInvalid;
-const isConfigInvalid_set = (val) => {
-    assert(val === false || val.err);
-    isConfigInvalid = val;
-};