vike 0.4.215 → 0.4.217-commit-99ea561

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vikeConfigDependencies = void 0;
 exports.getVikeConfig = getVikeConfig;
+exports.getVikeConfig2 = getVikeConfig2;
 exports.reloadVikeConfig = reloadVikeConfig;
 exports.isVikeConfigFile = isVikeConfigFile;
 exports.isV1Design = isV1Design;
@@ -26,18 +27,21 @@ const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.
 const resolvePointerImport_js_1 = require("./getVikeConfig/resolvePointerImport.js");
 const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const assertExtensions_js_1 = require("./assertExtensions.js");
+const resolveVikeConfigGlobal_js_1 = require("./getVikeConfig/resolveVikeConfigGlobal.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let devServerIsCorrupt = false;
+let restartVite = false;
 let wasConfigInvalid = null;
 let vikeConfigPromise = null;
 const vikeConfigDependencies = new Set();
 exports.vikeConfigDependencies = vikeConfigDependencies;
-function reloadVikeConfig(userRootDir, outDirRoot) {
+function reloadVikeConfig(config) {
+    const userRootDir = config.root;
+    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
     vikeConfigDependencies.clear();
     (0, resolvePointerImport_js_1.clearFilesEnvMap)();
-    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, true, true);
+    vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, true, vikeVitePluginOptions);
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
@@ -61,8 +65,8 @@ async function handleReloadSideEffects() {
             wasConfigInvalid = false;
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
         }
-        if (devServerIsCorrupt) {
-            devServerIsCorrupt = false;
+        if (restartVite) {
+            restartVite = false;
             const viteDevServer = (0, globalContext_js_1.getViteDevServer)();
             (0, utils_js_1.assert)(viteDevServer);
             (0, removeSuperfluousViteLog_js_1.removeSuperfluousViteLog_enable)();
@@ -71,23 +75,32 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, { crawlWithGit, tolerateInvalidConfig } = {}) {
-    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+async function getVikeConfig(config, { doNotRestartViteOnError } = {}) {
     const userRootDir = config.root;
+    const vikeVitePluginOptions = config._vikeVitePluginOptions;
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    const isDev = config._isDev;
+    (0, utils_js_1.assert)(typeof isDev === 'boolean');
+    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError ?? false);
+}
+async function getVikeConfig2(userRootDir, isDev, vikeVitePluginOptions) {
+    (0, utils_js_1.assert)(vikeVitePluginOptions);
+    return await getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, false);
+}
+async function getVikeConfigEntry(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     if (!vikeConfigPromise) {
-        const crawlWithGit_ = crawlWithGit !== undefined ? crawlWithGit : (await (0, getConfigVike_js_1.getConfigVike)(config)).crawl.git;
-        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit_, tolerateInvalidConfig);
+        vikeConfigPromise = loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError);
     }
     return await vikeConfigPromise;
 }
-async function isV1Design(config, isDev) {
-    const vikeConfig = await getVikeConfig(config, isDev);
+async function isV1Design(config) {
+    const vikeConfig = await getVikeConfig(config);
     const { pageConfigs } = vikeConfig;
     const isV1Design = pageConfigs.length > 0;
     return isV1Design;
 }
-async function loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit) {
-    const plusFiles = await findPlusFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadInterfaceFiles(userRootDir) {
+    const plusFiles = await findPlusFiles(userRootDir, null);
     const configFiles = [];
     const valueFiles = [];
     plusFiles.forEach((f) => {
@@ -196,12 +209,12 @@ function assertAllConfigsAreKnown(interfaceFilesByLocationId) {
         });
     });
 }
-async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev, crawlWithGit, tolerateInvalidConfig) {
+async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePluginOptions, doNotRestartViteOnError) {
     let hasError = false;
     let ret;
     let err;
     try {
-        ret = await loadVikeConfig(userRootDir, outDirRoot, crawlWithGit);
+        ret = await loadVikeConfig(userRootDir, vikeVitePluginOptions);
     }
     catch (err_) {
         hasError = true;
@@ -223,8 +236,8 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
         }
         else {
             (0, loggerNotProd_js_1.logConfigError)(err);
-            if (!tolerateInvalidConfig) {
-                devServerIsCorrupt = true;
+            if (!doNotRestartViteOnError) {
+                restartVite = true;
             }
             const dummyData = {
                 pageConfigs: [],
@@ -232,16 +245,17 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                globalVikeConfig: {}
+                vikeConfigGlobal: (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)({}, {})
             };
             return dummyData;
         }
     }
 }
-async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
-    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir, outDirRoot, crawlWithGit);
+async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
+    const interfaceFilesByLocationId = await loadInterfaceFiles(userRootDir);
     const importedFilesLoaded = {};
-    const { globalVikeConfig, pageConfigGlobal } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const { pageConfigGlobal, pageConfigGlobalValues } = await getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importedFilesLoaded);
+    const vikeConfigGlobal = (0, resolveVikeConfigGlobal_js_1.resolveVikeConfigGlobal)(vikeVitePluginOptions, pageConfigGlobalValues);
     const pageConfigs = await Promise.all((0, utils_js_1.objectEntries)(interfaceFilesByLocationId)
         .filter(([_pageId, interfaceFiles]) => isDefiningPage(interfaceFiles))
         .map(async ([locationId]) => {
@@ -291,7 +305,7 @@ async function loadVikeConfig(userRootDir, outDirRoot, crawlWithGit) {
         return pageConfig;
     }));
     assertPageConfigs(pageConfigs);
-    return { pageConfigs, pageConfigGlobal, globalVikeConfig };
+    return { pageConfigs, pageConfigGlobal, vikeConfigGlobal };
 }
 // TODO/soon: refactor
 //  - Dedupe: most of the assertUsageGlobalConfigs() code below is a copy-paste of the assertUsage() logic inside getGlobalConfigs()
@@ -401,7 +415,7 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
             });
         });
     }
-    const globalVikeConfig = {};
+    const pageConfigGlobalValues = {};
     const pageConfigGlobal = {
         configDefinitions: configDefinitionsBuiltIn_js_1.configDefinitionsBuiltInGlobal,
         configValueSources: {}
@@ -421,10 +435,10 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
                 return;
             const { filePathToShowToUser } = configValueSource.definedAtFilePath;
             (0, utils_js_1.assertWarning)(false, `Being able to define config ${picocolors_1.default.cyan(configName)} in ${filePathToShowToUser} is experimental and will likely be removed. Define the config ${picocolors_1.default.cyan(configName)} in Vike's Vite plugin options instead.`, { onlyOnce: true });
-            globalVikeConfig[configName] = configValueSource.value;
+            pageConfigGlobalValues[configName] = configValueSource.value;
         }
     }));
-    return { pageConfigGlobal, globalVikeConfig };
+    return { pageConfigGlobal, pageConfigGlobalValues };
 }
 async function resolveConfigValueSources(configName, configDef, interfaceFilesRelevant, userRootDir, importedFilesLoaded) {
     const sourcesInfo = [];
@@ -785,8 +799,8 @@ function getComputed(configValueSources, configDefinitions) {
     });
     return configValuesComputed;
 }
-async function findPlusFiles(userRootDir, outDirRoot, crawlWithGit) {
-    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, crawlWithGit);
+async function findPlusFiles(userRootDir, outDirRoot) {
+    const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot);
     const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir }));
     return plusFiles;
 }

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

@@ -8,7 +8,6 @@ const extractAssetsQuery_js_1 = require("../../../../shared/extractAssetsQuery.j
 const debug_js_1 = require("./debug.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
-const getConfigVike_js_1 = require("../../../../shared/getConfigVike.js");
 const fixServerAssets_js_1 = require("../../buildConfig/fixServerAssets.js");
 const getConfigValueBuildTime_js_1 = require("../../../../../shared/page-configs/getConfigValueBuildTime.js");
 async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
@@ -21,11 +20,11 @@ async function getVirtualFilePageConfigValuesAll(id, isDev, config) {
     }
     */
     const { pageId, isForClientSide } = result;
-    const { pageConfigs } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
+    const { pageConfigs } = vikeConfig;
     const pageConfig = pageConfigs.find((pageConfig) => pageConfig.pageId === pageId);
     (0, utils_js_1.assert)(pageConfig, { id, pageId });
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
-    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, configVike.includeAssetsImportedByServer, isDev);
+    const code = getLoadConfigValuesAll(pageConfig, isForClientSide, pageId, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }

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

@@ -7,7 +7,7 @@ const getVikeConfig_js_1 = require("./getVikeConfig.js");
 const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../../shared/page-configs/serialize/serializeConfigValues.js");
 async function getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, config) {
-    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, isDev, { tolerateInvalidConfig: true });
+    const { pageConfigs, pageConfigGlobal } = await (0, getVikeConfig_js_1.getVikeConfig)(config, { doNotRestartViteOnError: true });
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
 }
 function getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting) {

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

@@ -12,7 +12,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const index_js_1 = require("./devConfig/index.js");
 function previewConfig() {
     let config;
-    // let configVike: ConfigVikeResolved
+    // let vikeConfigGlobal: VikeConfigGlobal
     return {
         name: 'vike:previewConfig',
         apply: utils_js_1.applyPreview,
@@ -27,18 +27,18 @@ function previewConfig() {
         async configResolved(config_) {
             config = config_;
             (0, index_js_1.logDockerHint)(config.preview.host);
-            // configVike = await getConfigVike(config)
+            // const vikeConfig = await getVikeConfig(config)
+            // vikeConfigGlobal = vikeConfig.vikeConfigGlobal
         },
         configurePreviewServer(server) {
             /* - Couldn't make `appType: 'mpa'` work as of npm:@brillout/vite@5.0.0-beta.14.0426910c
                - This ugly hack to set appType for preview won't be need once https://github.com/vitejs/vite/pull/14855 is merged.
             config.appType = 'mpa'
             */
-            (0, utils_js_1.markEnvAsVitePreview)();
             return () => {
                 assertDist();
                 /* We don't use this condition (we wrongfully always use the SSR middleware) because of the regression introduced by https://github.com/vitejs/vite/pull/14756 which stops servering .html files when `appType: 'custom'`.
-                if (!configVike.prerender || configVike.prerender.partial) {
+                if (!vikeConfigGlobal.prerender || vikeConfigGlobal.prerender.partial) {
                   addSsrMiddleware(server.middlewares, config, true)
                 }
                 /*/

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

@@ -3,26 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalContext = setGlobalContext;
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const utils_js_1 = require("../utils.js");
+const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 function setGlobalContext() {
-    return {
-        name: 'vike:setGlobalContext',
-        enforce: 'pre',
-        configureServer: {
-            order: 'pre',
-            handler(viteDevServer) {
-                (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
+    return [
+        {
+            name: 'vike:setGlobalContext:pre',
+            enforce: 'pre',
+            configureServer: {
+                order: 'pre',
+                handler(viteDevServer) {
+                    (0, globalContext_js_1.setGlobalContext_viteDevServer)(viteDevServer);
+                    (0, utils_js_1.markSetup_viteDevServer)();
+                }
+            },
+            configurePreviewServer() {
+                (0, utils_js_1.markSetup_vitePreviewServer)();
+            },
+            config: {
+                order: 'pre',
+                handler(_, env) {
+                    const isViteDev = (0, utils_js_1.isDevCheck)(env);
+                    (0, globalContext_js_1.setGlobalContext_isViteDev)(isViteDev);
+                    (0, utils_js_1.markSetup_isViteDev)(isViteDev);
+                }
             }
         },
-        config: {
-            handler(_, env) {
-                const isDev = (0, utils_js_1.isDevCheck)(env);
-                (0, globalContext_js_1.setGlobalContext_isDev)(isDev);
+        {
+            name: 'vike:setGlobalContext:post',
+            enforce: 'post',
+            configResolved: {
+                order: 'post',
+                async handler(config) {
+                    const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
+                    (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
+                    (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
+                    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
+                    (0, globalContext_js_1.setGlobalContext_vikeConfig)(vikeConfig);
+                }
             }
-        },
-        configResolved(config) {
-            const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
-            (0, utils_js_1.assertFilePathAbsoluteFilesystem)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
-            (0, globalContext_js_1.setGlobalContext_viteConfig)(config, outDirRoot);
         }
-    };
+    ];
 }

package/dist/cjs/node/prerender/runPrerender.js

@@ -39,7 +39,6 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const os_1 = require("os");
 const globalContext_js_1 = require("../runtime/globalContext.js");
 const vite_1 = require("vite");
-const getConfigVike_js_1 = require("../shared/getConfigVike.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
@@ -56,7 +55,7 @@ const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/g
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
 const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
 const getConfigValueBuildTime_js_1 = require("../../shared/page-configs/getConfigValueBuildTime.js");
-const prepareApiCall_js_1 = require("../api/prepareApiCall.js");
+const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
 async function runPrerenderFromAPI(options = {}) {
     return await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -64,7 +63,7 @@ async function runPrerenderFromAPI(options = {}) {
 }
 async function runPrerenderFromCLIPrerenderCommand() {
     try {
-        const { viteConfigEnhanced } = await (0, prepareApiCall_js_1.prepareApiCall)(undefined, 'prerender');
+        const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(undefined, 'prerender');
         await runPrerender({ viteConfig: viteConfigEnhanced }, '$ vike prerender');
     }
     catch (err) {
@@ -89,20 +88,20 @@ async function runPrerenderFromAutoRun(viteConfig, forceExit) {
 }
 async function runPrerender(options = {}, standaloneTrigger) {
     checkOutdatedOptions(options);
+    (0, utils_js_1.onSetupPrerender)();
     (0, globalContext_js_1.setGlobalContext_isPrerendering)();
     (0, getHook_js_1.getHook_setIsPrerenderering)();
     const logLevel = !!options.onPagePrerender ? 'warn' : 'info';
     if (logLevel === 'info') {
         console.log(`${picocolors_1.default.cyan(`vike v${utils_js_1.projectInfo.projectVersion}`)} ${picocolors_1.default.green('pre-rendering HTML...')}`);
     }
-    (0, utils_js_1.handleNodeEnv_prerender)();
     await disableReactStreaming();
     const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'vike pre-rendering', 'production');
     assertLoadedConfig(viteConfig, options);
-    const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
+    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, utils_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = configVike.prerender;
+    const prerenderConfig = vikeConfig.vikeConfigGlobal.prerender;
     if (!prerenderConfig) {
         (0, utils_js_1.assert)(standaloneTrigger);
         (0, utils_js_1.assertWarning)(prerenderConfig, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but the config ${picocolors_1.default.cyan('prerender')} isn't set to true`, {
@@ -122,7 +121,6 @@ async function runPrerender(options = {}, standaloneTrigger) {
         pageContextInit: options.pageContextInit ?? null
     });
     const doNotPrerenderList = [];
-    const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig, false);
     await collectDoNoPrerenderList(renderContext, vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit);
     await callOnBeforePrerenderStartHooks(prerenderContext, renderContext, concurrencyLimit, doNotPrerenderList);
     await handlePagesWithStaticRoutes(prerenderContext, renderContext, doNotPrerenderList, concurrencyLimit);

package/dist/cjs/node/prerender/utils.js

@@ -27,7 +27,7 @@ __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
-__exportStar(require("../../utils/assertNodeEnv.js"), exports);
+__exportStar(require("../../utils/assertSetup.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
 __exportStar(require("../../utils/isFilePathAbsoluteFilesystem.js"), exports);
 __exportStar(require("../../utils/isArray.js"), exports);

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

@@ -14,16 +14,17 @@ exports.initGlobalContext_runPrerender = initGlobalContext_runPrerender;
 exports.initGlobalContext_getGlobalContextAsync = initGlobalContext_getGlobalContextAsync;
 exports.setGlobalContext_viteDevServer = setGlobalContext_viteDevServer;
 exports.setGlobalContext_viteConfig = setGlobalContext_viteConfig;
-exports.setGlobalContext_isDev = setGlobalContext_isDev;
+exports.setGlobalContext_vikeConfig = setGlobalContext_vikeConfig;
+exports.setGlobalContext_isViteDev = setGlobalContext_isViteDev;
 exports.setGlobalContext_isPrerendering = setGlobalContext_isPrerendering;
 const utils_js_1 = require("./utils.js");
 const loadImportBuild_js_1 = require("./globalContext/loadImportBuild.js");
 const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 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 getPageFilesExports_js_1 = require("./page-files/getPageFilesExports.js");
+const resolveBase_js_1 = require("../shared/resolveBase.js");
 const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', (() => {
     const { promise: viteDevServerPromise, resolve: viteDevServerPromiseResolve } = (0, utils_js_1.genPromise)();
     return {
@@ -88,12 +89,18 @@ function setGlobalContext_viteConfig(viteConfig, outDirRoot) {
     globalObject.viteConfig = viteConfig;
     globalObject.outDirRoot = outDirRoot;
 }
+function setGlobalContext_vikeConfig(vikeConfig) {
+    if (globalObject.vikeConfig)
+        return;
+    assertIsNotInitilizedYet();
+    globalObject.vikeConfig = vikeConfig;
+}
 function assertIsNotInitilizedYet() {
     // In develpoment, globalObject.viteDevServer always needs to be awaited for before initializing globalObject.globalContext
     (0, utils_js_1.assert)(!globalObject.globalContext);
 }
-function setGlobalContext_isDev(isDev) {
-    globalObject.isDev = isDev;
+function setGlobalContext_isViteDev(isViteDev) {
+    globalObject.isViteDev = isViteDev;
 }
 function setGlobalContext_isPrerendering() {
     globalObject.isPrerendering = true;
@@ -105,7 +112,7 @@ function getViteConfig() {
     return globalObject.viteConfig ?? null;
 }
 async function initGlobalContext_renderPage() {
-    await initGlobalContext(!globalObject.isDev);
+    await initGlobalContext(!globalObject.isViteDev);
 }
 async function initGlobalContext_runPrerender() {
     if (globalObject.initGlobalContext_runPrerender_alreadyCalled)
@@ -141,14 +148,15 @@ async function initGlobalContext(isProduction) {
         (0, utils_js_1.assert)(globalObject.globalContext.isPrerendering === (globalObject.isPrerendering ?? false));
         return;
     }
-    const { viteDevServer, viteConfig, isDev, isPrerendering } = globalObject;
-    (0, utils_js_1.assertNodeEnv_runtime)(isDev ?? false);
+    const { viteDevServer, viteConfig, vikeConfig, isPrerendering } = globalObject;
+    (0, utils_js_1.onSetupRuntime)();
     if (!isProduction) {
         (0, utils_js_1.assert)(viteConfig);
+        (0, utils_js_1.assert)(vikeConfig);
         (0, utils_js_1.assert)(viteDevServer);
         (0, utils_js_1.assert)(!isPrerendering);
-        const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
-        const pluginManifest = getRuntimeManifest(configVike);
+        const vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
+        const pluginManifest = getRuntimeManifest(vikeConfigGlobal, viteConfig);
         globalObject.globalContext = {
             isProduction: false,
             isPrerendering: false,
@@ -156,6 +164,7 @@ async function initGlobalContext(isProduction) {
             pluginManifest: null,
             viteDevServer,
             viteConfig,
+            vikeConfig,
             baseServer: pluginManifest.baseServer,
             baseAssets: pluginManifest.baseAssets,
             includeAssetsImportedByServer: pluginManifest.includeAssetsImportedByServer,
@@ -185,8 +194,6 @@ async function initGlobalContext(isProduction) {
         };
         if (isPrerendering) {
             (0, utils_js_1.assert)(viteConfig);
-            const configVike = await (0, getConfigVike_js_1.getConfigVike)(viteConfig);
-            (0, utils_js_1.assert)(configVike);
             (0, utils_js_1.objectAssign)(globalContext, {
                 isPrerendering: true,
                 viteConfig
@@ -202,8 +209,9 @@ async function initGlobalContext(isProduction) {
         }
     }
 }
-function getRuntimeManifest(configVike) {
-    const { includeAssetsImportedByServer, baseServer, baseAssets, redirects, trailingSlash, disableUrlNormalization } = configVike;
+function getRuntimeManifest(vikeConfigGlobal, viteConfig) {
+    const { includeAssetsImportedByServer, redirects, trailingSlash, disableUrlNormalization } = vikeConfigGlobal;
+    const { baseServer, baseAssets } = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfigGlobal.baseServer, vikeConfigGlobal.baseAssets, viteConfig);
     const manifest = {
         baseServer,
         baseAssets,

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.getGlobalContextAsync = exports.getGlobalContextSync = exports.version = exports.stampPipe = exports.pipeStream = exports.pipeNodeStream = exports.pipeWebStream = exports.dangerouslySkipEscape = exports.escapeInject = exports.renderPage = void 0;
+exports.createPageRenderer = exports._injectAssets = exports.createDevMiddleware = 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");
@@ -16,6 +16,8 @@ Object.defineProperty(exports, "version", { enumerable: true, get: function () {
 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; } });
+var index_js_1 = require("../runtime-dev/index.js");
+Object.defineProperty(exports, "createDevMiddleware", { enumerable: true, get: function () { return index_js_1.createDevMiddleware; } });
 // 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/renderPageAlreadyRouted.js

@@ -126,7 +126,7 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { ssr: { url
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
     (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
-        // The following is defined on `pageContext` because we can eventually make these non-global (e.g. sot that two pages can have different includeAssetsImportedByServer settings)
+        // The following is defined on `pageContext` because we can eventually make these non-global
         _baseServer: globalContext.baseServer,
         _baseAssets: globalContext.baseAssets,
         _includeAssetsImportedByServer: globalContext.includeAssetsImportedByServer,

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

@@ -37,7 +37,7 @@ exports.renderPage_addWrapper = renderPage_addWrapper;
 async function renderPage(pageContextInit) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextInit, 'urlOriginal', 'string')); // assertUsage() already implemented at assertArguments()
-    (0, utils_js_1.assertEnv)();
+    (0, utils_js_1.onSetupRuntime)();
     assertIsUrl(pageContextInit.urlOriginal);
     const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
     assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
@@ -338,7 +338,9 @@ function assertIsUrl(urlOriginal) {
 }
 function assertIsNotViteRequest(urlPathname, urlOriginal) {
     const isViteRequest = urlPathname.startsWith('/@vite/client') || urlPathname.startsWith('/@fs/') || urlPathname.startsWith('/__vite_ping');
-    (0, utils_js_1.assertUsage)(!isViteRequest, `${picocolors_1.default.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage) called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because this URL should have already been handled by Vite's development middleware. Make sure to 1. install Vite's development middleware and 2. add Vite's middleware *before* Vike's middleware, see https://vike.dev/renderPage`);
+    if (!isViteRequest)
+        return;
+    (0, utils_js_1.assertUsage)(false, `${picocolors_1.default.code('renderPage(pageContextInit)')} called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which is unexpected because the URL ${picocolors_1.default.bold(urlOriginal)} should have already been handled by the development middleware: make sure the ${picocolors_1.default.cyan('createDevMiddleware()')} middleware is executed *before* the ${picocolors_1.default.cyan('renderPage()')} middleware, see ${picocolors_1.default.underline('https://vike.dev/renderPage')}`);
 }
 function normalizeUrl(pageContextInit, httpRequestId) {
     const { trailingSlash, disableUrlNormalization, baseServer } = (0, globalContext_js_1.getGlobalContext)();

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

@@ -59,9 +59,8 @@ __exportStar(require("../../utils/objectKeys.js"), exports);
 __exportStar(require("../../utils/objectEntries.js"), exports);
 __exportStar(require("../../utils/objectFromEntries.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
-__exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);
+__exportStar(require("../../utils/assertSetup.js"), exports);
 __exportStar(require("../../utils/path-shim.js"), exports);
-__exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/isHtml.js"), exports);
 __exportStar(require("../../utils/warnIfErrorIsNotObject.js"), exports);
 __exportStar(require("../../utils/stripAnsi.js"), exports);

package/dist/cjs/node/runtime-dev/createDevMiddleware.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDevMiddleware = createDevMiddleware;
+const vite_1 = require("vite");
+const prepareViteApiCall_js_1 = require("../api/prepareViteApiCall.js");
+/*
+ * Create server middleware for development with HMR and lazy-transpiling.
+ *
+ * https://vike.dev/createDevMiddleware
+ */
+async function createDevMiddleware(options = {}) {
+    const viteConfig = {
+        ...options.viteConfig,
+        server: {
+            ...options.viteConfig?.server,
+            middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
+        }
+    };
+    if (options.root)
+        viteConfig.root = options.root;
+    const { viteConfigEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(viteConfig, 'dev');
+    const server = await (0, vite_1.createServer)(viteConfigEnhanced);
+    const devMiddleware = server.middlewares;
+    return { devMiddleware, viteServer: server, viteConfig: server.config };
+}

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

@@ -0,0 +1,32 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDevMiddleware = void 0;
+const createDevMiddleware_ = async (...args) => {
+    const p = './createDevMiddleware.js';
+    const { createDevMiddleware } = await Promise.resolve(`${p}`).then(s => __importStar(require(s)));
+    return createDevMiddleware(...args);
+};
+exports.createDevMiddleware = createDevMiddleware_;

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

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveBase = resolveBase;
+exports.resolveBaseFromResolvedConfig = resolveBaseFromResolvedConfig;
+const utils_js_1 = require("./utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
+    let baseViteOriginal = config._baseViteOriginal;
+    if (baseViteOriginal === '/__UNSET__')
+        baseViteOriginal = null;
+    (0, utils_js_1.assert)(baseViteOriginal === null || typeof baseViteOriginal == 'string');
+    return resolveBase(baseViteOriginal, baseServer, baseAssets);
+}
+function resolveBase(baseViteOriginal, baseServerUnresolved, baseAssetsUnresolved) {
+    {
+        const wrongBase = (val) => `should start with ${picocolors_1.default.cyan('/')}, ${picocolors_1.default.cyan('http://')}, or ${picocolors_1.default.cyan('https://')} (it's ${picocolors_1.default.cyan(val)} instead)`;
+        (0, utils_js_1.assertUsage)(baseViteOriginal === null || (0, utils_js_1.isBaseAssets)(baseViteOriginal), `vite.config.js#base ${wrongBase(baseViteOriginal)}`);
+        (0, utils_js_1.assertUsage)(baseAssetsUnresolved === null || (0, utils_js_1.isBaseAssets)(baseAssetsUnresolved), `Config ${picocolors_1.default.cyan('baseAssets')} ${wrongBase(baseAssetsUnresolved)}`);
+        (0, utils_js_1.assertUsage)(baseServerUnresolved === null || baseServerUnresolved.startsWith('/'), `Config ${picocolors_1.default.cyan('baseServer')} should start with a leading slash ${picocolors_1.default.cyan('/')} (it's ${picocolors_1.default.cyan(String(baseServerUnresolved))} instead)`);
+    }
+    if (baseViteOriginal) {
+        if (baseViteOriginal.startsWith('http')) {
+            baseAssetsUnresolved = baseAssetsUnresolved ?? baseViteOriginal;
+        }
+        else {
+            baseAssetsUnresolved = baseAssetsUnresolved ?? baseViteOriginal;
+            baseServerUnresolved = baseServerUnresolved ?? baseViteOriginal;
+        }
+    }
+    const baseServer = baseServerUnresolved ?? '/';
+    const baseAssets = baseAssetsUnresolved ?? '/';
+    (0, utils_js_1.assert)((0, utils_js_1.isBaseAssets)(baseAssets));
+    (0, utils_js_1.assert)((0, utils_js_1.isBaseServer)(baseServer));
+    return {
+        baseServer,
+        baseAssets
+    };
+}