vike 0.4.240-commit-309067c → 0.4.240-commit-42b44bb

package/dist/esm/client/runtime-client-routing/renderPageClientSide.js

@@ -241,7 +241,7 @@ async function renderPageClientSide(renderArgs) {
             // We don't swallow 404 errors:
             //  - On the server-side, Vike swallows / doesn't show any 404 error log because it's expected that a user may go to some random non-existent URL. (We don't want to flood the app's error tracking with 404 logs.)
             //  - On the client-side, if the user navigates to a 404 then it means that the UI has a broken link. (It isn't expected that users can go to some random URL using the client-side router, as it would require, for example, the user to manually change the URL of a link by manually manipulating the DOM which highly unlikely.)
-            logError(err);
+            logErrorClient(err);
         }
         else {
             // We swallow throw redirect()/render() called by client-side hooks onBeforeRender()/data()/guard()
@@ -272,7 +272,7 @@ async function renderPageClientSide(renderArgs) {
                - An infinite reloading page is a even worse UX than a blank page.
             redirectHard(urlOriginal)
             */
-            logError(err);
+            logErrorClient(err);
         };
         const errorPageId = getErrorPageId(pageContext._pageFilesAll, pageContext._globalContext._pageConfigs);
         if (!errorPageId)
@@ -384,7 +384,7 @@ async function renderPageClientSide(renderArgs) {
                 await handleError({ err });
             }
             else {
-                logError(err);
+                logErrorClient(err);
             }
         };
         // We use globalObject.onRenderClientPreviousPromise in order to ensure that there is never two concurrent onRenderClient() calls
@@ -665,7 +665,7 @@ if (import.meta.env.DEV && import.meta.hot)
             });
         }
     });
-function logError(err) {
+function logErrorClient(err) {
     if (isObject(err) &&
         // Set by vike-react
         // https://github.com/vikejs/vike-react/blob/195a208c6b77e7f34496e1f637278a36c60fbe07/packages/vike-react/src/integration/onRenderClient.tsx#L109

package/dist/esm/node/cli/parseCli.js

@@ -6,7 +6,7 @@ const commands = [
     { name: 'dev', desc: 'Start development server' },
     { name: 'build', desc: 'Build for production' },
     { name: 'preview', desc: 'Start preview server using production build' },
-    { name: 'prerender', desc: 'Pre-render pages (only needed when prerender.disableAutoRun is true)' },
+    { name: 'prerender', desc: 'Pre-render pages (only needed when +prerender.disableAutoRun is true)' },
 ];
 function parseCli() {
     const command = getCommand();
@@ -51,7 +51,7 @@ function getCliOptions() {
     return cliOptions;
 }
 function showHelp() {
-    const TAB = ' '.repeat(3);
+    const TAB = ' '.repeat(2);
     const nameMaxLength = Math.max(...commands.map((c) => c.name.length));
     console.log([
         `vike@${PROJECT_VERSION}`,
@@ -60,13 +60,17 @@ function showHelp() {
         ...[...commands, { name: '-v', desc: "Print Vike's installed version" }].map((c) => `  ${pc.dim('$')} vike ${c.name.startsWith('-') ? pc.cyan(`${c.name}`) : pc.bold(`${c.name}`)}${' '.repeat(nameMaxLength - c.name.length)}${TAB}${pc.dim(`# ${c.desc}`)}`),
         '',
         'Common CLI options:',
-        [`vike dev ${pc.cyan('--host')}`, `vike dev ${pc.cyan('--port')} 80`, `vike build ${pc.cyan('--mode')} staging`]
+        [
+            `vike dev ${pc.cyan('--host')}          ${TAB}${pc.dim('# Make server available over LAN and public addresses')}`,
+            `vike dev ${pc.cyan('--port')} 80       ${TAB}${pc.dim('# Change the server port')}`,
+            `vike build ${pc.cyan('--mode')} staging${TAB}${pc.dim('# Set the mode to run in')}`,
+            `vike dev ${pc.cyan('--force')}         ${TAB}${pc.dim("# Disable Vite's cache")}`,
+        ]
             .map((o) => `  ${pc.dim('$')} ${o}`)
             .join('\n'),
         '',
-        `More Vike settings can be passed over the ${pc.cyan('VIKE_CONFIG')} environment variable or as ${pc.cyan('CLI options')}.`,
+        `More Vike settings can be passed over the ${pc.cyan('VIKE_CONFIG')} environment variable or as ${pc.cyan('CLI option')}.`,
         `More Vite settings can be passed over the ${pc.cyan('VITE_CONFIG')} environment variable.`,
-        ``,
         `See ${pc.underline('https://vike.dev/cli')} for more information.`,
     ].join('\n'));
     process.exit(1);

package/dist/esm/node/runtime/renderPage.js

@@ -64,11 +64,12 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
         await initGlobalContext_renderPage();
     }
     catch (err) {
-        // Errors are expected since assertUsage() is used in initGlobalContext_renderPage() such as:
-        // ```bash
-        // Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
-        // ```
-        // initGlobalContext_renderPage() doesn't call any user hook => err isn't thrown from user code.
+        // Errors are expected:
+        // - assertUsage() such as:
+        //   ```bash
+        //   Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
+        //   ```
+        // - initGlobalContext_renderPage() depends on +onCreateGlobalContext hooks
         assert(!isAbortError(err));
         logRuntimeError(err, httpRequestId);
         const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);

package/dist/esm/node/vite/plugins/build/pluginDistFileNames.js

@@ -6,7 +6,7 @@ import { assertPosixPath, assert, assertUsage, isArray, isCallable } from '../..
 import path from 'node:path';
 import crypto from 'node:crypto';
 import { getAssetsDir } from '../../shared/getAssetsDir.js';
-import { assertModuleId, getModuleFilePathAbsolute } from '../../shared/getFilePath.js';
+import { assertModuleId, getFilePathToShowToUserModule } from '../../shared/getFilePath.js';
 function pluginDistFileNames() {
     return [
         {
@@ -63,7 +63,7 @@ function pluginDistFileNames() {
                                             name = isNodeModules[1];
                                         }
                                         else {
-                                            const filePath = getModuleFilePathAbsolute(id, config);
+                                            const filePath = getFilePathToShowToUserModule(id, config);
                                             name = filePath;
                                             name = name.split('.').slice(0, -1).join('.'); // remove file extension
                                             name = name.split('/').filter(Boolean).join('_');

package/dist/esm/node/vite/plugins/pluginCommon.js

@@ -91,6 +91,11 @@ function pluginCommon(vikeVitePluginOptions) {
                         // Set `--host` for Docker/Podman
                         setDefault('host', true, configFromUser, configFromVike);
                     }
+                    // https://vike.dev/force
+                    if (vikeConfig.config.force !== undefined && configFromUser.optimizeDeps?.force === undefined) {
+                        configFromVike.optimizeDeps ?? (configFromVike.optimizeDeps = {});
+                        configFromVike.optimizeDeps.force = vikeConfig.config.force;
+                    }
                     return configFromVike;
                 },
             },

package/dist/esm/node/vite/plugins/pluginFileEnv.js

@@ -3,7 +3,7 @@ import { assert, assertUsage, assertWarning, capitalizeFirstLetter, isFilePathAb
 import { extractAssetsRE } from './pluginExtractAssets.js';
 import { extractExportNamesRE } from './pluginExtractExportNames.js';
 import pc from '@brillout/picocolors';
-import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
+import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { getExportNames } from '../shared/parseEsModule.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isV1Design } from '../shared/resolveVikeConfigInternal.js';
@@ -42,8 +42,10 @@ function pluginFileEnv() {
                     if (id.endsWith('?direct'))
                         id = id.slice(0, -1 * '?direct'.length);
                     const moduleInfo = viteDevServer.moduleGraph.getModuleById(id);
-                    assert(moduleInfo);
-                    const importers = Array.from(moduleInfo.importers)
+                    /* It can fail, no clue why — https://github.com/vikejs/vike/issues/2740
+                    assert(moduleInfo, { moduleId })
+                    */
+                    const importers = (!moduleInfo ? [] : Array.from(moduleInfo.importers))
                         .map((m) => m.id)
                         .filter((id) => id !== null);
                     assertFileEnv(id, isViteServerSide_extraSafe(config, this.environment, options), importers, 
@@ -122,7 +124,7 @@ function pluginFileEnv() {
         const envActual = isServerSide ? 'server' : 'client';
         const envExpect = isServerSide ? 'client' : 'server';
         let errMsg;
-        let modulePathPretty = getModuleFilePathAbsolute(modulePath, config);
+        let modulePathPretty = getFilePathToShowToUserModule(modulePath, config);
         if (!noColor) {
             const suffix = getSuffix(envExpect);
             modulePathPretty = modulePathPretty.replaceAll(suffix, pc.bold(suffix));
@@ -133,13 +135,14 @@ function pluginFileEnv() {
                 .filter((importer) => 
             // Can be Vike's virtual module: https://github.com/vikejs/vike/issues/2483
             isFilePathAbsolute(importer))
-                .map((importer) => getModuleFilePathAbsolute(importer, config));
+                .map((importer) => getFilePathToShowToUserModule(importer, config))
+                .map((importPath) => pc.cyan(importPath));
             if (importPaths.length > 0) {
                 errMsg += ` by ${joinEnglish(importPaths, 'and')}`;
             }
         }
         if (onlyWarn) {
-            errMsg += ' and, therefore, Vike will prevent building your app for production.';
+            errMsg += ". This is potentially a security issue and Vike won't allow you to build your app for production.";
         }
         return errMsg;
     }

package/dist/esm/node/vite/plugins/pluginReplaceConstantsEnvVars.js

@@ -1,7 +1,7 @@
 export { pluginReplaceConstantsEnvVars };
 import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, isNotNullish, lowerFirst, } from '../utils.js';
-import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
+import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { normalizeId } from '../shared/normalizeId.js';
 import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
 import { getMagicString } from '../shared/getMagicString.js';
@@ -113,7 +113,7 @@ function assertNoClientSideLeak({ envName, envStatement, envStatementRegExpStr,
     // ❌ Security leak!
     // - Warning in dev
     // - assertUsage() and abort when building for production
-    const modulePath = getModuleFilePathAbsolute(id, config);
+    const modulePath = getFilePathToShowToUserModule(id, config);
     const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
     const envNameFixed = `${PUBLIC_ENV_PREFIX}${envName}`;
     const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${envNameFixed}, see https://vike.dev/env`;

package/dist/esm/node/vite/plugins/pluginVirtualFiles.js

@@ -7,7 +7,7 @@ import { parseVirtualFileId } from '../../shared/virtualFileId.js';
 import { reloadVikeConfig, isV1Design, getVikeConfigInternalOptional } from '../shared/resolveVikeConfigInternal.js';
 import pc from '@brillout/picocolors';
 import { logConfigInfo } from '../shared/loggerNotProd.js';
-import { getModuleFilePathAbsolute } from '../shared/getFilePath.js';
+import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
 import { isRunnable, updateUserFiles } from '../../runtime/globalContext.js';
 import { isPlusFile } from '../shared/resolveVikeConfigInternal/crawlPlusFiles.js';
 import { isTemporaryBuildFile } from '../shared/resolveVikeConfigInternal/transpileAndExecuteFile.js';
@@ -176,7 +176,7 @@ function reloadConfig(filePath, config, op, server) {
     // Ensure server.ssrLoadModule() loads fresh Vike virtual files (`reloadConfig()` > `updateUserFiles()` > `server.ssrLoadModule()`)
     invalidateVikeVirtualFiles(server);
     {
-        const filePathToShowToUserResolved = getModuleFilePathAbsolute(filePath, config);
+        const filePathToShowToUserResolved = getFilePathToShowToUserModule(filePath, config);
         const msg = `${op} ${pc.dim(filePathToShowToUserResolved)}`;
         logConfigInfo(msg, 'info');
     }

package/dist/esm/node/vite/shared/getFilePath.d.ts

@@ -1,9 +1,8 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
 export { getFilePathAbsoluteUserRootDir };
-export { getFilePathToShowToUserFromUnknown };
-export { getModuleFilePathAbsolute };
-export { getModuleFilePathRelative };
+export { getFilePathToShowToUserUnknown };
+export { getFilePathToShowToUserModule };
 export { cleanFilePathUnknown };
 export { assertModuleId };
 import type { FilePathResolved, FilePathUnresolved } from '../../../types/FilePath.js';
@@ -24,8 +23,7 @@ declare function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, us
     filePathAbsoluteFilesystem: string;
     userRootDir: string;
 }): string | null;
-declare function getModuleFilePathAbsolute(moduleId: string, config: ResolvedConfig): string;
-declare function getModuleFilePathRelative(moduleId: string, config: ResolvedConfig): string;
+declare function getFilePathToShowToUserModule(moduleId: string, config: ResolvedConfig): string;
 declare function assertModuleId(moduleId: string): void;
-declare function getFilePathToShowToUserFromUnknown(filePathUnknown: string, userRootDir: string): string;
+declare function getFilePathToShowToUserUnknown(filePathUnknown: string, userRootDir: string): string;
 declare function cleanFilePathUnknown(filePathUnknown: string): string;

package/dist/esm/node/vite/shared/getFilePath.js

@@ -1,9 +1,8 @@
 export { getFilePathResolved };
 export { getFilePathUnresolved };
 export { getFilePathAbsoluteUserRootDir };
-export { getFilePathToShowToUserFromUnknown };
-export { getModuleFilePathAbsolute };
-export { getModuleFilePathRelative };
+export { getFilePathToShowToUserUnknown };
+export { getFilePathToShowToUserModule };
 export { cleanFilePathUnknown };
 export { assertModuleId };
 import path from 'node:path';
@@ -107,15 +106,11 @@ function getFilePathRelative({ filePathAbsoluteFilesystem, userRootDir, }) {
         return { filePathAbsoluteUserRootDir, filePathRelativeUserRootDir };
     }
 }
-function getModuleFilePathAbsolute(moduleId, config) {
-    const { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem } = getModuleFilePath(moduleId, config);
+function getFilePathToShowToUserModule(moduleId, config) {
+    const { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem } = getFilePathModule(moduleId, config);
     return filePathAbsoluteUserRootDir || filePathAbsoluteFilesystem;
 }
-function getModuleFilePathRelative(moduleId, config) {
-    const { filePathRelativeUserRootDir } = getModuleFilePath(moduleId, config);
-    return filePathRelativeUserRootDir;
-}
-function getModuleFilePath(moduleId, config) {
+function getFilePathModule(moduleId, config) {
     const userRootDir = config.root;
     assertModuleId(moduleId);
     assertPosixPath(userRootDir);
@@ -132,7 +127,7 @@ function assertModuleId(moduleId) {
     assertPosixPath(moduleId);
     assertFilePathAbsoluteFilesystem(moduleId); // Can moduleId be something else than the filesystem absolute path?
 }
-function getFilePathToShowToUserFromUnknown(
+function getFilePathToShowToUserUnknown(
 // We don't have any guarantee about filePath, e.g. about whether is filePathAbsoluteFilesystem or filePathAbsoluteUserRootDir
 filePathUnknown, userRootDir) {
     assertPosixPath(userRootDir);

package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -8,7 +8,7 @@ export { getPrettyErrMessage };
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 import pc from '@brillout/picocolors';
 import { assert, escapeRegex, isObject, removeEmptyLines, stripAnsi } from '../../utils.js';
-import { cleanFilePathUnknown, getFilePathToShowToUserFromUnknown } from '../getFilePath.js';
+import { cleanFilePathUnknown, getFilePathToShowToUserUnknown } from '../getFilePath.js';
 function isErrorWithCodeSnippet(err) {
     if (!isObject(err)) {
         return false;
@@ -47,7 +47,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         pc.red('Failed to transpile'),
-        pc.bold(pc.red(getFilePathToShowToUserFromUnknown(id, userRootDir))),
+        pc.bold(pc.red(getFilePathToShowToUserUnknown(id, userRootDir))),
         pc.red('because:'),
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);

package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -171,6 +171,10 @@ const configDefinitionsBuiltIn = {
         env: { config: true },
         global: true,
     },
+    force: {
+        env: { config: true },
+        global: true,
+    },
     csp: {
         env: { server: true },
     },

package/dist/esm/types/Config.d.ts

@@ -468,6 +468,12 @@ type ConfigBuiltIn = {
      * https://vike.dev/mode
      */
     mode?: string;
+    /**
+     * Disable Vite's cache.
+     *
+     * https://vike.dev/force
+     */
+    force?: boolean;
     /**
      * Content Security Policy (CSP).
      *

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.240-commit-309067c";
+export declare const PROJECT_VERSION: "0.4.240-commit-42b44bb";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.240-commit-309067c';
+export const PROJECT_VERSION = '0.4.240-commit-42b44bb';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.240-commit-309067c",
+  "version": "0.4.240-commit-42b44bb",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {