vike 0.4.223-commit-e239e2b → 0.4.223-commit-3502685

package/dist/cjs/node/prerender/runPrerender.js

@@ -120,15 +120,16 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const vikeConfig = await (0, getVikeConfig_js_1.getVikeConfig)(viteConfig);
     const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
     const { root } = viteConfig;
-    const prerenderConfig = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfig)(vikeConfig);
-    validatePrerenderConfig(prerenderConfig);
-    if (!prerenderConfig) {
+    const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
+    validatePrerenderConfig(prerenderConfigGlobal);
+    const { partial, noExtraDir, parallel, defaultLocalValue, isEnabled } = prerenderConfigGlobal;
+    if (!isEnabled) {
         (0, utils_js_1.assert)(standaloneTrigger);
-        (0, utils_js_1.assertWarning)(prerenderConfig, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but the config ${picocolors_1.default.cyan('prerender')} isn't set to true`, {
+        // TODO/now: make it assertUsage() and remove dist/server/entry.mjs whenever possible
+        (0, utils_js_1.assertWarning)(prerenderConfigGlobal, `You're executing ${picocolors_1.default.cyan(standaloneTrigger)} but you didn't enable pre-rendering. Use the config ${picocolors_1.default.cyan('prerender')} (${picocolors_1.default.underline('https://vike.dev/prerender')}) to enable it.`, {
             onlyOnce: true
         });
     }
-    const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
     await (0, globalContext_js_1.initGlobalContext_runPrerender)();
     const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
@@ -141,7 +142,7 @@ async function runPrerender(options = {}, standaloneTrigger) {
         output: []
     };
     const doNotPrerenderList = [];
-    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext);
+    await collectDoNoPrerenderList(vikeConfig.pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext);
     await callOnBeforePrerenderStartHooks(prerenderContext, globalContext, concurrencyLimit, doNotPrerenderList);
     await handlePagesWithStaticRoutes(prerenderContext, globalContext, doNotPrerenderList, concurrencyLimit);
     await callOnPrerenderStartHook(prerenderContext, globalContext);
@@ -164,20 +165,21 @@ async function runPrerender(options = {}, standaloneTrigger) {
     const prerenderContextPublic = makePublic(prerenderContext);
     return { viteConfig, prerenderContextPublic };
 }
-async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurrencyLimit, globalContext) {
+async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, defaultLocalValue, concurrencyLimit, globalContext) {
     // V1 design
     pageConfigs.forEach((pageConfig) => {
-        const configValue = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
-        if (!configValue)
-            return;
-        const { value, configValueFilePathToShowToUser } = configValue;
-        if (value === false) {
-            doNotPrerenderList.push({
-                pageId: pageConfig.pageId,
-                setByConfigName: 'prerender',
-                setByConfigValue: false,
-                setByConfigFile: configValueFilePathToShowToUser
-            });
+        const prerenderConfigLocal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigLocal)(pageConfig);
+        const { pageId } = pageConfig;
+        if (!prerenderConfigLocal) {
+            if (!defaultLocalValue) {
+                doNotPrerenderList.push({ pageId });
+            }
+        }
+        else {
+            const { value } = prerenderConfigLocal;
+            if (value === false) {
+                doNotPrerenderList.push({ pageId });
+            }
         }
     });
     // Old design
@@ -210,12 +212,7 @@ async function collectDoNoPrerenderList(pageConfigs, doNotPrerenderList, concurr
             }
             else {
                 // Don't pre-render `pageId`
-                doNotPrerenderList.push({
-                    pageId,
-                    setByConfigFile: p.filePath,
-                    setByConfigName: 'doNotPrerender',
-                    setByConfigValue: doNotPrerender
-                });
+                doNotPrerenderList.push({ pageId });
             }
         }
     });
@@ -568,8 +565,7 @@ function warnContradictoryNoPrerenderList(prerenderedPageContexts, doNotPrerende
             if (!isContradictory)
                 return;
         }
-        const { setByConfigName, setByConfigValue, setByConfigFile } = doNotPrerenderListEntry;
-        (0, utils_js_1.assertWarning)(false, `The ${providedByHook.hookName}() hook defined by ${providedByHook.hookFilePath} returns the URL ${picocolors_1.default.cyan(urlOriginal)}, while ${setByConfigFile} sets the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))}. This is contradictory: either don't set the config ${picocolors_1.default.cyan(setByConfigName)} to ${picocolors_1.default.cyan(String(setByConfigValue))} or remove the URL ${picocolors_1.default.cyan(urlOriginal)} from the list of URLs to be pre-rendered.`, { onlyOnce: true });
+        (0, utils_js_1.assertWarning)(false, `The ${providedByHook.hookName}() hook defined by ${providedByHook.hookFilePath} returns the URL ${picocolors_1.default.cyan(urlOriginal)} matching the route of the page ${picocolors_1.default.cyan(pageId)} which isn't configured to be pre-rendered. This is contradictory: either enable pre-rendering for ${picocolors_1.default.cyan(pageId)} or remove the URL ${picocolors_1.default.cyan(urlOriginal)} from the list of URLs to be pre-rendered.`, { onlyOnce: true });
     });
 }
 async function warnMissingPages(prerenderedPageContexts, globalContext, doNotPrerenderList, partial) {
@@ -816,8 +812,8 @@ prerenderConfig) {
 }
 function makePublic(prerenderContext) {
     const prerenderContextPublic = (0, utils_js_1.makePublicCopy)(prerenderContext, 'prerenderContext', [
-        'pageContexts',
-        'output'
+        'output', // vite-plugin-vercel
+        'pageContexts' // https://vike.dev/i18n#pre-rendering
     ]);
     return prerenderContextPublic;
 }

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

@@ -33,3 +33,4 @@ __exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/changeEnumerable.js"), exports);
 __exportStar(require("../../utils/makePublicCopy.js"), exports);
+__exportStar(require("../../utils/isNotNullish.js"), exports);

package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js

@@ -31,7 +31,7 @@ function getConfigValue(pageConfig, configName) {
         (0, utils_js_1.assert)(configValueSource);
         (0, utils_js_1.assert)(configValueSource.isOverriden === false);
         (0, utils_js_1.assert)(sources.slice(1).every((s) => s.isOverriden === true));
-        (0, utils_js_1.assert)('value' in configValueSource);
+        (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         return {
             type: 'standard',
             value: configValueSource.value,
@@ -54,7 +54,7 @@ function mergeCumulative(configValueSources) {
     configValueSources.forEach((configValueSource) => {
         (0, utils_js_1.assert)(configValueSource.isOverriden === false);
         (0, utils_js_1.assert)(configValueSource.configEnv.config === true);
-        (0, utils_js_1.assert)('value' in configValueSource);
+        (0, utils_js_1.assert)(configValueSource.valueIsLoaded);
         value.push(configValueSource.value);
         definedAtData.push(getDefinedAtFile(configValueSource));
     });

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

@@ -51,7 +51,7 @@ function serializeConfigValues(pageConfig, importStatements, filesEnv, isEnvMatc
 function getValueSerializedFromSource(configValueSource, configName, importStatements, filesEnv) {
     (0, utils_js_1.assert)(configValueSource.isOverriden === false);
     let valueData;
-    if ('value' in configValueSource && !configValueSource.valueIsLoadedWithImport) {
+    if (configValueSource.valueIsLoaded && !configValueSource.valueIsLoadedWithImport) {
         valueData = getValueSerializedWithJson(configValueSource.value, configName, configValueSource.definedAtFilePath, importStatements, filesEnv, configValueSource.configEnv);
     }
     else {

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.223-commit-e239e2b';
+exports.PROJECT_VERSION = '0.4.223-commit-3502685';

package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js

@@ -5,9 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertFilePathAbsoluteFilesystem = assertFilePathAbsoluteFilesystem;
 exports.isFilePathAbsolute = isFilePathAbsolute;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const assert_js_1 = require("./assert.js");
 const path_js_1 = require("./path.js");
+const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+const assertSetup_js_1 = require("./assertSetup.js");
+(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
+// Server runtime shouldn't depend on node:path
+(0, assertSetup_js_1.assertIsNotProductionRuntime)();
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
  *
@@ -18,6 +23,7 @@ function assertFilePathAbsoluteFilesystem(filePath) {
     // - For Windows users, the assert is correct.
     // - 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.
+    //   - On Linux there doesn't seem to be a way to distinguish between an absolute path starting from the filesystem root or starting from the user root directory, see comment at isFilePathAbsoluteFilesystem()
     (0, assert_js_1.assert)(isFilePathAbsoluteFilesystem(filePath));
     (0, path_js_1.assertPosixPath)(filePath);
 }
@@ -33,11 +39,11 @@ function isFilePathAbsoluteFilesystem(filePath) {
         //   - File path absolute starting from filesystem root, e.g. /home/rom/code/my-app/pages/about/+Page.js
         //   - File path absolute starting from user root dir (Vite's `config.root`), e.g. /pages/about/+Page.js
         // - Checking whether `p` starts with the first directory of process.cwd() (or `userRootDir`) can be erroneous, most notably when using docker: https://github.com/vikejs/vike/issues/703
-        // - Using require.resolve() would be a solution but probably too slow?
+        // - Using require.resolve() or node:fs to check wehther the file/dir exsits would be a solution, but maybe too slow?
         return filePath.startsWith('/');
     }
     else {
-        const yes = path_1.default.win32.isAbsolute(filePath);
+        const yes = node_path_1.default.win32.isAbsolute(filePath);
         // Ensure isFilePathAbsoluteFilesystem() returns `false` if path is absolute starting from the user root dir (see comments above).
         if (yes)
             (0, assert_js_1.assert)(!filePath.startsWith('/'));
@@ -55,5 +61,5 @@ function isFilePathAbsolute(filePath) {
     if (filePath.startsWith('/'))
         return true;
     // Seems to be reliable: https://nodejs.org/api/path.html#pathisabsolutepath
-    return path_1.default.isAbsolute(filePath);
+    return node_path_1.default.isAbsolute(filePath);
 }

package/dist/cjs/utils/path.js

@@ -9,6 +9,7 @@ exports.assertPosixPath = assertPosixPath;
 //   - Robust shim reference: https://github.com/unjs/pathe
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+// While this path shim also works on the client-side, let's try to not use it on the client-side in order to minimize KBs sent to the browser.
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 /**********************/
 /****** SHIMS *********/

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

@@ -12,7 +12,8 @@ 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 { isPrerenderEnabled, temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
+import { resolvePrerenderConfigGlobal } from '../../prerender/resolvePrerenderConfig.js';
 const pluginName = 'vike:commonConfig';
 function commonConfig(vikeVitePluginOptions) {
     return [
@@ -38,7 +39,7 @@ function commonConfig(vikeVitePluginOptions) {
                         },
                         // TODO/v1-release: remove https://github.com/vikejs/vike/issues/2122
                         configVikePromise: Promise.resolve({
-                            prerender: isPrerenderEnabled(vikeConfig)
+                            prerender: resolvePrerenderConfigGlobal(vikeConfig).isEnabled
                         })
                     };
                 }

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

@@ -55,10 +55,13 @@ function fileEnv() {
             Array.from(this.getModuleIds())
                 .filter((id) => !skip(id))
                 .forEach((moduleId) => {
-                const { importers, dynamicImporters } = this.getModuleInfo(moduleId);
+                const mod = this.getModuleInfo(moduleId);
+                const { importers } = mod;
                 if (importers.length === 0) {
                     // Dynamic imports can only be verified at runtime
-                    assert(dynamicImporters.length > 0);
+                    /* This assertion can fail: https://github.com/vikejs/vike/issues/2227
+                    assert(dynamicImporters.length > 0)
+                    */
                     return;
                 }
                 assertFileEnv(moduleId, !!config.build.ssr, importers, false);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/crawlPlusFiles.js

@@ -1,13 +1,14 @@
 export { crawlPlusFiles };
 export { isPlusFile };
 export { getPlusFileValueConfigName };
-import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage } from '../../../../utils.js';
+import { assertPosixPath, assert, scriptFileExtensions, assertIsSingleModuleInstance, assertIsNotProductionRuntime, isVersionOrAbove, isScriptFile, scriptFileExtensionList, createDebugger, deepEqual, assertUsage, assertFilePathAbsoluteFilesystem, assertWarning, hasProp } from '../../../../utils.js';
 import path from 'path';
 import { glob } from 'tinyglobby';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { isTemporaryBuildFile } from './transpileAndExecuteFile.js';
 import { getEnvVarObject } from '../../../../shared/getEnvVarObject.js';
+import pc from '@brillout/picocolors';
 const execA = promisify(exec);
 const debug = createDebugger('vike:crawl');
 assertIsNotProductionRuntime();
@@ -15,6 +16,7 @@ assertIsSingleModuleInstance('getVikeConfig/crawlPlusFiles.ts');
 let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     assertPosixPath(userRootDir);
+    assertFilePathAbsoluteFilesystem(userRootDir);
     //*/
     const outDirRelativeFromUserRootDir = null;
     /*/
@@ -32,8 +34,9 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
         (!outDirRelativeFromUserRootDir.startsWith('./') &&
             //
             !outDirRelativeFromUserRootDir.startsWith('../')));
+    const crawSettings = getCrawlSettings();
     // Crawl
-    const filesGit = !isGitCrawlDisabled() && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
+    const filesGit = crawSettings.git !== false && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
     const filesGitNothingFound = !filesGit || filesGit.length === 0;
     const filesGlob = (filesGitNothingFound || debug.isActivated) && (await tinyglobby(userRootDir, outDirRelativeFromUserRootDir));
     let files = !filesGitNothingFound
@@ -41,8 +44,11 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
         : // Fallback to tinyglobby for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
             filesGlob;
     assert(files);
-    if (debug.isActivated)
-        assert(deepEqual(filesGlob, filesGit), "Git and glob results aren't matching.");
+    if (debug.isActivated) {
+        assert(filesGit);
+        assert(filesGlob);
+        assertWarning(deepEqual(filesGlob.slice().sort(), filesGit.slice().sort()), "Git and glob results aren't matching.", { onlyOnce: false });
+    }
     // Filter build files
     files = files.filter((filePath) => !isTemporaryBuildFile(filePath));
     // Normalize
@@ -129,8 +135,7 @@ async function tinyglobby(userRootDir, outDirRelativeFromUserRootDir) {
     const options = {
         ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
-        dot: false,
-        expandDirectories: false
+        dot: false
     };
     const files = await glob(pattern, options);
     // Make build deterministic, in order to get a stable generated hash for dist/client/assets/entries/entry-client-routing.${hash}.js
@@ -153,7 +158,9 @@ function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
         // +Page.js
         // +Page.telefunc.js
         // ```
-        '**/*.telefunc.*'
+        '**/*.telefunc.*',
+        // https://github.com/vikejs/vike/discussions/2222
+        '**/*.generated.*'
     ];
     if (outDirRelativeFromUserRootDir) {
         assert(!outDirRelativeFromUserRootDir.startsWith('/'));
@@ -167,6 +174,7 @@ function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
     return (file) => !file.includes('node_modules/') &&
         !file.includes('ejected/') &&
         !file.includes('.telefunc.') &&
+        !file.includes('.generated.') &&
         (outDirRelativeFromUserRootDir === null || !file.startsWith(`${outDirRelativeFromUserRootDir}/`));
 }
 // Whether Git is installed and whether we can use it
@@ -223,9 +231,11 @@ async function runCmd2(cmd, cwd) {
     stderr = stderr.toString().trim();
     return { stdout, stderr };
 }
-function isGitCrawlDisabled() {
-    const crawSettings = getEnvVarObject('VIKE_CRAWL');
-    return crawSettings?.git === false;
+function getCrawlSettings() {
+    const crawlSettings = getEnvVarObject('VIKE_CRAWL') ?? {};
+    const wrongUsage = (settingName, settingType) => `Setting ${pc.cyan(settingName)} in VIKE_CRAWL should be a ${pc.cyan(settingType)}`;
+    assertUsage(hasProp(crawlSettings, 'git', 'boolean') || hasProp(crawlSettings, 'git', 'undefined'), wrongUsage('git', 'boolean'));
+    return crawlSettings;
 }
 function isPlusFile(filePath) {
     assertPosixPath(filePath);

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js

@@ -40,6 +40,7 @@ function getLogicalPath(locationId, ignoredDirs, removeParenthesesDirs) {
     assertIsPath(logicalPath);
     return logicalPath;
 }
+// See getPlusFilesRelevant() and getPlusFilesOrdered()
 function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     assertLocationId(locationId1);
     assertLocationId(locationId2);
@@ -48,7 +49,7 @@ function sortAfterInheritanceOrder(locationId1, locationId2, locationIdPage) {
     const inheritanceRoot1 = getInheritanceRoot(locationId1);
     const inheritanceRoot2 = getInheritanceRoot(locationId2);
     const inheritanceRootPage = getInheritanceRoot(locationIdPage);
-    // sortAfterInheritanceOrder() only works if both locationId1 and locationId2 are inherited by the same page
+    // Only works if both locationId1 and locationId2 are inherited by the same page
     assert(isInherited(locationId1, locationIdPage));
     assert(isInherited(locationId2, locationIdPage));
     // Equivalent assertion (see isInherited() implementation)

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

@@ -3,7 +3,6 @@ export { getConfigBuildErrorFormatted };
 export { getConfigExecutionErrorIntroMsg };
 export { isTemporaryBuildFile };
 export type { EsbuildCache };
-import 'source-map-support/register.js';
 import type { FilePathResolved } from '../../../../../../shared/page-configs/FilePath.js';
 type FileExports = {
     fileExports: Record<string, unknown>;

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

@@ -7,16 +7,17 @@ import fs from 'fs';
 import path from 'path';
 import pc from '@brillout/picocolors';
 import { import_ } from '@brillout/import';
-import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise } from '../../../../utils.js';
+import { assertPosixPath, getRandomId, assertIsNotProductionRuntime, assert, assertWarning, isObject, toPosixPath, assertUsage, isPlainJavaScriptFile, createDebugger, assertFilePathAbsoluteFilesystem, assertIsNpmPackageImport, genPromise, isVitest } from '../../../../utils.js';
 import { transformPointerImports } from './transformPointerImports.js';
 import { vikeConfigDependencies } from '../getVikeConfig.js';
-import 'source-map-support/register.js';
+import sourceMapSupport from 'source-map-support';
 import { getFilePathAbsoluteUserRootDir } from '../../../../shared/getFilePath.js';
 import { createRequire } from 'module';
 // @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
 const importMetaUrl = import.meta.url;
 const require_ = createRequire(importMetaUrl);
 assertIsNotProductionRuntime();
+installSourceMapSupport();
 const debug = createDebugger('vike:pointer-imports');
 const debugEsbuildResolve = createDebugger('vike:esbuild-resolve');
 if (debugEsbuildResolve.isActivated)
@@ -401,3 +402,11 @@ function cleanEsbuildErrors(errors) {
     // ```
     !note.text.includes('as external to exclude it from the bundle'))));
 }
+function installSourceMapSupport() {
+    // Don't break Vitest's source mapping
+    if (isVitest())
+        return;
+    // How about other test runners?
+    // Should we call installSourceMapSupport() lazily in transpileAndExecuteFile() instead?
+    sourceMapSupport.install();
+}