vike 0.4.150 → 0.4.151-commit-19bc995

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

@@ -10,22 +10,23 @@ const fast_glob_1 = __importDefault(require("fast-glob"));
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const execA = (0, util_1.promisify)(child_process_1.exec);
+const globalObject = (0, utils_js_1.getGlobalObject)('crawlPlusFiles.ts', {
+    gitIsMissing: false
+});
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
     (0, utils_js_1.assertPosixPath)(userRootDir);
     (0, utils_js_1.assertPosixPath)(outDirAbsoluteFilesystem);
-    // Vike prepends userRootDir without resolving, e.g. outDirRelativeFromUserRootDir can be /home/rom/my-monorepo/my-app/../my-build/dist/ while userRootDir is /home/rom/my-monorepo/my-app/
-    (0, utils_js_1.assert)(outDirAbsoluteFilesystem.startsWith(userRootDir));
     let outDirRelativeFromUserRootDir = path_1.default.posix.relative(userRootDir, outDirAbsoluteFilesystem);
     if (outDirRelativeFromUserRootDir.startsWith('../')) {
         // config.outDir is outside of config.root => it's going to be ignored anyways
         outDirRelativeFromUserRootDir = null;
     }
     (0, utils_js_1.assert)(outDirRelativeFromUserRootDir === null || !outDirRelativeFromUserRootDir.startsWith('.'));
-    const timeBase = new Date().getTime();
+    const timeBefore = new Date().getTime();
     let files = [];
     const res = await gitLsFiles(userRootDir, outDirRelativeFromUserRootDir);
     if (res &&
-        // Fallback to fast-glob for users that dynamically generate plus files (we assume generetad plus files to be skipped because they are usually included in .gitignore)
+        // 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;
     }
@@ -33,10 +34,11 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
         files = await fastGlob(userRootDir, outDirRelativeFromUserRootDir);
     }
     {
-        const time = new Date().getTime() - timeBase;
+        const timeAfter = new Date().getTime();
+        const timeSpent = timeAfter - timeBefore;
         if (isDev) {
-            // We only warn in dev, because while building it's expected to take a long time as fast-glob is competing for resources with other tasks
-            (0, utils_js_1.assertWarning)(time < 2 * 1000, `Crawling your user files took an unexpected long time (${time}ms). Create a new issue on Vike's GitHub.`, {
+            // We only warn in dev, because while building it's expected to take a long time as crawling is competing for resources with other tasks.
+            (0, utils_js_1.assertWarning)(timeSpent < 2 * 1000, `Crawling your user files took an unexpected long time (${timeSpent}ms). Create a new issue on Vike's GitHub.`, {
                 onlyOnce: 'slow-page-files-search'
             });
         }
@@ -56,37 +58,54 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev) {
 exports.crawlPlusFiles = crawlPlusFiles;
 // Same as fastGlob() but using `$ git ls-files`
 async function gitLsFiles(userRootDir, outDirRelativeFromUserRootDir) {
-    if (!(await isUsingGit(userRootDir)))
+    if (globalObject.gitIsMissing)
         return null;
+    const ignoreAsPatterns = getIgnoreAsPatterns(outDirRelativeFromUserRootDir);
+    const ignoreAsFilterFn = getIgnoreAsFilterFn(outDirRelativeFromUserRootDir);
     const cmd = [
         'git ls-files',
         ...utils_js_1.scriptFileExtensionList.map((ext) => `"**/+*.${ext}"`),
-        ...getIgnorePatterns(outDirRelativeFromUserRootDir).map((pattern) => `--exclude="${pattern}"`),
+        ...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'
     ].join(' ');
-    let files = await runCmd(cmd, userRootDir);
-    files = files.filter(
-    // 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.)
-    (file) => getIgnoreFilter(file, outDirRelativeFromUserRootDir));
-    // Remove tracked but deleted files
-    const filesIgnore = await runCmd('git ls-files --deleted', userRootDir);
-    files = files.filter((file) => !filesIgnore.includes(file));
+    let files;
+    let filesDeleted;
+    try {
+        ;
+        [files, filesDeleted] = await Promise.all([
+            // Main command
+            runCmd(cmd, userRootDir),
+            // Get tracked by deleted files
+            runCmd('git ls-files --deleted', userRootDir)
+        ]);
+    }
+    catch (err) {
+        if (await isGitMissing(userRootDir)) {
+            globalObject.gitIsMissing = true;
+            return null;
+        }
+        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;
 }
 // Same as gitLsFiles() but using fast-glob
 async function fastGlob(userRootDir, outDirRelativeFromUserRootDir) {
     const files = await (0, fast_glob_1.default)(`**/+*.${utils_js_1.scriptFileExtensions}`, {
-        ignore: getIgnorePatterns(outDirRelativeFromUserRootDir),
+        ignore: getIgnoreAsPatterns(outDirRelativeFromUserRootDir),
         cwd: userRootDir,
         dot: false
     });
     return files;
 }
 // Same as getIgnoreFilter() but as glob pattern
-function getIgnorePatterns(outDirRelativeFromUserRootDir) {
-    const ignorePatterns = [
+function getIgnoreAsPatterns(outDirRelativeFromUserRootDir) {
+    const ignoreAsPatterns = [
         '**/node_modules/**',
         // Allow:
         // ```
@@ -97,31 +116,30 @@ function getIgnorePatterns(outDirRelativeFromUserRootDir) {
     ];
     if (outDirRelativeFromUserRootDir) {
         (0, utils_js_1.assert)(!outDirRelativeFromUserRootDir.startsWith('/'));
-        ignorePatterns.push(`${outDirRelativeFromUserRootDir}/**`);
+        ignoreAsPatterns.push(`${outDirRelativeFromUserRootDir}/**`);
     }
-    return ignorePatterns;
+    return ignoreAsPatterns;
 }
 // Same as getIgnorePatterns() but for Array.filter()
-function getIgnoreFilter(file, outDirRelativeFromUserRootDir) {
-    (0, utils_js_1.assert)(!file.startsWith('/'));
+function getIgnoreAsFilterFn(outDirRelativeFromUserRootDir) {
     (0, utils_js_1.assert)(outDirRelativeFromUserRootDir === null || !outDirRelativeFromUserRootDir.startsWith('/'));
-    return (!file.includes('node_modules/') &&
+    return (file) => !file.includes('node_modules/') &&
         !file.includes('.telefunc.') &&
-        (!outDirRelativeFromUserRootDir || !file.startsWith(`${outDirRelativeFromUserRootDir}/`)));
+        (outDirRelativeFromUserRootDir === null || !file.startsWith(`${outDirRelativeFromUserRootDir}/`));
 }
 // Whether Git is installed and whether userRootDir is inside a Git repository
-async function isUsingGit(userRootDir) {
+async function isGitMissing(userRootDir) {
     let res;
     try {
         res = await execA('git rev-parse --is-inside-work-tree', { cwd: userRootDir });
     }
     catch {
-        return false;
+        return true;
     }
     const { stdout, stderr } = res;
     (0, utils_js_1.assert)(stderr.toString().trim() === '');
     (0, utils_js_1.assert)(stdout.toString().trim() === 'true');
-    return true;
+    return false;
 }
 async function runCmd(cmd, cwd) {
     const res = await execA(cmd, { cwd });

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

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errSwc = void 0;
 exports.errSwc = {
-    stack: "Error: \n  \u001b[38;2;255;30;30m×\u001b[0m Expected ';', '}' or <eof>\n   ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/hello/+Page.tsx\u001b[0m:1:1]\n \u001b[2m1\u001b[0m │ export default Page\n \u001b[2m2\u001b[0m │ \n \u001b[2m3\u001b[0m │ impeort React from 'react'\n   · \u001b[38;2;246;87;248m───┬───\u001b[0m\u001b[38;2;30;201;212m ─────\u001b[0m\n   ·    \u001b[38;2;246;87;248m╰── \u001b[38;2;246;87;248mThis is the expression part of an expression statement\u001b[0m\u001b[0m\n \u001b[2m4\u001b[0m │ \n \u001b[2m5\u001b[0m │ function Page({ name }: { name: string }) {\n \u001b[2m6\u001b[0m │   return (\n   ╰────\n\n\nCaused by:\n    Syntax Error",
+    stack: "Error: \n  \u001b[38;2;255;30;30m×\u001b[0m Expected ';', '}' or <eof>\n   ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/hello/+Page.tsx\u001b[0m:1:1]\n \u001b[2m1\u001b[0m │ export default Page\n \u001b[2m2\u001b[0m │ \n \u001b[2m3\u001b[0m │ impeort React from 'react'\n   · \u001b[38;2;246;87;248m───┬───\u001b[0m\u001b[38;2;30;201;212m ─────\u001b[0m\n   ·    \u001b[38;2;246;87;248m╰── \u001b[38;2;246;87;248mThis is the expression part of an expression statement\u001b[0m\u001b[0m\n \u001b[2m4\u001b[0m │ \n \u001b[2m5\u001b[0m │ function Page({ name }: { name: string }) {\n \u001b[2m6\u001b[0m │   return (\n   ╰────\n\n\nCaused by:\n    Syntax Error",
     code: 'GenericFailure',
     line: '1',
     column: '1',
     plugin: 'vite:react-swc',
-    id: '/home/rom/code/vike/examples/react-full-v1/pages/hello/+Page.tsx',
+    id: '/home/rom/code/vike/examples/react-full/pages/hello/+Page.tsx',
     pluginCode: 'export default Page\n\nimpeort React from \'react\'\n\nfunction Page({ name }: { name: string }) {\n  return (\n    <>\n      <h1>Hello</h1>\n      <p>\n        Hi <b>{name}</b>.\n      </p>\n      <ul>\n        <li>\n          <a href="/hello/eli">/hello/eli</a>\n        </li>\n        <li>\n          <a href="/hello/jon">/hello/jon</a>\n        </li>\n      </ul>\n      <p>\n        Parameterized routes can be defined by exporting a route string in <code>*.page.route.js</code>.\n      </p>\n    </>\n  )\n}\n',
     loc: {
-        file: '/home/rom/code/vike/examples/react-full-v1/pages/hello/+Page.tsx',
+        file: '/home/rom/code/vike/examples/react-full/pages/hello/+Page.tsx',
         line: '1',
         column: '1'
     },
-    frame: '1  |  /home/rom/code/vike/examples/react-full-v1/pages/hello/+Page.tsx\n   |   ^',
-    message: "\n  \u001b[38;2;255;30;30m×\u001b[0m Expected ';', '}' or <eof>\n   ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/hello/+Page.tsx\u001b[0m:1:1]\n \u001b[2m1\u001b[0m │ export default Page\n \u001b[2m2\u001b[0m │ \n \u001b[2m3\u001b[0m │ impeort React from 'react'\n   · \u001b[38;2;246;87;248m───┬───\u001b[0m\u001b[38;2;30;201;212m ─────\u001b[0m\n   ·    \u001b[38;2;246;87;248m╰── \u001b[38;2;246;87;248mThis is the expression part of an expression statement\u001b[0m\u001b[0m\n \u001b[2m4\u001b[0m │ \n \u001b[2m5\u001b[0m │ function Page({ name }: { name: string }) {\n \u001b[2m6\u001b[0m │   return (\n   ╰────\n\n\nCaused by:\n    Syntax Error"
+    frame: '1  |  /home/rom/code/vike/examples/react-full/pages/hello/+Page.tsx\n   |   ^',
+    message: "\n  \u001b[38;2;255;30;30m×\u001b[0m Expected ';', '}' or <eof>\n   ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/hello/+Page.tsx\u001b[0m:1:1]\n \u001b[2m1\u001b[0m │ export default Page\n \u001b[2m2\u001b[0m │ \n \u001b[2m3\u001b[0m │ impeort React from 'react'\n   · \u001b[38;2;246;87;248m───┬───\u001b[0m\u001b[38;2;30;201;212m ─────\u001b[0m\n   ·    \u001b[38;2;246;87;248m╰── \u001b[38;2;246;87;248mThis is the expression part of an expression statement\u001b[0m\u001b[0m\n \u001b[2m4\u001b[0m │ \n \u001b[2m5\u001b[0m │ function Page({ name }: { name: string }) {\n \u001b[2m6\u001b[0m │   return (\n   ╰────\n\n\nCaused by:\n    Syntax Error"
 };

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

@@ -6,14 +6,14 @@ exports.errSwcBig = {
     line: '6',
     column: '1',
     plugin: 'vite:react-swc',
-    id: '/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx',
+    id: '/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx',
     pluginCode: "export default Page\n\nimport React from 'react'\nimport { navigate } from 'vike/client/router'\nimport { Counter } from '../../components/Counter'\n\nfunction Page() {\n  return (\n    <>\n      <h1>\n        Welcome to Vike\n      <h1>\n      This page is:\n      <ul>\n        <li>Rendered to HTML.</li>\n        <li>\n          Interactive. <Counter />\n        </li>\n      </ul>\n      <p>\n        <button\n          onClick={() => {\n            const randomIndex = Math.floor(Math.random() * 3)\n            navigate(['/markdown', '/star-wars', '/hello/alice.js'][randomIndex])\n          }}\n        >\n          Random Page\n        </button>\n      </p>\n    </>\n  )\n}\n",
     loc: {
-        file: '/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx',
+        file: '/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx',
         line: '6',
         column: '1'
     },
     frame: '',
-    message: "\n  \u001b[38;2;255;30;30m×\u001b[0m Expression expected\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:6:1]\n \u001b[2m 6\u001b[0m │ \n \u001b[2m 7\u001b[0m │ function Page() {\n \u001b[2m 8\u001b[0m │   return (\n \u001b[2m 9\u001b[0m │     <>\n    · \u001b[38;2;246;87;248m     ─\u001b[0m\n \u001b[2m10\u001b[0m │       <h1>\n \u001b[2m11\u001b[0m │         Welcome to Vike\n \u001b[2m12\u001b[0m │       <h1>\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unexpected token. Did you mean `{'}'}` or `&rbrace;`?\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:29:1]\n \u001b[2m29\u001b[0m │       </p>\n \u001b[2m30\u001b[0m │     </>\n \u001b[2m31\u001b[0m │   )\n \u001b[2m32\u001b[0m │ }\n    · \u001b[38;2;246;87;248m▲\u001b[0m\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unterminated JSX contents\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:27:1]\n \u001b[2m27\u001b[0m │               Random Page\n \u001b[2m28\u001b[0m │             </button>\n \u001b[2m29\u001b[0m │           </p>\n \u001b[2m30\u001b[0m │ \u001b[38;2;246;87;248m╭\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m     </>\n \u001b[2m31\u001b[0m │ \u001b[38;2;246;87;248m│\u001b[0m     )\n \u001b[2m32\u001b[0m │ \u001b[38;2;246;87;248m╰\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m }\n    ╰────\n\n\nCaused by:\n    Syntax Error",
-    stack: "Error: \n  \u001b[38;2;255;30;30m×\u001b[0m Expression expected\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:6:1]\n \u001b[2m 6\u001b[0m │ \n \u001b[2m 7\u001b[0m │ function Page() {\n \u001b[2m 8\u001b[0m │   return (\n \u001b[2m 9\u001b[0m │     <>\n    · \u001b[38;2;246;87;248m     ─\u001b[0m\n \u001b[2m10\u001b[0m │       <h1>\n \u001b[2m11\u001b[0m │         Welcome to Vike\n \u001b[2m12\u001b[0m │       <h1>\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unexpected token. Did you mean `{'}'}` or `&rbrace;`?\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:29:1]\n \u001b[2m29\u001b[0m │       </p>\n \u001b[2m30\u001b[0m │     </>\n \u001b[2m31\u001b[0m │   )\n \u001b[2m32\u001b[0m │ }\n    · \u001b[38;2;246;87;248m▲\u001b[0m\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unterminated JSX contents\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full-v1/pages/index/+Page.tsx\u001b[0m:27:1]\n \u001b[2m27\u001b[0m │               Random Page\n \u001b[2m28\u001b[0m │             </button>\n \u001b[2m29\u001b[0m │           </p>\n \u001b[2m30\u001b[0m │ \u001b[38;2;246;87;248m╭\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m     </>\n \u001b[2m31\u001b[0m │ \u001b[38;2;246;87;248m│\u001b[0m     )\n \u001b[2m32\u001b[0m │ \u001b[38;2;246;87;248m╰\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m }\n    ╰────\n\n\nCaused by:\n    Syntax Error"
+    message: "\n  \u001b[38;2;255;30;30m×\u001b[0m Expression expected\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:6:1]\n \u001b[2m 6\u001b[0m │ \n \u001b[2m 7\u001b[0m │ function Page() {\n \u001b[2m 8\u001b[0m │   return (\n \u001b[2m 9\u001b[0m │     <>\n    · \u001b[38;2;246;87;248m     ─\u001b[0m\n \u001b[2m10\u001b[0m │       <h1>\n \u001b[2m11\u001b[0m │         Welcome to Vike\n \u001b[2m12\u001b[0m │       <h1>\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unexpected token. Did you mean `{'}'}` or `&rbrace;`?\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:29:1]\n \u001b[2m29\u001b[0m │       </p>\n \u001b[2m30\u001b[0m │     </>\n \u001b[2m31\u001b[0m │   )\n \u001b[2m32\u001b[0m │ }\n    · \u001b[38;2;246;87;248m▲\u001b[0m\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unterminated JSX contents\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:27:1]\n \u001b[2m27\u001b[0m │               Random Page\n \u001b[2m28\u001b[0m │             </button>\n \u001b[2m29\u001b[0m │           </p>\n \u001b[2m30\u001b[0m │ \u001b[38;2;246;87;248m╭\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m     </>\n \u001b[2m31\u001b[0m │ \u001b[38;2;246;87;248m│\u001b[0m     )\n \u001b[2m32\u001b[0m │ \u001b[38;2;246;87;248m╰\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m }\n    ╰────\n\n\nCaused by:\n    Syntax Error",
+    stack: "Error: \n  \u001b[38;2;255;30;30m×\u001b[0m Expression expected\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:6:1]\n \u001b[2m 6\u001b[0m │ \n \u001b[2m 7\u001b[0m │ function Page() {\n \u001b[2m 8\u001b[0m │   return (\n \u001b[2m 9\u001b[0m │     <>\n    · \u001b[38;2;246;87;248m     ─\u001b[0m\n \u001b[2m10\u001b[0m │       <h1>\n \u001b[2m11\u001b[0m │         Welcome to Vike\n \u001b[2m12\u001b[0m │       <h1>\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unexpected token. Did you mean `{'}'}` or `&rbrace;`?\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:29:1]\n \u001b[2m29\u001b[0m │       </p>\n \u001b[2m30\u001b[0m │     </>\n \u001b[2m31\u001b[0m │   )\n \u001b[2m32\u001b[0m │ }\n    · \u001b[38;2;246;87;248m▲\u001b[0m\n    ╰────\n\n  \u001b[38;2;255;30;30m×\u001b[0m Unterminated JSX contents\n    ╭─[\u001b[38;2;92;157;255;1;4m/home/rom/code/vike/examples/react-full/pages/index/+Page.tsx\u001b[0m:27:1]\n \u001b[2m27\u001b[0m │               Random Page\n \u001b[2m28\u001b[0m │             </button>\n \u001b[2m29\u001b[0m │           </p>\n \u001b[2m30\u001b[0m │ \u001b[38;2;246;87;248m╭\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m     </>\n \u001b[2m31\u001b[0m │ \u001b[38;2;246;87;248m│\u001b[0m     )\n \u001b[2m32\u001b[0m │ \u001b[38;2;246;87;248m╰\u001b[0m\u001b[38;2;246;87;248m─\u001b[0m\u001b[38;2;246;87;248m▶\u001b[0m }\n    ╰────\n\n\nCaused by:\n    Syntax Error"
 };

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-v1/renderer/PageShell.vue',
+    file: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.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-v1/renderer/PageShell.vue',
-        file: '/home/rom/code/vike/examples/vue-full-v1/renderer/PageShell.vue'
+        url: 'file:///home/rom/code/vike/examples/vue-full/renderer/PageShell.vue',
+        file: '/home/rom/code/vike/examples/vue-full/renderer/PageShell.vue'
     },
-    loc: { file: '/home/rom/code/vike/examples/vue-full-v1/renderer/PageShell.vue', line: 45, column: 2 },
-    id: '/home/rom/code/vike/examples/vue-full-v1/renderer/PageShell.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',
     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-v1/renderer/PageShell.vue:6:2: Unexpected }',
-    stack: 'CssSyntaxError: /home/rom/code/vike/examples/vue-full-v1/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/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)'
 };

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errVueHtml = void 0;
 exports.errVueHtml = {
-    id: '/home/rom/code/vike/examples/vue-full-v1/pages/index/+Page.vue',
+    id: '/home/rom/code/vike/examples/vue-full/pages/index/+Page.vue',
     plugin: 'vite:vue',
     message: 'Element is missing end tag.',
     name: 'SyntaxError',
     stack: 'SyntaxError: Element is missing end tag.\n    at createCompilerError (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:19:19)\n    at emitError (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:1594:29)\n    at parseElement (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:1146:9)\n    at parseChildren (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:937:28)\n    at parseElement (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:1125:22)\n    at parseChildren (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:937:28)\n    at parseElement (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:1125:22)\n    at parseChildren (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:937:28)\n    at Object.baseParse (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-core@3.2.33/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js:852:23)\n    at Object.parse (/home/rom/code/vike/node_modules/.pnpm/@vue+compiler-dom@3.2.33/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js:3077:25)',
-    loc: { file: '/home/rom/code/vike/examples/vue-full-v1/pages/index/+Page.vue', line: 2, column: 46 },
+    loc: { file: '/home/rom/code/vike/examples/vue-full/pages/index/+Page.vue', line: 2, column: 46 },
     pluginCode: "<template>\n  <h1>Welcome to Vike<h1>\n  This page is:\n  <ul>\n    <li>Rendered to HTML.</li>\n    <li>Interactive. <Counter /></li>\n  </ul>\n  <p>\n    <button @click=\"randomNavigation\">Random Page</button>\n  </p>\n</template>\n\n<script lang=\"ts\" setup>\nimport Counter from '../../components/Counter.vue'\nimport { navigate } from 'vike/client/router'\n\nconst randomNavigation = () => {\n  const randomIndex = Math.floor(Math.random() * 3)\n  navigate(['/markdown', '/star-wars', '/hello/alice.js'][randomIndex])\n}\n</script>\n",
     frame: '1  |  <template>\n2  |    <h1>Welcome to Vike<h1>\n   |                                                ^\n3  |    This page is:\n4  |    <ul>'
 };

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

@@ -7,9 +7,9 @@ exports.errVueJavascript = {
     loc: { line: 2, column: 7, index: 8 },
     pos: 8,
     plugin: 'vite:vue',
-    id: '/home/rom/code/vike/examples/vue-full-v1/pages/index/+Page.vue',
+    id: '/home/rom/code/vike/examples/vue-full/pages/index/+Page.vue',
     pluginCode: "<template>\n  <h1>Welcome to Vike</h1>\n  This page is:\n  <ul>\n    <li>Rendered to HTML.</li>\n    <li>Interactive. <Counter /></li>\n  </ul>\n  <p>\n    <button @click=\"randomNavigation\">Random Page</button>\n  </p>\n</template>\n\n<script lang=\"ts\" setup>\nimeport Counter from '../../components/Counter.vue'\nimport { navigate } from 'vike/client/router'\n\nconst randomNavigation = () => {\n  const randomIndex = Math.floor(Math.random() * 3)\n  navigate(['/markdown', '/star-wars', '/hello/alice.js'][randomIndex])\n}\n</script>\n",
     frame: '1  |  <template>\n   |          ^\n2  |    <h1>Welcome to Vike</h1>\n3  |    This page is:',
-    message: "[@vue/compiler-sfc] Missing semicolon. (2:7)\n\n/home/rom/code/vike/examples/vue-full-v1/pages/index/+Page.vue\n12 |  \n13 |  <script lang=\"ts\" setup>\n14 |  imeport Counter from '../../components/Counter.vue'\n   |         ^\n15 |  import { navigate } from 'vike/client/router.js'\n16 |  ",
-    stack: "SyntaxError: [@vue/compiler-sfc] Missing semicolon. (2:7)\n\n/home/rom/code/vike/examples/vue-full-v1/pages/index/+Page.vue\n12 |  \n13 |  <script lang=\"ts\" setup>\n14 |  imeport Counter from '../../components/Counter.vue'\n   |         ^\n15 |  import { navigate } from 'vike/client/router.js'\n16 |  \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.semicolon (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/util.ts:138:10)\n    at TypeScriptParserMixin.parseExpressionStatement (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1279:10)\n    at TypeScriptParserMixin.parseExpressionStatement (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3044:28)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:643:19)\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)"
+    message: "[@vue/compiler-sfc] Missing semicolon. (2:7)\n\n/home/rom/code/vike/examples/vue-full/pages/index/+Page.vue\n12 |  \n13 |  <script lang=\"ts\" setup>\n14 |  imeport Counter from '../../components/Counter.vue'\n   |         ^\n15 |  import { navigate } from 'vike/client/router.js'\n16 |  ",
+    stack: "SyntaxError: [@vue/compiler-sfc] Missing semicolon. (2:7)\n\n/home/rom/code/vike/examples/vue-full/pages/index/+Page.vue\n12 |  \n13 |  <script lang=\"ts\" setup>\n14 |  imeport Counter from '../../components/Counter.vue'\n   |         ^\n15 |  import { navigate } from 'vike/client/router.js'\n16 |  \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.semicolon (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/util.ts:138:10)\n    at TypeScriptParserMixin.parseExpressionStatement (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:1279:10)\n    at TypeScriptParserMixin.parseExpressionStatement (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/plugins/typescript/index.ts:3044:28)\n    at TypeScriptParserMixin.parseStatementContent (/home/rom/code/vike/node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/src/parser/statement.ts:643:19)\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)"
 };

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -85,7 +85,7 @@ function getPrettyErrMessage(err) {
     const trail = /(?:\:|)(?:\s|$)/;
     // Remove "Transform failed with 1 error:" (redundant since we already print an intro message)
     errMsg = errMsg.split(reg([/Transform failed with \d* error(?:s|)/, trail], 'gi')).join('');
-    // Remove "/home/rom/code/vike/examples/react-full-v1/components/Counter.tsx:1:8:" (redundant since we already print the filename)
+    // Remove "/home/rom/code/vike/examples/react-full/components/Counter.tsx:1:8:" (redundant since we already print the filename)
     const pos = /(?:\:\d+|)/;
     errMsg = errMsg.split(reg([id, pos, pos, trail], 'gi')).join('');
     errMsg = errMsg.split(reg([normalizeId(id), pos, pos, trail], 'gi')).join('');

package/dist/cjs/node/plugin/shared/loggerVite.js

@@ -31,7 +31,7 @@ function intercept(logType, config) {
         if (options.error && store?.shouldErrorBeSwallowed(options.error)) {
             return;
         }
-        // Remove this once https://github.com/vitejs/vite/pull/13495 is released
+        // Remove this once https://github.com/vitejs/vite/pull/13495 is released and widely used
         if (msg.startsWith('Transform failed with ') && store && logType === 'error') {
             store.markErrorMessageAsLogged(msg);
             return;

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

@@ -40,3 +40,4 @@ __exportStar(require("../../utils/getPropAccessNotation.js"), exports);
 __exportStar(require("../../utils/mergeCumulativeValues.js"), exports);
 __exportStar(require("../../utils/deepEqual.js"), exports);
 __exportStar(require("../../utils/assertKeys.js"), exports);
+__exportStar(require("../../utils/injectRollupInputs.js"), exports);

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -39,6 +39,8 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
                 return 'HTML_BEGIN';
             }
             if (asset.assetType === 'script') {
+                if (isHtmlOnly)
+                    return false;
                 return 'HTML_END';
             }
             return false;

package/dist/cjs/node/runtime/html/serializePageContextClientSide.js

@@ -20,7 +20,8 @@ const PASS_TO_CLIENT = [
     '_abortCaller',
     */
     '_pageContextInitHasClientData',
-    '_pageId'
+    '_pageId',
+    'data' // for data() hook
 ];
 const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', '_isError'];
 function serializePageContextClientSide(pageContext) {

package/dist/cjs/node/runtime/index-deprecated.js

@@ -20,6 +20,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderErrorPage = void 0;
+const isBrowser_js_1 = require("../../utils/isBrowser.js");
+const assert_js_1 = require("../../utils/assert.js");
+(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike'` on the client-side: the module 'vike' is a server-only module.", { showStackTrace: true });
 __exportStar(require("./index-common.js"), exports);
 __exportStar(require("../../types/index-dreprecated.js"), exports);
 const utils_js_1 = require("./utils.js");
@@ -57,5 +60,3 @@ exports.RenderErrorPage = RenderErrorPage;
     picocolors_1.default.green("  import type { something } from 'vike/types'"),
     "Make sure to import renderPage(), escapeInject, html, dangerouslySkipEscape(), pipeWebStream(), pipeNodeStream(), pipeStream(), stampPipe() from 'vike/server'. (Or inspect the error stack below to find the import causing this warning.)"
 ].join('\n'), { showStackTrace: true, onlyOnce: true });
-const utils_js_2 = require("./utils.js");
-(0, utils_js_2.assertUsage)(!(0, utils_js_2.isBrowser)(), "It's forbidden to `import { something } from 'vike'` in code loaded in the browser: the module 'vike' is a server-only module.", { showStackTrace: true });

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

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const isBrowser_js_1 = require("../../utils/isBrowser.js");
+const assert_js_1 = require("../../utils/assert.js");
+(0, assert_js_1.assertUsage)(!(0, isBrowser_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike/server'` on the client-side: the module 'vike/server' is a server-only module.", { showStackTrace: true });
 __exportStar(require("./index-common.js"), exports);
-const utils_js_1 = require("./utils.js");
-(0, utils_js_1.assertUsage)(!(0, utils_js_1.isBrowser)(), "It's forbidden to `import { something } from 'vike/server'` in code loaded on the client-side: the module 'vike/server' is a server-only module.", { showStackTrace: true });

package/dist/cjs/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCacheControl = void 0;
+const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
+const defaultValue = 'no-store, max-age=0';
+function getCacheControl(pageId, pageConfigs) {
+    // TODO/v1-release: remove
+    if (pageConfigs.length === 0)
+        return defaultValue;
+    const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
+    const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'cacheControl', 'string');
+    const value = configValue?.value;
+    if (value)
+        return value;
+    // - Disabling caching by default is the safest strategy, because caching is problematic with authentication as described in https://github.com/vikejs/vike/issues/1275#issuecomment-1824366875
+    // - Are there use cases when we don't need to disable caching?
+    //   - When there isn't any <script id="vike_pageContext" type="application/json"> then we can safely have caching. (We don't implement this exception because we're lazy and it's quite a rare situation.)
+    return defaultValue;
+}
+exports.getCacheControl = getCacheControl;

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

@@ -5,6 +5,7 @@ const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
 const getEarlyHints_js_1 = require("./getEarlyHints.js");
+const getCacheControl_js_1 = require("./createHttpResponseObject/getCacheControl.js");
 const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponseObject/assertNoInfiniteHttpRedirect.js");
 async function createHttpResponseObject(htmlRender, renderHook, pageContext) {
     if (htmlRender === null) {
@@ -26,7 +27,13 @@ async function createHttpResponseObject(htmlRender, renderHook, pageContext) {
         }
     }
     const earlyHints = (0, getEarlyHints_js_1.getEarlyHints)(await pageContext.__getPageAssets());
-    return getHttpResponse(statusCode, 'text/html;charset=utf-8', [], htmlRender, earlyHints, renderHook);
+    const headers = [];
+    (0, utils_js_1.assert)(pageContext._pageId);
+    const cacheControl = (0, getCacheControl_js_1.getCacheControl)(pageContext._pageId, pageContext._pageConfigs);
+    if (cacheControl) {
+        headers.push(['Cache-Control', cacheControl]);
+    }
+    return getHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
 }
 exports.createHttpResponseObject = createHttpResponseObject;
 async function createHttpResponsePageContextJson(pageContextSerialized) {

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeOnBeforeRenderAndDataHooks = void 0;
+const getHook_js_1 = require("../../../shared/hooks/getHook.js");
+const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
+const utils_js_1 = require("../utils.js");
+const assertOnBeforeRenderHookReturn_js_1 = require("../../../shared/assertOnBeforeRenderHookReturn.js");
+async function executeOnBeforeRenderAndDataHooks(pageContext) {
+    if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
+        return;
+    }
+    const dataHook = (0, getHook_js_1.getHook)(pageContext, 'data');
+    const onBeforeRenderHook = (0, getHook_js_1.getHook)(pageContext, 'onBeforeRender');
+    if (!dataHook && !onBeforeRenderHook) {
+        return;
+    }
+    (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
+    if (dataHook) {
+        const hookResult = await (0, utils_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
+        // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
+        const pageContextFromHook = {
+            data: hookResult
+        };
+        Object.assign(pageContext, pageContextFromHook);
+    }
+    if (onBeforeRenderHook) {
+        const hookResult = await (0, utils_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
+        const pageContextFromHook = hookResult?.pageContext;
+        Object.assign(pageContext, pageContextFromHook);
+    }
+}
+exports.executeOnBeforeRenderAndDataHooks = executeOnBeforeRenderAndDataHooks;

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

@@ -85,7 +85,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer, configVike) {
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
         const { fileURLToPath } = (await (0, import_1.import_)('url')).default;
-        // @ts-ignore Shimed by dist-cjs-fixup.js for CJS build.
+        // @ts-ignore Shimmed by dist-cjs-fixup.js for CJS build.
         const importMetaUrl = `file://${__filename}`;
         const require_ = createRequire(importMetaUrl);
         const __dirname_ = dirname(fileURLToPath(importMetaUrl));

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

@@ -14,7 +14,7 @@ const globalContext_js_1 = require("../globalContext.js");
 const createHttpResponseObject_js_1 = require("./createHttpResponseObject.js");
 const loadPageFilesServerSide_js_1 = require("./loadPageFilesServerSide.js");
 const executeOnRenderHtmlHook_js_1 = require("./executeOnRenderHtmlHook.js");
-const executeOnBeforeRenderHook_js_1 = require("./executeOnBeforeRenderHook.js");
+const executeOnBeforeRenderAndDataHooks_js_1 = require("./executeOnBeforeRenderAndDataHooks.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const isNewError_js_1 = require("./isNewError.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
@@ -34,11 +34,11 @@ async function renderPageAlreadyRouted(pageContext) {
         await (0, executeGuardHook_js_1.executeGuardHook)(pageContext, (pageContext) => (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext));
     }
     if (!isError) {
-        await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+        await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
     }
     else {
         try {
-            await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+            await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
         }
         catch (err) {
             if ((0, isNewError_js_1.isNewError)(err, pageContext.errorWhileRendering)) {
@@ -77,7 +77,7 @@ async function prerenderPage(pageContext) {
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
     await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext))
     */
-    await (0, executeOnBeforeRenderHook_js_1.executeOnBeforeRenderHooks)(pageContext);
+    await (0, executeOnBeforeRenderAndDataHooks_js_1.executeOnBeforeRenderAndDataHooks)(pageContext);
     const { htmlRender, renderHook } = await (0, executeOnRenderHtmlHook_js_1.executeOnRenderHtmlHook)(pageContext);
     (0, utils_js_1.assertUsage)(htmlRender !== null, `Cannot pre-render ${picocolors_1.default.cyan(pageContext.urlOriginal)} because the ${renderHook.hookName}() hook defined by ${renderHook.hookFilePath} didn't return an HTML string.`);
     (0, utils_js_1.assert)(pageContext.isClientSideNavigation === false);
@@ -108,7 +108,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
         _debugRouteMatches: []
     };
     const pageContextInit = {
-        urlOriginal: '/fake-404-url',
+        urlOriginal: '/fake-404-url', // A URL is needed for `applyViteHtmlTransform`
         ...pageContextInit_
     };
     {

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

@@ -343,21 +343,33 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     const { redirects, baseServer } = (0, globalContext_js_1.getGlobalContext)();
     const urlWithoutBase = (0, utils_js_1.removeBaseServer)(pageContextInit.urlOriginal, baseServer);
     let origin = null;
+    let urlTargetExternal = null;
     let urlTarget = (0, utils_js_1.modifyUrlPathname)(urlWithoutBase, (urlPathname) => {
-        const urlTargetWithOrigin = (0, resolveRedirects_js_1.resolveRedirects)(redirects, urlPathname);
-        if (urlTargetWithOrigin === null)
+        const urlTarget = (0, resolveRedirects_js_1.resolveRedirects)(redirects, urlPathname);
+        if (urlTarget === null)
             return null;
-        const { urlModified, origin: origin_ } = (0, utils_js_1.removeUrlOrigin)(urlTargetWithOrigin);
+        if (!(0, utils_js_1.isParsable)(urlTarget)) {
+            // E.g. `urlTarget === 'mailto:some@example.com'`
+            (0, utils_js_1.assert)((0, utils_js_1.isUriWithProtocol)(urlTarget) && !urlTarget.startsWith('http'));
+            urlTargetExternal = urlTarget;
+            return null;
+        }
+        const { urlModified, origin: origin_ } = (0, utils_js_1.removeUrlOrigin)(urlTarget);
         origin = origin_;
         return urlModified;
     });
-    if (origin)
-        urlTarget = (0, utils_js_1.addUrlOrigin)(urlTarget, origin);
-    if (urlTarget === urlWithoutBase)
-        return null;
+    if (urlTargetExternal) {
+        urlTarget = urlTargetExternal;
+    }
+    else {
+        if (origin)
+            urlTarget = (0, utils_js_1.addUrlOrigin)(urlTarget, origin);
+        if (urlTarget === urlWithoutBase)
+            return null;
+        urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
+        (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
+    }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
-    urlTarget = (0, utils_js_1.prependBase)(urlTarget, baseServer);
-    (0, utils_js_1.assert)(urlTarget !== pageContextInit.urlOriginal);
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
     const pageContextHttpResponse = { ...pageContextInit, httpResponse };
     return pageContextHttpResponse;

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

@@ -24,7 +24,7 @@ function getExports(pageFiles, pageConfig) {
                 exportValue,
                 exportSource: `${pageFile.filePath} > ${isFromDefaultExport ? `\`export default { ${exportName} }\`` : `\`export { ${exportName} }\``}`,
                 filePath: pageFile.filePath,
-                _filePath: pageFile.filePath,
+                _filePath: pageFile.filePath, // TODO/next-major-release: remove
                 _fileType: pageFile.fileType,
                 _isFromDefaultExport: isFromDefaultExport
             });

package/dist/cjs/shared/route/resolveRedirects.js

@@ -7,6 +7,7 @@ exports.resolveRouteStringRedirect = exports.resolveRedirects = void 0;
 const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
 const parseUrl_extras_js_1 = require("../../utils/parseUrl-extras.js");
 const utils_js_1 = require("../utils.js");
+const resolveUrlPathname_js_1 = require("./resolveUrlPathname.js");
 const resolveRouteString_js_1 = require("./resolveRouteString.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)(); // Don't bloat the client
@@ -26,21 +27,12 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
     (0, utils_js_1.assertUsage)(urlTarget.startsWith('/') ||
         // Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
         (0, parseUrl_extras_js_1.isUriWithProtocol)(urlTarget) ||
-        urlTarget === '*', `${configSrc} Invalid redirection target URL ${picocolors_1.default.cyan(urlTarget)}: the target URL should start with ${picocolors_1.default.cyan('/')}, a valid protocol (${picocolors_1.default.cyan('https:')}, ${picocolors_1.default.cyan('http:')}, ${picocolors_1.default.cyan('ipfs:')}, ${picocolors_1.default.cyan('magnet:')}, ...), or be ${picocolors_1.default.cyan('*')}`);
+        urlTarget === '*', `${configSrc} Invalid redirection target URL ${picocolors_1.default.cyan(urlTarget)}: the target URL should start with ${picocolors_1.default.cyan('/')}, a valid protocol (${picocolors_1.default.cyan('https:')}, ${picocolors_1.default.cyan('http:')}, ${picocolors_1.default.cyan('mailto:')}, ${picocolors_1.default.cyan('ipfs:')}, ${picocolors_1.default.cyan('magnet:')}, ...), or be ${picocolors_1.default.cyan('*')}`);
     assertParams(urlSource, urlTarget);
     const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
     if (!match)
         return null;
-    let urlResolved = urlTarget;
-    Object.entries(match.routeParams).forEach(([key, val]) => {
-        if (key !== '*') {
-            key = `@${key}`;
-        }
-        urlResolved = urlResolved.replaceAll(key, val);
-    });
-    if (!urlResolved.startsWith('mailto:')) {
-        (0, utils_js_1.assertUsage)(!urlResolved.includes('@'), 'URL should not contain "@" unless it is a mailto link.');
-    }
+    const urlResolved = (0, resolveUrlPathname_js_1.resolveUrlPathname)(urlTarget, match.routeParams);
     if (urlResolved === urlPathname)
         return null;
     (0, utils_js_1.assert)(urlResolved.startsWith('/') || (0, parseUrl_extras_js_1.isUriWithProtocol)(urlResolved));