vike 0.4.171-commit-e429162 → 0.4.171-commit-978d69d

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -102,7 +102,7 @@ function extractAssetsPlugin() {
                 }
                 // If the import path resolves to a file in `node_modules/`, we ignore that file:
                 //  - Direct CSS dependencies are included though, such as `import 'bootstrap/theme/dark.css'`. (Because the above if-branch for CSS files will add the file.)
-                //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is non-standard; we can safely not support this case. (I'm not aware of any library that does this.)
+                //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is unconventional; we can safely not support this case. (I'm not aware of any library that does this.)
                 (0, utils_js_1.assertPosixPath)(file);
                 if (file.includes('/node_modules/')) {
                     return emptyModule(file, importer);

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

@@ -898,7 +898,7 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
             const configValueSource = sources[0];
             if ('value' in configValueSource) {
                 configValues[configName] = {
-                    type: 'classic',
+                    type: 'standard',
                     value: configValueSource.value,
                     definedAtData: getDefinedAtFile(configValueSource)
                 };

package/dist/cjs/node/runtime/html/stream.js

@@ -762,17 +762,17 @@ async function loadStreamNodeModule() {
     const { Readable, Writable } = streamModule;
     return { Readable, Writable };
 }
-function getStreamName(type, standard) {
-    let standardName = (0, utils_js_1.capitalizeFirstLetter)(standard);
-    if (standardName === 'Node') {
-        standardName = 'Node.js';
+function getStreamName(kind, type) {
+    let typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
+    if (typeName === 'Node') {
+        typeName = 'Node.js';
     }
-    const typeName = (0, utils_js_1.capitalizeFirstLetter)(type);
-    if (type !== 'pipe') {
-        return `a ${typeName} ${standardName} Stream`;
+    const kindName = (0, utils_js_1.capitalizeFirstLetter)(kind);
+    if (kind !== 'pipe') {
+        return `a ${kindName} ${typeName} Stream`;
     }
-    if (type === 'pipe') {
-        return `a ${standardName} Stream Pipe`;
+    if (kind === 'pipe') {
+        return `a ${typeName} Stream Pipe`;
     }
     (0, utils_js_1.assert)(false);
 }

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

@@ -100,8 +100,8 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
         }
     };
-    function getFixMsg(type, standard) {
-        const streamName = (0, stream_js_1.getStreamName)(type, standard);
+    function getFixMsg(kind, type) {
+        const streamName = (0, stream_js_1.getStreamName)(kind, type);
         (0, utils_js_1.assert)(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         (0, utils_js_1.assert)(renderHook);
         const { hookFilePath, hookName } = renderHook;

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

@@ -40,7 +40,7 @@ function getPageContextExports(pageFiles, pageConfig) {
         sources[configName].push(src);
     };
     const from = {
-        configsOverridable: {},
+        configsStandard: {},
         configsCumulative: {},
         configsComputed: {}
     };
@@ -58,6 +58,15 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'standard') {
+                const src = {
+                    type: 'configsStandard',
+                    value: configValue.value,
+                    definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsStandard[configName] = src;
+            }
             if (configValue.type === 'cumulative') {
                 const src = {
                     type: 'configsCumulative',
@@ -74,15 +83,6 @@ function getPageContextExports(pageFiles, pageConfig) {
                 addSrc(src, configName);
                 from.configsCumulative[configName] = src;
             }
-            if (configValue.type === 'classic') {
-                const src = {
-                    type: 'configsOverridable',
-                    value: configValue.value,
-                    definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
-                };
-                addSrc(src, configName);
-                from.configsOverridable[configName] = src;
-            }
             if (configValue.type === 'computed') {
                 const src = {
                     type: 'configsComputed',

package/dist/cjs/shared/hooks/executeHook.js

@@ -5,7 +5,6 @@ const assert_js_1 = require("../../utils/assert.js");
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const humanizeTime_js_1 = require("../../utils/humanizeTime.js");
 const isObject_js_1 = require("../../utils/isObject.js");
-const utils_js_1 = require("../utils.js");
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/executeHook.ts', {
     userHookErrors: new WeakMap(),
     pageContext: null
@@ -64,15 +63,20 @@ exports.executeHook = executeHook;
 function isNotDisabled(timeout) {
     return !!timeout && timeout !== Infinity;
 }
+/**
+ * Access `pageContext` object inside Vike hooks, in order to create universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
 function getPageContext() {
     return globalObject.pageContext;
 }
 exports.getPageContext = getPageContext;
 function providePageContext(pageContext) {
     globalObject.pageContext = pageContext;
-    if (!(0, utils_js_1.isBrowser)()) {
-        process.nextTick(() => {
-            globalObject.pageContext = null;
-        });
-    }
+    // Promise.resolve() is quicker than process.nextTick() and setImmediate()
+    // https://stackoverflow.com/questions/67949576/process-nexttick-before-promise-resolve-then
+    Promise.resolve().then(() => {
+        globalObject.pageContext = null;
+    });
 }

package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js

@@ -53,7 +53,7 @@ function parseConfigValuesImported(configValuesImported) {
             (0, utils_js_1.assert)(val);
             const { value, importPath, exportName } = val;
             configValues[configName] = {
-                type: 'classic',
+                type: 'standard',
                 value,
                 definedAtData: {
                     // importPath cannot be relative to the current file, since the current file is a virtual file

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.171-commit-e429162';
+const PROJECT_VERSION = '0.4.171-commit-978d69d';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -221,7 +221,7 @@ async function fetchPageContextFromServer(pageContext) {
     }
     // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occured on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
     if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
-        throw getProjectError(`The pageContext object couldn't be fetched from the server as an error occurred on the server-side. Check your server logs.`);
+        throw getProjectError(`pageContext couldn't be fetched from server: an error occurred on the server-side (see your server logs)`);
     }
     assert(hasProp(pageContextFromServer, '_pageId', 'string'));
     processPageContextFromServer(pageContextFromServer);

package/dist/esm/node/plugin/plugins/extractAssetsPlugin.js

@@ -101,7 +101,7 @@ function extractAssetsPlugin() {
                 }
                 // If the import path resolves to a file in `node_modules/`, we ignore that file:
                 //  - Direct CSS dependencies are included though, such as `import 'bootstrap/theme/dark.css'`. (Because the above if-branch for CSS files will add the file.)
-                //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is non-standard; we can safely not support this case. (I'm not aware of any library that does this.)
+                //  - Loading CSS from a library (living in `node_modules/`) in a non-direct way is unconventional; we can safely not support this case. (I'm not aware of any library that does this.)
                 assertPosixPath(file);
                 if (file.includes('/node_modules/')) {
                     return emptyModule(file, importer);

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

@@ -892,7 +892,7 @@ function getConfigValues(configValueSources, configValuesComputed, configDefinit
             const configValueSource = sources[0];
             if ('value' in configValueSource) {
                 configValues[configName] = {
-                    type: 'classic',
+                    type: 'standard',
                     value: configValueSource.value,
                     definedAtData: getDefinedAtFile(configValueSource)
                 };

package/dist/esm/node/runtime/html/stream.d.ts

@@ -80,5 +80,5 @@ type StreamPipeWrapped = {
 };
 declare function pipeStream(pipe: StreamPipe): StreamPipeWrapped;
 declare function streamToString(stream: StreamProviderAny): Promise<string>;
-declare function getStreamName(type: 'pipe' | 'readable' | 'writable', standard: 'web' | 'node'): `a ${string} Stream` | `a ${string} Stream Pipe`;
+declare function getStreamName(kind: 'pipe' | 'readable' | 'writable', type: 'web' | 'node'): `a ${string} Stream` | `a ${string} Stream Pipe`;
 declare function inferStreamName(stream: StreamProviderNormalized): `a ${string} Stream` | `a ${string} Stream Pipe`;

package/dist/esm/node/runtime/html/stream.js

@@ -758,17 +758,17 @@ async function loadStreamNodeModule() {
     const { Readable, Writable } = streamModule;
     return { Readable, Writable };
 }
-function getStreamName(type, standard) {
-    let standardName = capitalizeFirstLetter(standard);
-    if (standardName === 'Node') {
-        standardName = 'Node.js';
+function getStreamName(kind, type) {
+    let typeName = capitalizeFirstLetter(type);
+    if (typeName === 'Node') {
+        typeName = 'Node.js';
     }
-    const typeName = capitalizeFirstLetter(type);
-    if (type !== 'pipe') {
-        return `a ${typeName} ${standardName} Stream`;
+    const kindName = capitalizeFirstLetter(kind);
+    if (kind !== 'pipe') {
+        return `a ${kindName} ${typeName} Stream`;
     }
-    if (type === 'pipe') {
-        return `a ${standardName} Stream Pipe`;
+    if (kind === 'pipe') {
+        return `a ${typeName} Stream Pipe`;
     }
     assert(false);
 }

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

@@ -95,8 +95,8 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
             }
         }
     };
-    function getFixMsg(type, standard) {
-        const streamName = getStreamName(type, standard);
+    function getFixMsg(kind, type) {
+        const streamName = getStreamName(kind, type);
         assert(['a ', 'an ', 'the '].some((s) => streamName.startsWith(s)));
         assert(renderHook);
         const { hookFilePath, hookName } = renderHook;

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

@@ -9,6 +9,7 @@ declare global {
          *  - You can refine the type of `Config['Page']`.
          *  - You can define the type of custom configurations created with `config.meta` (https://vike.dev/meta)
          *
+         *  https://vike.dev/meta#typescript
          */
         interface Config {
         }
@@ -22,6 +23,14 @@ declare global {
          */
         interface PageContext {
         }
+        /** Refine the `pageContext.config` type.
+         *
+         *  It's used for cumulative configs: the `pageContext.config[configName]` type is an `array` whereas `Config[configName]` isn't.
+         *
+         *  https://vike.dev/meta#typescript
+         */
+        interface ConfigResolved {
+        }
     }
     /** This namespace is only used by:
      *  - `vike-react`

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

@@ -41,8 +41,8 @@ type PageContextExports = {
     pageExports: Record<string, unknown>;
 };
 type From = {
-    configsOverridable: Record<string, // configName
-    SourceConfigsOverridable>;
+    configsStandard: Record<string, // configName
+    SourceConfigsStandard>;
     configsCumulative: Record<string, // configName
     SourceConfigsCumulative>;
     configsComputed: Record<string, // configName
@@ -53,9 +53,9 @@ SourceAny>;
 type Sources = Record<string, // configName
 SourceAny[]>;
 type SourceAny = SourceConfigs;
-type SourceConfigs = SourceConfigsOverridable | SourceConfigsCumulative | SourceConfigsComputed;
-type SourceConfigsOverridable = {
-    type: 'configsOverridable';
+type SourceConfigs = SourceConfigsStandard | SourceConfigsCumulative | SourceConfigsComputed;
+type SourceConfigsStandard = {
+    type: 'configsStandard';
     value: unknown;
     definedAt: string;
 };

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

@@ -35,7 +35,7 @@ function getPageContextExports(pageFiles, pageConfig) {
         sources[configName].push(src);
     };
     const from = {
-        configsOverridable: {},
+        configsStandard: {},
         configsCumulative: {},
         configsComputed: {}
     };
@@ -53,6 +53,15 @@ function getPageContextExports(pageFiles, pageConfig) {
                 configDefinedAt,
                 configDefinedByFile: configValueFilePathToShowToUser
             });
+            if (configValue.type === 'standard') {
+                const src = {
+                    type: 'configsStandard',
+                    value: configValue.value,
+                    definedAt: getDefinedAtString(configValue.definedAtData, configName)
+                };
+                addSrc(src, configName);
+                from.configsStandard[configName] = src;
+            }
             if (configValue.type === 'cumulative') {
                 const src = {
                     type: 'configsCumulative',
@@ -69,15 +78,6 @@ function getPageContextExports(pageFiles, pageConfig) {
                 addSrc(src, configName);
                 from.configsCumulative[configName] = src;
             }
-            if (configValue.type === 'classic') {
-                const src = {
-                    type: 'configsOverridable',
-                    value: configValue.value,
-                    definedAt: getDefinedAtString(configValue.definedAtData, configName)
-                };
-                addSrc(src, configName);
-                from.configsOverridable[configName] = src;
-            }
             if (configValue.type === 'computed') {
                 const src = {
                     type: 'configsComputed',

package/dist/esm/shared/hooks/executeHook.d.ts

@@ -6,4 +6,9 @@ import type { Hook, HookLoc } from './getHook.js';
 type PageContextUnknown = null | Record<string, unknown>;
 declare function isUserHookError(err: unknown): false | HookLoc;
 declare function executeHook<T = unknown>(hookFnCaller: () => T, hook: Omit<Hook, 'hookFn'>, pageContext: PageContextUnknown): Promise<T>;
-declare function getPageContext<PageContext = PageContextClient | PageContextServer>(): PageContext;
+/**
+ * Access `pageContext` object inside Vike hooks, in order to create universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
+declare function getPageContext<PageContext = PageContextClient | PageContextServer>(): null | PageContext;

package/dist/esm/shared/hooks/executeHook.js

@@ -5,7 +5,6 @@ import { getProjectError, assertWarning } from '../../utils/assert.js';
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { humanizeTime } from '../../utils/humanizeTime.js';
 import { isObject } from '../../utils/isObject.js';
-import { isBrowser } from '../utils.js';
 const globalObject = getGlobalObject('utils/executeHook.ts', {
     userHookErrors: new WeakMap(),
     pageContext: null
@@ -62,14 +61,19 @@ function executeHook(hookFnCaller, hook, pageContext) {
 function isNotDisabled(timeout) {
     return !!timeout && timeout !== Infinity;
 }
+/**
+ * Access `pageContext` object inside Vike hooks, in order to create universal hooks.
+ *
+ * https://vike.dev/getPageContext
+ */
 function getPageContext() {
     return globalObject.pageContext;
 }
 function providePageContext(pageContext) {
     globalObject.pageContext = pageContext;
-    if (!isBrowser()) {
-        process.nextTick(() => {
-            globalObject.pageContext = null;
-        });
-    }
+    // Promise.resolve() is quicker than process.nextTick() and setImmediate()
+    // https://stackoverflow.com/questions/67949576/process-nexttick-before-promise-resolve-then
+    Promise.resolve().then(() => {
+        globalObject.pageContext = null;
+    });
 }

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

@@ -1,8 +1,8 @@
 export type { PageContextConfig };
 import type { VikePackages } from '../../VikeNamespace.js';
 import type { ConfigBuiltIn } from '../Config.js';
-import type { Combine, IsNotEmpty, XOR5 } from './helpers.ts';
-type PageContextConfig = ConfigBuiltIn & Vike.Config & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
+import type { Combine, IsNotEmpty, XOR5 } from './helpers.js';
+type PageContextConfig = ConfigBuiltIn & Vike.ConfigResolved & Omit<Vike.Config, keyof Vike.ConfigResolved> & (ConfigVikePackagesNotEmptyXor extends true ? ConfigVikePackagesIntersection : ConfigVikePackagesCombined);
 type ConfigVikePackagesIntersection = VikePackages.ConfigVikeReact & VikePackages.ConfigVikeVue & VikePackages.ConfigVikeSolid & VikePackages.ConfigVikeSvelte & VikePackages.ConfigVikeAngular;
 type ConfigVikePackagesCombined = Combine<VikePackages.ConfigVikeReact, Combine<VikePackages.ConfigVikeVue, Combine<VikePackages.ConfigVikeSolid, Combine<VikePackages.ConfigVikeSvelte, VikePackages.ConfigVikeAngular>>>>;
 type ConfigVikePackagesNotEmptyXor = XOR5<IsNotEmpty<VikePackages.ConfigVikeReact>, IsNotEmpty<VikePackages.ConfigVikeVue>, IsNotEmpty<VikePackages.ConfigVikeSolid>, IsNotEmpty<VikePackages.ConfigVikeSvelte>, IsNotEmpty<VikePackages.ConfigVikeAngular>>;

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

@@ -6,7 +6,7 @@ export type { ConfigEnvInternal };
 export type { PageConfigGlobalRuntime };
 export type { PageConfigGlobalBuildTime };
 export type { ConfigValue };
-export type { ConfigValueClassic };
+export type { ConfigValueStandard };
 export type { ConfigValueCumulative };
 export type { ConfigValueComputed };
 export type { ConfigValues };
@@ -86,10 +86,10 @@ type ConfigValuesComputed = Record<string, {
     configEnv: ConfigEnvInternal;
     value: unknown;
 }>;
-type ConfigValue = ConfigValueClassic | ConfigValueCumulative | ConfigValueComputed;
+type ConfigValue = ConfigValueStandard | ConfigValueCumulative | ConfigValueComputed;
 /** Defined by a unique source (thus unique file path). */
-type ConfigValueClassic = {
-    type: 'classic';
+type ConfigValueStandard = {
+    type: 'standard';
     value: unknown;
     definedAtData: DefinedAtFile;
 };

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

@@ -2,7 +2,7 @@ export type { PageConfigRuntimeSerialized };
 export type { PageConfigGlobalRuntimeSerialized };
 export type { ConfigValueSerialized };
 export type { ConfigValueImported };
-import type { ConfigValueClassic, ConfigValueComputed, ConfigValueCumulative, PageConfigRuntime } from '../PageConfig.js';
+import type { ConfigValueStandard, ConfigValueComputed, ConfigValueCumulative, PageConfigRuntime } from '../PageConfig.js';
 /** Page config data structure serialized in virtual files: parsing it results in PageConfigRuntime */
 type PageConfigRuntimeSerialized = Omit<PageConfigRuntime, 'configValues'> & {
     /** Config values that are serializable and loaded eagerly such as config.passToClient */
@@ -14,7 +14,7 @@ type PageConfigGlobalRuntimeSerialized = {
     configValuesImported: ConfigValueImported[];
 };
 /** Value is serialized */
-type ConfigValueSerialized = (Omit<ConfigValueClassic, 'value'> & {
+type ConfigValueSerialized = (Omit<ConfigValueStandard, 'value'> & {
     valueSerialized: string;
 }) | (Omit<ConfigValueCumulative, 'value'> & {
     valueSerialized: string;

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

@@ -51,7 +51,7 @@ function parseConfigValuesImported(configValuesImported) {
             assert(val);
             const { value, importPath, exportName } = val;
             configValues[configName] = {
-                type: 'classic',
+                type: 'standard',
                 value,
                 definedAtData: {
                     // importPath cannot be relative to the current file, since the current file is a virtual file

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-e429162";
+declare const PROJECT_VERSION: "0.4.171-commit-978d69d";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-e429162";
+    projectVersion: "0.4.171-commit-978d69d";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-e429162';
+const PROJECT_VERSION = '0.4.171-commit-978d69d';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-e429162",
+  "version": "0.4.171-commit-978d69d",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",