vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js

@@ -5,8 +5,9 @@ const findPageFiles_js_1 = require("../../shared/findPageFiles.js");
 const utils_js_1 = require("../../utils.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const pluginBuildConfig_js_1 = require("../pluginBuild/pluginBuildConfig.js");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const getFilePath_js_1 = require("../../shared/getFilePath.js");
+const getConfigValueSourcesRelevant_js_1 = require("../pluginVirtualFiles/getConfigValueSourcesRelevant.js");
 const debug = (0, utils_js_1.createDebugger)('vike:optimizeDeps');
 async function determineOptimizeDeps(config) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
@@ -40,43 +41,36 @@ async function getPageDeps(config, pageConfigs) {
     let entriesServer = [];
     let includeClient = [];
     let includeServer = [];
-    const addEntry = (e, configEnv, definedAt) => {
+    const addEntry = (e, isForClientSide, definedAt) => {
         (0, utils_js_1.assert)(e);
         // optimizeDeps.entries expects filesystem absolute paths
         (0, utils_js_1.assert)((0, utils_js_1.isVirtualFileId)(e) || (0, utils_js_1.isFilePathAbsoluteFilesystem)(e));
-        if (isRelevant(e, false, configEnv, definedAt)) {
+        if (isExcluded(e, isForClientSide, definedAt))
+            return;
+        if (isForClientSide) {
             entriesClient.push(e);
         }
-        if (isRelevant(e, true, configEnv, definedAt)) {
+        else {
             entriesServer.push(e);
         }
     };
-    const addInclude = (e, configEnv, definedAt) => {
+    const addInclude = (e, isForClientSide, definedAt) => {
         (0, utils_js_1.assert)(e);
         // optimizeDeps.include expects npm packages
         (0, utils_js_1.assert)(!e.startsWith('/'));
         // Shouldn't be a path alias, as path aliases would need to be added to optimizeDeps.entries instead of optimizeDeps.include
         (0, utils_js_1.assertIsImportPathNpmPackage)(e);
-        if (isRelevant(e, false, configEnv, definedAt)) {
+        if (isExcluded(e, isForClientSide, definedAt))
+            return;
+        if (isForClientSide) {
             includeClient.push(e);
         }
-        if (isRelevant(e, true, configEnv, definedAt)) {
-            includeServer.push(e);
-        }
-    };
-    const isRelevant = (e, server, configEnv, definedAt) => {
-        if (server) {
-            if (!configEnv || !configEnv.server)
-                return false;
-        }
         else {
-            if (configEnv && !configEnv.client)
-                return false;
+            includeServer.push(e);
         }
-        return !isExcluded(e, server, definedAt);
     };
-    const isExcluded = (e, server, definedAt) => {
-        const exclude = server ? config.ssr.optimizeDeps.exclude : config.optimizeDeps.exclude;
+    const isExcluded = (e, isForClientSide, definedAt) => {
+        const exclude = isForClientSide ? config.optimizeDeps.exclude : config.ssr.optimizeDeps.exclude;
         if (!exclude)
             return false;
         if (definedAt?.importPathAbsolute) {
@@ -88,26 +82,34 @@ async function getPageDeps(config, pageConfigs) {
     };
     // V1 design
     {
-        pageConfigs.forEach((pageConfig) => {
-            Object.entries(pageConfig.configValueSources).forEach(([configName, sources]) => {
-                sources
-                    .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverridden)(source, configName, pageConfig))
-                    .forEach((configValueSource) => {
-                    if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
-                        return;
-                    const { definedAt, configEnv } = configValueSource;
-                    if (definedAt.definedBy)
-                        return;
-                    if (definedAt.filePathAbsoluteUserRootDir !== null) {
-                        addEntry(
-                        // optimizeDeps.entries expects filesystem absolute paths
-                        definedAt.filePathAbsoluteFilesystem, configEnv, definedAt);
-                    }
-                    else {
-                        addInclude(
-                        // optimizeDeps.include expects npm packages
-                        definedAt.importPathAbsolute, configEnv, definedAt);
-                    }
+        ;
+        [true, false].forEach((isForClientSide) => {
+            pageConfigs.forEach((pageConfig) => {
+                Object.entries(pageConfig.configValueSources).forEach(([configName]) => {
+                    const runtimeEnv = {
+                        isForClientSide,
+                        isDev: true,
+                        // TO-DO/eventually/remove-server-router: let's eventually remove support for Server Routing
+                        isClientRouting: true,
+                    };
+                    const sourcesRelevant = (0, getConfigValueSourcesRelevant_js_1.getConfigValueSourcesRelevant)(configName, runtimeEnv, pageConfig);
+                    sourcesRelevant.forEach((configValueSource) => {
+                        if (!configValueSource.valueIsLoadedWithImport && !configValueSource.valueIsFilePath)
+                            return;
+                        const { definedAt } = configValueSource;
+                        if (definedAt.definedBy)
+                            return;
+                        if (definedAt.filePathAbsoluteUserRootDir !== null) {
+                            addEntry(
+                            // optimizeDeps.entries expects filesystem absolute paths
+                            definedAt.filePathAbsoluteFilesystem, isForClientSide, definedAt);
+                        }
+                        else {
+                            addInclude(
+                            // optimizeDeps.include expects npm packages
+                            definedAt.importPathAbsolute, isForClientSide, definedAt);
+                        }
+                    });
                 });
             });
         });
@@ -119,7 +121,7 @@ async function getPageDeps(config, pageConfigs) {
         pageFiles.forEach((filePathAbsoluteUserRootDir) => {
             const entry = (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir });
             const { filePathAbsoluteFilesystem } = entry;
-            addEntry(filePathAbsoluteFilesystem);
+            addEntry(filePathAbsoluteFilesystem, true);
         });
     }
     // Add virtual files.
@@ -129,11 +131,11 @@ async function getPageDeps(config, pageConfigs) {
     //     - If we do, then we need to adjust include/entries (maybe by making include === entries -> will Vite complain?)
     {
         const { hasClientRouting, hasServerRouting, clientEntries } = (0, pluginBuildConfig_js_1.analyzeClientEntries)(pageConfigs, config);
-        Object.values(clientEntries).forEach((e) => addEntry(e));
+        Object.values(clientEntries).forEach((e) => addEntry(e, true));
         if (hasClientRouting)
-            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientCR);
+            addEntry(virtualFileId_js_1.virtualFileIdGlobalEntryClientCR, true);
         if (hasServerRouting)
-            addEntry(virtualFileEntry_js_1.virtualFileIdEntryClientSR);
+            addEntry(virtualFileId_js_1.virtualFileIdGlobalEntryClientSR, true);
     }
     entriesClient = entriesClient;
     entriesServer = entriesServer;

package/dist/cjs/node/vite/plugins/pluginEnvVars.js

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginEnvVars = pluginEnvVars;
-const magic_string_1 = __importDefault(require("magic-string"));
 const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
 // TO-DO/eventually:
 // - Make ({}) 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
@@ -42,8 +38,8 @@ function pluginEnvVars() {
             if (!code.includes('({}).'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options);
-            const magicString = new magic_string_1.default(code);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             // Find & check
             const replacements = Object.entries(envsAll)
                 .filter(([key]) => {
@@ -81,14 +77,11 @@ function pluginEnvVars() {
                 .filter(utils_js_1.isNotNullish);
             // Apply
             replacements.forEach(({ regExpStr, replacement }) => {
-                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExpStr, replacement);
+                magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
             });
             if (!magicString.hasChanged())
                 return null;
-            return {
-                code: magicString.toString(),
-                map: magicString.generateMap({ hires: true, source: id }),
-            };
+            return getMagicStringResult();
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginExtractAssets.js

@@ -17,7 +17,7 @@ const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInter
 const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const getPageAssets_js_1 = require("../../runtime/renderPage/getPageAssets.js");
+const retrievePageAssetsProd_js_1 = require("../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 exports.extractAssetsRE = extractAssetsRE;
 const rawRE = /(\?|&)raw(?:&|$)/;
@@ -45,9 +45,9 @@ function pluginExtractAssets() {
                     (0, assertV1Design_js_1.assertV1Design)(vikeConfig._pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
-                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
-                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options));
+                (0, utils_js_1.assert)(!(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -64,7 +64,7 @@ function pluginExtractAssets() {
             //  - 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, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options)) {
+                if ((0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment)) {
                     // 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));
@@ -79,7 +79,7 @@ function pluginExtractAssets() {
                 if (!extractAssetsRE.test(importer)) {
                     return;
                 }
-                const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+                const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
                 (0, utils_js_1.assert)(includeAssetsImportedByServer);
                 let resolution = null;
                 try {

package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js

@@ -13,12 +13,13 @@ const debug = (0, utils_js_1.createDebugger)('vike:pluginExtractExportNames');
 const globalObject = (0, utils_js_1.getGlobalObject)('plugins/pluginExtractExportNames.ts', {});
 function pluginExtractExportNames() {
     let isDev = false;
+    let config;
     return {
         name: 'vike:pluginExtractExportNames',
         enforce: 'post',
         async transform(src, id, options) {
             id = (0, normalizeId_js_1.normalizeId)(id);
-            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options);
+            const isClientSide = !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment);
             if (extractExportNamesRE.test(id)) {
                 const code = await getExtractExportNamesCode(src, isClientSide, !isDev, id);
                 debug('id ' + id, ['result:\n' + code.code.trim(), 'src:\n' + src.trim()]);
@@ -28,6 +29,9 @@ function pluginExtractExportNames() {
         configureServer() {
             isDev = true;
         },
+        configResolved(config_) {
+            config = config_;
+        },
         config() {
             if (debug.isActivated) {
                 return { logLevel: 'silent' };

package/dist/cjs/node/vite/plugins/pluginNonRunnableDev.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginNonRunnableDev = pluginNonRunnableDev;
 const utils_js_1 = require("../utils.js");
-const resolveClientEntriesDev_js_1 = require("../shared/resolveClientEntriesDev.js");
-const retrieveAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js");
+const retrievePageAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js");
 const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
 const getMagicString_js_1 = require("../shared/getMagicString.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
@@ -12,11 +11,8 @@ function getViteRpcFunctions(viteDevServer) {
         async transformIndexHtmlRPC(html) {
             return await viteDevServer.transformIndexHtml('/', html);
         },
-        // TODO/now: dedupe retrievePageAssetsDevRPC and retrievePageAssetsDev()
         async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
-            const clientEntriesSrc = clientEntries.map((clientEntry) => (0, resolveClientEntriesDev_js_1.resolveClientEntriesDev)(clientEntry, viteDevServer));
-            const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
-            return { clientEntriesSrc, assetUrls };
+            return await (0, retrievePageAssetsDev_js_1.retrievePageAssetsDev)(viteDevServer, clientDependencies, clientEntries);
         },
         async getViteConfigRuntimeRPC() {
             return (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(viteDevServer.config);

package/dist/cjs/node/vite/plugins/pluginPreview.js

@@ -15,15 +15,22 @@ const sirv_1 = __importDefault(require("sirv"));
 const resolveVikeConfigInternal_js_1 = require("../shared/resolveVikeConfigInternal.js");
 function pluginPreview() {
     let config;
+    let configUnresolved;
     let vikeConfig;
     return {
         name: 'vike:pluginPreview',
         apply: utils_js_1.applyPreview,
         config(config) {
+            configUnresolved = config;
             return {
                 appType: 'custom',
+            };
+        },
+        configEnvironment(envName, configEnv) {
+            (0, utils_js_1.assert)(configUnresolved);
+            return {
                 build: {
-                    outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
+                    outDir: (0, getOutDirs_js_1.resolveOutDir_configEnvironment)(configUnresolved, envName, configEnv),
                 },
             };
         },
@@ -51,7 +58,7 @@ function pluginPreview() {
         },
     };
     function assertDist(isPrerenderingEnabledForAllPages) {
-        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirRoot, outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         const dirS = [outDirRoot, outDirClient];
         if (!isPrerenderingEnabledForAllPages)
             dirS.push(outDirServer);
@@ -60,11 +67,11 @@ function pluginPreview() {
         });
     }
     function addStaticAssetsMiddleware(middlewares) {
-        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         middlewares.use((0, sirv_1.default)(outDirClient));
     }
     function addStatic404Middleware(middlewares) {
-        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config);
+        const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(config, undefined);
         middlewares.use(config.base, (_, res, next) => {
             const file = node_path_1.default.posix.join(outDirClient, './404.html');
             if (node_fs_1.default.existsSync(file)) {

package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginReplaceConstants = pluginReplaceConstants;
-const magic_string_1 = __importDefault(require("magic-string"));
 const utils_js_1 = require("../utils.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
 const isViteServerBuild_js_1 = require("../shared/isViteServerBuild.js");
-const applyRegExWithMagicString_js_1 = require("../shared/applyRegExWithMagicString.js");
+const getMagicString_js_1 = require("../shared/getMagicString.js");
 function pluginReplaceConstants() {
     let config;
     return {
@@ -35,24 +31,21 @@ function pluginReplaceConstants() {
             // @ts-expect-error
             if (config._skipVikeReplaceConstants?.(id))
                 return;
-            const magicString = new magic_string_1.default(code);
+            const { magicString, getMagicStringResult } = (0, getMagicString_js_1.getMagicString)(code, id);
             const constantsMap = [];
             constantsMap.push({
                 constants: ['pageContext.isClientSide', 'globalContext.isClientSide', 'pageContext.globalContext.isClientSide'],
-                replacement: !(0, isViteServerBuild_js_1.isViteServerBuild_safe)(config, options),
+                replacement: !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, this.environment),
             });
             constantsMap.forEach(({ constants, replacement }) => {
                 if (!constants.some((c) => code.includes(c)))
                     return;
                 const regExp = getConstantRegExp(constants);
-                (0, applyRegExWithMagicString_js_1.applyRegExpWithMagicString)(magicString, regExp, replacement);
+                magicString.replaceAll(regExp, JSON.stringify(replacement));
             });
             if (!magicString.hasChanged())
                 return null;
-            return {
-                code: magicString.toString(),
-                map: magicString.generateMap({ hires: true, source: id }),
-            };
+            return getMagicStringResult();
         },
     };
 }

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigsEager = getVirtualFilePageConfigsEager;
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+exports.generateVirtualFileGlobalEntry = generateVirtualFileGlobalEntry;
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const debug_js_1 = require("./debug.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
-async function getVirtualFilePageConfigsEager(isForClientSide, isDev, id, isClientRouting) {
+async function generateVirtualFileGlobalEntry(isForClientSide, isDev, id, isClientRouting) {
     const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)(true);
     const { _pageConfigs: pageConfigs, _pageConfigGlobal: pageConfigGlobal } = vikeConfig;
     return getCode(pageConfigs, pageConfigGlobal, isForClientSide, isDev, id, isClientRouting);
@@ -37,11 +36,10 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
         lines.push(`    pageId: ${JSON.stringify(pageId)},`);
         lines.push(`    isErrorPage: ${JSON.stringify(isErrorPage)},`);
         lines.push(`    routeFilesystem: ${JSON.stringify(routeFilesystem)},`);
-        const virtualFileId = JSON.stringify((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, isForClientSide));
-        const load = `() => ({ moduleId: ${virtualFileId}, moduleExports: import(${virtualFileId}) })`;
-        lines.push(`    loadConfigLazy: ${load},`);
+        const virtualFileId = JSON.stringify((0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide }));
+        lines.push(`    loadVirtualFilePageEntry: () => ({ moduleId: ${virtualFileId}, moduleExportsPromise: import(${virtualFileId}) }),`);
         lines.push(`    configValuesSerialized: {`);
-        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', true));
+        lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', true));
         lines.push(`    },`);
         lines.push(`  },`);
     });
@@ -51,7 +49,7 @@ function getCodePageConfigsSerialized(pageConfigs, isForClientSide, isClientRout
 function getCodePageConfigGlobalSerialized(pageConfigGlobal, isForClientSide, isClientRouting, isDev, importStatements, filesEnv) {
     const lines = [];
     lines.push(`  configValuesSerialized: {`);
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '    ', null));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfigGlobal, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '    ', null));
     lines.push(`  },`);
     const code = lines.join('\n');
     return code;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFileEntry.js → generateVirtualFileGlobalEntryWithOldDesign.js}

@@ -3,22 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFileEntry = getVirtualFileEntry;
+exports.generateVirtualFileGlobalEntryWithOldDesign = generateVirtualFileGlobalEntryWithOldDesign;
 const utils_js_1 = require("../../utils.js");
-const virtualFileEntry_js_1 = require("../../../shared/virtualFiles/virtualFileEntry.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const vite_1 = require("vite");
 const fileTypes_js_1 = require("../../../../shared/getPageFiles/fileTypes.js");
 const node_path_1 = __importDefault(require("node:path"));
-const getVirtualFilePageConfigsEager_js_1 = require("./getVirtualFilePageConfigsEager.js");
+const generateVirtualFileGlobalEntry_js_1 = require("./generateVirtualFileGlobalEntry.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const isViteServerBuild_js_1 = require("../../shared/isViteServerBuild.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-async function getVirtualFileEntry(id, options, config, isDev) {
-    const idParsed = (0, virtualFileEntry_js_1.isVirtualFileIdEntry)(id);
-    (0, utils_js_1.assert)(idParsed);
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
+async function generateVirtualFileGlobalEntryWithOldDesign(id, options, config, env, isDev) {
+    const idParsed = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+    (0, utils_js_1.assert)(idParsed && idParsed.type === 'global-entry');
     const { isForClientSide, isClientRouting } = idParsed;
-    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_options)(options));
+    (0, utils_js_1.assert)(isForClientSide === !(0, isViteServerBuild_js_1.isViteServerBuild_extraSafe)(config, options, env));
     const code = await getCode(config, isForClientSide, isClientRouting, isDev, id);
     return code;
 }
@@ -71,7 +71,7 @@ export const pageFilesExportNamesEager = {};
 export const pageFilesList = [];
 export const neverLoaded = {};
 
-${await (0, getVirtualFilePageConfigsEager_js_1.getVirtualFilePageConfigsEager)(isForClientSide, isDev, id, isClientRouting)}
+${await (0, generateVirtualFileGlobalEntry_js_1.generateVirtualFileGlobalEntry)(isForClientSide, isDev, id, isClientRouting)}
 
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
@@ -96,7 +96,7 @@ ${await (0, getVirtualFilePageConfigsEager_js_1.getVirtualFilePageConfigsEager)(
             fileContent += getGlobs(globRoots, isBuild, fileType, 'extractExportNames', isV1Design);
         }
     });
-    const includeAssetsImportedByServer = (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
+    const includeAssetsImportedByServer = (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config);
     if (includeAssetsImportedByServer && isForClientSide) {
         fileContent += getGlobs(globRoots, isBuild, '.page.server', 'extractAssets', isV1Design);
     }
@@ -173,7 +173,7 @@ function getGlobRoots(config) {
     const globRoots = [
         {
             includeDir: '/',
-            excludeDir: node_path_1.default.posix.relative(config.root, (0, getOutDirs_js_1.getOutDirs)(config).outDirRoot),
+            excludeDir: node_path_1.default.posix.relative(config.root, (0, getOutDirs_js_1.getOutDirs)(config, undefined).outDirRoot),
         },
     ];
     return globRoots;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js}

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVirtualFilePageConfigLazy = getVirtualFilePageConfigLazy;
-// TODO/now: rename file to generateVirtualFileEntryPage.ts
+exports.generateVirtualFilePageEntry = generateVirtualFilePageEntry;
 const utils_js_1 = require("../../utils.js");
-const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
+const virtualFileId_js_1 = require("../../../shared/virtualFileId.js");
 const resolveVikeConfigInternal_js_1 = require("../../shared/resolveVikeConfigInternal.js");
 const extractAssetsQuery_js_1 = require("../../../shared/extractAssetsQuery.js");
 const debug_js_1 = require("./debug.js");
-const isRuntimeEnvMatch_js_1 = require("./isRuntimeEnvMatch.js");
 const serializeConfigValues_js_1 = require("../../../../shared/page-configs/serialize/serializeConfigValues.js");
 const handleAssetsManifest_js_1 = require("../pluginBuild/handleAssetsManifest.js");
 const getConfigValueBuildTime_js_1 = require("../../../../shared/page-configs/getConfigValueBuildTime.js");
-const getPageAssets_js_1 = require("../../../runtime/renderPage/getPageAssets.js");
-async function getVirtualFilePageConfigLazy(id, isDev, config) {
-    const result = (0, virtualFilePageConfigLazy_js_1.isVirtualFileIdPageConfigLazy)(id);
-    (0, utils_js_1.assert)(result);
+const retrievePageAssetsProd_js_1 = require("../../../runtime/renderPage/getPageAssets/retrievePageAssetsProd.js");
+async function generateVirtualFilePageEntry(id, isDev, config) {
+    const result = (0, virtualFileId_js_1.parseVirtualFileId)(id);
+    (0, utils_js_1.assert)(result && result.type === 'page-entry');
     /* This assertion fails when using includeAssetsImportedByServer
     {
       const isForClientSide = !config.build.ssr
@@ -36,20 +34,20 @@ async function getVirtualFilePageConfigLazy(id, isDev, config) {
             throw (0, utils_js_1.getProjectError)('Outdated request');
         //*/
     }
-    const code = getLoadConfigLazy(pageConfig, isForClientSide, pageId, (0, getPageAssets_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
+    const code = getCode(pageConfig, isForClientSide, pageId, (0, retrievePageAssetsProd_js_1.resolveIncludeAssetsImportedByServer)(vikeConfig.config), config, isDev);
     (0, debug_js_1.debug)(id, isForClientSide ? 'CLIENT-SIDE' : 'SERVER-SIDE', code);
     return code;
 }
-function getLoadConfigLazy(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
+function getCode(pageConfig, isForClientSide, pageId, includeAssetsImportedByServer, config, isDev) {
     const lines = [];
     const importStatements = [];
     const filesEnv = new Map();
     const isClientRouting = (0, getConfigValueBuildTime_js_1.getConfigValueBuildTime)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
     lines.push('export const configValuesSerialized = {');
-    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, (configEnv) => (0, isRuntimeEnvMatch_js_1.isRuntimeEnvMatch)(configEnv, { isForClientSide, isClientRouting, isDev }), '', false));
+    lines.push(...(0, serializeConfigValues_js_1.serializeConfigValues)(pageConfig, importStatements, filesEnv, { isForClientSide, isClientRouting, isDev }, '', false));
     lines.push('};');
     if (!(0, handleAssetsManifest_js_1.handleAssetsManifest_isFixEnabled)(config) && includeAssetsImportedByServer && isForClientSide && !isDev) {
-        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFilePageConfigLazy_js_1.getVirtualFileIdPageConfigLazy)(pageId, false))}'`);
+        importStatements.push(`import '${(0, extractAssetsQuery_js_1.extractAssetsAddQuery)((0, virtualFileId_js_1.generateVirtualFileId)({ type: 'page-entry', pageId, isForClientSide: false }))}'`);
     }
     const code = [...importStatements, ...lines].join('\n');
     return code;

package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigValueSourcesRelevant = getConfigValueSourcesRelevant;
+exports.isRuntimeEnvMatch = isRuntimeEnvMatch;
+const utils_js_1 = require("../../utils.js");
+function getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    let sourcesRelevant = pageConfig.configValueSources[configName];
+    if (!sourcesRelevant)
+        return [];
+    if (!configDef.cumulative) {
+        const source = sourcesRelevant[0];
+        if (source) {
+            sourcesRelevant = [source];
+        }
+        else {
+            (0, utils_js_1.assert)(sourcesRelevant.length === 0);
+        }
+    }
+    else {
+        // isOverridden() must be called before isRuntimeEnvMatch() is called (otherwise isOverridden() will return a wrong value)
+        sourcesRelevant = sourcesRelevant.filter((source) => !isOverridden(source, configName, pageConfig));
+    }
+    sourcesRelevant = sourcesRelevant.filter((source) => isRuntimeEnvMatch(source.configEnv, runtimeEnv));
+    return sourcesRelevant;
+}
+function isRuntimeEnvMatch(configEnv, runtimeEnv) {
+    if ('isForConfig' in runtimeEnv)
+        return !!configEnv.config;
+    // Runtime
+    if (!runtimeEnv.isForClientSide) {
+        if (!configEnv.server)
+            return false;
+    }
+    else {
+        if (!configEnv.client)
+            return false;
+        if (configEnv.client === 'if-client-routing' && !runtimeEnv.isClientRouting)
+            return false;
+    }
+    // Production/development
+    if (configEnv.production !== undefined) {
+        (0, utils_js_1.assert)(typeof configEnv.production === 'boolean');
+        (0, utils_js_1.assert)(typeof runtimeEnv.isDev === 'boolean');
+        if (configEnv.production) {
+            if (runtimeEnv.isDev)
+                return false;
+        }
+        else {
+            if (!runtimeEnv.isDev)
+                return false;
+        }
+    }
+    return true;
+}
+function isOverridden(source, configName, pageConfig) {
+    const configDef = pageConfig.configDefinitions[configName];
+    (0, utils_js_1.assert)(configDef);
+    if (configDef.cumulative)
+        return false;
+    const sources = pageConfig.configValueSources[configName];
+    (0, utils_js_1.assert)(sources);
+    const idx = sources.indexOf(source);
+    (0, utils_js_1.assert)(idx >= 0);
+    return idx > 0;
+}