vike 0.4.220-commit-a9f46b8 → 0.4.220-commit-9a798ce

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

@@ -20,5 +20,5 @@ const onLoad_js_1 = require("./onLoad.js");
 (0, onLoad_js_1.onLoad)();
 __exportStar(require("../../utils/assert.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
-__exportStar(require("../../utils/filesystemPathHandling.js"), exports);
+__exportStar(require("../../utils/toPosixPath.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);

package/dist/cjs/{utils → node/plugin}/getOutDirs.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutDirs = getOutDirs;
 exports.resolveOutDir = resolveOutDir;
-const viteIsSSR_js_1 = require("./viteIsSSR.js");
-const assert_js_1 = require("./assert.js");
-const path_shim_js_1 = require("./path-shim.js");
-const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
+const viteIsSSR_js_1 = require("../../utils/viteIsSSR.js");
+const assert_js_1 = require("../../utils/assert.js");
+const path_shim_js_1 = require("../../utils/path-shim.js");
+const toPosixPath_js_1 = require("../../utils/toPosixPath.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const debug_js_1 = require("./debug.js");
+const debug_js_1 = require("../../utils/debug.js");
 const debug = (0, debug_js_1.createDebugger)('vike:outDir');
 function getOutDirs(config) {
     debug('getOutDirs()', new Error().stack);
@@ -55,7 +55,7 @@ function resolveOutDir(config) {
     }
 }
 function determineOutDirs(outDirRoot) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDirRoot);
+    (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
     (0, assert_js_1.assert)(!outDirRoot.endsWith('/'));
     (0, assert_js_1.assert)(isOutDirRoot(outDirRoot));
     const outDirClient = (0, path_shim_js_1.pathJoin)(outDirRoot, 'client');
@@ -66,8 +66,8 @@ function determineOutDirs(outDirRoot) {
 }
 function getOutDirsAll(outDirRoot, root) {
     if (!outDirIsAbsolutePath(outDirRoot)) {
-        (0, filesystemPathHandling_js_1.assertPosixPath)(outDirRoot);
-        (0, filesystemPathHandling_js_1.assertPosixPath)(root);
+        (0, toPosixPath_js_1.assertPosixPath)(outDirRoot);
+        (0, toPosixPath_js_1.assertPosixPath)(root);
         outDirRoot = (0, path_shim_js_1.pathJoin)(root, outDirRoot);
     }
     let { outDirClient, outDirServer } = determineOutDirs(outDirRoot);
@@ -80,7 +80,7 @@ function getOutDirsAll(outDirRoot, root) {
     return { outDirRoot, outDirClient, outDirServer };
 }
 function assertNormalization(outDirAny) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDirAny);
+    (0, toPosixPath_js_1.assertPosixPath)(outDirAny);
     (0, assert_js_1.assert)(outDirIsAbsolutePath(outDirAny));
     (0, assert_js_1.assert)(outDirAny.endsWith('/'));
     (0, assert_js_1.assert)(!outDirAny.endsWith('//'));
@@ -95,7 +95,7 @@ function assertIsNotOutDirRoot(outDir) {
 }
 /** `outDir` ends with `/server` or `/client` */
 function assertOutDirResolved(outDir, config) {
-    (0, filesystemPathHandling_js_1.assertPosixPath)(outDir);
+    (0, toPosixPath_js_1.assertPosixPath)(outDir);
     assertIsNotOutDirRoot(outDir);
     (0, assert_js_1.assert)('/client'.length === '/server'.length);
     const outDirCorrected = outDir.slice(0, -1 * '/client'.length);
@@ -121,7 +121,7 @@ function getOutDirFromViteResolvedConfig(config) {
     return outDir;
 }
 function normalize(outDir) {
-    outDir = (0, filesystemPathHandling_js_1.toPosixPath)(outDir);
+    outDir = (0, toPosixPath_js_1.toPosixPath)(outDir);
     outDir = outDir.replace(/\/+$/, ''); // remove trailing slashes
     return outDir;
 }

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

@@ -9,7 +9,6 @@ exports.ssr = plugin;
 exports.default = plugin;
 var utils_js_1 = require("./utils.js");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return utils_js_1.PROJECT_VERSION; } });
-const vite_1 = require("vite");
 const utils_js_2 = require("./utils.js");
 const buildConfig_js_1 = require("./plugins/buildConfig.js");
 const previewConfig_js_1 = require("./plugins/previewConfig.js");
@@ -33,8 +32,7 @@ const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
 const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
-(0, utils_js_2.markSetup_vikeVitePlugin)();
-assertViteVersion();
+// We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
 (0, getPageAssets_js_1.setResolveClientEntriesDev)(resolveClientEntriesDev_js_1.resolveClientEntriesDev);
 // Return as `any` to avoid Plugin type mismatches when there are multiple Vite versions installed
 function plugin(vikeVitePluginOptions = {}) {
@@ -69,10 +67,6 @@ Object.defineProperty(plugin, 'apply', {
         (0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
     }
 });
-// package.json#peerDependencies isn't enough as users can ignore it
-function assertViteVersion() {
-    (0, utils_js_2.assertVersion)('Vite', vite_1.version, '5.1.0');
-}
 // Ensures following works: `const vike = require('vike/plugin')` / `import vike from 'vike/plugin'`
 //  - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
 try {

package/dist/cjs/node/plugin/onLoad.js

@@ -4,9 +4,14 @@ exports.onLoad = onLoad;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const assertSetup_js_1 = require("../../utils/assertSetup.js");
 const assertNodeVersion_js_1 = require("../../utils/assertNodeVersion.js");
+const assertVersion_js_1 = require("../../utils/assertVersion.js");
+const vite_1 = require("vite");
 function onLoad() {
+    (0, assertSetup_js_1.markSetup_vikeVitePlugin)();
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
-    // Ensure we don't bloat the server runtime with heavy plugin dependencies such as esbuild
+    // package.json#peerDependencies isn't enough as users can ignore it
+    (0, assertVersion_js_1.assertVersion)('Vite', vite_1.version, '5.1.0');
+    // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     (0, assertSetup_js_1.assertIsNotProductionRuntime)();
 }

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

@@ -19,17 +19,16 @@ const context_js_3 = require("../../cli/context.js");
 let forceExit = false;
 function autoFullBuild() {
     let config;
-    let vikeConfigGlobal;
+    let vikeConfig;
     return [
         {
             name: 'vike:autoFullBuild',
             apply: 'build',
             enforce: 'pre',
             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_;
-                abortViteBuildSsr(vikeConfigGlobal);
+                abortViteBuildSsr(vikeConfig);
             },
             writeBundle: {
                 /* We can't use this because it breaks Vite's logging. TODO: try again with latest Vite version.
@@ -38,7 +37,7 @@ function autoFullBuild() {
                 */
                 async handler(_options, bundle) {
                     try {
-                        await triggerFullBuild(config, vikeConfigGlobal, bundle);
+                        await triggerFullBuild(config, vikeConfig, bundle);
                     }
                     catch (err) {
                         // Avoid Rollup prefixing the error with [vike:autoFullBuild], for example see https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
@@ -64,10 +63,10 @@ function autoFullBuild() {
         }
     ];
 }
-async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
+async function triggerFullBuild(config, vikeConfig, bundle) {
     if (config.build.ssr)
         return; // already triggered
-    if (isDisabled(vikeConfigGlobal))
+    if (isDisabled(vikeConfig))
         return;
     // Workaround for @vitejs/plugin-legacy
     //  - The legacy plugin triggers its own Rollup build for the client-side.
@@ -98,7 +97,7 @@ async function triggerFullBuild(config, vikeConfigGlobal, bundle) {
         (0, logErrorHint_js_1.logErrorHint)(err);
         process.exit(1);
     }
-    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfigGlobal)) {
+    if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
         const { prerenderContextPublic } = await (0, runPrerender_js_1.runPrerenderFromAutoRun)(configInline);
         config.vike.prerenderContext = prerenderContextPublic;
         forceExit = (0, context_js_3.isVikeCli)() || (0, isViteCliCall_js_1.isViteCliCall)();
@@ -113,15 +112,15 @@ function setSSR(configInline) {
         }
     };
 }
-function abortViteBuildSsr(vikeConfigGlobal) {
-    if (vikeConfigGlobal.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
+function abortViteBuildSsr(vikeConfig) {
+    if (vikeConfig.global.config.disableAutoFullBuild !== true && (0, isViteCliCall_js_1.isViteCliCall)() && (0, isViteCliCall_js_1.getViteConfigFromCli)()?.build.ssr) {
         (0, utils_js_1.assertWarning)(false, `The CLI call ${picocolors_1.default.cyan('$ vite build --ssr')} is superfluous since ${picocolors_1.default.cyan('$ vite build')} also builds the server-side. If you want two separate build steps then use https://vike.dev/disableAutoFullBuild or use Vite's ${picocolors_1.default.cyan('build()')} API.`, { onlyOnce: true });
         process.exit(0);
     }
 }
-function isDisabled(vikeConfigGlobal) {
-    const { disableAutoFullBuild } = vikeConfigGlobal;
-    if (disableAutoFullBuild === null || disableAutoFullBuild === 'prerender') {
+function isDisabled(vikeConfig) {
+    const { disableAutoFullBuild } = vikeConfig.global.config;
+    if (disableAutoFullBuild === undefined || disableAutoFullBuild === 'prerender') {
         const isViteApi = !(0, isViteCliCall_js_1.isViteCliCall)() && !(0, context_js_2.isVikeCliOrApi)();
         return isViteApi;
     }

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

@@ -13,7 +13,7 @@ function baseUrls() {
             const isDev = config._isDev;
             (0, utils_js_1.assert)(typeof isDev === 'boolean');
             const baseViteOriginal = config.base ?? '/__UNSET__'; // '/__UNSET__' because Vite resolves `_baseViteOriginal: null` to `undefined`
-            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config._vikeConfigGlobal.baseServer, config._vikeConfigGlobal.baseAssets);
+            basesResolved = (0, resolveBase_js_1.resolveBase)(baseViteOriginal, config.vike.global.config.baseServer ?? null, config.vike.global.config.baseAssets ?? null);
             // We cannot define these in configResolved() because Vite picks up the env variables before any configResolved() hook is called
             process.env.BASE_SERVER = basesResolved.baseServer;
             process.env.BASE_ASSETS = basesResolved.baseAssets;
@@ -29,7 +29,7 @@ function baseUrls() {
         },
         async configResolved(config) {
             const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(config);
-            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.vikeConfigGlobal.baseServer, vikeConfig.vikeConfigGlobal.baseAssets, config);
+            const basesResolved2 = (0, resolveBase_js_1.resolveBaseFromResolvedConfig)(vikeConfig.global.config.baseServer ?? null, vikeConfig.global.config.baseAssets ?? null, config);
             (0, utils_js_1.assert)(basesResolved2.baseServer === basesResolved.baseServer);
             (0, utils_js_1.assert)(basesResolved2.baseAssets === basesResolved.baseAssets);
             /* In dev, Vite seems buggy around setting vite.config.js#base to an absolute URL (e.g. http://localhost:8080/cdn/)

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

@@ -85,7 +85,7 @@ 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: {
@@ -108,7 +108,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,7 +118,10 @@ 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)) {
         const pageEntries = getPageEntries(pageConfigs);

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,74 @@ 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 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}';`,
         `  {`,
-        // 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,`,
         `      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;
         }

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

@@ -17,6 +17,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 [
@@ -36,10 +37,10 @@ function commonConfig(vikeVitePluginOptions) {
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
                         vike: { global: vikeConfig.global },
-                        // TODO/now: remove
-                        _vikeConfigGlobal: vikeConfig.vikeConfigGlobal,
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
-                        configVikePromise: Promise.resolve({ prerender: !!vikeConfig.vikeConfigGlobal.prerender })
+                        configVikePromise: Promise.resolve({
+                            prerender: !!(0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender)
+                        })
                     };
                 }
             }

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

@@ -45,7 +45,8 @@ function extractAssetsPlugin() {
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
-                (0, utils_js_1.assert)(vikeConfig.vikeConfigGlobal.includeAssetsImportedByServer);
+                // TODO/now: add meta.default
+                (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
                 (0, utils_js_1.assert)(!(0, utils_js_1.viteIsSSR_options)(options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
@@ -78,7 +79,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/importUserCode/getVirtualFileImportUserCode.js

@@ -11,16 +11,17 @@ 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 getVikeConfig_js_1 = require("./v1-design/getVikeConfig.js");
-async function getVirtualFileImportUserCode(id, options, vikeConfigGlobal, config, isDev) {
+const resolvePrerenderConfig_js_1 = require("../../../prerender/resolvePrerenderConfig.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);
+    const isPrerendering = !!(0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
+    const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isPrerendering, isDev, id);
     return code;
 }
-async function getCode(config, vikeConfigGlobal, isForClientSide, isClientRouting, isPrerendering, isDev, id) {
+async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isPrerendering, 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, isPrerendering, 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, isPrerendering, config, isDev, id) {
     let fileContent = `// Generated by https://github.com/vikejs/vike/blob/main/vike/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.ts
 
 export const pageFilesLazy = {};
@@ -91,7 +92,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;

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

@@ -17,12 +17,11 @@ const loggerNotProd_js_1 = require("../../shared/loggerNotProd.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.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 +56,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;
             }
         },

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertExtensionsConventions = assertExtensionsConventions;
-exports.assertExtensionsPeerDependencies = assertExtensionsPeerDependencies;
+exports.assertExtensionsRequire = assertExtensionsRequire;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isObjectOfStrings_js_1 = require("../../../../../utils/isObjectOfStrings.js");
 const utils_js_1 = require("../../../utils.js");
@@ -23,32 +23,33 @@ function assertConfigExportPath(interfaceFile) {
         (0, utils_js_1.assert)(!p.includes('node_modules'));
         return;
     }
-    const name = getConfigNameValue(interfaceFile);
+    const name = getNameValue(interfaceFile);
     (0, utils_js_1.assert)(name); // already asserted in assertExtensionName()
     const importPathAbsoluteExpected = `${name}/config`;
     (0, utils_js_1.assertWarning)(importPathAbsolute === importPathAbsoluteExpected, `The Vike configuration of ${picocolors_1.default.bold(name)} is exported at ${picocolors_1.default.bold(importPathAbsolute)}, but it should be exported at ${picocolors_1.default.bold(importPathAbsoluteExpected)} instead.`, { onlyOnce: true });
 }
 function assertExtensionName(interfaceFile) {
     const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
-    const name = getConfigNameValue(interfaceFile);
+    const name = getNameValue(interfaceFile);
     (0, utils_js_1.assertUsage)(name, `Vike extension name missing: the config ${filePathToShowToUser} must define the setting ${picocolors_1.default.cyan('name')}`);
 }
-function assertExtensionsPeerDependencies(interfaceFilesRelevantList) {
-    // Get installed extensions
+function assertExtensionsRequire(pageConfig) {
+    const interfaceFilesRelevantList = Object.values(pageConfig.interfaceFiles).flat(1);
+    // Collect extensions
     const extensions = {};
     interfaceFilesRelevantList.forEach((interfaceFile) => {
-        const name = getConfigNameValue(interfaceFile);
+        const name = getNameValue(interfaceFile);
         if (name) {
             const version = getExtensionVersion(name, interfaceFile);
             extensions[name] = version;
         }
     });
-    // Enforce peer dependencies
+    // Enforce `require`
     interfaceFilesRelevantList.forEach((interfaceFile) => {
         const require = getConfigRequireValue(interfaceFile);
         if (!require)
             return;
-        const name = getConfigNameValue(interfaceFile);
+        const name = getNameValue(interfaceFile);
         const filePathToShowToUser = getFilePathToShowToUser(interfaceFile);
         (0, utils_js_1.assertUsage)(name, `Setting ${picocolors_1.default.bold('name')} is required for being able to use setting ${picocolors_1.default.bold('require')} in ${filePathToShowToUser}.`);
         Object.entries(require).forEach(([reqName, reqVersion]) => {
@@ -72,7 +73,7 @@ function getConfigRequireValue(interfaceFile) {
     (0, utils_js_1.assertUsage)((0, isObjectOfStrings_js_1.isObjectOfStrings)(require), `The setting ${picocolors_1.default.bold('require')} defined at ${filePathToShowToUserResolved} should be an object with string values (${picocolors_1.default.bold('Record<string, string>')}).`);
     return require;
 }
-function getConfigNameValue(interfaceFile) {
+function getNameValue(interfaceFile) {
     const name = (0, getVikeConfig_js_1.getConfigValueInterfaceFile)(interfaceFile, 'name');
     if (!name)
         return null;

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

@@ -141,7 +141,12 @@ const configDefinitionsBuiltInAll = {
         eager: true,
         global: true
     },
-    prerender: { env: { config: true }, global: (value) => typeof value !== 'object', type: ['boolean', 'object'] },
+    prerender: {
+        env: { config: true },
+        global: (value) => typeof value === 'object',
+        type: ['boolean', 'object'],
+        cumulative: true
+    },
     vite: { env: { config: true }, global: true, cumulative: true, type: 'object' },
     disableAutoFullBuild: {
         env: { config: true },
@@ -153,8 +158,8 @@ const configDefinitionsBuiltInAll = {
         ]
     },
     includeAssetsImportedByServer: { env: { config: true }, global: true, type: 'boolean' },
-    baseAssets: { env: { config: true }, global: true, type: 'string' },
-    baseServer: { env: { config: true }, global: true, type: 'string' },
+    baseAssets: { env: { config: true, server: true }, global: true, type: 'string' },
+    baseServer: { env: { config: true, server: true }, global: true, type: 'string' },
     redirects: { env: { server: true }, global: true, type: 'string{}', cumulative: true },
     trailingSlash: { env: { server: true }, global: true, type: 'boolean' },
     disableUrlNormalization: { env: { server: true }, global: true, type: 'boolean' }