vike 0.4.223 → 0.4.224-commit-f0d0f8a

package/dist/cjs/node/plugin/plugins/{buildConfig.js → build/pluginBuildConfig.js}

@@ -1,62 +1,44 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.manifestTempFile = void 0;
-exports.buildConfig = buildConfig;
+exports.pluginBuildConfig = pluginBuildConfig;
 exports.assertRollupInput = assertRollupInput;
 exports.analyzeClientEntries = analyzeClientEntries;
-const utils_js_1 = require("../utils.js");
-const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
-const findPageFiles_js_1 = require("../shared/findPageFiles.js");
-const virtualFilePageConfigValuesAll_js_1 = require("../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
-const extractAssetsQuery_js_1 = require("../../shared/extractAssetsQuery.js");
+const utils_js_1 = require("../../utils.js");
+const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
+const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
+const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
+const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const module_1 = require("module");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = __importDefault(require("path"));
-const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
-const index_js_1 = require("./buildEntry/index.js");
-const prependEntriesDir_js_1 = require("../../shared/prependEntriesDir.js");
-const getFilePath_js_1 = require("../shared/getFilePath.js");
-const getConfigValueBuildTime_js_1 = require("../../../shared/page-configs/getConfigValueBuildTime.js");
-const getOutDirs_js_1 = require("../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
+const getFilePath_js_1 = require("../../shared/getFilePath.js");
+const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const handleAssetsManifest_js_1 = require("./handleAssetsManifest.js");
+// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
-function buildConfig() {
-    let isServerAssetsFixEnabled;
-    let outDirs;
+function pluginBuildConfig() {
     let config;
     return [
         {
-            name: 'vike:buildConfig:post',
+            name: 'vike:build:pluginBuildConfig',
             apply: 'build',
             enforce: 'post',
             configResolved: {
                 order: 'post',
                 async handler(config_) {
-                    config = config_;
                     (0, utils_js_1.onSetupBuild)();
+                    config = config_;
                     assertRollupInput(config);
                     const entries = await getEntries(config);
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
-                    outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
-                    {
-                        isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
-                        if (isServerAssetsFixEnabled) {
-                            // https://github.com/vikejs/vike/issues/1339
-                            config.build.ssrEmitAssets = true;
-                            // Required if `ssrEmitAssets: true`, see https://github.com/vitejs/vite/pull/11430#issuecomment-1454800934
-                            config.build.cssMinify = 'esbuild';
-                            (0, fixServerAssets_js_1.fixServerAssets_assertCssCodeSplit)(config);
-                        }
-                    }
+                    (0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
                 }
             },
             config: {
@@ -66,56 +48,13 @@ function buildConfig() {
                     return {
                         build: {
                             outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
-                            manifest: manifestTempFile,
-                            copyPublicDir: config.vike.config.viteEnvironmentAPI
-                                ? // Already set by buildApp() plugin
-                                    undefined
-                                : !(0, viteIsSSR_js_1.viteIsSSR)(config)
+                            ...(0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)
                         }
                     };
                 }
             },
             buildStart() {
                 (0, utils_js_1.onSetupBuild)();
-            },
-            async closeBundle() {
-                (0, utils_js_1.onSetupBuild)();
-                await (0, fixServerAssets_js_1.fixServerAssets_assertCssTarget)(config);
-            }
-        },
-        {
-            name: 'vike:buildConfig:pre',
-            apply: 'build',
-            applyToEnvironment(env) {
-                return env.name === 'ssr';
-            },
-            // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_ASSETS_MANIFEST() needs to be called before dist/server/ code is executed.
-            //    - For example, the writeBundle() hook of vite-plugin-vercel needs to be called after this writeBundle() hook, otherwise: https://github.com/vikejs/vike/issues/1527
-            enforce: 'pre',
-            writeBundle: {
-                order: 'pre',
-                sequential: true,
-                async handler(options, bundle) {
-                    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
-                        // Ideally we'd move dist/_temp_manifest.json to dist/server/client-assets.json instead of dist/assets.json
-                        //  - But we can't because there is no guarentee whether dist/server/ is generated before or after dist/client/ (generating dist/server/ after dist/client/ erases dist/server/client-assets.json)
-                        //  - We'll able to do so once we replace `$ vite build` with `$ vike build`
-                        const assetsJsonFilePath = path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
-                        const clientManifestFilePath = path_1.default.posix.join(outDirs.outDirClient, manifestTempFile);
-                        const serverManifestFilePath = path_1.default.posix.join(outDirs.outDirServer, manifestTempFile);
-                        if (!isServerAssetsFixEnabled) {
-                            await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
-                        }
-                        else {
-                            const { clientManifestMod } = await (0, fixServerAssets_js_1.fixServerAssets)(config);
-                            await promises_1.default.writeFile(assetsJsonFilePath, JSON.stringify(clientManifestMod, null, 2), 'utf-8');
-                        }
-                        await promises_1.default.rm(clientManifestFilePath);
-                        await promises_1.default.rm(serverManifestFilePath);
-                        await (0, index_js_1.set_ASSETS_MANIFEST)(options, bundle);
-                    }
-                }
             }
         }
     ];
@@ -128,10 +67,9 @@ async function getEntries(config) {
     // TODO/now: add meta.default
     vikeConfig.global.config.includeAssetsImportedByServer ?? true);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
+    if ((0, isViteServerBuild_js_1.isViteServerBuild)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
-            // buildEntry: resolve('dist/esm/node/buildEntry.js'), // TODO/next-major-release: remove
             ...pageFileEntries,
             // Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
             ...pageEntries
@@ -202,7 +140,7 @@ function analyzeClientEntries(pageConfigs, config) {
 // Ensure Rollup creates entries for each page file, see https://github.com/vikejs/vike/issues/350
 // (Otherwise the page files may be missing in the client manifest.json)
 async function getPageFileEntries(config, includeAssetsImportedByServer) {
-    const isForClientSide = !(0, viteIsSSR_js_1.viteIsSSR)(config);
+    const isForClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');
@@ -261,8 +199,8 @@ function getEntryFromPageConfig(pageConfig, isForClientSide) {
 }
 function resolve(filePath) {
     (0, utils_js_1.assert)(filePath.startsWith('dist/'));
-    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/
-    return require_.resolve(`../../../../../${filePath}`);
+    // [RELATIVE_PATH_FROM_DIST] Current directory: node_modules/vike/dist/esm/node/plugin/plugins/build/
+    return require_.resolve(`../../../../../../${filePath}`);
 }
 function addLogHook() {
     const tty = process.stdout.isTTY && !process.env.CI; // Equals https://github.com/vitejs/vite/blob/193d55c7b9cbfec5b79ebfca276d4a721e7de14d/packages/vite/src/node/plugins/reporter.ts#L27

package/dist/cjs/node/plugin/plugins/{buildEntry/index.js → build/pluginBuildEntry.js}

@@ -3,26 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEntry = buildEntry;
-exports.set_ASSETS_MANIFEST = set_ASSETS_MANIFEST;
+exports.pluginBuildEntry = pluginBuildEntry;
+exports.set_macro_ASSETS_MANIFEST = set_macro_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const module_1 = require("module");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
-function buildEntry() {
+function pluginBuildEntry() {
     let config;
     return [
         {
-            name: 'vike:buildEntry',
+            name: 'vike:build:pluginBuildEntry',
+            apply: 'build',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
@@ -63,13 +64,12 @@ function getServerProductionEntryCode(config) {
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MANIFEST(options, bundle) {
+// Set the value of the ASSETS_MANIFEST constant inside dist/server/entry.js (or dist/server/index.js)
+async function set_macro_ASSETS_MANIFEST(options, bundle, assetsJsonFilePath) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
     const chunkPath = find_ASSETS_MANIFEST(bundle);
     const chunkFilePath = path_1.default.join(dir, chunkPath);
-    const assetsJsonFilePath = path_1.default.join(dir, '..', 'assets.json');
     const [assetsJsonString, chunkFileContent] = await Promise.all([
         await promises_1.default.readFile(assetsJsonFilePath, 'utf8'),
         await promises_1.default.readFile(chunkFilePath, 'utf8')
@@ -93,7 +93,7 @@ function find_ASSETS_MANIFEST(bundle) {
 function getImportPath(config) {
     // We resolve filePathAbsolute even if we don't use it: we use require.resolve() as an assertion that the relative path is correct
     const filePathAbsolute = (0, utils_js_1.toPosixPath)(
-    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/buildEntry/index.js
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/pluginBuildEntry/index.js
     require_.resolve(`../../../../../../dist/esm/__internal/index.js`));
     if (
     // Let's implement a new config if a user needs the import to be a relative path instead of 'vike/__internal' (AFAIK a relative path is needed only if a framework has npm package 'vike' as direct dependency instead of a peer dependency and if the user of that framework uses pnpm)

package/dist/cjs/node/plugin/plugins/{distFileNames.js → build/pluginDistFileNames.js}

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.distFileNames = distFileNames;
+exports.pluginDistFileNames = pluginDistFileNames;
 // Attempt to preserve file structure of `.page.js` files:
 //  - https://github.com/vikejs/vike/commit/11a4c49e5403aa7c37c8020c462b499425b41854
 //  - Blocker: https://github.com/rollup/rollup/issues/4724
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const crypto_1 = __importDefault(require("crypto"));
-const getAssetsDir_js_1 = require("../shared/getAssetsDir.js");
-const getFilePath_js_1 = require("../shared/getFilePath.js");
-function distFileNames() {
+const getAssetsDir_js_1 = require("../../shared/getAssetsDir.js");
+const getFilePath_js_1 = require("../../shared/getFilePath.js");
+function pluginDistFileNames() {
     return {
-        name: 'vike:distFileNames',
+        name: 'vike:build:pluginDistFileNames',
         apply: 'build',
         enforce: 'post',
         configResolved(config) {
@@ -33,7 +33,7 @@ function distFileNames() {
                 else {
                     // If a user needs this:
                     //  - assertUsage() that the naming provided by the user ends with `.[hash][extname]`
-                    //    - It's needed for getHash() of fixServerAssets()
+                    //    - It's needed for getHash() of handleAssetsManifest()
                     //    - Asset URLs should always contain a hash: it's paramount for caching assets.
                     //    - If rollupOutput.assetFileNames is a function then use a wrapper function to apply the assertUsage()
                     (0, utils_js_1.assertUsage)(false, "Setting Vite's configuration build.rollupOptions.output.assetFileNames is currently forbidden. Reach out if you need to use.");

package/dist/cjs/node/plugin/plugins/{packageJsonFile.js → build/pluginDistPackageJsonFile.js}

@@ -8,19 +8,19 @@
  * Reproduction: https://github.com/brillout/vite-plugin-ssr-server-import-syntax
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageJsonFile = packageJsonFile;
-const rollupIsEsm_js_1 = require("../shared/rollupIsEsm.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
-function packageJsonFile() {
+exports.pluginDistPackageJsonFile = pluginDistPackageJsonFile;
+const rollupIsEsm_js_1 = require("../../shared/rollupIsEsm.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
+function pluginDistPackageJsonFile() {
     let config;
     return {
-        name: 'vike:packageJsonFile',
+        name: 'vike:build:pluginDistPackageJsonFile',
         apply: 'build',
         configResolved(config_) {
             config = config_;
         },
         generateBundle(options, bundle) {
-            if (!(0, viteIsSSR_js_1.viteIsSSR)(config))
+            if (!(0, isViteServerBuild_js_1.isViteServerBuild)(config))
                 return;
             const isEsm = (0, rollupIsEsm_js_1.rollupIsEsm)(options);
             const fileName = 'package.json';

package/dist/cjs/node/plugin/plugins/{suppressRollupWarning.js → build/pluginSuppressRollupWarning.js}

@@ -1,10 +1,10 @@
 "use strict";
 // Suppress Rollup warnings `Generated an empty chunk: "index.page.server"`
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.suppressRollupWarning = suppressRollupWarning;
-function suppressRollupWarning() {
+exports.pluginSuppressRollupWarning = pluginSuppressRollupWarning;
+function pluginSuppressRollupWarning() {
     return {
-        name: 'vike:suppressRollupWarning',
+        name: 'vike:build:pluginSuppressRollupWarning',
         apply: 'build',
         enforce: 'post',
         async configResolved(config) {

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.build = build;
+const pluginBuildApp_js_1 = require("./build/pluginBuildApp.js");
+const pluginDistPackageJsonFile_js_1 = require("./build/pluginDistPackageJsonFile.js");
+const pluginSuppressRollupWarning_js_1 = require("./build/pluginSuppressRollupWarning.js");
+const pluginDistFileNames_js_1 = require("./build/pluginDistFileNames.js");
+const pluginAutoFullBuild_js_1 = require("./build/pluginAutoFullBuild.js");
+const pluginBuildEntry_js_1 = require("./build/pluginBuildEntry.js");
+const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
+function build() {
+    return [
+        ...(0, pluginBuildConfig_js_1.pluginBuildConfig)(),
+        ...(0, pluginBuildApp_js_1.pluginBuildApp)(),
+        ...(0, pluginAutoFullBuild_js_1.pluginAutoFullBuild)(),
+        ...(0, pluginBuildEntry_js_1.pluginBuildEntry)(),
+        (0, pluginDistPackageJsonFile_js_1.pluginDistPackageJsonFile)(),
+        (0, pluginSuppressRollupWarning_js_1.pluginSuppressRollupWarning)(),
+        (0, pluginDistFileNames_js_1.pluginDistFileNames)()
+    ];
+}

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

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonConfig = commonConfig;
+exports.getVikeConfigPublic = getVikeConfigPublic;
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
-const buildConfig_js_1 = require("./buildConfig.js");
+const pluginBuildConfig_js_1 = require("./build/pluginBuildConfig.js");
 const require_shim_1 = require("@brillout/require-shim");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const path_1 = __importDefault(require("path"));
@@ -17,6 +18,7 @@ const context_js_1 = require("../../api/context.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const prepareViteApiCall_js_1 = require("../../api/prepareViteApiCall.js");
 const context_js_2 = require("../../prerender/context.js");
+const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -35,13 +37,14 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: {
+                        _vikeConfigObject: vikeConfig,
+                        _vike: {
                             pages: vikeConfig.pages,
                             config: vikeConfig.global.config
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: (0, context_js_2.isPrerenderEnabled)(vikeConfig)
+                            prerender: (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig).isPrerenderingEnabled
                         })
                     };
                 }
@@ -65,7 +68,7 @@ function commonConfig(vikeVitePluginOptions) {
                     overrideViteDefaultSsrExternal(config)
                     //*/
                     workaroundCI(config);
-                    (0, buildConfig_js_1.assertRollupInput)(config);
+                    (0, pluginBuildConfig_js_1.assertRollupInput)(config);
                     (0, assertResolveAlias_js_1.assertResolveAlias)(config);
                     assertEsm(config.root);
                     assertVikeCliOrApi(config);
@@ -173,3 +176,18 @@ function temp_supportOldInterface(config) {
     }
     (0, utils_js_1.assert)(false);
 }
+// TODO/soon rename:
+// - `getVikeConfig()` => `resolveVikeConfig()` ?
+// - `getVikeConfigPublic()` => `getVikeConfig()`
+// - `VikeConfigPublic` => `VikeConfig` ?
+// - `VikeConfigObject` => `VikeConfigInternal` ?
+/**
+ * Get all the information Vike knows about the app in your Vite plugin.
+ *
+ * https://vike.dev/getVikeConfig
+ */
+function getVikeConfigPublic(config) {
+    const vikeConfig = config._vike;
+    (0, utils_js_1.assert)(vikeConfig);
+    return vikeConfig;
+}

package/dist/cjs/node/plugin/plugins/devConfig/determineFsAllowList.js

@@ -10,7 +10,7 @@ const utils_js_1 = require("../../utils.js");
 const module_1 = require("module");
 const path_2 = require("path");
 const url_1 = require("url");
-// @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
+// @ts-ignore `file://${__filename}` is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const __dirname_ = (0, path_2.dirname)((0, url_1.fileURLToPath)(importMetaUrl));

package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -4,7 +4,7 @@ exports.determineOptimizeDeps = determineOptimizeDeps;
 const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
-const buildConfig_js_1 = require("../buildConfig.js");
+const pluginBuildConfig_js_1 = require("../build/pluginBuildConfig.js");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
@@ -46,11 +46,11 @@ async function getPageDeps(config, pageConfigs) {
     // V1 design
     {
         pageConfigs.forEach((pageConfig) => {
-            Object.values(pageConfig.configValueSources).forEach((sources) => {
+            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
                 sources
-                    .filter((c) => !c.isOverriden)
+                    .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
                     .forEach((configValueSource) => {
-                    if (!configValueSource.valueIsImportedAtRuntime)
+                    if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
                         return;
                     const { definedAtFilePath, configEnv } = configValueSource;
                     if (!configEnv.client)
@@ -82,7 +82,7 @@ async function getPageDeps(config, pageConfigs) {
     return { entries, include };
 }
 function getVirtualFiles(config, pageConfigs) {
-    const { hasClientRouting, hasServerRouting, clientEntries } = (0, buildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
+    const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
     const entriesVirtualFiles = Object.values(clientEntries);
     if (hasClientRouting)
         entriesVirtualFiles.push(virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeClientCR);

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

@@ -84,7 +84,7 @@ function devConfig() {
                     if (config.server.middlewareMode || hasHonoViteDevServer)
                         return;
                     return () => {
-                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, false);
+                        (0, addSsrMiddleware_js_1.addSsrMiddleware)(server.middlewares, config, false, null);
                     };
                 }
             },

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

@@ -6,7 +6,7 @@ const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -39,7 +39,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite

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

@@ -14,11 +14,11 @@ const isAsset_js_1 = require("../shared/isAsset.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.js");
+const handleAssetsManifest_js_1 = require("./build/handleAssetsManifest.js");
 const getVikeConfig_js_1 = require("./importUserCode/v1-design/getVikeConfig.js");
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -28,7 +28,7 @@ const debug = (0, utils_js_1.createDebugger)('vike:extractAssets');
 function extractAssetsPlugin() {
     let config;
     let vikeConfig;
-    let isServerAssetsFixEnabled;
+    let isFixEnabled;
     return [
         // This plugin removes all JavaScript from server-side only code, so that only CSS imports remains. (And also satic files imports e.g. `import logoURL from './logo.svg.js'`).
         {
@@ -41,14 +41,14 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(id)) {
                     return;
                 }
-                if (isServerAssetsFixEnabled) {
-                    // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
+                if (isFixEnabled) {
+                    // I'm guessing isFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
                 // TODO/now: add meta.default
                 (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options));
+                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -65,7 +65,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, viteIsSSR_js_1.viteIsSSR_safe)(config, options)) {
+                if ((0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));
@@ -142,8 +142,8 @@ function extractAssetsPlugin() {
             async configResolved(config_) {
                 config = config_;
                 vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
-                if (!isServerAssetsFixEnabled) {
+                isFixEnabled = (0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config);
+                if (!isFixEnabled) {
                     // https://github.com/vikejs/vike/issues/1060
                     (0, utils_js_1.assertUsage)(!config.plugins.find((p) => p.name === 'vite-tsconfig-paths'), 'vite-tsconfig-paths not supported, remove it and use vite.config.js#resolve.alias instead');
                 }

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

@@ -7,7 +7,7 @@ const utils_js_1 = require("../utils.js");
 const parseEsModule_js_1 = require("../shared/parseEsModule.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
-const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
@@ -19,7 +19,7 @@ function extractExportNamesPlugin() {
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_options)(options);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);

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

@@ -60,10 +60,13 @@ function fileEnv() {
             Array.from(this.getModuleIds())
                 .filter((id) => !skip(id))
                 .forEach((moduleId) => {
-                const { importers, dynamicImporters } = this.getModuleInfo(moduleId);
+                const mod = this.getModuleInfo(moduleId);
+                const { importers } = mod;
                 if (importers.length === 0) {
                     // Dynamic imports can only be verified at runtime
-                    (0, utils_js_1.assert)(dynamicImporters.length > 0);
+                    /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
+                    assert(dynamicImporters.length > 0)
+                    */
                     return;
                 }
                 assertFileEnv(moduleId, !!config.build.ssr, importers, false);

package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -12,12 +12,12 @@ const path_1 = __importDefault(require("path"));
 const getVirtualFilePageConfigs_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigs.js");
 const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
-const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
+const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
 async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
     const idParsed = (0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id);
     (0, utils_js_1.assert)(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, viteIsSSR_js_1.viteIsSSR_options)(options));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options));
     const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -74,7 +74,7 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
-    const isV1Design = await (0, getVikeConfig_js_1.isV1Design)(config);
+    const isV1Design = (0, getVikeConfig_js_1.isV1Design)(config);
     // Old design => no + files => only to enable pre-rendering is setting `vike({prerender})` in vite.config.js
     const isPrerendering = !!vikeConfig.global.config.prerender;
     fileTypes_js_1.fileTypes

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

@@ -26,11 +26,8 @@ function importUserCode() {
             vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
             config = config_;
             // TODO/v1-release: remove
-            {
-                const isV1 = await (0, getVikeConfig_js_1.isV1Design)(config);
-                if (!isV1)
-                    config.experimental.importGlobRestoreExtension = true;
-            }
+            if (!(0, getVikeConfig_js_1.isV1Design)(config))
+                config.experimental.importGlobRestoreExtension = true;
         },
         resolveId(id) {
             if ((0, virtual_files_js_1.isVirtualFileId)(id)) {