vike 0.4.162-commit-421de1c → 0.4.163

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -45,12 +45,11 @@ function getEntryCode(config, configVike) {
         `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
-        `    const clientManifest = ${ASSETS_MAP};`,
+        `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
         '    setImportBuildGetters({',
         `      pageFiles: () => pageFiles,`,
-        // TODO: rename clientManifest -> assetManifest
-        `      clientManifest: () => clientManifest,`,
+        `      getAssetsManifest: () => assetsManifest,`,
         // TODO: rename pluginManifest -> vikeManifest
         `      pluginManifest: () => pluginManifest,`,
         '    });',

package/dist/cjs/node/runtime/globalContext/loadImportBuild.js

@@ -15,12 +15,12 @@ async function loadImportBuild(outDir) {
         await (0, importServerEntry_js_1.importServerEntry)(outDir);
         (0, utils_js_1.assert)(buildGetters.getters);
     }
-    const [pageFiles, clientManifest, pluginManifest] = await Promise.all([
+    const [pageFiles, assetsManifest, pluginManifest] = await Promise.all([
         buildGetters.getters.pageFiles(),
-        buildGetters.getters.clientManifest(),
+        buildGetters.getters.getAssetsManifest(),
         buildGetters.getters.pluginManifest()
     ]);
-    const buildEntries = { pageFiles, clientManifest, pluginManifest };
+    const buildEntries = { pageFiles, assetsManifest, pluginManifest };
     return buildEntries;
 }
 exports.loadImportBuild = loadImportBuild;

package/dist/cjs/node/runtime/globalContext.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = void 0;
+exports.getRuntimeManifest = exports.setGlobalContext_prerender = exports.setGlobalContext_viteDevServer = exports.getViteConfig = exports.getViteDevServer = exports.getGlobalContext = exports.initGlobalContext = exports.getGlobalContextAsync = exports.getGlobalContextSync = void 0;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
@@ -11,12 +11,52 @@ const assertPluginManifest_js_1 = require("../shared/assertPluginManifest.js");
 const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const assertRuntimeManifest_js_1 = require("../shared/assertRuntimeManifest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', {});
+let resolveGlobalContext;
+const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', {
+    globalContextPromise: new Promise((r) => (resolveGlobalContext = r))
+});
 function getGlobalContext() {
     (0, utils_js_1.assert)(globalObject.globalContext);
     return globalObject.globalContext;
 }
 exports.getGlobalContext = getGlobalContext;
+/** @experimental https://vike.dev/getGlobalContext */
+function getGlobalContextSync() {
+    (0, utils_js_1.assertUsage)(globalObject.globalContext, "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContextAsync() instead.");
+    return makePublic(globalObject.globalContext);
+}
+exports.getGlobalContextSync = getGlobalContextSync;
+/** @experimental https://vike.dev/getGlobalContext */
+async function getGlobalContextAsync() {
+    await globalObject.globalContextPromise;
+    (0, utils_js_1.assert)(globalObject.globalContext);
+    return makePublic(globalObject.globalContext);
+}
+exports.getGlobalContextAsync = getGlobalContextAsync;
+function makePublic(globalContext) {
+    const globalContextPublic = {
+        assetsManifest: globalContext.assetsManifest
+    };
+    // Add internals (and prepended _ prefix to their keys)
+    {
+        const publicKeys = Object.keys(globalContextPublic);
+        (0, utils_js_1.objectKeys)(globalContext)
+            .filter((key) => !publicKeys.includes(key))
+            .forEach((key) => {
+            const keyPublic = `_${key}`;
+            Object.defineProperty(globalContextPublic, keyPublic, {
+                enumerable: true,
+                get() {
+                    (0, utils_js_1.assertWarning)(false, `Using internal globalContext.${keyPublic} which is discouraged: it may break in any minor version update. Instead, reach out on GitHub and elaborate your use case.`, {
+                        onlyOnce: true
+                    });
+                    return globalContext[key];
+                }
+            });
+        });
+    }
+    return globalContextPublic;
+}
 function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
@@ -55,7 +95,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
-            clientManifest: null,
+            assetsManifest: null,
             pluginManifest: null,
             viteDevServer,
             viteConfig,
@@ -70,13 +110,13 @@ async function initGlobalContext(isPrerendering = false, outDir) {
     else {
         const buildEntries = await (0, loadImportBuild_js_1.loadImportBuild)(outDir);
         assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, clientManifest, pluginManifest } = buildEntries;
+        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
         (0, getPageFiles_js_1.setPageFiles)(pageFiles);
-        assertViteManifest(clientManifest);
+        assertViteManifest(assetsManifest);
         (0, assertPluginManifest_js_1.assertPluginManifest)(pluginManifest);
         const globalContext = {
             isProduction: true,
-            clientManifest,
+            assetsManifest,
             pluginManifest,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
@@ -104,6 +144,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             globalObject.globalContext = globalContext;
         }
     }
+    resolveGlobalContext(globalObject.globalContext);
 }
 exports.initGlobalContext = initGlobalContext;
 function getRuntimeManifest(configVike) {

package/dist/cjs/node/runtime/index-common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPageRenderer = exports._injectAssets = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
+exports.createPageRenderer = exports._injectAssets = exports.getGlobalContextAsync = exports.getGlobalContextSync = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
 var renderPage_js_1 = require("./renderPage.js");
 Object.defineProperty(exports, "renderPage", { enumerable: true, get: function () { return renderPage_js_1.renderPage; } });
 var renderHtml_js_1 = require("./html/renderHtml.js");
@@ -13,6 +13,9 @@ Object.defineProperty(exports, "pipeStream", { enumerable: true, get: function (
 Object.defineProperty(exports, "stampPipe", { enumerable: true, get: function () { return stream_js_1.stampPipe; } });
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+var globalContext_js_1 = require("./globalContext.js");
+Object.defineProperty(exports, "getGlobalContextSync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextSync; } });
+Object.defineProperty(exports, "getGlobalContextAsync", { enumerable: true, get: function () { return globalContext_js_1.getGlobalContextAsync; } });
 // TODO/v1-release: remove
 var injectAssets__public_js_1 = require("./html/injectAssets/injectAssets__public.js");
 Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: function () { return injectAssets__public_js_1.injectAssets__public; } });

package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -5,13 +5,13 @@ const utils_js_1 = require("../../utils.js");
 const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
-function getManifestEntry(id, clientManifest) {
+function getManifestEntry(id, assetsManifest) {
     (0, assertClientEntryId_js_1.assertClientEntryId)(id);
-    const debugInfo = getDebugInfo(id, clientManifest);
+    const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
         const manifestKeyEnd = (0, utils_js_1.slice)(id, '@@vike'.length, 0);
-        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         (0, utils_js_1.assert)(manifestEntry && manifestKey, debugInfo);
         return { manifestEntry, manifestKey };
     }
@@ -19,7 +19,7 @@ function getManifestEntry(id, clientManifest) {
     if ((0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(id)) {
         {
             const manifestKey = id;
-            const manifestEntry = clientManifest[manifestKey];
+            const manifestEntry = assetsManifest[manifestKey];
             if (manifestEntry) {
                 return { manifestEntry, manifestKey };
             }
@@ -32,20 +32,20 @@ function getManifestEntry(id, clientManifest) {
         //  - This workaround was implemented to support Vitest runnung /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;
-        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // User files
     if (id.startsWith('/')) {
         const manifestKey = id.slice(1);
-        let manifestEntry = clientManifest[manifestKey];
+        let manifestEntry = assetsManifest[manifestKey];
         (0, utils_js_1.assert)(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // npm package import
     if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const found = Object.entries(clientManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+        const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
         (0, utils_js_1.assert)(found);
         const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
@@ -57,7 +57,7 @@ function getManifestEntry(id, clientManifest) {
         (0, utils_js_1.assert)(!manifestKeyEnd.startsWith('/'), debugInfo);
         manifestKeyEnd = '/' + manifestKeyEnd;
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 (0, utils_js_1.assert)(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -71,7 +71,7 @@ function getManifestEntry(id, clientManifest) {
             (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
         }
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 (0, utils_js_1.assert)(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -82,11 +82,11 @@ function getManifestEntry(id, clientManifest) {
     (0, utils_js_1.assert)(false, debugInfo);
 }
 exports.getManifestEntry = getManifestEntry;
-function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -97,13 +97,13 @@ function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -113,11 +113,11 @@ function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getDebugInfo(id, clientManifest, manifestKeyEnd) {
-    const manifestKeys = Object.keys(clientManifest);
+function getDebugInfo(id, assetsManifest, manifestKeyEnd) {
+    const manifestKeys = Object.keys(assetsManifest);
     if (manifestKeyEnd === undefined) {
         return { manifestKeys, id };
     }

package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -4,9 +4,9 @@ exports.retrieveAssetsProd = void 0;
 const utils_js_1 = require("../../utils.js");
 const getManifestEntry_js_1 = require("./getManifestEntry.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
+function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
-    (0, utils_js_1.assert)(clientManifest);
+    (0, utils_js_1.assert)(assetsManifest);
     const visistedAssets = new Set();
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
@@ -21,18 +21,18 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
             }
         }
-        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, clientManifest);
-        collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
+        const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, assetsManifest);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);
     });
-    collectSingleStyle(assetUrls, clientManifest);
+    collectSingleStyle(assetUrls, assetsManifest);
     return Array.from(assetUrls);
 }
 exports.retrieveAssetsProd = retrieveAssetsProd;
-function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets) {
+function collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets) {
     if (visistedAssets.has(manifestKey))
         return;
     visistedAssets.add(manifestKey);
-    const manifestEntry = manifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     (0, utils_js_1.assert)(manifestEntry, { manifestKey });
     const { file } = manifestEntry;
     if (!onlyCollectStaticAssets) {
@@ -40,9 +40,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
     const { imports = [], assets = [], css = [] } = manifestEntry;
     for (const manifestKey of imports) {
-        const importManifestEntry = manifest[manifestKey];
+        const importManifestEntry = assetsManifest[manifestKey];
         (0, utils_js_1.assert)(importManifestEntry);
-        collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets);
     }
     for (const cssAsset of css) {
         assetUrls.add(`/${cssAsset}`);
@@ -52,9 +52,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
 }
 // Support `config.build.cssCodeSplit: false`, see https://github.com/vikejs/vike/issues/644
-function collectSingleStyle(assetUrls, manifest) {
-    const style = manifest['style.css'];
-    if (style && Object.values(manifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
+function collectSingleStyle(assetUrls, assetsManifest) {
+    const style = assetsManifest['style.css'];
+    if (style && Object.values(assetsManifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
         assetUrls.add(`/${style.file}`);
     }
 }

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

@@ -21,9 +21,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
         assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
     }
     else {
-        const { clientManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
+        const { assetsManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -119,8 +119,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, utils_js_1.assertPosixPath)(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest) {
-    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, clientManifest);
+function resolveClientEntriesProd(clientEntry, assetsManifest) {
+    const { manifestEntry } = (0, getManifestEntry_js_1.getManifestEntry)(clientEntry, assetsManifest);
     (0, utils_js_1.assert)(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     (0, utils_js_1.assert)(!file.startsWith('/'));

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

@@ -14,6 +14,13 @@ const knownErrors = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
         link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+    },
+    {
+        // ```
+        // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
+        // ```
+        errMsg: 'assets.json',
+        link: 'https://vike.dev/getGlobalContext'
     }
 ];
 function logErrorHint(error) {

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.162-commit-421de1c';
+const PROJECT_VERSION = '0.4.163';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

package/dist/esm/node/plugin/plugins/importBuild/index.js

@@ -40,12 +40,11 @@ function getEntryCode(config, configVike) {
         `  import * as pageFiles from '${virtualFileIdImportUserCodeServer}';`,
         `  {`,
         // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
-        `    const clientManifest = ${ASSETS_MAP};`,
+        `    const assetsManifest = ${ASSETS_MAP};`,
         `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
         '    setImportBuildGetters({',
         `      pageFiles: () => pageFiles,`,
-        // TODO: rename clientManifest -> assetManifest
-        `      clientManifest: () => clientManifest,`,
+        `      getAssetsManifest: () => assetsManifest,`,
         // TODO: rename pluginManifest -> vikeManifest
         `      pluginManifest: () => pluginManifest,`,
         '    });',

package/dist/esm/node/runtime/globalContext/loadImportBuild.d.ts

@@ -2,13 +2,13 @@ export { loadImportBuild };
 export { setImportBuildGetters };
 type BuildGetters = null | {
     pageFiles: () => Promise<Record<string, unknown>>;
-    clientManifest: () => Promise<Record<string, unknown>>;
+    getAssetsManifest: () => Promise<Record<string, unknown>>;
     pluginManifest: () => Promise<Record<string, unknown>>;
 };
 declare function setImportBuildGetters(getters: BuildGetters): void;
 declare function loadImportBuild(outDir?: string): Promise<{
     pageFiles: Record<string, unknown>;
-    clientManifest: Record<string, unknown>;
+    assetsManifest: Record<string, unknown>;
     pluginManifest: Record<string, unknown>;
 }>;
 declare global {

package/dist/esm/node/runtime/globalContext/loadImportBuild.js

@@ -13,11 +13,11 @@ async function loadImportBuild(outDir) {
         await importServerEntry(outDir);
         assert(buildGetters.getters);
     }
-    const [pageFiles, clientManifest, pluginManifest] = await Promise.all([
+    const [pageFiles, assetsManifest, pluginManifest] = await Promise.all([
         buildGetters.getters.pageFiles(),
-        buildGetters.getters.clientManifest(),
+        buildGetters.getters.getAssetsManifest(),
         buildGetters.getters.pluginManifest()
     ]);
-    const buildEntries = { pageFiles, clientManifest, pluginManifest };
+    const buildEntries = { pageFiles, assetsManifest, pluginManifest };
     return buildEntries;
 }

package/dist/esm/node/runtime/globalContext.d.ts

@@ -1,3 +1,5 @@
+export { getGlobalContextSync };
+export { getGlobalContextAsync };
 export { initGlobalContext };
 export { getGlobalContext };
 export { getViteDevServer };
@@ -10,6 +12,9 @@ import type { ResolvedConfig, ViteDevServer } from 'vite';
 import { PluginManifest } from '../shared/assertPluginManifest.js';
 import type { ConfigVikeResolved } from '../../shared/ConfigVike.js';
 import { type RuntimeManifest } from '../shared/assertRuntimeManifest.js';
+type GlobalContextPublic = {
+    assetsManifest: null | ViteManifest;
+};
 type GlobalContext = {
     baseServer: string;
     baseAssets: null | string;
@@ -22,11 +27,11 @@ type GlobalContext = {
     isPrerendering: false;
     viteConfig: ResolvedConfig;
     viteDevServer: ViteDevServer;
-    clientManifest: null;
+    assetsManifest: null;
     pluginManifest: null;
 } | ({
     isProduction: true;
-    clientManifest: ViteManifest;
+    assetsManifest: ViteManifest;
     pluginManifest: PluginManifest;
     viteDevServer: null;
 } & ({
@@ -37,6 +42,10 @@ type GlobalContext = {
     viteConfig: ResolvedConfig;
 })));
 declare function getGlobalContext(): GlobalContext;
+/** @experimental https://vike.dev/getGlobalContext */
+declare function getGlobalContextSync(): GlobalContextPublic;
+/** @experimental https://vike.dev/getGlobalContext */
+declare function getGlobalContextAsync(): Promise<GlobalContextPublic>;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function setGlobalContext_prerender(viteConfig: ResolvedConfig): void;

package/dist/esm/node/runtime/globalContext.js

@@ -1,3 +1,7 @@
+// Public use
+export { getGlobalContextSync };
+export { getGlobalContextAsync };
+// Internal use
 export { initGlobalContext };
 export { getGlobalContext };
 export { getViteDevServer };
@@ -5,18 +9,56 @@ export { getViteConfig };
 export { setGlobalContext_viteDevServer };
 export { setGlobalContext_prerender };
 export { getRuntimeManifest };
-import { assert, assertUsage, getGlobalObject, getNodeEnv, getNodeEnvDesc, isNodeEnvDev, isPlainObject, objectAssign } from './utils.js';
+import { assert, assertUsage, assertWarning, getGlobalObject, getNodeEnv, getNodeEnvDesc, isNodeEnvDev, isPlainObject, objectAssign, objectKeys } from './utils.js';
 import { loadImportBuild } from './globalContext/loadImportBuild.js';
 import { setPageFiles } from '../../shared/getPageFiles.js';
 import { assertPluginManifest } from '../shared/assertPluginManifest.js';
 import { getConfigVike } from '../shared/getConfigVike.js';
 import { assertRuntimeManifest } from '../shared/assertRuntimeManifest.js';
 import pc from '@brillout/picocolors';
-const globalObject = getGlobalObject('globalContext.ts', {});
+let resolveGlobalContext;
+const globalObject = getGlobalObject('globalContext.ts', {
+    globalContextPromise: new Promise((r) => (resolveGlobalContext = r))
+});
 function getGlobalContext() {
     assert(globalObject.globalContext);
     return globalObject.globalContext;
 }
+/** @experimental https://vike.dev/getGlobalContext */
+function getGlobalContextSync() {
+    assertUsage(globalObject.globalContext, "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContextAsync() instead.");
+    return makePublic(globalObject.globalContext);
+}
+/** @experimental https://vike.dev/getGlobalContext */
+async function getGlobalContextAsync() {
+    await globalObject.globalContextPromise;
+    assert(globalObject.globalContext);
+    return makePublic(globalObject.globalContext);
+}
+function makePublic(globalContext) {
+    const globalContextPublic = {
+        assetsManifest: globalContext.assetsManifest
+    };
+    // Add internals (and prepended _ prefix to their keys)
+    {
+        const publicKeys = Object.keys(globalContextPublic);
+        objectKeys(globalContext)
+            .filter((key) => !publicKeys.includes(key))
+            .forEach((key) => {
+            const keyPublic = `_${key}`;
+            Object.defineProperty(globalContextPublic, keyPublic, {
+                enumerable: true,
+                get() {
+                    assertWarning(false, `Using internal globalContext.${keyPublic} which is discouraged: it may break in any minor version update. Instead, reach out on GitHub and elaborate your use case.`, {
+                        onlyOnce: true
+                    });
+                    return globalContext[key];
+                }
+            });
+        });
+    }
+    return globalContextPublic;
+}
 function setGlobalContext_viteDevServer(viteDevServer) {
     if (globalObject.viteDevServer)
         return;
@@ -51,7 +93,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
-            clientManifest: null,
+            assetsManifest: null,
             pluginManifest: null,
             viteDevServer,
             viteConfig,
@@ -66,13 +108,13 @@ async function initGlobalContext(isPrerendering = false, outDir) {
     else {
         const buildEntries = await loadImportBuild(outDir);
         assertBuildEntries(buildEntries, isPrerendering ?? false);
-        const { pageFiles, clientManifest, pluginManifest } = buildEntries;
+        const { pageFiles, assetsManifest, pluginManifest } = buildEntries;
         setPageFiles(pageFiles);
-        assertViteManifest(clientManifest);
+        assertViteManifest(assetsManifest);
         assertPluginManifest(pluginManifest);
         const globalContext = {
             isProduction: true,
-            clientManifest,
+            assetsManifest,
             pluginManifest,
             viteDevServer: null,
             baseServer: pluginManifest.baseServer,
@@ -100,6 +142,7 @@ async function initGlobalContext(isPrerendering = false, outDir) {
             globalObject.globalContext = globalContext;
         }
     }
+    resolveGlobalContext(globalObject.globalContext);
 }
 function getRuntimeManifest(configVike) {
     const { includeAssetsImportedByServer, baseServer, baseAssets, redirects, trailingSlash, disableUrlNormalization } = configVike;

package/dist/esm/node/runtime/index-common.d.ts

@@ -2,6 +2,7 @@ export { renderPage } from './renderPage.js';
 export { escapeInject, dangerouslySkipEscape } from './html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './html/stream.js';
 export { PROJECT_VERSION as version } from './utils.js';
+export { getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 export { createPageRenderer } from '../createPageRenderer.js';
 declare global {

package/dist/esm/node/runtime/index-common.js

@@ -2,6 +2,7 @@ export { renderPage } from './renderPage.js';
 export { escapeInject, dangerouslySkipEscape } from './html/renderHtml.js';
 export { pipeWebStream, pipeNodeStream, pipeStream, stampPipe } from './html/stream.js';
 export { PROJECT_VERSION as version } from './utils.js';
+export { getGlobalContextSync, getGlobalContextAsync } from './globalContext.js';
 // TODO/v1-release: remove
 export { injectAssets__public as _injectAssets } from './html/injectAssets/injectAssets__public.js';
 // TODO/v1-release: remove

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.d.ts

@@ -1,6 +1,6 @@
 export { getManifestEntry };
 import type { ViteManifest, ViteManifestEntry } from '../../../shared/ViteManifest.js';
-declare function getManifestEntry(id: string, clientManifest: ViteManifest): {
+declare function getManifestEntry(id: string, assetsManifest: ViteManifest): {
     manifestKey: string;
     manifestEntry: ViteManifestEntry;
 };

package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -3,13 +3,13 @@ import { assert, slice, isNpmPackageImport } from '../../utils.js';
 import { assertClientEntryId } from './assertClientEntryId.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { prependEntriesDir } from '../../../shared/prependEntriesDir.js';
-function getManifestEntry(id, clientManifest) {
+function getManifestEntry(id, assetsManifest) {
     assertClientEntryId(id);
-    const debugInfo = getDebugInfo(id, clientManifest);
+    const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
         const manifestKeyEnd = slice(id, '@@vike'.length, 0);
-        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         assert(manifestEntry && manifestKey, debugInfo);
         return { manifestEntry, manifestKey };
     }
@@ -17,7 +17,7 @@ function getManifestEntry(id, clientManifest) {
     if (isVirtualFileIdPageConfigValuesAll(id)) {
         {
             const manifestKey = id;
-            const manifestEntry = clientManifest[manifestKey];
+            const manifestEntry = assetsManifest[manifestKey];
             if (manifestEntry) {
                 return { manifestEntry, manifestKey };
             }
@@ -30,20 +30,20 @@ function getManifestEntry(id, clientManifest) {
         //  - This workaround was implemented to support Vitest runnung /tests/*
         //    - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
         const manifestKeyEnd = id;
-        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+        const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
         assert(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // User files
     if (id.startsWith('/')) {
         const manifestKey = id.slice(1);
-        let manifestEntry = clientManifest[manifestKey];
+        let manifestEntry = assetsManifest[manifestKey];
         assert(manifestEntry, debugInfo);
         return { manifestEntry, manifestKey };
     }
     // npm package import
     if (isNpmPackageImport(id)) {
-        const found = Object.entries(clientManifest).find(([, e]) => e.name === prependEntriesDir(id));
+        const found = Object.entries(assetsManifest).find(([, e]) => e.name === prependEntriesDir(id));
         assert(found);
         const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
@@ -55,7 +55,7 @@ function getManifestEntry(id, clientManifest) {
         assert(!manifestKeyEnd.startsWith('/'), debugInfo);
         manifestKeyEnd = '/' + manifestKeyEnd;
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 assert(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -69,7 +69,7 @@ function getManifestEntry(id, clientManifest) {
             assert(manifestKeyEnd.startsWith('/'), debugInfo);
         }
         {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id);
+            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
             if (manifestEntry) {
                 assert(manifestKey, debugInfo);
                 return { manifestEntry, manifestKey };
@@ -79,11 +79,11 @@ function getManifestEntry(id, clientManifest) {
     }
     assert(false, debugInfo);
 }
-function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     assert(manifestKeyEnd.startsWith('/'), debugInfo);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -94,13 +94,13 @@ function findEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
-    const debugInfo = getDebugInfo(id, clientManifest, manifestKeyEnd);
+function getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {
+    const debugInfo = getDebugInfo(id, assetsManifest, manifestKeyEnd);
     const manifestKeys = [];
-    for (const manifestKey in clientManifest) {
+    for (const manifestKey in assetsManifest) {
         if (manifestKey.endsWith(manifestKeyEnd)) {
             manifestKeys.push(manifestKey);
         }
@@ -110,11 +110,11 @@ function getEntryWithKeyEnd(manifestKeyEnd, clientManifest, id) {
     if (!manifestKey) {
         return { manifestEntry: null, manifestKey: null };
     }
-    const manifestEntry = clientManifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     return { manifestEntry, manifestKey };
 }
-function getDebugInfo(id, clientManifest, manifestKeyEnd) {
-    const manifestKeys = Object.keys(clientManifest);
+function getDebugInfo(id, assetsManifest, manifestKeyEnd) {
+    const manifestKeys = Object.keys(assetsManifest);
     if (manifestKeyEnd === undefined) {
         return { manifestKeys, id };
     }

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.d.ts

@@ -1,4 +1,4 @@
 export { retrieveAssetsProd };
 import type { ViteManifest } from '../../../shared/ViteManifest.js';
 import type { ClientDependency } from '../../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
-declare function retrieveAssetsProd(clientDependencies: ClientDependency[], clientManifest: ViteManifest, includeAssetsImportedByServer: boolean): string[];
+declare function retrieveAssetsProd(clientDependencies: ClientDependency[], assetsManifest: ViteManifest, includeAssetsImportedByServer: boolean): string[];

package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js

@@ -2,9 +2,9 @@ export { retrieveAssetsProd };
 import { assert, isNpmPackageImport } from '../../utils.js';
 import { getManifestEntry } from './getManifestEntry.js';
 import { extractAssetsAddQuery } from '../../../shared/extractAssetsQuery.js';
-function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImportedByServer) {
+function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImportedByServer) {
     let assetUrls = new Set();
-    assert(clientManifest);
+    assert(assetsManifest);
     const visistedAssets = new Set();
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
@@ -19,17 +19,17 @@ function retrieveAssetsProd(clientDependencies, clientManifest, includeAssetsImp
                 id = extractAssetsAddQuery(id);
             }
         }
-        const { manifestKey } = getManifestEntry(id, clientManifest);
-        collectAssets(manifestKey, assetUrls, visistedAssets, clientManifest, onlyAssets);
+        const { manifestKey } = getManifestEntry(id, assetsManifest);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);
     });
-    collectSingleStyle(assetUrls, clientManifest);
+    collectSingleStyle(assetUrls, assetsManifest);
     return Array.from(assetUrls);
 }
-function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets) {
+function collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets) {
     if (visistedAssets.has(manifestKey))
         return;
     visistedAssets.add(manifestKey);
-    const manifestEntry = manifest[manifestKey];
+    const manifestEntry = assetsManifest[manifestKey];
     assert(manifestEntry, { manifestKey });
     const { file } = manifestEntry;
     if (!onlyCollectStaticAssets) {
@@ -37,9 +37,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
     const { imports = [], assets = [], css = [] } = manifestEntry;
     for (const manifestKey of imports) {
-        const importManifestEntry = manifest[manifestKey];
+        const importManifestEntry = assetsManifest[manifestKey];
         assert(importManifestEntry);
-        collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCollectStaticAssets);
+        collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyCollectStaticAssets);
     }
     for (const cssAsset of css) {
         assetUrls.add(`/${cssAsset}`);
@@ -49,9 +49,9 @@ function collectAssets(manifestKey, assetUrls, visistedAssets, manifest, onlyCol
     }
 }
 // Support `config.build.cssCodeSplit: false`, see https://github.com/vikejs/vike/issues/644
-function collectSingleStyle(assetUrls, manifest) {
-    const style = manifest['style.css'];
-    if (style && Object.values(manifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
+function collectSingleStyle(assetUrls, assetsManifest) {
+    const style = assetsManifest['style.css'];
+    if (style && Object.values(assetsManifest).filter((asset) => asset.file.endsWith('.css')).length === 1) {
         assetUrls.add(`/${style.file}`);
     }
 }

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

@@ -19,9 +19,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
         assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
     }
     else {
-        const { clientManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, clientManifest));
-        assetUrls = retrieveAssetsProd(clientDependencies, clientManifest, pageContext._includeAssetsImportedByServer);
+        const { assetsManifest } = globalContext;
+        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
     }
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -116,8 +116,8 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     assertPosixPath(filePath);
     return filePath;
 }
-function resolveClientEntriesProd(clientEntry, clientManifest) {
-    const { manifestEntry } = getManifestEntry(clientEntry, clientManifest);
+function resolveClientEntriesProd(clientEntry, assetsManifest) {
+    const { manifestEntry } = getManifestEntry(clientEntry, assetsManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });
     let { file } = manifestEntry;
     assert(!file.startsWith('/'));

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

@@ -13,6 +13,13 @@ const knownErrors = [
     {
         errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
         link: 'https://vike.dev/broken-npm-package#react-invalid-component'
+    },
+    {
+        // ```
+        // Error [RollupError]: Could not resolve "../dist/client/assets.json" from "renderer/+onRenderHtml.tsx"
+        // ```
+        errMsg: 'assets.json',
+        link: 'https://vike.dev/getGlobalContext'
     }
 ];
 function logErrorHint(error) {

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.162-commit-421de1c";
+declare const PROJECT_VERSION: "0.4.163";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.162-commit-421de1c";
+    projectVersion: "0.4.163";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
 import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.162-commit-421de1c';
+const PROJECT_VERSION = '0.4.163';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.162-commit-421de1c",
+  "version": "0.4.163",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",