vike 0.4.222-commit-207e079 → 0.4.222-commit-5513d32

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

@@ -1,20 +1,51 @@
-export { getPageConfigUserFriendlyOld };
-export { getPageConfigUserFriendlyNew };
+export { getPageConfigUserFriendly };
+export { getPageConfigUserFriendly_oldDesign };
+export { getPageConfigGlobalUserFriendly };
 import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
 import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from './helpers.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile } from '../utils.js';
 import pc from '@brillout/picocolors';
-function getPageConfigUserFriendlyNew(pageConfig) {
-    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues });
+    let page;
+    if (!pageConfig.isErrorPage) {
+        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        page = {
+            ...pageConfigUserFriendly,
+            route
+        };
+    }
+    else {
+        page = {
+            ...pageConfigUserFriendly,
+            isErrorPage: true
+        };
+    }
+    return [pageConfig.pageId, page];
+}
+function getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues }) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues });
+    return getPublicCopy(pageConfigUserFriendly);
+}
+function getPublicCopy(pageConfigUserFriendly) {
+    const p = pageConfigUserFriendly;
     return {
-        config: res.config,
-        _source: res.source,
-        _sources: res.sources,
-        _from: res.from
+        config: p.config,
+        _source: p.source,
+        _sources: p.sources,
+        _from: p.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
+function getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues }) {
+    const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
+    return getPageConfigUserFriendly_V1Design({ configValues });
+}
+function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }) {
+    const pageConfigGlobalUserFriendly = getPageConfigUserFriendly_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(pageConfigGlobalUserFriendly);
+}
+function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -39,8 +70,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        const res = getPageConfigUserFriendly_base({
+            pageConfigGlobalValues: pageConfigGlobal.configValues,
+            pageConfigValues: pageConfig.configValues
         });
         source = res.source;
         sources = res.sources;
@@ -87,7 +119,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyV1Desin(pageConfig) {
+function getPageConfigUserFriendly_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

package/dist/esm/shared/page-configs/serialize/PageConfigSerialized.d.ts

@@ -2,11 +2,12 @@ export type { PageConfigRuntimeSerialized };
 export type { PageConfigGlobalRuntimeSerialized };
 export type { ConfigValueSerialized };
 export type { ValueSerialized };
-import type { ConfigValueStandard, ConfigValueComputed, ConfigValueCumulative, PageConfigRuntime } from '../PageConfig.js';
+import type { ConfigValueStandard, ConfigValueComputed, ConfigValueCumulative, PageConfigCommon, PageConfigRuntime } from '../PageConfig.js';
 /** Page config data structure serialized in virtual files: parsing it results in PageConfigRuntime */
-type PageConfigRuntimeSerialized = Omit<PageConfigRuntime, 'configValues'> & {
+type PageConfigRuntimeSerialized = PageConfigCommon & {
     /** Config values that are serializable and loaded eagerly such as config.passToClient */
     configValuesSerialized: Record<string, ConfigValueSerialized>;
+    loadConfigValuesAll: PageConfigRuntime['loadConfigValuesAll'];
 };
 type PageConfigGlobalRuntimeSerialized = {
     configValuesSerialized: Record<string, ConfigValueSerialized>;

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/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.222-commit-207e079";
+export declare const PROJECT_VERSION: "0.4.222-commit-5513d32";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.222-commit-207e079';
+export const PROJECT_VERSION = '0.4.222-commit-5513d32';

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/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-commit-207e079";
+    projectVersion: "0.4.222-commit-5513d32";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.222-commit-207e079",
+  "version": "0.4.222-commit-5513d32",
   "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'