vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageAssets = getPageAssets;
 exports.setResolveClientEntriesDev = setResolveClientEntriesDev;
+exports.resolveIncludeAssetsImportedByServer = resolveIncludeAssetsImportedByServer;
 const utils_js_1 = require("../utils.js");
 const retrieveAssetsDev_js_1 = require("./getPageAssets/retrieveAssetsDev.js");
 const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js");
@@ -25,7 +26,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     else {
         const { assetsManifest } = globalContext;
         clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesProd(clientEntry, assetsManifest));
-        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, pageContext._includeAssetsImportedByServer);
+        assetUrls = (0, retrieveAssetsProd_js_1.retrieveAssetsProd)(clientDependencies, assetsManifest, resolveIncludeAssetsImportedByServer(pageContext._globalContext.config));
     }
     let pageAssets = [];
     (0, utils_js_1.unique)([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -70,3 +71,6 @@ function resolveClientEntriesProd(clientEntry, assetsManifest) {
 function setResolveClientEntriesDev(resolveClientEntriesDev) {
     globalObject.resolveClientEntriesDev = resolveClientEntriesDev;
 }
+function resolveIncludeAssetsImportedByServer(config) {
+    return config.includeAssetsImportedByServer ?? true;
+}

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

@@ -13,7 +13,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     (0, utils_js_1.assert)(pageContext.pageId === null);
     (0, utils_js_1.assert)(pageContext.errorWhileRendering || pageContext.is404);
     {
-        const isV1 = pageContext._pageConfigs.length > 0;
+        const isV1 = pageContext._globalContext._pageConfigs.length > 0;
         await warnMissingErrorPage(isV1, pageContext._globalContext._isProduction);
     }
     if (!pageContext.isClientSideNavigation) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPageConfigsLazyServerSide = loadPageConfigsLazyServerSide;
 const getPageFiles_js_1 = require("../../../shared/getPageFiles.js");
-const getUserFriendlyConfigs_js_1 = require("../../../shared/page-configs/getUserFriendlyConfigs.js");
+const resolveVikeConfigPublic_js_1 = require("../../../shared/page-configs/resolveVikeConfigPublic.js");
 const analyzePageClientSide_js_1 = require("../../../shared/getPageFiles/analyzePageClientSide.js");
 const utils_js_1 = require("../utils.js");
 const getPageAssets_js_1 = require("./getPageAssets.js");
@@ -11,13 +11,15 @@ const findPageConfig_js_1 = require("../../../shared/page-configs/findPageConfig
 const analyzePage_js_1 = require("./analyzePage.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadPageConfigsLazyServerSide(pageContext) {
-    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
+    const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._globalContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig ?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
-        loadPageUserFiles(pageContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
-        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext.pageId, { sharedPageFilesAlreadyLoaded: true })
+        loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
+        (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
+            sharedPageFilesAlreadyLoaded: true
+        })
     ]);
-    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
+    const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
     const isV1Design = !!pageConfig;
     const passToClient = [];
     const errMsg = ' should be an array of strings.';
@@ -102,7 +104,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getUserFriendlyConfigs_js_1.getUserFriendlyConfigsPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/cjs/node/runtime/renderPage/log404/index.js

@@ -10,7 +10,7 @@ const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function log404(pageContext) {
     const { urlPathname } = pageContext;
-    const pageRoutes = pageContext._pageRoutes;
+    const pageRoutes = pageContext._globalContext._pageRoutes;
     (0, utils_js_1.assertUsage)(pageRoutes.length > 0, 'No page found.'
     /* TODO/v1-release: use this
     'No page found. Create at least one /pages/some-page/+Page.js file.'

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

@@ -188,7 +188,7 @@ function collectError(err) {
     /* For reproductions using older vite-plugin-ssr versions, do one of the following.
         - If upon pre-rendering:https: //github.com/brillout/repro_node-syntax-error#error-catched-by-vite-plugin-ssr
         - Inject the logger inside `catch` in node_modules/vite-plugin-ssr/dist/esm/node/runtime/renderPage.js
-        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/plugin/plugins/devConfig/index.js
+        - Inject the following inside `configResolved(config_)` at node_modules/vite-plugin-ssr/dist/cjs/node/vite/plugins/pluginDev/index.js
           ```js
           config_.logger.error = (msg, options) => {
             const { error } = options;

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

@@ -13,7 +13,7 @@ const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const loadPageConfigsLazyServerSide_js_1 = require("./loadPageConfigsLazyServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
 const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
-const loggerRuntime_js_1 = require("./loggerRuntime.js");
+const loggerRuntime_js_1 = require("../loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
@@ -25,7 +25,9 @@ async function renderPageAlreadyRouted(pageContext) {
     //  - ID of the error page `_error.page.js`.
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'string'));
     const isError = pageContext.is404 || !!pageContext.errorWhileRendering;
-    (0, utils_js_1.assert)(isError === (pageContext.pageId === (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs)));
+    (0, utils_js_1.assert)(isError ===
+        (pageContext.pageId ===
+            (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs)));
     (0, utils_js_1.objectAssign)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
     if (!isError) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(pageContext));

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

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderPage = renderPage;
 exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
+exports.renderPage_vikeConfigHasError = renderPage_vikeConfigHasError;
+exports.vikeConfigHasError = vikeConfigHasError;
 const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
 const createPageContextServerSide_js_1 = require("./renderPage/createPageContextServerSide.js");
 const index_js_1 = require("../../shared/route/index.js");
@@ -13,11 +15,10 @@ const abort_js_1 = require("../../shared/route/abort.js");
 const globalContext_js_1 = require("./globalContext.js");
 const handlePageContextRequestUrl_js_1 = require("./renderPage/handlePageContextRequestUrl.js");
 const createHttpResponse_js_1 = require("./renderPage/createHttpResponse.js");
-const loggerRuntime_js_1 = require("./renderPage/loggerRuntime.js");
+const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const assertArguments_js_1 = require("./renderPage/assertArguments.js");
 const index_js_2 = require("./renderPage/log404/index.js");
-const isVikeConfigInvalid_js_1 = require("./renderPage/isVikeConfigInvalid.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializeContext_js_1 = require("./html/serializeContext.js");
 const error_page_js_1 = require("../../shared/error-page.js");
@@ -25,7 +26,9 @@ const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithou
 const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
 const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
-    httpRequestsCount: 0
+    httpRequestsCount: 0,
+    vikeConfigHasRuntimeError: false,
+    vikeConfigHasBuildError: false
 });
 // `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
 async function renderPage(pageContextInit) {
@@ -55,10 +58,11 @@ function renderPage_addAsyncHookwrapper(wrapper) {
 }
 async function renderPagePrepare(pageContextInit, httpRequestId) {
     // Invalid config
-    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid &&
-        true // Make TS happy
-    ) {
-        return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
+    {
+        const vikeConfigError = getVikeConfigError();
+        if (vikeConfigError) {
+            return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
+        }
     }
     // Prepare context
     try {
@@ -75,11 +79,14 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
         return pageContextWithError;
     }
-    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
-        return getPageContextInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
-    }
-    else {
-        // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
+    {
+        const vikeConfigError = getVikeConfigError();
+        if (vikeConfigError) {
+            return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
+        }
+        else {
+            // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
+        }
     }
     const { globalContext } = await (0, globalContext_js_1.getGlobalContextServerInternal)();
     const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
@@ -275,7 +282,7 @@ async function renderPageNominal(pageContext) {
         (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         (0, utils_js_1.objectAssign)(pageContext, { is404: pageContext.pageId ? null : true });
         if (pageContext.pageId === null) {
-            const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
+            const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._globalContext._pageFilesAll, pageContext._globalContext._pageConfigs);
             if (!errorPageId) {
                 (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, 'pageId', 'null'));
                 return (0, handleErrorWithoutErrorPage_js_1.handleErrorWithoutErrorPage)(pageContext);
@@ -480,7 +487,7 @@ function getPageContextSkipRequest(pageContextInit) {
     return pageContext;
 }
 function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
-    (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
+    (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error loading Vike config — see error above')), httpRequestId, 'error');
     const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
     return pageContextWithError;
 }
@@ -490,3 +497,15 @@ function forkPageContext(pageContextBegin) {
     (0, utils_js_1.objectAssign)(pageContext, pageContextBegin, true);
     return pageContext;
 }
+function renderPage_vikeConfigHasError(val) {
+    if ('hasRuntimeError' in val)
+        globalObject.vikeConfigHasRuntimeError = val.hasRuntimeError;
+    if ('hasBuildError' in val)
+        globalObject.vikeConfigHasBuildError = val.hasBuildError;
+}
+function getVikeConfigError() {
+    return globalObject.vikeConfigHasBuildError || globalObject.vikeConfigHasRuntimeError;
+}
+function vikeConfigHasError() {
+    return !!getVikeConfigError();
+}

package/dist/cjs/node/shared/extractAssetsQuery.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractAssetsAddQuery = extractAssetsAddQuery;
 exports.extractAssetsRemoveQuery = extractAssetsRemoveQuery;
-// We import from node/utils.ts insead of node/plugin/utils.ts because this file is loaded by the server runtime
+// We import from node/utils.ts insead of node/vite/utils.ts because this file is loaded by the server runtime
 const utils_js_1 = require("./utils.js");
 const query = 'extractAssets';
 function extractAssetsAddQuery(id) {

package/dist/cjs/node/shared/virtualFiles/virtualFileEntry.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.virtualFileIdEntryClientCR = exports.virtualFileIdEntryClientSR = exports.virtualFileIdEntryServer = void 0;
+exports.isVirtualFileIdEntry = isVirtualFileIdEntry;
+const utils_js_1 = require("../utils.js");
+const virtualFiles_js_1 = require("../virtualFiles.js");
+const idBase = 'virtual:vike:entry';
+const virtualFileIdEntryServer = `${idBase}:server`;
+exports.virtualFileIdEntryServer = virtualFileIdEntryServer;
+const virtualFileIdEntryClientSR = `${idBase}:client:server-routing`;
+exports.virtualFileIdEntryClientSR = virtualFileIdEntryClientSR;
+const virtualFileIdEntryClientCR = `${idBase}:client:client-routing`;
+exports.virtualFileIdEntryClientCR = virtualFileIdEntryClientCR;
+function isVirtualFileIdEntry(id) {
+    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
+    if (!id.startsWith(idBase))
+        return false;
+    (0, utils_js_1.assert)(
+    // prettier-ignore
+    // biome-ignore format:
+    [
+        virtualFileIdEntryServer,
+        virtualFileIdEntryClientCR,
+        virtualFileIdEntryClientSR
+    ].includes(id));
+    const isForClientSide = id !== virtualFileIdEntryServer;
+    const isClientRouting = id === virtualFileIdEntryClientCR;
+    return { isForClientSide, isClientRouting };
+}

package/dist/cjs/node/shared/{virtual-files/virtualFilePageConfigValuesAll.js → virtualFiles/virtualFilePageConfigLazy.js}

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVirtualFileIdPageConfigValuesAll = isVirtualFileIdPageConfigValuesAll;
-exports.getVirtualFileIdPageConfigValuesAll = getVirtualFileIdPageConfigValuesAll;
+exports.isVirtualFileIdPageConfigLazy = isVirtualFileIdPageConfigLazy;
+exports.getVirtualFileIdPageConfigLazy = getVirtualFileIdPageConfigLazy;
 const extractAssetsQuery_js_1 = require("../extractAssetsQuery.js");
 const utils_js_1 = require("../utils.js");
-const virtual_files_js_1 = require("../virtual-files.js");
-const idBase = 'virtual:vike:pageConfigValuesAll:';
+const virtualFiles_js_1 = require("../virtualFiles.js");
+const idBase = 'virtual:vike:pageConfigLazy:';
 const idBaseClient = `${idBase}client:`;
 const idBaseServer = `${idBase}server:`;
-function getVirtualFileIdPageConfigValuesAll(pageId, isForClientSide) {
+function getVirtualFileIdPageConfigLazy(pageId, isForClientSide) {
     const id = `${isForClientSide ? idBaseClient : idBaseServer}${pageId}`;
     return id;
 }
-function isVirtualFileIdPageConfigValuesAll(id) {
-    id = (0, virtual_files_js_1.getVirtualFileId)(id);
+function isVirtualFileIdPageConfigLazy(id) {
+    id = (0, virtualFiles_js_1.getVirtualFileId)(id);
     if (!id.includes(idBase))
         return false;
     (0, utils_js_1.assert)(id.startsWith(idBase));

package/dist/cjs/node/vite/index.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.version = exports.getVikeConfig = void 0;
+exports.plugin = plugin;
+exports.ssr = plugin;
+exports.default = plugin;
+var resolveVikeConfigInternal_js_1 = require("./shared/resolveVikeConfigInternal.js");
+Object.defineProperty(exports, "getVikeConfig", { enumerable: true, get: function () { return resolveVikeConfigInternal_js_1.getVikeConfig; } });
+var utils_js_1 = require("./utils.js");
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
+const utils_js_2 = require("./utils.js");
+const pluginBuild_js_1 = require("./plugins/pluginBuild.js");
+const pluginPreview_js_1 = require("./plugins/pluginPreview.js");
+const pluginDev_js_1 = require("./plugins/pluginDev.js");
+const pluginVirtualFiles_js_1 = require("./plugins/pluginVirtualFiles.js");
+const pluginExtractAssets_js_1 = require("./plugins/pluginExtractAssets.js");
+const pluginExtractExportNames_js_1 = require("./plugins/pluginExtractExportNames.js");
+const pluginSetGlobalContext_js_1 = require("./plugins/pluginSetGlobalContext.js");
+const pluginCommon_js_1 = require("./plugins/pluginCommon.js");
+const pluginBaseUrls_js_1 = require("./plugins/pluginBaseUrls.js");
+const pluginEnvVars_js_1 = require("./plugins/pluginEnvVars.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const pluginFileEnv_js_1 = require("./plugins/pluginFileEnv.js");
+const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
+const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
+const pluginWorkaroundCssModuleHmr_js_1 = require("./plugins/pluginWorkaroundCssModuleHmr.js");
+const pluginWorkaroundVite6HmrRegression_js_1 = require("./plugins/pluginWorkaroundVite6HmrRegression.js");
+const pluginReplaceConstants_js_1 = require("./plugins/pluginReplaceConstants.js");
+// We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
+(0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
+// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
+function plugin(vikeVitePluginOptions = {}) {
+    const plugins = [
+        ...(0, pluginCommon_js_1.pluginCommon)(vikeVitePluginOptions),
+        (0, pluginVirtualFiles_js_1.pluginVirtualFiles)(),
+        ...(0, pluginDev_js_1.pluginDev)(),
+        ...(0, pluginBuild_js_1.pluginBuild)(),
+        (0, pluginPreview_js_1.pluginPreview)(),
+        ...(0, pluginExtractAssets_js_1.pluginExtractAssets)(),
+        (0, pluginExtractExportNames_js_1.pluginExtractExportNames)(),
+        ...(0, pluginSetGlobalContext_js_1.pluginSetGlobalContext)(),
+        (0, pluginBaseUrls_js_1.pluginBaseUrls)(),
+        (0, pluginEnvVars_js_1.pluginEnvVars)(),
+        (0, pluginFileEnv_js_1.pluginFileEnv)(),
+        (0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
+        (0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
+        (0, pluginReplaceConstants_js_1.pluginReplaceConstants)()
+    ];
+    Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
+    return plugins;
+}
+// Error upon wrong usage
+Object.defineProperty(plugin, 'apply', {
+    enumerable: true,
+    get: () => {
+        (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
+    }
+});
+// CJS default export `const vike = require('vike/plugin')`
+//  - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
+try {
+    module.exports = Object.assign(exports.default, exports);
+}
+catch { }

package/dist/cjs/node/{plugin/plugins/baseUrls.js → vite/plugins/pluginBaseUrls.js}

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseUrls = baseUrls;
+exports.pluginBaseUrls = pluginBaseUrls;
 const resolveBase_js_1 = require("../../shared/resolveBase.js");
 const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const commonConfig_js_1 = require("./commonConfig.js");
-function baseUrls() {
+const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
+function pluginBaseUrls() {
     let basesResolved;
     return {
-        name: 'vike:baseUrls',
+        name: 'vike:pluginBaseUrls',
         enforce: 'post',
         async config(config) {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vike.config.baseServer ?? null, vike.config.baseAssets ?? null);
+            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -30,8 +29,8 @@ function baseUrls() {
             };
         },
         async configResolved(config) {
-            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
+            const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+            const basesResolved2 = resolveBaseFromResolvedConfig(vikeConfig.config.baseServer ?? null, vikeConfig.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/handleAssetsManifest.js

@@ -13,14 +13,13 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fs_2 = require("fs");
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
 const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const commonConfig_js_1 = require("../commonConfig.js");
 const pluginBuildEntry_js_1 = require("./pluginBuildEntry.js");
 (0, utils_js_1.assertIsSingleModuleInstance)('build/handleAssetsManifest.ts');
 let assetsJsonFilePath;
@@ -28,7 +27,7 @@ let assetsJsonFilePath;
 // false => use workaround extractAssets plugin
 function handleAssetsManifest_isFixEnabled(config) {
     // Allow user to toggle between the two workarounds? E.g. based on https://vike.dev/includeAssetsImportedByServer.
-    return (0, getVikeConfig_js_1.isV1Design)(config);
+    return (0, resolveVikeConfigInternal_js_1.isV1Design)();
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
@@ -172,12 +171,12 @@ function addServerAssets(clientManifest, serverManifest) {
 }
 function getPageId(key) {
     // Normalize from:
-    //   ../../virtual:vike:pageConfigValuesAll:client:/pages/index
+    //   ../../virtual:vike:pageConfigLazy:client:/pages/index
     // to:
-    //   virtual:vike:pageConfigValuesAll:client:/pages/index
+    //   virtual:vike:pageConfigLazy:client:/pages/index
     // (This seems to be needed only for vitest tests that use Vite's build() API with an inline config.)
     key = key.substring(key.indexOf('virtual:vike'));
-    const result = (0, virtualFilePageConfigValuesAll_js_1.isVirtualFileIdPageConfigValuesAll)(key);
+    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(key);
     return result && result.pageId;
 }
 function collectResources(entryRoot, manifest) {
@@ -285,8 +284,8 @@ async function writeManifestFile(manifest, manifestFilePath) {
     const manifestFileContent = JSON.stringify(manifest, null, 2);
     await promises_1.default.writeFile(manifestFilePath, manifestFileContent, 'utf-8');
 }
-function handleAssetsManifest_getBuildConfig(config) {
-    const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
+async function handleAssetsManifest_getBuildConfig(config) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
     return {
         // https://github.com/vikejs/vike/issues/1339
@@ -294,7 +293,7 @@ function handleAssetsManifest_getBuildConfig(config) {
         // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
         cssMinify: isFixEnabled ? 'esbuild' : undefined,
         manifest: pluginBuildConfig_js_1.manifestTempFile,
-        copyPublicDir: vike.config.vite6BuilderApp
+        copyPublicDir: vikeConfig.config.vite6BuilderApp
             ? // Already set by vike:build:pluginBuildApp
                 undefined
             : !(0, isViteServerBuild_js_1.isViteServerBuild)(config)

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginAutoFullBuild.js

@@ -13,7 +13,7 @@ const isViteCliCall_js_1 = require("../../shared/isViteCliCall.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const logErrorHint_js_1 = require("../../../runtime/renderPage/logErrorHint.js");
 const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const context_js_2 = require("../../../api/context.js");
 const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
@@ -21,16 +21,14 @@ const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 let forceExit = false;
 function pluginAutoFullBuild() {
     let config;
-    let vikeConfig;
     return [
         {
             name: 'vike:build:pluginAutoFullBuild',
             apply: 'build',
             enforce: 'pre',
             async configResolved(config_) {
-                vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
                 config = config_;
-                abortViteBuildSsr(vikeConfig);
+                await abortViteBuildSsr();
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO/eventually: try again with latest Vite version.
@@ -39,7 +37,7 @@ function pluginAutoFullBuild() {
                 */
                 async handler(options, bundle) {
                     await (0, handleAssetsManifest_js_1.handleAssetsManifest)(config, this.environment, options, bundle);
-                    await triggerFullBuild(config, vikeConfig, this.environment, bundle);
+                    await triggerFullBuild(config, this.environment, bundle);
                 }
             }
         },
@@ -50,12 +48,13 @@ function pluginAutoFullBuild() {
             closeBundle: {
                 sequential: true,
                 order: 'post',
-                handler() {
+                async handler() {
                     (0, utils_js_1.onSetupBuild)();
                     (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssTarget)(config);
+                    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
                     if (forceExit &&
                         // Let vike:build:pluginBuildApp force exit
-                        !vikeConfig.global.config.vite6BuilderApp) {
+                        !vikeConfig.config.vite6BuilderApp) {
                         (0, runPrerender_js_1.runPrerender_forceExit)();
                         (0, utils_js_1.assert)(false);
                     }
@@ -64,9 +63,10 @@ function pluginAutoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
+async function triggerFullBuild(config, viteEnv, bundle) {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
     // Whether builder.buildApp() is being used, see plugin:build:pluginBuildApp
-    const isBuilderApp = vikeConfig.global.config.vite6BuilderApp;
+    const isBuilderApp = vikeConfig.config.vite6BuilderApp;
     // If builder.buildApp() => trigger at end of `this.environment.name === 'ssr'`.
     // Else => trigger at end of client-side build.
     if (isBuilderApp ? !(0, isViteServerBuild_js_1.isViteServerBuild_onlySsrEnv)(config, viteEnv) : !(0, isViteServerBuild_js_1.isViteClientBuild)(config, viteEnv))
@@ -95,6 +95,7 @@ async function triggerFullBuild(config, vikeConfig, viteEnv, bundle) {
         // The server bulid is already called by builder.buildApp()
     }
     if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
+        (0, utils_js_1.assert)((0, context_js_1.isPrerendering)());
         const res = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
         forceExit = res.forceExit;
     }
@@ -108,14 +109,15 @@ function setSSR(configInline) {
         }
     };
 }
-function abortViteBuildSsr(vikeConfig) {
-    if (vikeConfig.global.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+async function abortViteBuildSsr() {
+    const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+    if (vikeConfig.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
         (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
 function isEntirelyDisabled(vikeConfig) {
-    const { disableAutoFullBuild } = vikeConfig.global.config;
+    const { disableAutoFullBuild } = vikeConfig.config;
     if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
         const isUserUsingViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
         return isUserUsingViteApi;

package/dist/cjs/node/{plugin/plugins/build → vite/plugins/pluginBuild}/pluginBuildApp.js

@@ -4,16 +4,16 @@ exports.pluginBuildApp = pluginBuildApp;
 const runPrerender_js_1 = require("../../../prerender/runPrerender.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const utils_js_1 = require("../../utils.js");
-const commonConfig_js_1 = require("../commonConfig.js");
 const pluginAutoFullBuild_js_1 = require("./pluginAutoFullBuild.js");
+const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 function pluginBuildApp() {
     return [
         {
             name: 'vike:build:pluginBuildApp',
             apply: 'build',
-            config(config) {
-                const vike = (0, commonConfig_js_1.getVikeConfigInternal)(config);
-                if (!vike.config.vite6BuilderApp)
+            async config(config) {
+                const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
+                if (!vikeConfig.config.vite6BuilderApp)
                     return;
                 return {
                     builder: {