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

package/dist/cjs/shared/getPageFiles/getPageFileObject.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageFileObject = getPageFileObject;
 const determinePageIdOld_js_1 = require("../determinePageIdOld.js");
-const assertPageFilePath_js_1 = require("../assertPageFilePath.js");
 const error_page_js_1 = require("../error-page.js");
 const utils_js_1 = require("../utils.js");
 const fileTypes_js_1 = require("./fileTypes.js");
@@ -38,19 +37,15 @@ function getPageFileObject(filePath) {
     return pageFile;
 }
 function isDefaultFilePath(filePath) {
-    (0, assertPageFilePath_js_1.assertPageFilePath)(filePath);
     if ((0, error_page_js_1.isErrorPageId)(filePath, false)) {
         return false;
     }
     return filePath.includes('/_default');
 }
 function isRendererFilePath(filePath) {
-    (0, assertPageFilePath_js_1.assertPageFilePath)(filePath);
     return filePath.includes('/renderer/');
 }
 function isAncestorDefaultPage(pageId, defaultPageFilePath) {
-    (0, assertPageFilePath_js_1.assertPageFilePath)(pageId);
-    (0, assertPageFilePath_js_1.assertPageFilePath)(defaultPageFilePath);
     (0, utils_js_1.assert)(!pageId.endsWith('/'));
     (0, utils_js_1.assert)(!defaultPageFilePath.endsWith('/'));
     (0, utils_js_1.assert)(isDefaultFilePath(defaultPageFilePath));

package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js

@@ -7,7 +7,6 @@ exports.serializeConfigValues = serializeConfigValues;
 exports.getConfigValuesBase = getConfigValuesBase;
 const assertSetup_js_1 = require("../../../utils/assertSetup.js");
 const utils_js_1 = require("../../../node/plugin/utils.js");
-const addImportStatement_js_1 = require("../../../node/plugin/plugins/importUserCode/addImportStatement.js");
 const transformPointerImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/transformPointerImports.js");
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
@@ -18,20 +17,20 @@ const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
 // - vike/shared/page-configs/serialize/parsePageConfigs.ts
 // - parsePageConfigs() is loaded on both the client- and server-side.
 (0, assertSetup_js_1.assertIsNotProductionRuntime)();
-function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspace, isEager) {
+function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatch, tabspace, isEager) {
     const lines = [];
     tabspace += '  ';
     getConfigValuesBase(pageConfig, isEnvMatch, isEager).forEach((entry) => {
         if (entry.configValueBase.type === 'computed') {
             (0, utils_js_1.assert)('value' in entry); // Help TS
-            const { configValueBase, value, configName } = entry;
-            const valueData = getValueSerializedWithJson(value, configName, configValueBase.definedAtData, importStatements);
+            const { configValueBase, value, configName, configEnv } = entry;
+            const valueData = getValueSerializedWithJson(value, configName, configValueBase.definedAtData, importStatements, filesEnv, configEnv);
             serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
         }
         if (entry.configValueBase.type === 'standard') {
             (0, utils_js_1.assert)('sourceRelevant' in entry); // Help TS
             const { configValueBase, sourceRelevant, configName } = entry;
-            const valueData = getValueSerializedFromSource(sourceRelevant, configName, importStatements);
+            const valueData = getValueSerializedFromSource(sourceRelevant, configName, importStatements, filesEnv);
             serializeConfigValue(configValueBase, valueData, configName, lines, tabspace);
         }
         if (entry.configValueBase.type === 'cumulative') {
@@ -39,7 +38,7 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
             const { configValueBase, sourcesRelevant, configName } = entry;
             const valueDataList = [];
             sourcesRelevant.forEach((source) => {
-                const valueData = getValueSerializedFromSource(source, configName, importStatements);
+                const valueData = getValueSerializedFromSource(source, configName, importStatements, filesEnv);
                 valueDataList.push(valueData);
             });
             serializeConfigValue(configValueBase, valueDataList, configName, lines, tabspace);
@@ -47,14 +46,14 @@ function serializeConfigValues(pageConfig, importStatements, isEnvMatch, tabspac
     });
     return lines;
 }
-function getValueSerializedFromSource(configValueSource, configName, importStatements) {
+function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     (0, utils_js_1.assert)(configValueSource.isOverriden === false);
     let valueData;
     if ('value' in configValueSource) {
-        valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements);
+        valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {
-        valueData = getValueSerializedWithImport(configValueSource, importStatements);
+        valueData = getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName);
     }
     return valueData;
 }
@@ -100,27 +99,27 @@ function serializeConfigValue(configValueBase, valueData, configName, lines, tab
         tabspace = tabspace.slice(2);
     }
 }
-function getValueSerializedWithImport(configValueSource, importStatements) {
+function getValueSerializedWithImport(configValueSource, importStatements, filesEnv, configName) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
-    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByPlusFile, definedAtFilePath, configEnv } = configValueSource;
     (0, utils_js_1.assert)(valueIsImportedAtRuntime);
     const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByPlusFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
-    const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, filePathAbsoluteVite, fileExportName || '*');
+    const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
     return {
         type: valueIsDefinedByPlusFile ? 'plus-file' : 'pointer-import',
         valueAsJsCode: importName
     };
 }
-function getValueSerializedWithJson(value, configName, definedAtData, importStatements) {
-    const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements);
+function getValueSerializedWithJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
+    const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv);
     return {
         type: 'js-serialized',
         valueAsJsCode
     };
 }
-function valueToJson(value, configName, definedAtData, importStatements) {
+function valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
     const valueName = `config${(0, utils_js_1.getPropAccessNotation)(configName)}`;
     let configValueSerialized;
     try {
@@ -135,7 +134,7 @@ function valueToJson(value, configName, definedAtData, importStatements) {
                 if (typeof value === 'string') {
                     const importData = (0, transformPointerImports_js_1.parsePointerImportData)(value);
                     if (importData) {
-                        const { importName } = (0, addImportStatement_js_1.addImportStatement)(importStatements, importData.importPath, importData.exportName);
+                        const { importName } = addImportStatement(importStatements, importData.importPath, importData.exportName, filesEnv, configEnv, configName);
                         const replacement = [REPLACE_ME_BEFORE, importName, REPLACE_ME_AFTER].join('');
                         return { replacement };
                     }
@@ -172,7 +171,8 @@ function logJsonSerializeError(err, configName, definedAtData) {
 }
 function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
     const fromComputed = Object.entries(pageConfig.configValuesComputed ?? {}).map(([configName, valueInfo]) => {
-        if (!isEnvMatch(valueInfo.configEnv))
+        const { configEnv, value } = valueInfo;
+        if (!isEnvMatch(configEnv))
             return 'SKIP';
         // Is there a use case for overriding computed values? If yes, then configValeSources has higher precedence
         if (pageConfig.configValueSources[configName])
@@ -181,7 +181,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
             type: 'computed',
             definedAtData: null
         };
-        return { configValueBase, value: valueInfo.value, configName };
+        return { configValueBase, value, configName, configEnv };
     });
     const fromSources = Object.entries(pageConfig.configValueSources).map(([configName, sources]) => {
         const configDef = pageConfig.configDefinitions[configName];
@@ -226,3 +226,54 @@ function getDefinedAtFileSource(source) {
     };
     return definedAtFile;
 }
+/*
+ * Naming:
+ *   `import { someExport as someImport } from './some-file'`
+ * <=>
+ *   `{`
+ *      `importPath: './some-file',`
+ *      `exportName: 'someExport',`
+ *      `importName: 'someImport',`
+ *    `}`
+ */
+function addImportStatement(importStatements, importPath, exportName, filesEnv, configEnv, configName) {
+    const importCounter = importStatements.length + 1;
+    const importName = `import${importCounter}`;
+    const importLiteral = (() => {
+        if (exportName === '*') {
+            return `* as ${importName}`;
+        }
+        if (exportName === 'default') {
+            return importName;
+        }
+        return `{ ${exportName} as ${importName} }`;
+    })();
+    const importStatement = `import ${importLiteral} from '${importPath}';`;
+    importStatements.push(importStatement);
+    assertFileEnv(importPath, configEnv, configName, filesEnv);
+    return { importName };
+}
+function assertFileEnv(importPath, configEnv, configName, filesEnv) {
+    const key = importPath;
+    (0, utils_js_1.assert)(key);
+    (0, utils_js_1.assertPosixPath)(key);
+    (0, utils_js_1.assert)(!isRelativeImportPath(key));
+    if (!filesEnv.has(key)) {
+        filesEnv.set(key, []);
+    }
+    const fileEnvs = filesEnv.get(key);
+    const fileEnvNew = { configEnv, configName };
+    fileEnvs.push(fileEnvNew);
+    const fileEnvDiff = fileEnvs.filter((c) => !(0, utils_js_1.deepEqual)(c.configEnv, configEnv))[0];
+    if (fileEnvDiff) {
+        (0, utils_js_1.assertUsage)(false, [
+            `${importPath} defines the value of configs living in different environments:`,
+            ...[fileEnvDiff, fileEnvNew].map((c) => `  - config ${picocolors_1.default.code(c.configName)} which value lives in environment ${picocolors_1.default.code(JSON.stringify(c.configEnv))}`),
+            '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'));
+    }
+}
+// TODO/now dedupe
+function isRelativeImportPath(importPath) {
+    return importPath.startsWith('./') || importPath.startsWith('../');
+}

package/dist/cjs/shared/utils.js

@@ -32,7 +32,6 @@ __exportStar(require("../utils/isPlainObject.js"), exports);
 __exportStar(require("../utils/compareString.js"), exports);
 __exportStar(require("../utils/isNotNullish.js"), exports);
 __exportStar(require("../utils/stringifyStringArray.js"), exports);
-__exportStar(require("../utils/toPosixPath.js"), exports);
 __exportStar(require("../utils/cast.js"), exports);
 __exportStar(require("../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../utils/isPromise.js"), exports);

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.220-commit-5c7810f';
+exports.PROJECT_VERSION = '0.4.220-commit-af5c91f';

package/dist/cjs/utils/findFile.js

@@ -7,16 +7,16 @@ exports.findFile = findFile;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const isArray_js_1 = require("./isArray.js");
-const toPosixPath_js_1 = require("./toPosixPath.js");
+const path_js_1 = require("./path.js");
 function findFile(arg, cwd) {
-    (0, toPosixPath_js_1.assertPosixPath)(cwd);
+    (0, path_js_1.assertPosixPath)(cwd);
     const filenames = (0, isArray_js_1.isArray)(arg) ? arg : [arg];
     let dir = cwd;
     while (true) {
         for (const filename of filenames) {
             const configFilePath = path_1.default.posix.join(dir, `./${filename}`);
             if (fs_1.default.existsSync(configFilePath)) {
-                (0, toPosixPath_js_1.assertPosixPath)(configFilePath);
+                (0, path_js_1.assertPosixPath)(configFilePath);
                 return configFilePath;
             }
         }

package/dist/cjs/utils/isDev.js

@@ -4,13 +4,10 @@ exports.isDevCheck = isDevCheck;
 exports.applyDev = applyDev;
 exports.applyPreview = applyPreview;
 const assert_js_1 = require("./assert.js");
-const vite_1 = require("vite");
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
-    // Released at vite@5.1.0 which is guaranteed with `assertVersion('Vite', version, '5.1.0')`
-    // - Release: https://github.com/vitejs/vite/blob/6f7466e6211027686f40ad7e4ce6ec8477414546/packages/vite/CHANGELOG.md#510-beta4-2024-01-26:~:text=fix(preview)%3A-,set%20isPreview%20true,-(%2315695)%20(93fce55
-    // - Surprisingly, this assert() can fail: https://github.com/vikejs/vike/issues/2135
-    (0, assert_js_1.assert)(typeof isPreview === 'boolean', { isPreview, version: vite_1.version });
+    // `assertVersion('Vite', version, '5.1.0')` isn't enough: https://github.com/vitejs/vite/pull/19355
+    (0, assert_js_1.assertUsage)(typeof isPreview === 'boolean', 'You are using an old Vite version; make sure to use Vite 5.1.0 or above.');
     return command === 'serve' && !isPreview;
 }
 function applyDev(_, env) {

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -7,7 +7,7 @@ exports.assertFilePathAbsoluteFilesystem = assertFilePathAbsoluteFilesystem;
 exports.isFilePathAbsolute = isFilePathAbsolute;
 const path_1 = __importDefault(require("path"));
 const assert_js_1 = require("./assert.js");
-const toPosixPath_js_1 = require("./toPosixPath.js");
+const path_js_1 = require("./path.js");
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *
@@ -19,7 +19,7 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Linux users assertFilePathAbsoluteFilesystem() will erroneously succeed if `p` is a path absolute from the user root dir.
     //   - But that's okay because the assertion will eventually fail for Windows users.
     (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
-    (0, toPosixPath_js_1.assertPosixPath)(filePath);
+    (0, path_js_1.assertPosixPath)(filePath);
 }
 /**
  * Whether `filePath` is an absolute file path starting from the filesystem root.

package/dist/cjs/utils/path.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pathJoin = pathJoin;
+exports.pathIsRelative = pathIsRelative;
+exports.toPosixPath = toPosixPath;
+exports.assertPosixPath = assertPosixPath;
+// Utilites for handling file paths.
+// - Shims `import * from "node:path"` for server runtime.
+//   - Robust shim reference: https://github.com/unjs/pathe
+const assert_js_1 = require("./assert.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+/**********************/
+/****** SHIMS *********/
+/**********************/
+function pathJoin(path1, path2) {
+    (0, assert_js_1.assert)(!path1.includes('\\'));
+    (0, assert_js_1.assert)(!path2.includes('\\'));
+    let joined = [...path1.split('/'), ...path2.split('/')].filter(Boolean).join('/');
+    if (path1.startsWith('/'))
+        joined = '/' + joined;
+    return joined;
+}
+/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
+function pathIsAbsolute(filePath: string) {
+  return IS_ABSOLUTE_RE.test(filePath)
+}
+//*/
+/**********************/
+/****** UTILS *********/
+/**********************/
+function toPosixPath(path) {
+    const pathPosix = path.split('\\').join('/');
+    assertPosixPath(pathPosix);
+    return pathPosix;
+}
+function assertPosixPath(path) {
+    const errMsg = (msg) => `Not a posix path: ${msg}`;
+    (0, assert_js_1.assert)(path !== null, errMsg('null'));
+    (0, assert_js_1.assert)(typeof path === 'string', errMsg(`typeof path === ${JSON.stringify(typeof path)}`));
+    (0, assert_js_1.assert)(path !== '', errMsg('(empty string)'));
+    (0, assert_js_1.assert)(path);
+    (0, assert_js_1.assert)(!path.includes('\\'), errMsg(path));
+}
+function pathIsRelative(importPath) {
+    return importPath.startsWith('./') || importPath.startsWith('../');
+}

package/dist/cjs/utils/requireResolve.js

@@ -4,7 +4,7 @@ exports.requireResolve = requireResolve;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
-const toPosixPath_js_1 = require("./toPosixPath.js");
+const path_js_1 = require("./path.js");
 const isScriptFile_js_1 = require("./isScriptFile.js");
 const module_1 = require("module");
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
@@ -15,7 +15,7 @@ const require_ = (0, module_1.createRequire)(importMetaUrl);
 // We still can't use import.meta.resolve() as of 23.1.0 (November 2024) because `parent` argument requires an experimental flag.
 // - https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules#comment139581675_62272600
 function requireResolve(importPath, cwd) {
-    (0, toPosixPath_js_1.assertPosixPath)(cwd);
+    (0, path_js_1.assertPosixPath)(cwd);
     const clean = addFileExtensionsToRequireResolve();
     importPath = removeFileExtention(importPath);
     let importedFile;
@@ -29,7 +29,7 @@ function requireResolve(importPath, cwd) {
         clean();
     }
     if (importedFile) {
-        importedFile = (0, toPosixPath_js_1.toPosixPath)(importedFile);
+        importedFile = (0, path_js_1.toPosixPath)(importedFile);
     }
     return importedFile;
 }

package/dist/esm/node/api/utils.d.ts

@@ -1,4 +1,4 @@
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../utils/toPosixPath.js';
+export * from '../../utils/path.js';
 export * from '../../utils/isObject.js';

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

@@ -4,5 +4,5 @@ import { onLoad } from './onLoad.js';
 onLoad();
 export * from '../../utils/assert.js';
 export * from '../../utils/getGlobalObject.js';
-export * from '../../utils/toPosixPath.js';
+export * from '../../utils/path.js';
 export * from '../../utils/isObject.js';

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

@@ -23,7 +23,7 @@ import { envVarsPlugin } from './plugins/envVars.js';
 import pc from '@brillout/picocolors';
 import { fileEnv } from './plugins/fileEnv.js';
 import { setResolveClientEntriesDev } from '../runtime/renderPage/getPageAssets.js';
-import { resolveClientEntriesDev } from './resolveClientEntriesDev.js';
+import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
 import { workaroundCssModuleHmr } from './plugins/workaroundCssModuleHmr.js';
 import { workaroundVite6HmrRegression } from './plugins/workaroundVite6HmrRegression.js';
 // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts

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

@@ -8,7 +8,7 @@ function onLoad() {
     markSetup_vikeVitePlugin();
     assertIsNotBrowser();
     assertNodeVersion();
-    // package.json#peerDependencies isn't enough as users can ignore it
+    // package.json#peerDependencies isn't enough as users often ignore it
     assertVersion('Vite', version, '5.1.0');
     // Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
     assertIsNotProductionRuntime();

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

@@ -7,12 +7,14 @@ import fs from 'fs/promises';
 import fs_sync from 'fs';
 import path from 'path';
 import { existsSync } from 'fs';
-import { assert, assertWarning, getOutDirs, isEqualStringList, pLimit, unique, viteIsSSR } from '../../utils.js';
+import { assert, assertWarning, isEqualStringList, pLimit, unique } from '../../utils.js';
 import { isVirtualFileIdPageConfigValuesAll } from '../../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
 import { manifestTempFile } from '../buildConfig.js';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
 import pc from '@brillout/picocolors';
 import { isV1Design } from '../importUserCode/v1-design/getVikeConfig.js';
+import { getOutDirs } from '../../shared/getOutDirs.js';
+import { viteIsSSR } from '../../shared/viteIsSSR.js';
 /**
  * true  => use workaround config.build.ssrEmitAssets
  * false => use workaround extractAssets plugin

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

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
+import { assert, addOnBeforeLogHook, removeFileExtention, unique, assertUsage, injectRollupInputs, normalizeRollupInput, onSetupBuild, assertIsNpmPackageImport } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
 import { getVirtualFileIdPageConfigValuesAll } from '../../shared/virtual-files/virtualFilePageConfigValuesAll.js';
@@ -15,6 +15,8 @@ import { set_ASSETS_MANIFEST } from './buildEntry/index.js';
 import { prependEntriesDir } from '../../shared/prependEntriesDir.js';
 import { getFilePathResolved } from '../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../shared/page-configs/getConfigValueBuildTime.js';
+import { getOutDirs, resolveOutDir } from '../shared/getOutDirs.js';
+import { viteIsSSR } from '../shared/viteIsSSR.js';
 // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);

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

@@ -2,7 +2,7 @@ export { buildEntry };
 export { set_ASSETS_MANIFEST };
 import { serverProductionEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin';
 import { virtualFileIdImportUserCodeServer } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
-import { assert, getOutDirs, projectInfo, toPosixPath } from '../../utils.js';
+import { assert, projectInfo, toPosixPath } from '../../utils.js';
 import fs from 'fs/promises';
 import path from 'path';
 import { createRequire } from 'module';
@@ -11,6 +11,7 @@ const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 import { isUsingClientRouter } from '../extractExportNamesPlugin.js';
 import { assertBuildInfo, getViteConfigRuntime } from '../../../runtime/globalContext.js';
+import { getOutDirs } from '../../shared/getOutDirs.js';
 const ASSETS_MANIFEST = '__VITE_ASSETS_MANIFEST__';
 function buildEntry() {
     let config;

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

@@ -11,8 +11,7 @@ import { isViteCliCall } from '../shared/isViteCliCall.js';
 import { isVikeCliOrApi } from '../../api/context.js';
 import { getVikeConfig2 } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
-import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
-import { resolvePrerenderConfig } from '../../prerender/resolvePrerenderConfig.js';
+import { isPrerenderEnabled, temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -34,7 +33,7 @@ function commonConfig(vikeVitePluginOptions) {
                         vike: { global: vikeConfig.global },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: !!resolvePrerenderConfig(vikeConfig.global.config.prerender)
+                            prerender: isPrerenderEnabled(vikeConfig)
                         })
                     };
                 }

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

@@ -6,7 +6,7 @@
 //  - This appraoch supports import path aliases `vite.config.js#resolve.alias` https://vitejs.dev/config/#resolve-alias
 export { extractAssetsPlugin };
 export { extractAssetsRE };
-import { viteIsSSR_options, assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
+import { assert, assertPosixPath, styleFileRE, createDebugger, isScriptFile, assertUsage } from '../utils.js';
 import { resolveVirtualFileId, isVirtualFileId, getVirtualFileId } from '../../shared/virtual-files.js';
 import { extractAssetsAddQuery } from '../../shared/extractAssetsQuery.js';
 import { isAsset } from '../shared/isAsset.js';
@@ -17,6 +17,7 @@ import { fixServerAssets_isEnabled } from './buildConfig/fixServerAssets.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { assertV1Design } from '../../shared/assertV1Design.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
 const rawRE = /(\?|&)raw(?:&|$)/;
 const urlRE = /(\?|&)url(?:&|$)/;

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

@@ -1,10 +1,11 @@
 export { extractExportNamesPlugin };
 export { isUsingClientRouter };
 export { extractExportNamesRE };
-import { assert, getFileExtension, viteIsSSR_options, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
+import { assert, getFileExtension, createDebugger, getGlobalObject, assertUsage } from '../utils.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { sourceMapRemove } from '../shared/rollupSourceMap.js';
 import { normalizeId } from '../shared/normalizeId.js';
+import { viteIsSSR_options } from '../shared/viteIsSSR.js';
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 const debug = createDebugger('vike:extractExportNames');
 const globalObject = getGlobalObject('extractExportNamesPlugin.ts', {});

package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js

@@ -1,22 +1,22 @@
 export { getVirtualFileImportUserCode };
-import { assert, assertPosixPath, viteIsSSR_options, scriptFileExtensions, debugGlob, getOutDirs, isVersionOrAbove, assertWarning } from '../../utils.js';
+import { assert, assertPosixPath, scriptFileExtensions, debugGlob, isVersionOrAbove, assertWarning } from '../../utils.js';
 import { isVirtualFileIdImportUserCode } from '../../../shared/virtual-files/virtualFileImportUserCode.js';
 import { version as viteVersion } from 'vite';
 import { fileTypes } from '../../../../shared/getPageFiles/fileTypes.js';
 import path from 'path';
 import { getVirtualFilePageConfigs } from './v1-design/getVirtualFilePageConfigs.js';
 import { isV1Design as isV1Design_ } from './v1-design/getVikeConfig.js';
-import { resolvePrerenderConfig } from '../../../prerender/resolvePrerenderConfig.js';
+import { getOutDirs } from '../../shared/getOutDirs.js';
+import { viteIsSSR_options } from '../../shared/viteIsSSR.js';
 async function getVirtualFileImportUserCode(id, options, vikeConfig, config, isDev) {
     const idParsed = isVirtualFileIdImportUserCode(id);
     assert(idParsed);
     const { isForClientSide, isClientRouting } = idParsed;
     assert(isForClientSide === !viteIsSSR_options(options));
-    const isPrerendering = !!resolvePrerenderConfig(vikeConfig.global.config.prerender);
-    const code = await getCode(config, vikeConfig, isForClientSide, isClientRouting, isPrerendering, isDev, id);
+    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;
     assert(command === 'serve' || command === 'build');
     const isBuild = command === 'build';
@@ -25,7 +25,7 @@ async function getCode(config, vikeConfig, isForClientSide, isClientRouting, isP
     {
         const globRoots = getGlobRoots(config);
         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);
     }
     debugGlob(`Glob imports for ${isForClientSide ? 'client' : 'server'}:\n`, content);
     return content;
@@ -55,7 +55,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 = {};
@@ -70,6 +70,8 @@ ${await getVirtualFilePageConfigs(isForClientSide, isDev, id, isClientRouting, c
 `;
     // We still use import.meta.glob() when using th V1 design in order to not break the V1 design deprecation warning
     const isV1Design = await 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
         .filter((fileType) => fileType !== '.css')
         .forEach((fileType) => {

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/loadFileAtConfigTime.d.ts

@@ -1,24 +1,27 @@
-export { loadImportedFile };
+export { loadPointerImport };
 export { loadValueFile };
-export { loadValueFiles };
 export { loadConfigFile };
-export type { ImportedFilesLoaded };
 export type { ConfigFile };
+export type { PointerImportLoaded };
 import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
-import { InterfaceFilesByLocationId, type InterfaceValueFile } from '../getVikeConfig.js';
+import { type EsbuildCache } from './transpileAndExecuteFile.js';
+import { type InterfaceValueFile } from '../getVikeConfig.js';
+import { PointerImport } from './resolvePointerImport.js';
 import type { ConfigDefinitions } from './configDefinitionsBuiltIn.js';
-type ImportedFilesLoaded = Record<string, Promise<Record<string, unknown>>>;
 type ConfigFile = {
     fileExports: Record<string, unknown>;
     filePath: FilePathResolved;
     extendsFilePaths: string[];
 };
-declare function loadImportedFile(import_: FilePathResolved & {
-    fileExportName: string;
-}, userRootDir: string, importedFilesLoaded: ImportedFilesLoaded): Promise<unknown>;
-declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
-declare function loadValueFiles(interfaceFiles: InterfaceFilesByLocationId, configDefinitions: ConfigDefinitions, userRootDir: string): Promise<void>;
-declare function loadConfigFile(configFilePath: FilePathResolved, userRootDir: string, visited: string[], isExtensionConfig: boolean): Promise<{
+declare function loadPointerImport(pointerImport: PointerImportLoaded, userRootDir: string, configName: string, configDefinitions: ConfigDefinitions, esbuildCache: EsbuildCache): Promise<unknown>;
+type PointerImportLoaded = PointerImport & ({
+    fileExportValueLoaded: true;
+    fileExportValue: unknown;
+} | {
+    fileExportValueLoaded: false;
+});
+declare function loadValueFile(interfaceValueFile: InterfaceValueFile, configDefinitions: ConfigDefinitions, userRootDir: string, esbuildCache: EsbuildCache): Promise<void>;
+declare function loadConfigFile(configFilePath: FilePathResolved, userRootDir: string, visited: string[], isExtensionConfig: boolean, esbuildCache: EsbuildCache): Promise<{
     configFile: ConfigFile;
     extendsConfigs: ConfigFile[];
 }>;