vike 0.4.220-commit-5c7810f → 0.4.220-commit-af5c91f

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/toPosixPath.js"), exports);
+__exportStar(require("../../utils/path.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);

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

@@ -29,7 +29,7 @@ const envVars_js_1 = require("./plugins/envVars.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const fileEnv_js_1 = require("./plugins/fileEnv.js");
 const getPageAssets_js_1 = require("../runtime/renderPage/getPageAssets.js");
-const resolveClientEntriesDev_js_1 = require("./resolveClientEntriesDev.js");
+const resolveClientEntriesDev_js_1 = require("./shared/resolveClientEntriesDev.js");
 const workaroundCssModuleHmr_js_1 = require("./plugins/workaroundCssModuleHmr.js");
 const workaroundVite6HmrRegression_js_1 = require("./plugins/workaroundVite6HmrRegression.js");
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts

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

@@ -10,7 +10,7 @@ function onLoad() {
     (0, assertSetup_js_1.markSetup_vikeVitePlugin)();
     (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
     (0, assertNodeVersion_js_1.assertNodeVersion)();
-    // package.json#peerDependencies isn't enough as users can ignore it
+    // package.json#peerDependencies isn't enough as users often 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/buildConfig/fixServerAssets.js

@@ -18,6 +18,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 +33,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 +49,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))
@@ -199,7 +201,7 @@ function fixServerAssets_assertCssCodeSplit(config) {
 }
 const targets = [];
 function fixServerAssets_assertCssTarget_populate(config) {
-    const isServerSide = (0, utils_js_1.viteIsSSR)(config);
+    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 });

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);
@@ -45,7 +47,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) {
@@ -63,10 +65,10 @@ function buildConfig() {
                 order: 'post',
                 handler(config) {
                     (0, utils_js_1.onSetupBuild)();
-                    isSsrBuild = (0, utils_js_1.viteIsSSR)(config);
+                    isSsrBuild = (0, viteIsSSR_js_1.viteIsSSR)(config);
                     return {
                         build: {
-                            outDir: (0, utils_js_1.resolveOutDir)(config),
+                            outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
                             manifest: manifestTempFile,
                             copyPublicDir: !isSsrBuild
                         }
@@ -123,7 +125,7 @@ async function getEntries(config) {
     // TODO/now: add meta.default
     vikeConfig.global.config.includeAssetsImportedByServer ?? true);
     (0, utils_js_1.assertUsage)(Object.keys(pageFileEntries).length !== 0 || pageConfigs.length !== 0, 'At least one page should be defined, see https://vike.dev/add');
-    if ((0, 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
@@ -197,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

@@ -16,6 +16,7 @@ const importMetaUrl = `file://${__filename}`;
 const require_ = (0, module_1.createRequire)(importMetaUrl);
 const extractExportNamesPlugin_js_1 = require("../extractExportNamesPlugin.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
+const getOutDirs_js_1 = require("../../shared/getOutDirs.js");
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function buildEntry() {
     let config;
@@ -100,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

@@ -17,7 +17,6 @@ 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 [
@@ -39,7 +38,7 @@ function commonConfig(vikeVitePluginOptions) {
                         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)
+                            prerender: (0, context_js_2.isPrerenderEnabled)(vikeConfig)
                         })
                     };
                 }

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(?:&|$)/;
@@ -47,7 +48,7 @@ function extractAssetsPlugin() {
                 }
                 // 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));
+                (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');
@@ -64,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));

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

@@ -11,17 +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");
-const resolvePrerenderConfig_js_1 = require("../../../prerender/resolvePrerenderConfig.js");
+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 = !!(0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig.global.config.prerender);
-    const code = await getCode(config, vikeConfig, 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, vikeConfig, 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';
@@ -30,7 +30,7 @@ async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isP
     {
         const globRoots = getGlobRoots(config);
         (0, utils_js_1.debugGlob)('Glob roots: ', globRoots);
-        content += await generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, 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;
@@ -60,7 +60,7 @@ function determineInjection({ fileType, isForClientSide, isClientRouting, isPrer
         }
     }
 }
-async function generateGlobImports(globRoots, isBuild, isForClientSide, isClientRouting, vikeConfig, 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 = {};
@@ -75,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) => {
@@ -170,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/v1-design/getVikeConfig/loadFileAtConfigTime.js

@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadImportedFile = loadImportedFile;
+exports.loadPointerImport = loadPointerImport;
 exports.loadValueFile = loadValueFile;
-exports.loadValueFiles = loadValueFiles;
 exports.loadConfigFile = loadConfigFile;
 const utils_js_1 = require("../../../../utils.js");
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
@@ -16,38 +15,36 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
+const getConfigDefinedAt_js_1 = require("../../../../../../shared/page-configs/getConfigDefinedAt.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 // Load pointer import
-async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
-    const f = import_.filePathAbsoluteFilesystem;
-    if (!importedFilesLoaded[f]) {
-        importedFilesLoaded[f] = (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(import_, userRootDir, false).then((r) => r.fileExports);
-    }
-    const fileExports = await importedFilesLoaded[f];
-    const fileExport = fileExports[import_.fileExportName];
-    return fileExport;
+async function loadPointerImport(pointerImport, userRootDir, configName, configDefinitions, esbuildCache) {
+    // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
+    if (configName === 'extends')
+        return;
+    const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
+    // Only load pointer import if `env.config===true`
+    if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
+        return;
+    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, pointerImport.fileExportPath);
+    (0, utils_js_1.assertUsage)(pointerImport.fileExportPath.filePathAbsoluteFilesystem, `${configDefinedAt} cannot be defined over an aliased import`);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(pointerImport.fileExportPath, userRootDir, false, esbuildCache);
+    const fileExportValue = fileExports[pointerImport.fileExportPath.fileExportName];
+    pointerImport.fileExportValueLoaded = true;
+    (0, utils_js_1.assert)(pointerImport.fileExportValueLoaded);
+    pointerImport.fileExportValue = fileExportValue;
 }
 // Load +{configName}.js
-async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir) {
+async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir, esbuildCache) {
     const { configName } = interfaceValueFile;
     const configDef = (0, getVikeConfig_js_1.getConfigDefinitionOptional)(configDefinitions, configName);
-    if (!configDef || !(0, getVikeConfig_js_1.shouldBeLoadableAtBuildTime)(configDef)) {
-        // Only load value files with `env.config===true`
+    // Only load value files with `env.config===true`
+    if (!configDef || !shouldBeLoadableAtBuildTime(configDef))
         return;
-    }
-    if (interfaceValueFile.isValueLoaded) {
-        await interfaceValueFile.isValueLoaded;
-        if (
-        // Help TS
-        true)
-            return;
-    }
-    const { promise, resolve } = (0, utils_js_1.genPromise)();
-    interfaceValueFile.isValueLoaded = promise;
-    (0, utils_js_1.assert)(interfaceValueFile.isValueLoaded);
+    interfaceValueFile.isValueFileLoaded = true;
+    (0, utils_js_1.assert)(interfaceValueFile.isValueFileLoaded);
     interfaceValueFile.fileExportsByConfigName = {};
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, userRootDir, false);
-    resolve();
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(interfaceValueFile.filePath, userRootDir, false, esbuildCache);
     const { filePathToShowToUser } = interfaceValueFile.filePath;
     (0, assertPlusFileExport_js_1.assertPlusFileExport)(fileExports, filePathToShowToUser, configName);
     Object.entries(fileExports).forEach(([exportName, configValue]) => {
@@ -55,21 +52,12 @@ async function loadValueFile(interfaceValueFile, configDefinitions, userRootDir)
         interfaceValueFile.fileExportsByConfigName[configName_] = configValue;
     });
 }
-async function loadValueFiles(interfaceFiles, configDefinitions, userRootDir) {
-    await Promise.all(Object.values(interfaceFiles)
-        .flat(1)
-        .filter((interfaceFile) => interfaceFile.isValueFile)
-        .map(async (interfaceFile) => await loadValueFile(interfaceFile, configDefinitions, userRootDir)));
-}
 // Load +config.js, including all its extends pointer imports
-async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
+async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig, esbuildCache) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);
-    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, userRootDir, isExtensionConfig ? 'is-extension-config' : true);
-    const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [
-        ...visited,
-        filePathAbsoluteFilesystem
-    ]);
+    const { fileExports } = await (0, transpileAndExecuteFile_js_1.transpileAndExecuteFile)(configFilePath, userRootDir, isExtensionConfig ? 'is-extension-config' : true, esbuildCache);
+    const { extendsConfigs, extendsFilePaths } = await loadExtendsConfigs(fileExports, configFilePath, userRootDir, [...visited, filePathAbsoluteFilesystem], esbuildCache);
     const configFile = {
         fileExports,
         filePath: configFilePath,
@@ -85,15 +73,15 @@ function assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem) {
     (0, utils_js_1.assert)(loop[0] === filePathAbsoluteFilesystem);
     (0, utils_js_1.assertUsage)(idx === -1, `Infinite extends loop ${[...loop, filePathAbsoluteFilesystem].join('>')}`);
 }
-async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited) {
+async function loadExtendsConfigs(configFileExports, configFilePath, userRootDir, visited, esbuildCache) {
     const { extendsPointerImportData, extendsConfigs } = getExtendsPointerImportData(configFileExports, configFilePath);
     const extendsConfigFiles = [];
     extendsPointerImportData.map((pointerImportData) => {
-        const filePath = (0, resolvePointerImport_js_1.resolvePointerImport)(pointerImportData, configFilePath, userRootDir);
+        const filePath = (0, resolvePointerImport_js_1.resolvePointerImportData)(pointerImportData, configFilePath, userRootDir);
         (0, utils_js_1.assert)(filePath.filePathAbsoluteFilesystem);
         extendsConfigFiles.push(filePath);
     });
-    const results = await Promise.all(extendsConfigFiles.map(async (configFilePath) => await loadConfigFile(configFilePath, userRootDir, visited, true)));
+    const results = await Promise.all(extendsConfigFiles.map(async (configFilePath) => await loadConfigFile(configFilePath, userRootDir, visited, true, esbuildCache)));
     results.forEach((result) => {
         extendsConfigs.push(result.configFile);
         extendsConfigs.push(...result.extendsConfigs);
@@ -136,3 +124,6 @@ function getExtendsPointerImportData(configFileExports, configFilePath) {
     }
     return { extendsPointerImportData, extendsConfigs };
 }
+function shouldBeLoadableAtBuildTime(configDef) {
+    return !!configDef.env.config && !configDef._valueIsFilePath;
+}

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

@@ -3,37 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePointerImportOfConfig = resolvePointerImportOfConfig;
 exports.resolvePointerImport = resolvePointerImport;
-exports.clearFilesEnvMap = clearFilesEnvMap;
-exports.resolveConfigEnvWithFileName = resolveConfigEnvWithFileName;
+exports.resolvePointerImportData = resolvePointerImportData;
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const utils_js_1 = require("../../../../utils.js");
 const transformPointerImports_js_1 = require("./transformPointerImports.js");
 const path_1 = __importDefault(require("path"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
-const filesEnvMap = new Map();
-function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
+function resolvePointerImport(configValue, importerFilePath, userRootDir, configName) {
     if (typeof configValue !== 'string')
         return null;
     const pointerImportData = (0, transformPointerImports_js_1.parsePointerImportData)(configValue);
     if (!pointerImportData)
         return null;
-    const { importPath, exportName } = pointerImportData;
-    const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
+    const { exportName } = pointerImportData;
+    const filePath = resolvePointerImportData(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
-    let configEnvResolved = configEnv;
-    if (filePath.filePathAbsoluteFilesystem)
-        configEnvResolved = resolveConfigEnvWithFileName(configEnv, filePath);
-    assertUsageFileEnv(filePath, importPath, configEnvResolved, configName);
-    const pointerImport = {
+    const fileExportPath = {
         ...filePath,
         fileExportName: exportName,
         fileExportPathToShowToUser
     };
-    return { pointerImport, configEnvResolved };
+    return { fileExportPath };
 }
-function resolvePointerImport(pointerImportData, importerFilePath, userRootDir) {
+function resolvePointerImportData(pointerImportData, importerFilePath, userRootDir) {
     // `importPath` should be one of the following:
     // - A relative import path
     // - A filesystem absolute path
@@ -44,7 +37,7 @@ function resolvePointerImport(pointerImportData, importerFilePath, userRootDir)
     (0, utils_js_1.assertPosixPath)(importPath);
     if (importPath.startsWith('.') || (0, utils_js_1.isFilePathAbsolute)(importPath)) {
         if (importPath.startsWith('.')) {
-            (0, utils_js_1.assertUsage)(isRelativeImportPath(importPath), `Invalid relative import path ${picocolors_1.default.code(importPath)} defined by ${importerFilePath.filePathToShowToUser} because it should start with ${picocolors_1.default.code('./')} or ${picocolors_1.default.code('../')}, or use an npm package import instead.`);
+            (0, utils_js_1.assertUsage)((0, utils_js_1.pathIsRelative)(importPath), `Invalid relative import path ${picocolors_1.default.code(importPath)} defined by ${importerFilePath.filePathToShowToUser} because it should start with ${picocolors_1.default.code('./')} or ${picocolors_1.default.code('../')}, or use an npm package import instead.`);
         }
         // Pointer imports are included in virtual files, thus relative imports need to be resolved. (Virtual modules cannot contain relative imports.)
         assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportData, importerFilePath);
@@ -100,7 +93,7 @@ function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportD
             : `The import ${picocolors_1.default.code(importString)} defined by ${filePathToShowToUser}`;
         const errIntro2 = `${errIntro} couldn't be resolved: does ${importPathString}`;
         if (importPath.startsWith('.')) {
-            (0, utils_js_1.assert)(isRelativeImportPath(importPath));
+            (0, utils_js_1.assert)((0, utils_js_1.pathIsRelative)(importPath));
             (0, utils_js_1.assertUsage)(false, `${errIntro2} point to an existing file?`);
         }
         else {
@@ -108,51 +101,3 @@ function assertUsageResolutionSuccess(filePathAbsoluteFilesystem, pointerImportD
         }
     }
 }
-function assertUsageFileEnv(filePath, importPath, configEnvResolved, configName) {
-    let key;
-    if (filePath.filePathAbsoluteFilesystem) {
-        key = filePath.filePathAbsoluteFilesystem;
-    }
-    else {
-        // Path alias
-        (0, utils_js_1.assert)(!isRelativeImportPath(importPath));
-        key = importPath;
-    }
-    (0, utils_js_1.assertPosixPath)(key);
-    if (!filesEnvMap.has(key)) {
-        filesEnvMap.set(key, []);
-    }
-    const fileEnv = filesEnvMap.get(key);
-    fileEnv.push({ configEnvResolved, configName });
-    const configDifferentEnv = fileEnv.filter((c) => !(0, utils_js_1.deepEqual)(c.configEnvResolved, configEnvResolved))[0];
-    if (configDifferentEnv) {
-        (0, utils_js_1.assertUsage)(false, [
-            `${key} defines the value of configs living in different environments:`,
-            ...[configDifferentEnv, { configName, configEnvResolved }].map((c) => `  - config ${picocolors_1.default.code(c.configName)} which value lives in environment ${picocolors_1.default.code(JSON.stringify(c.configEnvResolved))}`),
-            'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
-        ].join('\n'));
-    }
-}
-function clearFilesEnvMap() {
-    filesEnvMap.clear();
-}
-function resolveConfigEnvWithFileName(configEnv, filePath) {
-    const { fileName } = filePath;
-    const configEnvResolved = { ...configEnv };
-    if (fileName.includes('.server.')) {
-        configEnvResolved.server = true;
-        configEnvResolved.client = false;
-    }
-    else if (fileName.includes('.client.')) {
-        configEnvResolved.client = true;
-        configEnvResolved.server = false;
-    }
-    else if (fileName.includes('.shared.')) {
-        configEnvResolved.server = true;
-        configEnvResolved.client = true;
-    }
-    return configEnvResolved;
-}
-function isRelativeImportPath(importPath) {
-    return importPath.startsWith('./') || importPath.startsWith('../');
-}

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

@@ -26,25 +26,31 @@ const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
 const debugEsbuildResolve = (0, utils_js_1.createDebugger)('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
     debugEsbuildResolve('esbuild version', esbuild_1.version);
-async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
+async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile, esbuildCache) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
+    if (esbuildCache[filePathAbsoluteFilesystem]) {
+        return await esbuildCache[filePathAbsoluteFilesystem];
+    }
+    const { promise, resolve } = (0, utils_js_1.genPromise)();
+    esbuildCache[filePathAbsoluteFilesystem] = promise;
     (0, utils_js_1.assertUsage)((0, utils_js_1.isPlainJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
         (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
+    let fileExports;
     if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
-        const fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
-        return { fileExports };
+        fileExports = await executeFile(filePathAbsoluteFilesystem, filePath);
     }
     else {
         const transformImports = isConfigFile && (isHeader ? 'all' : true);
         const code = await transpileFile(filePath, transformImports, userRootDir);
-        const fileExports = await executeTranspiledFile(filePath, code);
-        return { fileExports };
+        fileExports = await executeTranspiledFile(filePath, code);
     }
+    resolve({ fileExports });
+    return { fileExports };
 }
 async function transpileFile(filePath, transformImports, userRootDir) {
     const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;