vike 0.4.236-commit-85d361d → 0.4.236-commit-e752d12

package/dist/cjs/client/shared/createGetGlobalContextClient.js

@@ -27,7 +27,7 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
             return globalObject.globalContext;
         }
         // Create
-        const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, async (globalContext) => {
+        const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, undefined, async (globalContext) => {
             const globalContextAddendum = {
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.

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

@@ -374,7 +374,7 @@ async function updateUserFiles() {
 async function setGlobalContext(virtualFileExports) {
     debug('setGlobalContext()');
     (0, utils_js_1.assert)(!(0, getVikeConfigError_js_1.getVikeConfigErrorBuild)());
-    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
+    const globalContext = await (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp);
     (0, assertV1Design_js_1.assertV1Design)(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -384,13 +384,13 @@ async function setGlobalContext(virtualFileExports) {
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
-async function addGlobalContextAsync(globalContext) {
-    debug('addGlobalContextAsync()');
+async function addGlobalContextTmp(globalContext) {
+    debug('addGlobalContextTmp()');
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
-function addGlobalContextSync(globalContext) {
-    debug('addGlobalContextSync()');
+function addGlobalContext(globalContext) {
+    debug('addGlobalContext()');
     const { pageRoutes, onBeforeRouteHook } = (0, loadPageRoutes_js_1.loadPageRoutesSync)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }

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

@@ -16,18 +16,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
-    let assetUrls;
-    let clientEntriesSrc;
-    if (isDev) {
-        const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-        assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-    }
-    else {
-        const { assetsManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
-    }
+    const { assetUrls, clientEntriesSrc } = isDev
+        ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
         const { mediaType = null, assetType = null } = (0, inferMediaType_js_1.inferMediaType)(src) || {};
@@ -61,6 +52,16 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await (0, sortPageAssetsForEarlyHintsHeader_js_1.sortPageAssetsForEarlyHintsHeader)(pageAssets, isProduction);
     return pageAssets;
 }
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
+    const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+    const assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
+    return { clientEntriesSrc, assetUrls };
+}
 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 });

package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -300,8 +300,8 @@ async function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsREnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
-    if (isSsREnv) {
+    const isSsrEnv = (0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv);
+    if (isSsrEnv) {
         (0, utils_js_1.assert)(!assetsJsonFilePath);
         const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
         assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
@@ -315,7 +315,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
         const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
-        if (isSsREnv)
+        if (isSsrEnv)
             (0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }

package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js

@@ -106,6 +106,7 @@ function getIdHash(id) {
     return node_crypto_1.default.createHash('md5').update(id).digest('hex').slice(0, 8);
 }
 function getAssetFileName(assetInfo, config) {
+    const userRootDir = config.root;
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
@@ -123,11 +124,11 @@ function getAssetFileName(assetInfo, config) {
         // Vite 3
         name?.endsWith('?extractAssets&lang.css')) {
         name = name.split('.').slice(0, -2).join('.');
-        name = clean(name);
+        name = clean(name, userRootDir);
         return `${dir}/${name}.[hash][extname]`;
     }
     name = name.split('.').slice(0, -1).join('.');
-    name = clean(name);
+    name = clean(name, userRootDir);
     return `${dir}/${name}.[hash][extname]`;
 }
 function getChunkFileName(_chunkInfo, config) {
@@ -140,11 +141,12 @@ function getChunkFileName(_chunkInfo, config) {
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
+    const userRootDir = config.root;
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     (0, utils_js_1.assertPosixPath)(name);
-    name = clean(name, true, 
+    name = clean(name, userRootDir, true, 
     // Not needed for client-side because dist/ filenames contain `.[hash].js`
     !isForClientSide);
     if (isForClientSide) {
@@ -154,9 +156,14 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeparators(name) {
+function removePathSeparators(name, userRootDir) {
     (0, utils_js_1.assertPosixPath)(name);
-    (0, utils_js_1.assert)(!name.startsWith('/'));
+    if (name.startsWith(userRootDir)) {
+        name = name.slice(userRootDir.length);
+        if (name.startsWith('/'))
+            name = name.slice(1);
+    }
+    (0, utils_js_1.assert)(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
     if (hasEntryDir) {
@@ -169,14 +176,14 @@ function removePathSeparators(name) {
     }
     return name;
 }
-function clean(name, removePathSep, fixGlob) {
+function clean(name, userRootDir, removePathSep, fixGlob) {
     name = fixExtractAssetsQuery(name);
     if (fixGlob) {
         name = workaroundGlob(name);
     }
     name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeparators(name);
+        name = removePathSeparators(name, userRootDir);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);

package/dist/cjs/shared/createGlobalContextShared.js

@@ -10,25 +10,29 @@ const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextF
 const getHook_js_1 = require("./hooks/getHook.js");
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync) {
+async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+// TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
+addGlobalContextTmp) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
+        // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
+        // - Required by vike-vercel
         globalObject.globalContext = globalContext;
         isNewGlobalContext = false;
     }
     else {
         isNewGlobalContext = true;
     }
-    if (addGlobalContextSync &&
+    if (addGlobalContext &&
         // TODO/next-major-release: remove
         globalContext._pageConfigs.length > 0) {
-        const globalContextAddendum = addGlobalContextSync?.(globalContext);
-        (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+        const globalContextAdded = addGlobalContext?.(globalContext);
+        (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
     }
     else {
-        const globalContextAddendum = await addGlobalContextAsync?.(globalContext);
-        (0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
+        const globalContextAdded = await addGlobalContextTmp?.(globalContext);
+        (0, utils_js_1.objectAssign)(globalContext, globalContextAdded);
     }
     const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.236-commit-85d361d';
+exports.PROJECT_VERSION = '0.4.236-commit-e752d12';

package/dist/esm/client/runtime-client-routing/history.d.ts

@@ -2,8 +2,7 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistoryState };
-export { monkeyPatchHistoryAPI };
+export { initHistory };
 export type { HistoryInfo };
 export type { ScrollPosition };
 type StateEnhanced = {
@@ -19,7 +18,6 @@ type ScrollPosition = {
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url: string): void;
-declare function monkeyPatchHistoryAPI(): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;
@@ -29,4 +27,4 @@ declare function onPopStateBegin(): {
     previous: HistoryInfo;
     current: HistoryInfo;
 };
-declare function initHistoryState(): void;
+declare function initHistory(): void;

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

@@ -2,12 +2,15 @@ export { pushHistoryState };
 export { replaceHistoryStateOriginal };
 export { onPopStateBegin };
 export { saveScrollPosition };
-export { initHistoryState };
-export { monkeyPatchHistoryAPI };
+export { initHistory };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
-initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('runtime-client-routing/history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('history.ts', {
+    monkeyPatched: false,
+    previous: undefined,
+});
+initHistory(); // we redundantly call initHistory() to ensure it's called early
+globalObject.previous = getHistoryInfo();
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`
@@ -41,7 +44,7 @@ function enhance(stateNotEnhanced) {
             _isVikeEnhanced: true,
         };
     }
-    assert(isVikeEnhanced(stateVikeEnhanced));
+    assertIsVikeEnhanced(stateVikeEnhanced);
     return stateVikeEnhanced;
 }
 function getState() {
@@ -51,7 +54,7 @@ function getState() {
     // - Therefore, we have to monkey patch history.pushState() and history.replaceState()
     // - Therefore, we need the assert() below to ensure history.state has been enhanced by Vike
     //   - If users stumble upon this assert() then let's make it a assertUsage()
-    assert(isVikeEnhanced(state), { state });
+    assertIsVikeEnhanced(state);
     return state;
 }
 function getStateNotEnhanced() {
@@ -90,6 +93,7 @@ function pushHistoryState(url, overwriteLastHistoryEntry) {
 function replaceHistoryState(state, url) {
     const url_ = url ?? null; // Passing `undefined` chokes older Edge versions.
     window.history.replaceState(state, '', url_);
+    assertIsVikeEnhanced(getState());
 }
 function replaceHistoryStateOriginal(state, url) {
     // Bypass all monkey patches.
@@ -100,7 +104,11 @@ function replaceHistoryStateOriginal(state, url) {
 // - history.pushState()
 // - history.replaceState()
 function monkeyPatchHistoryAPI() {
-    ;
+    if (globalObject.monkeyPatched)
+        return;
+    globalObject.monkeyPatched = true;
+    // Ensure Vike's monkey patch is the first.
+    assert(window.history.pushState === History.prototype.pushState);
     ['pushState', 'replaceState'].forEach((funcName) => {
         const funcOriginal = window.history[funcName].bind(window.history);
         window.history[funcName] = (stateOriginal = {}, ...rest) => {
@@ -114,11 +122,14 @@ function monkeyPatchHistoryAPI() {
                     triggeredBy: 'user',
                     ...stateOriginal,
                 };
-            assert(isVikeEnhanced(stateEnhanced));
-            const ret = funcOriginal(stateEnhanced, ...rest);
+            assertIsVikeEnhanced(stateEnhanced);
+            funcOriginal(stateEnhanced, ...rest);
+            assertIsVikeEnhanced(getState());
             globalObject.previous = getHistoryInfo();
-            return ret;
         };
+        window.history[funcName]._isVikeMonkeyPatch = true;
+        // Ensure assert() above isn't a false positive
+        assert(window.history.pushState !== History.prototype.pushState);
     });
 }
 function isVikeEnhanced(state) {
@@ -136,6 +147,16 @@ function isVikeEnhanced(state) {
     }
     return false;
 }
+function assertIsVikeEnhanced(state) {
+    if (isVikeEnhanced(state))
+        return;
+    assert(false, {
+        state,
+        // TO-DO/eventually: remove _isVikeMonkeyPatch debug info to save KBs
+        pushStateIsVikeMonkeyPatch: window.history.pushState._isVikeMonkeyPatch,
+        replaceStateIsVikeMonkeyPatch: window.history.replaceState._isVikeMonkeyPatch,
+    });
+}
 function getHistoryInfo() {
     return {
         url: getCurrentUrl(),
@@ -147,11 +168,12 @@ function onPopStateBegin() {
     const isHistoryStateEnhanced = window.history.state !== null;
     if (!isHistoryStateEnhanced)
         enhanceHistoryState();
-    assert(isVikeEnhanced(window.history.state));
+    assertIsVikeEnhanced(window.history.state);
     const current = getHistoryInfo();
     globalObject.previous = current;
     return { isHistoryStateEnhanced, previous, current };
 }
-function initHistoryState() {
-    enhanceHistoryState();
+function initHistory() {
+    monkeyPatchHistoryAPI(); // the earlier we call it the better (Vike can workaround erroneous library monkey patches if Vike is the last one in the monkey patch chain)
+    enhanceHistoryState(); // enhance very first window.history.state which is `null`
 }

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

@@ -6,7 +6,7 @@ import { initOnLinkClick } from './initOnLinkClick.js';
 import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
-import { initHistoryState, monkeyPatchHistoryAPI } from './history.js';
+import { initHistory } from './history.js';
 async function initClientRouter() {
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
@@ -29,8 +29,7 @@ async function renderFirstPage() {
 }
 function initHistoryAndScroll() {
     scrollRestoration_init();
-    monkeyPatchHistoryAPI();
-    initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
+    initHistory(); // we redundantly call initHistory() to ensure it's called early
     autoSaveScrollPosition();
     // Handle back-/forward navigation
     initOnPopState();

package/dist/esm/client/shared/createGetGlobalContextClient.js

@@ -27,7 +27,7 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
             return globalObject.globalContext;
         }
         // Create
-        const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, async (globalContext) => {
+        const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, undefined, async (globalContext) => {
             const globalContextAddendum = {
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.

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

@@ -370,7 +370,7 @@ async function updateUserFiles() {
 async function setGlobalContext(virtualFileExports) {
     debug('setGlobalContext()');
     assert(!getVikeConfigErrorBuild());
-    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync);
+    const globalContext = await createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, addGlobalContextTmp);
     assertV1Design(
     // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
     globalContext._pageConfigs.length > 0, globalContext._pageFilesAll);
@@ -380,13 +380,13 @@ async function setGlobalContext(virtualFileExports) {
     // Never actually used, only used for TypeScript `ReturnType<typeof setGlobalContext>`
     return globalContext;
 }
-async function addGlobalContextAsync(globalContext) {
-    debug('addGlobalContextAsync()');
+async function addGlobalContextTmp(globalContext) {
+    debug('addGlobalContextTmp()');
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }
-function addGlobalContextSync(globalContext) {
-    debug('addGlobalContextSync()');
+function addGlobalContext(globalContext) {
+    debug('addGlobalContext()');
     const { pageRoutes, onBeforeRouteHook } = loadPageRoutesSync(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return addGlobalContextCommon(globalContext, pageRoutes, onBeforeRouteHook);
 }

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

@@ -14,18 +14,9 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = pageContext._globalContext;
     const { _isProduction: isProduction } = globalContext;
     const isDev = !isProduction;
-    let assetUrls;
-    let clientEntriesSrc;
-    if (isDev) {
-        const { _viteDevServer: viteDevServer } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
-        assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
-    }
-    else {
-        const { assetsManifest } = globalContext;
-        clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
-    }
+    const { assetUrls, clientEntriesSrc } = isDev
+        ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
+        : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
     let pageAssets = [];
     unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
         const { mediaType = null, assetType = null } = inferMediaType(src) || {};
@@ -59,6 +50,16 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     await sortPageAssetsForEarlyHintsHeader(pageAssets, isProduction);
     return pageAssets;
 }
+async function retrievePageAssetsDev(viteDevServer, clientDependencies, clientEntries) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => globalObject.resolveClientEntriesDev(clientEntry, viteDevServer));
+    const assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
+    return { clientEntriesSrc, assetUrls };
+}
+function retrievePageAssetsProd(assetsManifest, clientDependencies, clientEntries, includeAssetsImportedByServer) {
+    const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
+    const assetUrls = retrieveAssetsProd(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(includeAssetsImportedByServer));
+    return { clientEntriesSrc, assetUrls };
+}
 function resolveClientEntriesProd(clientEntry, assetsManifest) {
     const { manifestEntry } = getManifestEntry(clientEntry, assetsManifest);
     assert(manifestEntry.isEntry || manifestEntry.isDynamicEntry || clientEntry.endsWith('.css'), { clientEntry });

package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js

@@ -295,8 +295,8 @@ async function handleAssetsManifest_getBuildConfig(config) {
     };
 }
 async function handleAssetsManifest(config, viteEnv, options, bundle) {
-    const isSsREnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
-    if (isSsREnv) {
+    const isSsrEnv = isViteServerBuild_onlySsrEnv(config, viteEnv);
+    if (isSsrEnv) {
         assert(!assetsJsonFilePath);
         const outDirs = getOutDirs(config, viteEnv);
         assetsJsonFilePath = path.posix.join(outDirs.outDirRoot, 'assets.json');
@@ -310,7 +310,7 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
         // - Also in some other server builds such as dist/vercel/ from vike-vercel
         // - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
         const noop = await set_macro_ASSETS_MANIFEST(assetsJsonFilePath, bundle, outDir);
-        if (isSsREnv)
+        if (isSsrEnv)
             assert(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
     }
 }

package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js

@@ -101,6 +101,7 @@ function getIdHash(id) {
     return crypto.createHash('md5').update(id).digest('hex').slice(0, 8);
 }
 function getAssetFileName(assetInfo, config) {
+    const userRootDir = config.root;
     const assetsDir = getAssetsDir(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
@@ -118,11 +119,11 @@ function getAssetFileName(assetInfo, config) {
         // Vite 3
         name?.endsWith('?extractAssets&lang.css')) {
         name = name.split('.').slice(0, -2).join('.');
-        name = clean(name);
+        name = clean(name, userRootDir);
         return `${dir}/${name}.[hash][extname]`;
     }
     name = name.split('.').slice(0, -1).join('.');
-    name = clean(name);
+    name = clean(name, userRootDir);
     return `${dir}/${name}.[hash][extname]`;
 }
 function getChunkFileName(_chunkInfo, config) {
@@ -135,11 +136,12 @@ function getChunkFileName(_chunkInfo, config) {
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
+    const userRootDir = config.root;
     const assetsDir = getAssetsDir(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     assertPosixPath(name);
-    name = clean(name, true, 
+    name = clean(name, userRootDir, true, 
     // Not needed for client-side because dist/ filenames contain `.[hash].js`
     !isForClientSide);
     if (isForClientSide) {
@@ -149,9 +151,14 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeparators(name) {
+function removePathSeparators(name, userRootDir) {
     assertPosixPath(name);
-    assert(!name.startsWith('/'));
+    if (name.startsWith(userRootDir)) {
+        name = name.slice(userRootDir.length);
+        if (name.startsWith('/'))
+            name = name.slice(1);
+    }
+    assert(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
     if (hasEntryDir) {
@@ -164,14 +171,14 @@ function removePathSeparators(name) {
     }
     return name;
 }
-function clean(name, removePathSep, fixGlob) {
+function clean(name, userRootDir, removePathSep, fixGlob) {
     name = fixExtractAssetsQuery(name);
     if (fixGlob) {
         name = workaroundGlob(name);
     }
     name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeparators(name);
+        name = removePathSeparators(name, userRootDir);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);

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

@@ -9,10 +9,10 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-declare function createGlobalContextShared<GlobalContextAddendum extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
+declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
     onCreateGlobalContextHooks?: Hook[];
-}, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>, addGlobalContextSync?: (globalContext: GlobalContextBase) => GlobalContextAddendum): Promise<{
+}, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>): Promise<{
     /**
      * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
      *
@@ -35,7 +35,7 @@ declare function createGlobalContextShared<GlobalContextAddendum extends Record<
     pages: {
         [k: string]: import("./page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
-} & GlobalContextAddendum>;
+} & GlobalContextAdded>;
 type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExports: unknown): {

package/dist/esm/shared/createGlobalContextShared.js

@@ -7,25 +7,29 @@ import { execHookGlobal } from './hooks/execHook.js';
 import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync) {
+async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+// TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
+addGlobalContextTmp) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
+        // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
+        // - Required by vike-vercel
         globalObject.globalContext = globalContext;
         isNewGlobalContext = false;
     }
     else {
         isNewGlobalContext = true;
     }
-    if (addGlobalContextSync &&
+    if (addGlobalContext &&
         // TODO/next-major-release: remove
         globalContext._pageConfigs.length > 0) {
-        const globalContextAddendum = addGlobalContextSync?.(globalContext);
-        objectAssign(globalContext, globalContextAddendum);
+        const globalContextAdded = addGlobalContext?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
     }
     else {
-        const globalContextAddendum = await addGlobalContextAsync?.(globalContext);
-        objectAssign(globalContext, globalContextAddendum);
+        const globalContextAdded = await addGlobalContextTmp?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
     }
     const onCreateGlobalContextHooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.236-commit-85d361d";
+export declare const PROJECT_VERSION: "0.4.236-commit-e752d12";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.236-commit-85d361d';
+export const PROJECT_VERSION = '0.4.236-commit-e752d12';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.236-commit-85d361d",
+  "version": "0.4.236-commit-e752d12",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {