vike 0.4.219 → 0.4.220-commit-9a798ce

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

@@ -16,7 +16,8 @@ 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 resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -35,9 +36,11 @@ function commonConfig(vikeVitePluginOptions) {
                         _isDev: isDev,
                         _root: root,
                         _vikeVitePluginOptions: vikeVitePluginOptions,
-                        vike: vikeConfig,
-                        // TODO/v1-release: remove
-                        configVikePromise: Promise.resolve(vikeConfig.vikeConfigGlobal)
+                        vike: { global: vikeConfig.global },
+                        // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
+                        configVikePromise: Promise.resolve({
+                            prerender: !!(0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender)
+                        })
                     };
                 }
             }
@@ -80,7 +83,7 @@ function commonConfig(vikeVitePluginOptions) {
                     // VITE_CONFIG
                     const configFromEnvVar = (0, getEnvVarObject_js_1.getEnvVarObject)('VITE_CONFIG');
                     if (configFromEnvVar)
-                        configFromVike = (0, vite_1.mergeConfig)(configFromEnvVar, configFromVike);
+                        configFromVike = (0, vite_1.mergeConfig)(configFromVike, configFromEnvVar);
                     return configFromVike;
                 }
             }
@@ -147,7 +150,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 +158,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

@@ -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' }