vike 0.4.176 → 0.4.177-commit-f4a92e0

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

@@ -40,7 +40,7 @@ function extractAssetsPlugin() {
                 }
                 if (isServerAssetsFixEnabled) {
                     // I'm guessing isServerAssetsFixEnabled can only be true when mixing both designs: https://github.com/vikejs/vike/issues/1480
-                    (0, assertV1Design_js_1.assertV1Design)(true, vikeConfig.pageConfigs);
+                    (0, assertV1Design_js_1.assertV1Design)(vikeConfig.pageConfigs, true);
                     (0, utils_js_1.assert)(false);
                 }
                 (0, utils_js_1.assert)(configVike.includeAssetsImportedByServer);

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

@@ -115,7 +115,7 @@ const configDefinitionsBuiltIn = {
 exports.configDefinitionsBuiltIn = configDefinitionsBuiltIn;
 const configDefinitionsBuiltInGlobal = {
     onPrerenderStart: {
-        env: { server: true, production: true }
+        env: { server: true, production: true, eager: true }
     },
     onBeforeRoute: {
         env: { server: true, client: 'if-client-routing', eager: true }

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

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.crawlPlusFiles = void 0;
 const utils_js_1 = require("../../../../utils.js");
 const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("fs/promises"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const transpileAndExecuteFile_js_1 = require("./transpileAndExecuteFile.js");
 const execA = (0, util_1.promisify)(child_process_1.exec);
+const TOO_MANY_UNTRACKED_FILES = 5;
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
 let gitIsNotUsable = false;
@@ -35,15 +37,17 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev, craw
     let files = [];
     const res = crawlWithGit !== false && (await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir));
     if (res &&
-        // Fallback to fast-glob for users that dynamically generate plus files. (Assuming all (generetad) plus files to be skipped because users usually included them in `.gitignore`.)
-        res.length > 0) {
-        files = res;
+        // Fallback to fast-glob for users that dynamically generate plus files. (Assuming that no plus file is found because of the user's .gitignore list.)
+        res.files.length > 0) {
+        files = res.files;
+        // We cannot find files inside symlink directories with `$ git ls-files` => we use fast-glob
+        files.push(...(await crawlSymlinkDirs(res.symlinkDirs, userRootDir, outDirRelativeFromUserRootDir)));
     }
     else {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
     }
     // Filter build files
-    files = files.filter((file) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(file));
+    files = files.filter((filePath) => !(0, transpileAndExecuteFile_js_1.isTemporaryBuildFile)(filePath));
     // Check performance
     {
         const timeAfter = new Date().getTime();
@@ -82,20 +86,27 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         'git',
         preserveUTF8,
         'ls-files',
-        ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        // We don't filter because:
+        //  - It would skip symlink directories
+        //  - Performance gain seems negligible: https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
+        // ...scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
+        // Performance gain is non-negligible.
+        //  - https://github.com/vikejs/vike/pull/1688#issuecomment-2166206648
+        //  - When node_modules/ is untracked the performance gain could be significant?
         ...ignoreAsPatterns.map((pattern) => `--exclude="${pattern}"`),
-        // --others lists untracked files only (but using .gitignore because --exclude-standard)
-        // --cached adds the tracked files to the output
-        '--others --cached --exclude-standard'
+        // --others --exclude-standard => list untracked files (--others) while using .gitignore (--exclude-standard)
+        // --cached => list tracked files
+        // --stage => get file modes which we use to find symlink directories
+        '--others --exclude-standard --cached --stage'
     ].join(' ');
-    let files;
+    let resultLines;
     let filesDeleted;
     try {
         ;
-        [files, filesDeleted] = await Promise.all([
+        [resultLines, filesDeleted] = await Promise.all([
             // Main command
             runCmd1(cmd, userRootDir),
-            // Get tracked by deleted files
+            // Get tracked but deleted files
             runCmd1('git ls-files --deleted', userRootDir)
         ]);
     }
@@ -106,11 +117,40 @@ async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
         }
         throw err;
     }
-    files = files
-        // We have to repeat the same exclusion logic here because the `git ls-files` option --exclude only applies to untracked files. (We use --exclude only to speed up the command.)
-        .filter(ignoreAsFilterFn)
-        .filter((file) => !filesDeleted.includes(file));
-    return files;
+    const filePaths = resultLines.map(parseGitLsResultLine);
+    // If there are too many files without mode we fallback to fast-glob
+    if (filePaths.filter((f) => !f.mode).length > TOO_MANY_UNTRACKED_FILES)
+        return null;
+    const symlinkDirs = [];
+    const files = [];
+    for (const { filePath, mode } of filePaths) {
+        // Deleted?
+        if (filesDeleted.includes(filePath))
+            continue;
+        // We have to repeat the same exclusion logic here because the option --exclude of `$ git ls-files` only applies to untracked files. (We use --exclude only to speed up the `$ git ls-files` command.)
+        if (!ignoreAsFilterFn(filePath))
+            continue;
+        // Symlink directory?
+        {
+            const isSymlinkDir = await isSymlinkDirectory(mode, filePath, userRootDir);
+            if (isSymlinkDir) {
+                symlinkDirs.push(filePath);
+                continue;
+            }
+            // Skip deleted files and non-symlink directories
+            if (isSymlinkDir === null) {
+                continue;
+            }
+        }
+        // + file?
+        if (!path_1.default.posix.basename(filePath).startsWith('+'))
+            continue;
+        // JavaScript file?
+        if (!(0, utils_js_1.isScriptFile)(filePath))
+            continue;
+        files.push(filePath);
+    }
+    return { files, symlinkDirs };
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
@@ -121,7 +161,7 @@ async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
     });
     return files;
 }
-// Same as getIgnoreFilter() but as glob pattern
+// Same as getIgnoreAsFilterFn() but as glob pattern
 function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
     const ignoreAsPatterns = [
         '**/node_modules/**',
@@ -138,7 +178,7 @@ function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
     }
     return ignoreAsPatterns;
 }
-// Same as getIgnorePatterns() but for Array.filter()
+// Same as getIgnoreAsPatterns() but for Array.filter()
 function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
     (0, utils_js_1.assert)(outDirRelativeFromUserRootDir === null || !outDirRelativeFromUserRootDir.startsWith('/'));
     return (file) => !file.includes('node_modules/') &&
@@ -175,6 +215,77 @@ async function isGitNotUsable(userRootDir) {
         return false;
     }
 }
+async function crawlSymlinkDirs(symlinkDirs, userRootDir, outDirRelativeFromUserRootDir) {
+    const filesInSymlinkDirs = (await Promise.all(symlinkDirs.map(async (symlinkDir) => (await fastGlob(path_1.default.posix.join(userRootDir, symlinkDir), outDirRelativeFromUserRootDir)).map((filePath) => path_1.default.posix.join(symlinkDir, filePath))))).flat();
+    return filesInSymlinkDirs;
+}
+// Parse:
+// ```
+// some/not/tracked/path
+// 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
+// ```
+function parseGitLsResultLine(resultLine) {
+    const [part1, part2, ...rest] = resultLine.split('\t');
+    (0, utils_js_1.assert)(part1);
+    (0, utils_js_1.assert)(rest.length === 0);
+    // Git doesn't provide the mode for untracked paths.
+    // `resultLine` is:
+    // ```
+    // some/not/tracked/path
+    // ```
+    if (part2 === undefined) {
+        return { filePath: part1, mode: null };
+    }
+    (0, utils_js_1.assert)(part2);
+    // `resultLine` is:
+    // ```
+    // 100644 f6928073402b241b468b199893ff6f4aed0b7195 0\tpages/index/+Page.tsx
+    // ```
+    const [mode, _, __, ...rest2] = part1.split(' ');
+    (0, utils_js_1.assert)(mode && _ && __ && rest2.length === 0);
+    return { filePath: part2, mode };
+}
+async function isSymlinkDirectory(mode, filePath, userRootDir) {
+    const filePathAbsolute = path_1.default.posix.join(userRootDir, filePath);
+    let stats = null;
+    let isSymlink = false;
+    if (mode === '120000') {
+        isSymlink = true;
+    }
+    else if (mode === null) {
+        // `$ git ls-files` doesn't provide the mode when Git doesn't track the path
+        stats = await getFileStats(filePathAbsolute);
+        if (stats === null)
+            return null;
+        isSymlink = stats.isSymbolicLink();
+        if (!isSymlink && stats.isDirectory())
+            return null;
+    }
+    else {
+        (0, utils_js_1.assert)(mode);
+    }
+    if (!isSymlink)
+        return false;
+    if (!stats)
+        stats = await getFileStats(filePathAbsolute);
+    if (stats === null)
+        return null;
+    const isDirectory = stats.isDirectory();
+    return isDirectory;
+}
+async function getFileStats(filePathAbsolute) {
+    let stats;
+    try {
+        stats = await promises_1.default.lstat(filePathAbsolute);
+    }
+    catch (err) {
+        // File was deleted, usually a temporary file such as +config.js.build-j95xb988fpln.mjs
+        // ENOENT: no such file or directory
+        (0, utils_js_1.assert)(err.code === 'ENOENT');
+        return null;
+    }
+    return stats;
+}
 async function runCmd1(cmd, cwd) {
     const { stdout } = await execA(cmd, { cwd });
     /* Not always true: https://github.com/vikejs/vike/issues/1440#issuecomment-1892831303

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

@@ -614,7 +614,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
             if (!configMeta)
                 return;
             const meta = configMeta.configValue;
-            assertMetaValue(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
+            assertMetaUsage(meta, `Config ${picocolors_1.default.cyan('meta')} defined at ${interfaceFile.filePath.filePathToShowToUser}`);
             // Set configDef._userEffectDefinedAtFilePath
             Object.entries(meta).forEach(([configName, configDef]) => {
                 if (!configDef.effect)
@@ -637,7 +637,7 @@ function getConfigDefinitions(interfaceFilesRelevant) {
     const configDefinitions = configDefinitionsMerged;
     return configDefinitions;
 }
-function assertMetaValue(metaVal, metaConfigDefinedAt) {
+function assertMetaUsage(metaVal, metaConfigDefinedAt) {
     if (!(0, utils_js_1.isObject)(metaVal)) {
         (0, utils_js_1.assert)(metaConfigDefinedAt); // We expect internal effects to return a valid meta value
         (0, utils_js_1.assertUsage)(false, `${metaConfigDefinedAt} has an invalid type ${picocolors_1.default.cyan(typeof metaVal)}: it should be an object instead.`);
@@ -709,7 +709,7 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
             else {
                 configDefinedAt = null;
             }
-            assertMetaValue(configValue, configDefinedAt);
+            assertMetaUsage(configValue, configDefinedAt);
             (0, utils_js_1.objectEntries)(configValue).forEach(([configTargetName, configTargetDef]) => {
                 {
                     const keys = Object.keys(configTargetDef);
@@ -726,8 +726,13 @@ function applyEffect(configModFromEffect, configValueSources, configDefEffect) {
         }
         else {
             (0, utils_js_1.assertUsage)(false, notSupported);
-            // If we do end implementing being able to set the value of a config:
-            //  - For setting definedAtFile: we could take the definedAtFile of the effect config while appending '(effect)' to definedAtFile.fileExportPathToShowToUser
+            /* To implement being able to set a config value in an effect:
+             * - Copy and append definedAtFile.fileExportPathToShowToUser with ['meta', configName, 'effect']
+             *   - Copying the definedAtFile of the config that defines the effect
+             * - Same precedence as the config that sets the value triggering the effect (not the config defining the effect)
+             *   - Apply sortConfigValueSources() again?
+            configValueSources.push()
+            */
         }
     });
 }
@@ -900,7 +905,10 @@ function getConfigEnvValue(val, errMsgIntro) {
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'config', 'undefined') || (0, utils_js_1.hasProp)(val, 'config', 'boolean'), errInvalidValue);
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'server', 'undefined') || (0, utils_js_1.hasProp)(val, 'server', 'boolean'), errInvalidValue);
     (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(val, 'client', 'undefined') || (0, utils_js_1.hasProp)(val, 'client', 'boolean'), errInvalidValue);
-    /* Uncomment to allow users to set an eager config. Same for `{ client: 'if-client-routing' }`.
+    /* To allow users to set an eager config:
+     * - Uncomment line below.
+     * - Add 'eager' to assertKeys() call above.
+     * - Add `eager: boolean` to ConfigEnv type.
     assertUsage(hasProp(val, 'eager', 'undefined') || hasProp(val, 'eager', 'boolean'), errInvalidValue)
     */
     return val;

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errBabelReact.js

@@ -7,9 +7,9 @@ exports.errBabelReact = {
     loc: { line: 7, column: 20, index: 208 },
     pos: 208,
     plugin: 'vite:react-babel',
-    id: '/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx',
-    pluginCode: "import React from 'react'\nimport logoUrl from './logo.svg'\nimport { PageContextProvider } from './usePageContext'\nimport { Link } from './Link'\nimport type { PageContext } from './types'\n\nexport { PageShell }}\n\nfunction PageShell({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n  return (\n    <React.StrictMode>\n      <PageContextProvider pageContext={pageContext}>\n        <Layout>\n          <Sidebar>\n            <Logo />\n            <Link href=\"/\">Welcome</Link>\n            <Link href=\"/markdown\">Markdown</Link>\n            <Link href=\"/star-wars\">Data Fetching</Link>\n            <Link href=\"/hello\">Routing</Link>\n          </Sidebar>\n          <Content>{children}</Content>\n        </Layout>\n      </PageContextProvider>\n    </React.StrictMode>\n  )\n}\n\nfunction Layout({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      style={{\n        display: 'flex',\n        maxWidth: 900,\n        margin: 'auto'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Sidebar({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      id=\"sidebar\"\n      style={{\n        padding: 20,\n        flexShrink: 0,\n        display: 'flex',\n        flexDirection: 'column',\n        lineHeight: '1.8em',\n        borderRight: '2px solid #eee'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Content({ children }: { children: React.ReactNode }) {\n  return (\n    <div id=\"page-container\">\n      <div\n        id=\"page-content\"\n        style={{\n          padding: 20,\n          paddingBottom: 50,\n          minHeight: '100vh.js'\n        }}\n      >\n        {children}\n      </div>\n    </div>\n  )\n}\n\nfunction Logo() {\n  return (\n    <div\n      style={{\n        marginTop: 20,\n        marginBottom: 10\n      }}\n    >\n      <a href=\"/\">\n        <img src={logoUrl} height={64} width={64} />\n      </a>\n    </div>\n  )\n}\n",
-    frame: "5  |  import type { PageContext } from './types.js'\n6  |  \n7  |  export { PageShell }}\n   |                      ^\n8  |  \n9  |  function PageShell({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {",
-    message: "/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx: Unexpected token (7:20)\n\n\u001b[0m \u001b[90m  5 |\u001b[39m \u001b[36mimport\u001b[39m type { \u001b[33mPageContext\u001b[39m } \u001b[36mfrom\u001b[39m \u001b[32m'./types'\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  6 |\u001b[39m\u001b[0m\n\u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[39m\u001b[90m  7 |\u001b[39m \u001b[36mexport\u001b[39m { \u001b[33mPageShell\u001b[39m }}\u001b[0m\n\u001b[0m \u001b[90m    |\u001b[39m                     \u001b[31m\u001b[1m^\u001b[22m\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  8 |\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  9 |\u001b[39m \u001b[36mfunction\u001b[39m \u001b[33mPageShell\u001b[39m({ pageContext\u001b[33m,\u001b[39m children }\u001b[33m:\u001b[39m { pageContext\u001b[33m:\u001b[39m \u001b[33mPageContext\u001b[39m\u001b[33m;\u001b[39m children\u001b[33m:\u001b[39m \u001b[33mReact\u001b[39m\u001b[33m.\u001b[39m\u001b[33mReactNode\u001b[39m }) {\u001b[0m\n\u001b[0m \u001b[90m 10 |\u001b[39m   \u001b[36mreturn\u001b[39m (\u001b[0m",
-    stack: "SyntaxError: /home/rom/code/vike/examples/react-full/renderer/PageShell.tsx: Unexpected token (7:20)\n\n\u001b[0m \u001b[90m  5 |\u001b[39m \u001b[36mimport\u001b[39m type { \u001b[33mPageContext\u001b[39m } \u001b[36mfrom\u001b[39m \u001b[32m'./types'\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  6 |\u001b[39m\u001b[0m\n\u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[39m\u001b[90m  7 |\u001b[39m \u001b[36mexport\u001b[39m { \u001b[33mPageShell\u001b[39m }}\u001b[0m\n\u001b[0m \u001b[90m    |\u001b[39m                     \u001b[31m\u001b[1m^\u001b[22m\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  8 |\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  9 |\u001b[39m \u001b[36mfunction\u001b[39m \u001b[33mPageShell\u001b[39m({ pageContext\u001b[33m,\u001b[39m children }\u001b[33m:\u001b[39m { pageContext\u001b[33m:\u001b[39m \u001b[33mPageContext\u001b[39m\u001b[33m;\u001b[39m children\u001b[33m:\u001b[39m \u001b[33mReact\u001b[39m\u001b[33m.\u001b[39m\u001b[33mReactNode\u001b[39m }) {\u001b[0m\n\u001b[0m \u001b[90m 10 |\u001b[39m   \u001b[36mreturn\u001b[39m (\u001b[0m\n    at instantiate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parse-error/credentials.ts:62:21)\n    at toParseError (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parse-error.ts:60:12)\n    at TypeScriptParserMixin.raise (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/tokenizer/index.ts:1490:19)\n    at TypeScriptParserMixin.unexpected (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/tokenizer/index.ts:1531:16)\n    at TypeScriptParserMixin.parseExprAtom (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:1347:16)\n    at TypeScriptParserMixin.parseExprAtom (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/jsx/index.ts:574:22)\n    at TypeScriptParserMixin.parseExprSubscripts (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:718:23)\n    at TypeScriptParserMixin.parseUpdate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:695:21)\n    at TypeScriptParserMixin.parseMaybeUnary (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:657:23)\n    at TypeScriptParserMixin.parseMaybeUnary (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3552:20)\n    at TypeScriptParserMixin.parseMaybeUnaryOrPrivate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:395:14)\n    at TypeScriptParserMixin.parseExprOps (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:407:23)\n    at TypeScriptParserMixin.parseMaybeConditional (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:362:23)\n    at TypeScriptParserMixin.parseMaybeAssign (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:302:21)\n    at TypeScriptParserMixin.parseMaybeAssign (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3429:22)\n    at TypeScriptParserMixin.parseExpressionBase (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:225:23)\n    at callback (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:216:39)\n    at TypeScriptParserMixin.allowInAnd (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:3072:16)\n    at TypeScriptParserMixin.parseExpression (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:216:17)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:628:23)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:2887:20)\n    at TypeScriptParserMixin.parseStatementLike (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:417:17)\n    at TypeScriptParserMixin.parseModuleItem (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:354:17)\n    at TypeScriptParserMixin.parseBlockOrModuleBlockBody (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1359:16)\n    at TypeScriptParserMixin.parseBlockBody (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1333:10)\n    at TypeScriptParserMixin.parseProgram (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:226:10)\n    at TypeScriptParserMixin.parseTopLevel (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:208:25)\n    at TypeScriptParserMixin.parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/index.ts:45:10)\n    at TypeScriptParserMixin.parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3997:20)\n    at parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/index.ts:67:38)\n    at parser (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/parser/index.ts:28:19)\n    at parser.next (<anonymous>)\n    at normalizeFile (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transformation/normalize-file.ts:51:24)\n    at normalizeFile.next (<anonymous>)\n    at run (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transformation/index.ts:38:36)\n    at run.next (<anonymous>)\n    at transform (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transform.ts:29:20)\n    at transform.next (<anonymous>)\n    at step (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:261:32)\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:273:13\n    at async.call.result.err.err (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:223:11)\n    at cb (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:189:28)\n    at /home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/gensync-utils/async.ts:90:7\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:113:33\n    at step (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:287:14)\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:273:13\n    at async.call.result.err.err (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:223:11)"
+    id: '/home/rom/code/vike/examples/react-full/renderer/Layout.tsx',
+    pluginCode: "import React from 'react'\nimport logoUrl from './logo.svg'\nimport { PageContextProvider } from './usePageContext'\nimport { Link } from './Link'\nimport type { PageContext } from './types'\n\nexport { Layout }}\n\nfunction Layout({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n  return (\n    <React.StrictMode>\n      <PageContextProvider pageContext={pageContext}>\n        <Layout>\n          <Sidebar>\n            <Logo />\n            <Link href=\"/\">Welcome</Link>\n            <Link href=\"/markdown\">Markdown</Link>\n            <Link href=\"/star-wars\">Data Fetching</Link>\n            <Link href=\"/hello\">Routing</Link>\n          </Sidebar>\n          <Content>{children}</Content>\n        </Layout>\n      </PageContextProvider>\n    </React.StrictMode>\n  )\n}\n\nfunction Layout({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      style={{\n        display: 'flex',\n        maxWidth: 900,\n        margin: 'auto'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Sidebar({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      id=\"sidebar\"\n      style={{\n        padding: 20,\n        flexShrink: 0,\n        display: 'flex',\n        flexDirection: 'column',\n        lineHeight: '1.8em',\n        borderRight: '2px solid #eee'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Content({ children }: { children: React.ReactNode }) {\n  return (\n    <div id=\"page-container\">\n      <div\n        id=\"page-content\"\n        style={{\n          padding: 20,\n          paddingBottom: 50,\n          minHeight: '100vh.js'\n        }}\n      >\n        {children}\n      </div>\n    </div>\n  )\n}\n\nfunction Logo() {\n  return (\n    <div\n      style={{\n        marginTop: 20,\n        marginBottom: 10\n      }}\n    >\n      <a href=\"/\">\n        <img src={logoUrl} height={64} width={64} />\n      </a>\n    </div>\n  )\n}\n",
+    frame: "5  |  import type { PageContext } from './types.js'\n6  |  \n7  |  export { Layout }}\n   |                      ^\n8  |  \n9  |  function Layout({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {",
+    message: "/home/rom/code/vike/examples/react-full/renderer/Layout.tsx: Unexpected token (7:20)\n\n\u001b[0m \u001b[90m  5 |\u001b[39m \u001b[36mimport\u001b[39m type { \u001b[33mPageContext\u001b[39m } \u001b[36mfrom\u001b[39m \u001b[32m'./types'\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  6 |\u001b[39m\u001b[0m\n\u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[39m\u001b[90m  7 |\u001b[39m \u001b[36mexport\u001b[39m { \u001b[33mLayout\u001b[39m }}\u001b[0m\n\u001b[0m \u001b[90m    |\u001b[39m                     \u001b[31m\u001b[1m^\u001b[22m\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  8 |\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  9 |\u001b[39m \u001b[36mfunction\u001b[39m \u001b[33mLayout\u001b[39m({ pageContext\u001b[33m,\u001b[39m children }\u001b[33m:\u001b[39m { pageContext\u001b[33m:\u001b[39m \u001b[33mPageContext\u001b[39m\u001b[33m;\u001b[39m children\u001b[33m:\u001b[39m \u001b[33mReact\u001b[39m\u001b[33m.\u001b[39m\u001b[33mReactNode\u001b[39m }) {\u001b[0m\n\u001b[0m \u001b[90m 10 |\u001b[39m   \u001b[36mreturn\u001b[39m (\u001b[0m",
+    stack: "SyntaxError: /home/rom/code/vike/examples/react-full/renderer/Layout.tsx: Unexpected token (7:20)\n\n\u001b[0m \u001b[90m  5 |\u001b[39m \u001b[36mimport\u001b[39m type { \u001b[33mPageContext\u001b[39m } \u001b[36mfrom\u001b[39m \u001b[32m'./types'\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  6 |\u001b[39m\u001b[0m\n\u001b[0m\u001b[31m\u001b[1m>\u001b[22m\u001b[39m\u001b[90m  7 |\u001b[39m \u001b[36mexport\u001b[39m { \u001b[33mLayout\u001b[39m }}\u001b[0m\n\u001b[0m \u001b[90m    |\u001b[39m                     \u001b[31m\u001b[1m^\u001b[22m\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  8 |\u001b[39m\u001b[0m\n\u001b[0m \u001b[90m  9 |\u001b[39m \u001b[36mfunction\u001b[39m \u001b[33mLayout\u001b[39m({ pageContext\u001b[33m,\u001b[39m children }\u001b[33m:\u001b[39m { pageContext\u001b[33m:\u001b[39m \u001b[33mPageContext\u001b[39m\u001b[33m;\u001b[39m children\u001b[33m:\u001b[39m \u001b[33mReact\u001b[39m\u001b[33m.\u001b[39m\u001b[33mReactNode\u001b[39m }) {\u001b[0m\n\u001b[0m \u001b[90m 10 |\u001b[39m   \u001b[36mreturn\u001b[39m (\u001b[0m\n    at instantiate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parse-error/credentials.ts:62:21)\n    at toParseError (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parse-error.ts:60:12)\n    at TypeScriptParserMixin.raise (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/tokenizer/index.ts:1490:19)\n    at TypeScriptParserMixin.unexpected (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/tokenizer/index.ts:1531:16)\n    at TypeScriptParserMixin.parseExprAtom (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:1347:16)\n    at TypeScriptParserMixin.parseExprAtom (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/jsx/index.ts:574:22)\n    at TypeScriptParserMixin.parseExprSubscripts (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:718:23)\n    at TypeScriptParserMixin.parseUpdate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:695:21)\n    at TypeScriptParserMixin.parseMaybeUnary (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:657:23)\n    at TypeScriptParserMixin.parseMaybeUnary (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3552:20)\n    at TypeScriptParserMixin.parseMaybeUnaryOrPrivate (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:395:14)\n    at TypeScriptParserMixin.parseExprOps (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:407:23)\n    at TypeScriptParserMixin.parseMaybeConditional (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:362:23)\n    at TypeScriptParserMixin.parseMaybeAssign (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:302:21)\n    at TypeScriptParserMixin.parseMaybeAssign (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3429:22)\n    at TypeScriptParserMixin.parseExpressionBase (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:225:23)\n    at callback (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:216:39)\n    at TypeScriptParserMixin.allowInAnd (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:3072:16)\n    at TypeScriptParserMixin.parseExpression (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/expression.ts:216:17)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:628:23)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:2887:20)\n    at TypeScriptParserMixin.parseStatementLike (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:417:17)\n    at TypeScriptParserMixin.parseModuleItem (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:354:17)\n    at TypeScriptParserMixin.parseBlockOrModuleBlockBody (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1359:16)\n    at TypeScriptParserMixin.parseBlockBody (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1333:10)\n    at TypeScriptParserMixin.parseProgram (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:226:10)\n    at TypeScriptParserMixin.parseTopLevel (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:208:25)\n    at TypeScriptParserMixin.parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/index.ts:45:10)\n    at TypeScriptParserMixin.parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3997:20)\n    at parse (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/index.ts:67:38)\n    at parser (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/parser/index.ts:28:19)\n    at parser.next (<anonymous>)\n    at normalizeFile (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transformation/normalize-file.ts:51:24)\n    at normalizeFile.next (<anonymous>)\n    at run (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transformation/index.ts:38:36)\n    at run.next (<anonymous>)\n    at transform (/home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/transform.ts:29:20)\n    at transform.next (<anonymous>)\n    at step (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:261:32)\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:273:13\n    at async.call.result.err.err (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:223:11)\n    at cb (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:189:28)\n    at /home/rom/code/vike/node_modules/.pnpm/@babel+core@7.21.8/node_modules/@babel/core/src/gensync-utils/async.ts:90:7\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:113:33\n    at step (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:287:14)\n    at /home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:273:13\n    at async.call.result.err.err (/home/rom/code/vike/node_modules/.pnpm/gensync@1.0.0-beta.2/node_modules/gensync/index.js:223:11)"
 };

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errEsbuild.js

@@ -7,10 +7,10 @@ exports.errEsbuild = {
             id: '',
             location: {
                 column: 20,
-                file: '/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx',
+                file: '/home/rom/code/vike/examples/react-full/renderer/Layout.tsx',
                 length: 1,
                 line: 7,
-                lineText: 'export { PageShell }}',
+                lineText: 'export { Layout }}',
                 namespace: '',
                 suggestion: ''
             },
@@ -20,19 +20,19 @@ exports.errEsbuild = {
         }
     ],
     warnings: [],
-    frame: '\n\u001b[33mUnexpected "}"\u001b[39m\n5  |  import type { PageContext } from \'./types\'\n6  |  \n7  |  export { PageShell }}\n   |                      ^\n8  |  \n9  |  function PageShell({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n',
+    frame: '\n\u001b[33mUnexpected "}"\u001b[39m\n5  |  import type { PageContext } from \'./types\'\n6  |  \n7  |  export { Layout }}\n   |                      ^\n8  |  \n9  |  function Layout({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n',
     loc: {
         column: 20,
-        file: '/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx',
+        file: '/home/rom/code/vike/examples/react-full/renderer/Layout.tsx',
         length: 1,
         line: 7,
-        lineText: 'export { PageShell }}',
+        lineText: 'export { Layout }}',
         namespace: '',
         suggestion: ''
     },
     plugin: 'vite:esbuild',
-    id: '/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx',
-    pluginCode: "import React from 'react'\nimport logoUrl from './logo.svg'\nimport { PageContextProvider } from './usePageContext'\nimport { Link } from './Link'\nimport type { PageContext } from './types'\n\nexport { PageShell }}\n\nfunction PageShell({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n  return (\n    <React.StrictMode>\n      <PageContextProvider pageContext={pageContext}>\n        <Layout>\n          <Sidebar>\n            <Logo />\n            <Link href=\"/\">Welcome</Link>\n            <Link href=\"/markdown\">Markdown</Link>\n            <Link href=\"/star-wars\">Data Fetching</Link>\n            <Link href=\"/hello\">Routing</Link>\n          </Sidebar>\n          <Content>{children}</Content>\n        </Layout>\n      </PageContextProvider>\n    </React.StrictMode>\n  )\n}\n\nfunction Layout({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      style={{\n        display: 'flex',\n        maxWidth: 900,\n        margin: 'auto'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Sidebar({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      id=\"sidebar\"\n      style={{\n        padding: 20,\n        flexShrink: 0,\n        display: 'flex',\n        flexDirection: 'column',\n        lineHeight: '1.8em',\n        borderRight: '2px solid #eee'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Content({ children }: { children: React.ReactNode }) {\n  return (\n    <div id=\"page-container\">\n      <div\n        id=\"page-content\"\n        style={{\n          padding: 20,\n          paddingBottom: 50,\n          minHeight: '100vh.js'\n        }}\n      >\n        {children}\n      </div>\n    </div>\n  )\n}\n\nfunction Logo() {\n  return (\n    <div\n      style={{\n        marginTop: 20,\n        marginBottom: 10\n      }}\n    >\n      <a href=\"/\">\n        <img src={logoUrl} height={64} width={64} />\n      </a>\n    </div>\n  )\n}\n",
-    message: 'Transform failed with 1 error:\n/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx:7:20: ERROR: Unexpected "}"',
-    stack: 'Error: Transform failed with 1 error:\n/home/rom/code/vike/examples/react-full/renderer/PageShell.tsx:7:20: ERROR: Unexpected "}"\n    at failureErrorWithLog (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:1636:15)\n    at /home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:837:29\n    at responseCallbacks.<computed> (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:697:9)\n    at handleIncomingPacket (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:752:9)\n    at Socket.readFromStdout (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:673:7)\n    at Socket.emit (node:events:513:28)\n    at addChunk (node:internal/streams/readable:324:12)\n    at readableAddChunk (node:internal/streams/readable:297:9)\n    at Socket.Readable.push (node:internal/streams/readable:234:10)\n    at Pipe.onStreamRead (node:internal/stream_base_commons:190:23)'
+    id: '/home/rom/code/vike/examples/react-full/renderer/Layout.tsx',
+    pluginCode: "import React from 'react'\nimport logoUrl from './logo.svg'\nimport { PageContextProvider } from './usePageContext'\nimport { Link } from './Link'\nimport type { PageContext } from './types'\n\nexport { Layout }}\n\nfunction Layout({ pageContext, children }: { pageContext: PageContext; children: React.ReactNode }) {\n  return (\n    <React.StrictMode>\n      <PageContextProvider pageContext={pageContext}>\n        <Layout>\n          <Sidebar>\n            <Logo />\n            <Link href=\"/\">Welcome</Link>\n            <Link href=\"/markdown\">Markdown</Link>\n            <Link href=\"/star-wars\">Data Fetching</Link>\n            <Link href=\"/hello\">Routing</Link>\n          </Sidebar>\n          <Content>{children}</Content>\n        </Layout>\n      </PageContextProvider>\n    </React.StrictMode>\n  )\n}\n\nfunction Layout({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      style={{\n        display: 'flex',\n        maxWidth: 900,\n        margin: 'auto'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Sidebar({ children }: { children: React.ReactNode }) {\n  return (\n    <div\n      id=\"sidebar\"\n      style={{\n        padding: 20,\n        flexShrink: 0,\n        display: 'flex',\n        flexDirection: 'column',\n        lineHeight: '1.8em',\n        borderRight: '2px solid #eee'\n      }}\n    >\n      {children}\n    </div>\n  )\n}\n\nfunction Content({ children }: { children: React.ReactNode }) {\n  return (\n    <div id=\"page-container\">\n      <div\n        id=\"page-content\"\n        style={{\n          padding: 20,\n          paddingBottom: 50,\n          minHeight: '100vh.js'\n        }}\n      >\n        {children}\n      </div>\n    </div>\n  )\n}\n\nfunction Logo() {\n  return (\n    <div\n      style={{\n        marginTop: 20,\n        marginBottom: 10\n      }}\n    >\n      <a href=\"/\">\n        <img src={logoUrl} height={64} width={64} />\n      </a>\n    </div>\n  )\n}\n",
+    message: 'Transform failed with 1 error:\n/home/rom/code/vike/examples/react-full/renderer/Layout.tsx:7:20: ERROR: Unexpected "}"',
+    stack: 'Error: Transform failed with 1 error:\n/home/rom/code/vike/examples/react-full/renderer/Layout.tsx:7:20: ERROR: Unexpected "}"\n    at failureErrorWithLog (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:1636:15)\n    at /home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:837:29\n    at responseCallbacks.<computed> (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:697:9)\n    at handleIncomingPacket (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:752:9)\n    at Socket.readFromStdout (/home/rom/code/vike/node_modules/.pnpm/esbuild@0.17.18/node_modules/esbuild/lib/main.js:673:7)\n    at Socket.emit (node:events:513:28)\n    at addChunk (node:internal/streams/readable:324:12)\n    at readableAddChunk (node:internal/streams/readable:297:9)\n    at Socket.Readable.push (node:internal/streams/readable:234:10)\n    at Pipe.onStreamRead (node:internal/stream_base_commons:190:23)'
 };

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueCss.js

@@ -4,7 +4,7 @@ exports.errVueCss = void 0;
 exports.errVueCss = {
     name: 'CssSyntaxError',
     reason: 'Unexpected }',
-    file: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue',
+    file: '/home/rom/code/vike/examples/vue-full/renderer/Layout.vue',
     source: '\n.layout {\n  display: flex;\n  max-width: 900px;\n  margin: auto;\n}}\n.content {\n  padding: 20px;\n  padding-bottom: 50px;\n  min-height: 100vh;\n}\n.navigation {\n  padding: 20px;\n  flex-shrink: 0;\n  display: flex;\n  flex-direction: column;\n  line-height: 1.8em;\n  border-right: 2px solid #eee;\n}\n.logo {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\n.content {\n  transition: opacity 0.1s ease-in;\n}\n.content.page-transition {\n  opacity: 0;\n}\n',
     line: 6,
     column: 2,
@@ -16,14 +16,14 @@ exports.errVueCss = {
         endLine: 6,
         endColumn: 3,
         source: '\n.layout {\n  display: flex;\n  max-width: 900px;\n  margin: auto;\n}}\n.content {\n  padding: 20px;\n  padding-bottom: 50px;\n  min-height: 100vh;\n}\n.navigation {\n  padding: 20px;\n  flex-shrink: 0;\n  display: flex;\n  flex-direction: column;\n  line-height: 1.8em;\n  border-right: 2px solid #eee;\n}\n.logo {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\n.content {\n  transition: opacity 0.1s ease-in;\n}\n.content.page-transition {\n  opacity: 0;\n}\n',
-        url: 'file:///home/rom/code/vike/examples/vue-full/renderer/PageShell.vue',
-        file: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue'
+        url: 'file:///home/rom/code/vike/examples/vue-full/renderer/Layout.vue',
+        file: '/home/rom/code/vike/examples/vue-full/renderer/Layout.vue'
     },
-    loc: { file: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue', line: 45, column: 2 },
-    id: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue',
+    loc: { file: '/home/rom/code/vike/examples/vue-full/renderer/Layout.vue', line: 45, column: 2 },
+    id: '/home/rom/code/vike/examples/vue-full/renderer/Layout.vue',
     plugin: 'vite:vue',
     pluginCode: '\n.layout {\n  display: flex;\n  max-width: 900px;\n  margin: auto;\n}}\n.content {\n  padding: 20px;\n  padding-bottom: 50px;\n  min-height: 100vh;\n}\n.navigation {\n  padding: 20px;\n  flex-shrink: 0;\n  display: flex;\n  flex-direction: column;\n  line-height: 1.8em;\n  border-right: 2px solid #eee;\n}\n.logo {\n  margin-top: 20px;\n  margin-bottom: 10px;\n}\n.content {\n  transition: opacity 0.1s ease-in;\n}\n.content.page-transition {\n  opacity: 0;\n}\n',
     frame: '43 |    margin: auto;\n44 |  }}\n45 |  .content {\n   |    ^\n46 |    padding: 20px;\n47 |    padding-bottom: 50px;',
-    message: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue:6:2: Unexpected }',
-    stack: 'CssSyntaxError: /home/rom/code/vike/examples/vue-full/renderer/PageShell.vue:6:2: Unexpected }\n    at Input.error (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/input.js:148:16)\n    at Parser.unexpectedClose (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:548:22)\n    at Parser.end (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:379:12)\n    at Parser.parse (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:56:16)\n    at parse (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parse.js:11:12)\n    at new LazyResult (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/lazy-result.js:133:16)\n    at Processor.process (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/processor.js:28:14)\n    at doCompileStyle (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-sfc@3.2.33/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js:17246:45)\n    at Object.compileStyleAsync (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-sfc@3.2.33/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js:17188:12)\n    at transformStyle (/home/rom/code/vike/node_modules/.pnpm/@vitejs+plugin-vue@4.2.1_vite@4.3.5_vue@3.2.33/node_modules/@vitejs/plugin-vue/dist/index.cjs:2622:41)'
+    message: '/home/rom/code/vike/examples/vue-full/renderer/Layout.vue:6:2: Unexpected }',
+    stack: 'CssSyntaxError: /home/rom/code/vike/examples/vue-full/renderer/Layout.vue:6:2: Unexpected }\n    at Input.error (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/input.js:148:16)\n    at Parser.unexpectedClose (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:548:22)\n    at Parser.end (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:379:12)\n    at Parser.parse (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parser.js:56:16)\n    at parse (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/parse.js:11:12)\n    at new LazyResult (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/lazy-result.js:133:16)\n    at Processor.process (/home/rom/code/vike/node_modules/.pnpm/postcss@8.4.23/node_modules/postcss/lib/processor.js:28:14)\n    at doCompileStyle (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-sfc@3.2.33/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js:17246:45)\n    at Object.compileStyleAsync (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-sfc@3.2.33/node_modules/@vue/compiler-sfc/dist/compiler-sfc.cjs.js:17188:12)\n    at transformStyle (/home/rom/code/vike/node_modules/.pnpm/@vitejs+plugin-vue@4.2.1_vite@4.3.5_vue@3.2.33/node_modules/@vitejs/plugin-vue/dist/index.cjs:2622:41)'
 };

package/dist/cjs/node/runtime/renderPage/handleErrorWithoutErrorPage.js

@@ -35,8 +35,8 @@ function warnMissingErrorPage(isV1) {
     if (!globalContext.isProduction) {
         const msg = [
             `No ${isV1 ? 'error page' : picocolors_1.default.cyan('_error.page.js')} found,`,
-            'we recommend defining an error page,',
-            'see https://vike.dev/error-page'
+            'we recommend defining one',
+            'https://vike.dev/error-page'
         ].join(' ');
         (0, utils_js_1.assertWarning)(false, msg, { onlyOnce: true });
     }

package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -22,6 +22,7 @@ const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isServerSideError_js_1 = require("../../../shared/misc/isServerSideError.js");
+const assertV1Design_js_1 = require("../../shared/assertV1Design.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -175,8 +176,9 @@ async function getRenderContext() {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal } = await (0, getPageFiles_js_1.getPageFilesAll)(false, globalContext.isProduction);
     const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(pageFilesAll, pageConfigs, pageConfigGlobal, allPageIds);
-    // We assume assertV1Design() was already called at build-time
-    (0, utils_js_1.assert)(pageFilesAll.length === 0 || pageConfigs.length === 0);
+    (0, assertV1Design_js_1.assertV1Design)(
+    // pageConfigs is PageConfigRuntime[] but assertV1Design() requires PageConfigBuildTime[]
+    pageConfigs.length > 0, pageFilesAll);
     const renderContext = {
         pageFilesAll: pageFilesAll,
         pageConfigs,

package/dist/cjs/node/shared/assertV1Design.js

@@ -2,21 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertV1Design = void 0;
 const utils_js_1 = require("./utils.js");
-function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
-    const isV1Design = pageConfigs.length > 0;
+function assertV1Design(pageConfigs, pageFilesAll) {
+    const isOldDesign = pageFilesAll === true || (pageFilesAll !== false && pageFilesAll.length > 0);
+    const isV1Design = pageConfigs === true || (pageConfigs !== false && pageConfigs.length > 0);
     if (isV1Design && isOldDesign) {
         const lines = ['Mixing the new V1 design with the old V0.4 design is forbidden.'];
-        if (pageFilesAll) {
-            (0, utils_js_1.assert)(pageFilesAll.length > 0);
-            const indent = '- ';
+        const indent = '- ';
+        if (typeof pageConfigs !== 'boolean') {
+            (0, utils_js_1.assert)(pageConfigs.length > 0);
             const filesV1 = (0, utils_js_1.unique)(pageConfigs
                 .map((p) => Object.values(p.configValueSources).map((sources) => sources
                 .map((c) => c.definedAtFilePath.filePathAbsoluteUserRootDir)
                 .filter(utils_js_1.isNotNullish)
                 .map((filePathToShowToUser) => indent + filePathToShowToUser)))
                 .flat(2));
+            lines.push(...['V1 design files:', ...filesV1]);
+        }
+        if (typeof pageFilesAll !== 'boolean') {
+            (0, utils_js_1.assert)(pageFilesAll.length > 0);
             const filesOld = pageFilesAll.map((p) => indent + p.filePath);
-            lines.push(...['V1 design files:', ...filesV1, 'Old design files:', ...filesOld]);
+            lines.push(...['Old design files:', ...filesOld]);
         }
         (0, utils_js_1.assertUsage)(false, lines.join('\n'));
     }

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

@@ -25,7 +25,6 @@ function getConfigValue(pageConfig, configName) {
     const sources = configValueSources[configName];
     if (!sources)
         return null;
-    (0, utils_js_1.assert)(sources.every((s) => s.configEnv.config === true));
     const configDef = configDefinitions[configName];
     (0, utils_js_1.assert)(configDef);
     if (!configDef.cumulative) {

package/dist/cjs/utils/assertSingleInstance.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onAssertModuleLoad = exports.onClientEntry_ClientRouting = exports.onClientEntry_ServerRouting = void 0;
 //  - Throw error if there are two different versions of vike loaded
@@ -7,6 +10,7 @@ exports.onAssertModuleLoad = exports.onClientEntry_ClientRouting = exports.onCli
 const unique_js_1 = require("./unique.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
 const projectInfo_js_1 = require("./projectInfo.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
@@ -21,7 +25,7 @@ function assertSingleInstance() {
         const versions = (0, unique_js_1.unique)(globalObject.instances);
         assertUsage(versions.length <= 1, 
         // DO *NOT* patch vike to remove this error: because of multiple conflicting versions, you *will* eventually encounter insidious issues that hard to debug and potentially a security hazard, see for example https://github.com/vikejs/vike/issues/1108
-        `Both vike@${versions[0]} and vike@${versions[1]} loaded. Only one version should be loaded.`);
+        `vike@${picocolors_1.default.bold(versions[0])} and vike@${picocolors_1.default.bold(versions[1])} loaded but only one version should be loaded`);
     }
     if (globalObject.checkSingleInstance && globalObject.instances.length > 1) {
         /*/ Not sure whether circular dependency can cause problems? In principle not since client-side code is ESM.

package/dist/cjs/utils/parseUrl.js

@@ -16,7 +16,9 @@ const PROTOCOLS = [
     // For [Tauri](https://tauri.app/)
     'tauri://',
     // For Electron: https://github.com/vikejs/vike/issues/1557
-    'file://'
+    'file://',
+    // For Capacitor: https://github.com/vikejs/vike/issues/1706
+    'capacitor://'
 ];
 function isParsable(url) {
     // `parseUrl()` works with these URLs

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.176';
+const PROJECT_VERSION = '0.4.177-commit-f4a92e0';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -19,7 +19,7 @@ async function installClientRouter() {
 function render() {
     assert(getRenderCount() === 0);
     const renderPromise = renderPageClientSide({
-        scrollTarget: 'preserve-scroll',
+        scrollTarget: { preserveScroll: true },
         isBackwardNavigation: null,
         isClientSideNavigation: false
     });

package/dist/esm/client/client-routing-runtime/navigate.d.ts

@@ -9,7 +9,7 @@ export { reload };
  * @param overwriteLastHistoryEntry - Don't create a new entry in the browser's history, instead let the new URL replace the current URL. (This effectively removes the current URL from the browser history).
  */
 declare function navigate(url: string, { keepScrollPosition, overwriteLastHistoryEntry }?: {
-    keepScrollPosition?: boolean | undefined;
-    overwriteLastHistoryEntry?: boolean | undefined;
+    keepScrollPosition?: boolean;
+    overwriteLastHistoryEntry?: boolean;
 }): Promise<void>;
 declare function reload(): Promise<void>;