vike 0.4.220 → 0.4.221-commit-ab9e52a

package/dist/cjs/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -7,7 +7,6 @@ exports.fixServerAssets = fixServerAssets;
 exports.fixServerAssets_isEnabled = fixServerAssets_isEnabled;
 exports.fixServerAssets_assertCssCodeSplit = fixServerAssets_assertCssCodeSplit;
 exports.fixServerAssets_assertCssTarget = fixServerAssets_assertCssTarget;
-exports.fixServerAssets_assertCssTarget_populate = fixServerAssets_assertCssTarget_populate;
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -18,6 +17,8 @@ const buildConfig_js_1 = require("../buildConfig.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 getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const viteIsSSR_js_1 = require("../../shared/viteIsSSR.js");
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin
@@ -31,7 +32,7 @@ function fixServerAssets_isEnabled() {
 }
 /** https://github.com/vikejs/vike/issues/1339 */
 async function fixServerAssets(config) {
-    const outDirs = (0, utils_js_1.getOutDirs)(config);
+    const outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
     const clientManifest = await loadManifest(outDirs.outDirClient);
     const serverManifest = await loadManifest(outDirs.outDirServer);
     const { clientManifestMod, serverManifestMod, filesToCopy, filesToRemove } = addServerAssets(clientManifest, serverManifest);
@@ -47,7 +48,7 @@ async function loadManifest(outDir) {
     return manifest;
 }
 async function copyAssets(filesToCopy, filesToRemove, config) {
-    const { outDirClient, outDirServer } = (0, utils_js_1.getOutDirs)(config);
+    const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
     const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
     const assetsDirServer = path_1.default.posix.join(outDirServer, assetsDir);
     if (!filesToCopy.length && !filesToRemove.length && !(0, fs_2.existsSync)(assetsDirServer))
@@ -198,17 +199,15 @@ function fixServerAssets_assertCssCodeSplit(config) {
     (0, utils_js_1.assertWarning)(config.build.cssCodeSplit, `${picocolors_1.default.cyan('build.cssCodeSplit')} shouldn't be set to ${picocolors_1.default.cyan('false')} (https://github.com/vikejs/vike/issues/1993)`, { onlyOnce: true });
 }
 const targets = [];
-function fixServerAssets_assertCssTarget_populate(config) {
-    const isServerSide = (0, utils_js_1.viteIsSSR)(config);
-    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
-    (0, utils_js_1.assert)(config.build.target !== undefined);
-    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
-}
 async function fixServerAssets_assertCssTarget(config) {
     if (!fixServerAssets_isEnabled())
         return;
     if (!(await (0, getVikeConfig_js_1.isV1Design)(config)))
         return;
+    const isServerSide = (0, viteIsSSR_js_1.viteIsSSR)(config);
+    (0, utils_js_1.assert)(typeof isServerSide === 'boolean');
+    (0, utils_js_1.assert)(config.build.target !== undefined);
+    targets.push({ global: config.build.target, css: config.build.cssTarget, isServerSide });
     const targetsServer = targets.filter((t) => t.isServerSide);
     const targetsClient = targets.filter((t) => !t.isServerSide);
     targetsClient.forEach((targetClient) => {
@@ -216,9 +215,10 @@ async function fixServerAssets_assertCssTarget(config) {
         targetsServer.forEach((targetServer) => {
             const targetCssResolvedServer = resolveCssTarget(targetServer);
             (0, utils_js_1.assertWarning)((0, utils_js_1.isEqualStringList)(targetCssResolvedClient, targetCssResolvedServer), [
-                'The CSS browser target should be the same for both client-side and server-side (https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979) but we got:',
-                `Client-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
-                `Server-side: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`
+                'The CSS browser target should be the same for both client and server, but we got:',
+                `Client: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
+                `Server: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`,
+                `Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`
             ].join('\n'), {
                 showStackTrace: true,
                 onlyOnce: 'different-css-target'

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

@@ -20,6 +20,8 @@ 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 importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
@@ -27,7 +29,6 @@ const manifestTempFile = '_temp_manifest.json';
 exports.manifestTempFile = manifestTempFile;
 function buildConfig() {
     let isServerAssetsFixEnabled;
-    let isSsrBuild;
     let outDirs;
     let config;
     return [
@@ -45,7 +46,7 @@ function buildConfig() {
                     (0, utils_js_1.assert)(Object.keys(entries).length > 0);
                     config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
                     addLogHook();
-                    outDirs = (0, utils_js_1.getOutDirs)(config);
+                    outDirs = (0, getOutDirs_js_1.getOutDirs)(config);
                     {
                         isServerAssetsFixEnabled = (0, fixServerAssets_js_1.fixServerAssets_isEnabled)() && (await (0, getVikeConfig_js_1.isV1Design)(config));
                         if (isServerAssetsFixEnabled) {
@@ -53,7 +54,6 @@ function buildConfig() {
                             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_assertCssTarget_populate)(config);
                             (0, fixServerAssets_js_1.fixServerAssets_assertCssCodeSplit)(config);
                         }
                     }
@@ -63,12 +63,14 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     (0, utils_js_1.onSetupBuild)();
-                    isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
                     return {
                         build: {
-                            outDir: (0, utils_js_1.resolveOutDir)(config),
+                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
                             manifest: manifestTempFile,
-                            copyPublicDir: !isSsrBuild
+                            copyPublicDir: config.vike.config.viteEnvironmentAPI
+                                ? // Already set by buildApp() plugin
+                                    undefined
+                                : !(0, viteIsSSR_js_1.viteIsSSR)(config)
                         }
                     };
                 }
@@ -85,14 +87,14 @@ function buildConfig() {
             name: 'vike:buildConfig:pre',
             apply: 'build',
             // Make sure other writeBundle() hooks are called after this writeBundle() hook.
-            //  - set_ASSETS_MAP() needs to be called before dist/server/ code is executed.
+            //  - 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 (isSsrBuild) {
+                    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`
@@ -108,7 +110,7 @@ function buildConfig() {
                         }
                         await promises_1.default.rm(clientManifestFilePath);
                         await promises_1.default.rm(serverManifestFilePath);
-                        await (0, index_js_1.set_ASSETS_MAP)(options, bundle);
+                        await (0, index_js_1.set_ASSETS_MANIFEST)(options, bundle);
                     }
                 }
             }
@@ -118,9 +120,12 @@ function buildConfig() {
 async function getEntries(config) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
     const { pageConfigs } = vikeConfig;
-    const pageFileEntries = await getPageFileEntries(config, vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer); // TODO/v1-release: remove
+    // TODO/v1-release: remove
+    const pageFileEntries = await getPageFileEntries(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, utils_js_1.viteIsSSR)(config)) {
+    if ((0, viteIsSSR_js_1.viteIsSSR)(config)) {
         const pageEntries = getPageEntries(pageConfigs);
         const entries = {
             // buildEntry: resolve('dist/esm/node/buildEntry.js'), // TODO/next-major-release: remove
@@ -194,7 +199,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, utils_js_1.viteIsSSR)(config);
+    const isForClientSide = !(0, viteIsSSR_js_1.viteIsSSR)(config);
     const fileTypes = isForClientSide ? ['.page', '.page.client'] : ['.page', '.page.server'];
     if (isForClientSide && includeAssetsImportedByServer) {
         fileTypes.push('.page.server');

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

@@ -4,11 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildEntry = buildEntry;
-exports.set_ASSETS_MAP = set_ASSETS_MAP;
+exports.set_ASSETS_MANIFEST = set_ASSETS_MANIFEST;
 const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/virtualFileImportUserCode.js");
-const getVikeManifest_js_1 = require("./getVikeManifest.js");
-const getVikeConfig_js_1 = require("../importUserCode/v1-design/getVikeConfig.js");
 const utils_js_1 = require("../../utils.js");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
@@ -16,69 +14,75 @@ const module_1 = require("module");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
-const ASSETS_MAP = '__VITE_ASSETS_MAP__';
+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() {
     let config;
-    let vikeConfigGlobal;
     return [
         {
             name: 'vike:buildEntry',
             enforce: 'post',
             async configResolved(config_) {
                 config = config_;
-                const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-                vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
             }
         },
         ...(0, plugin_1.serverProductionEntryPlugin)({
             getServerProductionEntry: () => {
-                return getServerProductionEntryCode(config, vikeConfigGlobal);
+                return getServerProductionEntryCode(config);
             },
             libraryName: 'Vike'
         })
     ];
 }
-function getServerProductionEntryCode(config, vikeConfigGlobal) {
+function getServerProductionEntryCode(config) {
     const importPath = getImportPath(config);
-    const vikeManifest = (0, getVikeManifest_js_1.getVikeManifest)(vikeConfigGlobal, config);
-    // Let's eventually simplify and move everything to a single virtual module
+    const buildInfo = {
+        versionAtBuildTime: utils_js_1.projectInfo.projectVersion,
+        usesClientRouter: (0, extractExportNamesPlugin_js_1.isUsingClientRouter)(), // TODO/v1-release: remove
+        viteConfigRuntime: (0, globalContext_js_1.getViteConfigRuntime)(config)
+    };
+    (0, globalContext_js_1.assertBuildInfo)(buildInfo);
+    // After the old design is removed, let's maybe simplify and move everything into a single virtual module
     const importerCode = [
         `  import { setGlobalContext_buildEntry } from '${importPath}';`,
-        `  import * as pageFiles from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
+        `  import * as virtualFileExports from '${virtualFileImportUserCode_js_1.virtualFileIdImportUserCodeServer}';`,
         `  {`,
-        // We first set the values to a variable because of a Rollup bug, and this workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
-        `    const assetsManifest = ${ASSETS_MAP};`,
-        `    const pluginManifest = ${JSON.stringify(vikeManifest, null, 2)};`,
+        // Because of a Rollup bug, we have to assign ASSETS_MANIFEST to a variable before passing it to setGlobalContext_buildEntry()
+        // - This workaround doesn't work: https://github.com/vikejs/vike/commit/d5f3a4f7aae5a8bc44192e6cbb2bcb9007be188d
+        `    const assetsManifest = ${ASSETS_MANIFEST};`,
+        `    const buildInfo = ${JSON.stringify(buildInfo, null, 2)};`,
         '    setGlobalContext_buildEntry({',
-        `      pageFiles,`,
+        `      virtualFileExports,`,
         `      assetsManifest,`,
-        `      pluginManifest,`,
+        `      buildInfo,`,
         '    });',
         `  }`,
         ''
     ].join('\n');
     return importerCode;
 }
-/** Set the value of the ASSETS_MAP constant inside dist/server/entry.js (or dist/server/index.js) */
-async function set_ASSETS_MAP(options, bundle) {
+/** 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) {
     const { dir } = options;
     (0, utils_js_1.assert)(dir);
-    const chunkPath = find_ASSETS_MAP(bundle);
+    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')
     ]);
-    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MAP, assetsJsonString);
+    const serverEntryFileContentPatched = chunkFileContent.replace(ASSETS_MANIFEST, assetsJsonString);
     (0, utils_js_1.assert)(serverEntryFileContentPatched !== chunkFileContent);
     await promises_1.default.writeFile(chunkFilePath, serverEntryFileContentPatched);
 }
-function find_ASSETS_MAP(bundle) {
+function find_ASSETS_MANIFEST(bundle) {
     let chunkPath;
     for (const filePath in bundle) {
         const chunk = bundle[filePath];
-        if ('code' in chunk && chunk.code.includes(ASSETS_MAP)) {
+        if ('code' in chunk && chunk.code.includes(ASSETS_MANIFEST)) {
             (0, utils_js_1.assert)(!chunkPath);
             chunkPath = filePath;
         }
@@ -97,7 +101,7 @@ function getImportPath(config) {
         return 'vike/__internal';
     }
     else {
-        const { outDirServer } = (0, utils_js_1.getOutDirs)(config);
+        const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
         const filePathRelative = path_1.default.posix.relative(outDirServer, filePathAbsolute);
         return filePathRelative;
     }

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

@@ -16,7 +16,7 @@ const isViteCliCall_js_1 = require("../shared/isViteCliCall.js");
 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 isPrerenderAutoRunEnabled_js_1 = require("../../prerender/isPrerenderAutoRunEnabled.js");
+const context_js_2 = require("../../prerender/context.js");
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -35,9 +35,11 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: vikeConfig,
-                        // TODO/v1-release: remove
-                        configVikePromise: Promise.resolve(vikeConfig.vikeConfigGlobal)
+                        vike: { 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)
+                        })
                     };
                 }
             }
@@ -147,7 +149,7 @@ function assertVikeCliOrApi(config) {
         onlyOnce: true
     });
 }
-// TODO/v1-release: remove
+// TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
 function temp_supportOldInterface(config) {
     if (!('vitePluginSsr' in config))
         return;
@@ -155,14 +157,14 @@ function temp_supportOldInterface(config) {
     if ((0, utils_js_1.hasProp)(config.vitePluginSsr, 'prerender', 'object')) {
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(config.vitePluginSsr.prerender, 'disableAutoRun', 'boolean'));
         if (config.vitePluginSsr.prerender.disableAutoRun) {
-            (0, isPrerenderAutoRunEnabled_js_1.temp_disablePrerenderAutoRun)();
+            (0, context_js_2.temp_disablePrerenderAutoRun)();
         }
         return;
     }
     if ((0, utils_js_1.hasProp)(config.vitePluginSsr, 'disableAutoFullBuild')) {
         if (config.vitePluginSsr.disableAutoFullBuild) {
             (0, utils_js_1.assert)(config.vitePluginSsr.disableAutoFullBuild === 'prerender');
-            (0, isPrerenderAutoRunEnabled_js_1.temp_disablePrerenderAutoRun)();
+            (0, context_js_2.temp_disablePrerenderAutoRun)();
         }
         return;
     }

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

@@ -18,6 +18,7 @@ const fixServerAssets_js_1 = require("./buildConfig/fixServerAssets.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 extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -45,8 +46,9 @@ function extractAssetsPlugin() {
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
-                (0, utils_js_1.assert)(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
-                (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
+                // 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_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -63,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, utils_js_1.viteIsSSR_options)(options)) {
+                if ((0, viteIsSSR_js_1.viteIsSSR_options)(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));
@@ -78,7 +80,8 @@ function extractAssetsPlugin() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                (0, utils_js_1.assert)(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
+                // TODO/now: add meta.default
+                (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
                 let resolution = null;
                 try {
                     resolution = await this.resolve(source, importer, { skipSelf: true, ...options });

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

@@ -7,6 +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 extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
@@ -18,7 +19,7 @@ function extractExportNamesPlugin() {
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, utils_js_1.viteIsSSR_options)(options);
+            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_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/importUserCode/getVirtualFileImportUserCode.js

@@ -9,18 +9,19 @@ const virtualFileImportUserCode_js_1 = require("../../../shared/virtual-files/vi
 const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const path_1 = __importDefault(require("path"));
-const getVirtualFilePageConfigs_js_1 = require("./v1-design/getVirtualFilePageConfigs.js");
+const getVirtualFilePageConfigs_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigs.js");
 const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
-async function getVirtualFileImportUserCode(id, options, vikeConfigGlobal, config, isDev) {
+const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
+const viteIsSSR_js_1 = require("../../shared/viteIsSSR.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, utils_js_1.viteIsSSR_options)(options));
-    const isPrerendering = !!vikeConfigGlobal.prerender;
-    const code = await getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id);
+    (0, utils_js_1.assert)(isForClientSide === !(0, viteIsSSR_js_1.viteIsSSR_options)(options));
+    const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
-async function getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
+async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isDev, id) {
     const { command } = config;
     (0, utils_js_1.assert)(command === 'serve' || command === 'build');
     const isBuild = command === 'build';
@@ -29,7 +30,7 @@ async function getCode(config, vikeConfigGlobal, isForClientSide, isClientRoutin
     {
         const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
-        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id);
+        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, config, isDev, id);
     }
     (0, utils_js_1.debugGlob)(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
@@ -59,7 +60,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfigGlobal, isPrerendering, config, isDev, id) {
+async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, config, isDev, id) {
     let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
@@ -74,6 +75,8 @@ ${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);
+    // 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
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {
@@ -91,7 +94,9 @@ ${await (0, getVirtualFilePageConfigs_js_1.getVirtualFilePageConfigs)(isForClien
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    if (vikeConfigGlobal.includeAssetsImportedByServer && isForClientSide) {
+    // TODO/now: add meta.default
+    const includeAssetsImportedByServer = vikeConfig.global.config.includeAssetsImportedByServer ?? true;
+    if (includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
     return fileContent;
@@ -167,7 +172,7 @@ function getGlobRoots(config) {
     const globRoots = [
         {
             includeDir: '/',
-            excludeDir: path_1.default.posix.relative(config.root, (0, utils_js_1.getOutDirs)(config).outDirRoot)
+            excludeDir: path_1.default.posix.relative(config.root, (0, getOutDirs_js_1.getOutDirs)(config).outDirRoot)
         }
     ];
     return globRoots;

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importUserCode = importUserCode;
 const vite_1 = require("vite");
-const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/getVirtualFilePageConfigValuesAll.js");
+const getVirtualFilePageConfigValuesAll_js_1 = require("./v1-design/virtual-files/getVirtualFilePageConfigValuesAll.js");
 const getVirtualFileImportUserCode_js_1 = require("./getVirtualFileImportUserCode.js");
 const utils_js_1 = require("../../utils.js");
 const virtual_files_js_1 = require("../../../shared/virtual-files.js");
@@ -15,14 +15,15 @@ const getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const loggerNotProd_js_1 = require("../../shared/loggerNotProd.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
+const getPlusFilesAll_js_1 = require("./v1-design/getVikeConfig/getPlusFilesAll.js");
+const globalContext_js_1 = require("../../../runtime/globalContext.js");
 function importUserCode() {
     let config;
-    let vikeConfigGlobal;
+    let vikeConfig;
     return {
         name: 'vike:importUserCode',
         async configResolved(config_) {
-            const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
-            vikeConfigGlobal = vikeConfig.vikeConfigGlobal;
+            vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config_);
             config = config_;
             // TODO/v1-release: remove
             {
@@ -57,7 +58,7 @@ function importUserCode() {
                 return code;
             }
             if ((0, virtualFileImportUserCode_js_1.isVirtualFileIdImportUserCode)(id)) {
-                const code = await (0, getVirtualFileImportUserCode_js_1.getVirtualFileImportUserCode)(id, options, vikeConfigGlobal, config, isDev);
+                const code = await (0, getVirtualFileImportUserCode_js_1.getVirtualFileImportUserCode)(id, options, vikeConfig, config, isDev);
                 return code;
             }
         },
@@ -72,7 +73,7 @@ function handleFileAddRemove(server, config) {
     return;
     function listener(file, isRemove) {
         file = (0, vite_1.normalizePath)(file);
-        const isVikeConfig = isVikeConfigModule(file) || (0, getVikeConfig_js_1.isVikeConfigFile)(file);
+        const isVikeConfig = isVikeConfigModule(file) || isVikeConfigFile(file);
         if (isVikeConfig) {
             const virtualModules = getVirtualModules(server);
             virtualModules.forEach((mod) => {
@@ -124,6 +125,7 @@ function reloadConfig(filePath, config, op) {
         (0, loggerNotProd_js_1.logConfigInfo)(msg, 'info');
     }
     (0, getVikeConfig_js_1.reloadVikeConfig)(config);
+    (0, globalContext_js_1.updateUserFiles)();
 }
 function getVirtualModules(server) {
     const virtualModules = Array.from(server.moduleGraph.urlToModuleMap.keys())
@@ -135,3 +137,6 @@ function getVirtualModules(server) {
     });
     return virtualModules;
 }
+function isVikeConfigFile(filePath) {
+    return !!(0, getPlusFilesAll_js_1.getPlusFileValueConfigName)(filePath);
+}