vike 0.4.177 → 0.4.178-commit-fae90a1

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

@@ -5,6 +5,15 @@ const vite_1 = require("vite");
 const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
+// TODO/enventually: (after we implemented vike.config.js)
+// - Make import.meta.env work inside +config.js
+//   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
+//   - Or stop using Vite's `mode` implemention and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
+const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
+const PUBLIC_ENV_WHITELIST = [
+    // https://github.com/vikejs/vike/issues/1724
+    'STORYBOOK'
+];
 function envVarsPlugin() {
     let envsAll;
     let config;
@@ -37,14 +46,13 @@ function envVarsPlugin() {
                 // Security check
                 {
                     const envStatement = getEnvStatement(envName);
-                    const publicPrefix = 'PUBLIC_ENV__';
-                    const isPrivate = !envName.startsWith(publicPrefix);
+                    const isPrivate = !envName.startsWith(PUBLIC_ENV_PREFIX) && !PUBLIC_ENV_WHITELIST.includes(envName);
                     if (isPrivate && isClientSide) {
                         if (!code.includes(envStatement))
                             return;
                         const modulePath = (0, getFilePath_js_1.getModuleFilePath)(id, config);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
-                        const keyPublic = `${publicPrefix}${envName}`;
+                        const keyPublic = `${PUBLIC_ENV_PREFIX}${envName}`;
                         const errMsg = `${envStatement} is used in client-side file ${modulePath} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;
                         if (isBuild) {
                             (0, utils_js_1.assertUsage)(false, errMsg);

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();
@@ -51,8 +55,8 @@ async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem, isDev, craw
         if (isDev) {
             // 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.
             // Although, in dev, it's also competing for resources e.g. with Vite's `optimizeDeps`.
-            (0, utils_js_1.assertWarning)(timeSpent < 3 * 1000, `Crawling your ${picocolors_1.default.cyan('+')} files took an unexpected long time (${(0, utils_js_1.humanizeTime)(timeSpent)}). If you repeatedly get this warning, then consider creating a new issue on Vike's GitHub.`, {
-                onlyOnce: 'slow-page-files-search'
+            (0, utils_js_1.assertWarning)(timeSpent < 3 * 1000, `Crawling your ${picocolors_1.default.cyan('+')} files took an unexpected long time (${(0, utils_js_1.humanizeTime)(timeSpent)}). If you consistently get this warning, then consider reaching out on GitHub.`, {
+                onlyOnce: 'slow-crawling'
             });
         }
     }
@@ -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/runtime/html/injectAssets/getHtmlTags.js

@@ -8,16 +8,14 @@ const utils_js_1 = require("../../utils.js");
 const serializePageContextClientSide_js_1 = require("../serializePageContextClientSide.js");
 const sanitizeJson_js_1 = require("./sanitizeJson.js");
 const inferHtmlTags_js_1 = require("./inferHtmlTags.js");
-const getViteDevScripts_js_1 = require("./getViteDevScripts.js");
 const mergeScriptTags_js_1 = require("./mergeScriptTags.js");
 const globalContext_js_1 = require("../../globalContext.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const stamp = '__injectFilterEntry';
-async function getHtmlTags(pageContext, injectToStream, injectFilter) {
+function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript) {
     (0, utils_js_1.assert)([true, false].includes(pageContext._isHtmlOnly));
     const isHtmlOnly = pageContext._isHtmlOnly;
     const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
-    const pageAssets = await pageContext.__getPageAssets();
     const injectFilterEntries = pageAssets
         .filter((asset) => {
         if (asset.isEntry && asset.assetType === 'script') {
@@ -90,11 +88,11 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     // See https://github.com/vikejs/vike/pull/1271
     const positionJavaScriptEntry = (() => {
         if (pageContext._pageContextPromise) {
-            (0, utils_js_1.assertWarning)(!injectToStream, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
+            (0, utils_js_1.assertWarning)(!streamFromReactStreamingPackage, "[getHtmlTags()] We recommend against using streaming and a pageContext promise at the same time, because progressive hydration won't work.", { onlyOnce: true });
             // If there is a pageContext._pageContextPromise (which is resolved after the stream has ended) then the pageContext JSON data needs to await for it: https://vike.dev/streaming#initial-data-after-stream-end
             return 'HTML_END';
         }
-        if (injectToStream) {
+        if (streamFromReactStreamingPackage && !streamFromReactStreamingPackage.hasStreamEnded()) {
             // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary
             return 'STREAM';
         }
@@ -112,7 +110,7 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
         });
     }
     // The JavaScript entry <script> tag
-    const scriptEntry = await mergeScriptEntries(pageAssets);
+    const scriptEntry = mergeScriptEntries(pageAssets, viteDevScript);
     if (scriptEntry) {
         htmlTags.push({
             htmlTag: scriptEntry,
@@ -134,10 +132,9 @@ async function getHtmlTags(pageContext, injectToStream, injectFilter) {
     return htmlTags;
 }
 exports.getHtmlTags = getHtmlTags;
-async function mergeScriptEntries(pageAssets) {
+function mergeScriptEntries(pageAssets, viteDevScript) {
     const scriptEntries = pageAssets.filter((pageAsset) => pageAsset.isEntry && pageAsset.assetType === 'script');
-    const viteScripts = await (0, getViteDevScripts_js_1.getViteDevScripts)();
-    const scriptTagsHtml = `${viteScripts}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
+    const scriptTagsHtml = `${viteDevScript}${scriptEntries.map((asset) => (0, inferHtmlTags_js_1.inferAssetTag)(asset)).join('')}`;
     const scriptTag = (0, mergeScriptTags_js_1.mergeScriptTags)(scriptTagsHtml);
     return scriptTag;
 }

package/dist/cjs/node/runtime/html/injectAssets/{getViteDevScripts.js → getViteDevScript.js}

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getViteDevScripts = void 0;
+exports.getViteDevScript = void 0;
 const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-async function getViteDevScripts() {
+async function getViteDevScript() {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     if (globalContext.isProduction) {
         return '';
@@ -23,7 +23,7 @@ async function getViteDevScripts() {
     const viteInjection = fakeHtml.slice(fakeHtmlBegin.length, -1 * fakeHtmlEnd.length);
     (0, utils_js_1.assert)(viteInjection.includes('script'));
     (0, utils_js_1.assertWarning)(!viteInjection.includes('import('), 'Unexpected Vite HMR code. Reach out to a Vike maintainer on GitHub.', { onlyOnce: true });
-    const scriptTags = viteInjection;
-    return scriptTags;
+    const viteDevScript = viteInjection;
+    return viteDevScript;
 }
-exports.getViteDevScripts = getViteDevScripts;
+exports.getViteDevScript = getViteDevScript;

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

@@ -1,23 +1,30 @@
 "use strict";
 // Unit tests at ./injectHtmlTags.spec.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectAtClosingTag = exports.injectAtOpeningTag = exports.createHtmlHeadIfMissing = exports.injectHtmlTags = void 0;
+exports.injectAtClosingTag = exports.injectAtOpeningTag = exports.createHtmlHeadIfMissing = exports.injectHtmlTagsUsingStream = exports.injectHtmlTags = void 0;
 const utils_js_1 = require("../../utils.js");
-const POSITIONS = ['HTML_BEGIN', 'HTML_END', 'STREAM'];
-function injectHtmlTags(htmlString, htmlTags, injectToStream) {
-    POSITIONS.forEach((position) => {
-        const htmlFragment = htmlTags
-            .filter((h) => h.position === position)
-            .map((h) => resolveHtmlTag(h.htmlTag))
-            .join('');
-        if (htmlFragment) {
-            htmlString = injectHtmlFragment(position, htmlFragment, htmlString, injectToStream);
-        }
-    });
+function injectHtmlTags(htmlString, htmlTags, position) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === position));
+    if (htmlFragment) {
+        htmlString = injectHtmlFragment(position, htmlFragment, htmlString);
+    }
     return htmlString;
 }
 exports.injectHtmlTags = injectHtmlTags;
-function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream) {
+async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
+    if (htmlFragment) {
+        (0, utils_js_1.assert)(streamFromReactStreamingPackage);
+        (0, utils_js_1.assert)(!streamFromReactStreamingPackage.hasStreamEnded());
+        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+    }
+}
+exports.injectHtmlTagsUsingStream = injectHtmlTagsUsingStream;
+function joinHtmlTags(htmlTags) {
+    const htmlFragment = htmlTags.map((h) => resolveHtmlTag(h.htmlTag)).join('');
+    return htmlFragment;
+}
+function injectHtmlFragment(position, htmlFragment, htmlString) {
     if (position === 'HTML_BEGIN') {
         {
             const res = injectAtPaceholder(htmlFragment, htmlString, true);
@@ -42,11 +49,6 @@ function injectHtmlFragment(position, htmlFragment, htmlString, injectToStream)
         }
         return htmlString + '\n' + htmlFragment;
     }
-    if (position === 'STREAM') {
-        (0, utils_js_1.assert)(injectToStream);
-        injectToStream(htmlFragment, { flush: true });
-        return htmlString;
-    }
     (0, utils_js_1.assert)(false);
 }
 function resolveHtmlTag(htmlTag) {

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

@@ -5,26 +5,31 @@ const utils_js_1 = require("../utils.js");
 const assertPageContextProvidedByUser_js_1 = require("../../../shared/assertPageContextProvidedByUser.js");
 const injectHtmlTags_js_1 = require("./injectAssets/injectHtmlTags.js");
 const getHtmlTags_js_1 = require("./injectAssets/getHtmlTags.js");
+const getViteDevScript_js_1 = require("./injectAssets/getViteDevScript.js");
 async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
-    const htmlTags = await (0, getHtmlTags_js_1.getHtmlTags)(pageContext, null, injectFilter);
     const pageAssets = await pageContext.__getPageAssets();
+    const viteDevScript = await (0, getViteDevScript_js_1.getViteDevScript)();
+    const htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, null, injectFilter, pageAssets, viteDevScript);
     let htmlString = htmlPartsToString(htmlParts, pageAssets);
-    htmlString = injectToHtmlBegin(htmlString, htmlTags, null);
+    htmlString = injectToHtmlBegin(htmlString, htmlTags);
     htmlString = injectToHtmlEnd(htmlString, htmlTags);
+    (0, utils_js_1.assert)(htmlTags.filter((snippet) => snippet.position === 'STREAM').length === 0);
     return htmlString;
 }
 exports.injectHtmlTagsToString = injectHtmlTagsToString;
-function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
+function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, injectFilter) {
     let htmlTags;
     return {
         injectAtStreamBegin,
         injectAtStreamEnd
     };
     async function injectAtStreamBegin(htmlPartsBegin) {
-        htmlTags = await (0, getHtmlTags_js_1.getHtmlTags)(pageContext, injectToStream, injectFilter);
         const pageAssets = await pageContext.__getPageAssets();
+        const viteDevScript = await (0, getViteDevScript_js_1.getViteDevScript)();
+        htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
-        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags, injectToStream);
+        htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
+        await (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {
@@ -37,16 +42,14 @@ function injectHtmlTagsToStream(pageContext, injectToStream, injectFilter) {
     }
 }
 exports.injectHtmlTagsToStream = injectHtmlTagsToStream;
-function injectToHtmlBegin(htmlBegin, htmlTags, injectToStream) {
-    const htmlTagsAtBegin = htmlTags.filter((snippet) => snippet.position !== 'HTML_END');
+function injectToHtmlBegin(htmlBegin, htmlTags) {
     // Ensure existence of `<head>`
     htmlBegin = (0, injectHtmlTags_js_1.createHtmlHeadIfMissing)(htmlBegin);
-    htmlBegin = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlBegin, htmlTagsAtBegin, injectToStream);
+    htmlBegin = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlBegin, htmlTags, 'HTML_BEGIN');
     return htmlBegin;
 }
 function injectToHtmlEnd(htmlEnd, htmlTags) {
-    const htmlTagsAtEnd = htmlTags.filter((snippet) => snippet.position === 'HTML_END');
-    htmlEnd = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlEnd, htmlTagsAtEnd, null);
+    htmlEnd = (0, injectHtmlTags_js_1.injectHtmlTags)(htmlEnd, htmlTags, 'HTML_END');
     return htmlEnd;
 }
 async function resolvePageContextPromise(pageContext) {

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

@@ -60,11 +60,11 @@ async function renderHtmlStream(streamOriginal, injectString, pageContext, onErr
         enableEagerStreaming: pageContext.enableEagerStreaming
     };
     if (injectString) {
-        let injectToStream = null;
-        if ((0, react_streaming_js_1.isStreamReactStreaming)(streamOriginal) && !streamOriginal.disabled) {
-            injectToStream = streamOriginal.injectToStream;
+        let streamFromReactStreamingPackage = null;
+        if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal) && !streamOriginal.disabled) {
+            streamFromReactStreamingPackage = streamOriginal;
         }
-        const { injectAtStreamBegin, injectAtStreamEnd } = (0, injectAssets_js_1.injectHtmlTagsToStream)(pageContext, injectToStream, injectFilter);
+        const { injectAtStreamBegin, injectAtStreamEnd } = (0, injectAssets_js_1.injectHtmlTagsToStream)(pageContext, streamFromReactStreamingPackage, injectFilter);
         (0, utils_js_1.objectAssign)(opts, {
             injectStringAtBegin: async () => {
                 return await injectAtStreamBegin(injectString.htmlPartsBegin);

package/dist/cjs/node/runtime/html/stream/react-streaming.js

@@ -1,10 +1,10 @@
 "use strict";
 // Zero-config support for https://www.npmjs.com/package/react-streaming
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStreamFromReactStreaming = exports.streamReactStreamingToString = exports.isStreamReactStreaming = void 0;
+exports.getStreamOfReactStreamingPackage = exports.streamFromReactStreamingPackageToString = exports.isStreamFromReactStreamingPackage = void 0;
 const utils_js_1 = require("../../utils.js");
 const stream_js_1 = require("../stream.js");
-function streamReactStreamingToString(stream) {
+function streamFromReactStreamingPackageToString(stream) {
     if (stream.pipe) {
         return (0, stream_js_1.streamPipeNodeToString)(stream.pipe);
     }
@@ -13,19 +13,20 @@ function streamReactStreamingToString(stream) {
     }
     (0, utils_js_1.assert)(false);
 }
-exports.streamReactStreamingToString = streamReactStreamingToString;
-function isStreamReactStreaming(thing) {
+exports.streamFromReactStreamingPackageToString = streamFromReactStreamingPackageToString;
+function isStreamFromReactStreamingPackage(thing) {
     if ((0, utils_js_1.hasProp)(thing, 'injectToStream', 'function')) {
+        (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(thing, 'hasStreamEnded', 'function'), (0, utils_js_1.isVikeReactApp)()
+            ? //
+                'Update vike-react to its latest version'
+            : 'Update react-streaming to its latest version');
         return true;
     }
-    // TODO
-    //if( isStreamPipeNode
     return false;
 }
-exports.isStreamReactStreaming = isStreamReactStreaming;
-function getStreamFromReactStreaming(stream) {
+exports.isStreamFromReactStreamingPackage = isStreamFromReactStreamingPackage;
+function getStreamOfReactStreamingPackage(stream) {
     if (stream.pipe) {
-        // TODO
         return { __streamPipeNode: stream.pipe };
     }
     if (stream.readable) {
@@ -33,4 +34,4 @@ function getStreamFromReactStreaming(stream) {
     }
     (0, utils_js_1.assert)(false);
 }
-exports.getStreamFromReactStreaming = getStreamFromReactStreaming;
+exports.getStreamOfReactStreamingPackage = getStreamOfReactStreamingPackage;

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

@@ -354,9 +354,9 @@ async function processStream(streamOriginal, { injectStringAtBegin, injectString
 }
 exports.processStream = processStream;
 async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onFlush, onReadyToWrite }) {
-    if ((0, react_streaming_js_1.isStreamReactStreaming)(streamOriginal)) {
+    if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(streamOriginal)) {
         debug(`onRenderHtml() hook returned ${picocolors_1.default.cyan('react-streaming')} result`);
-        const stream = (0, react_streaming_js_1.getStreamFromReactStreaming)(streamOriginal);
+        const stream = (0, react_streaming_js_1.getStreamOfReactStreamingPackage)(streamOriginal);
         streamOriginal = stream;
     }
     if (isStreamPipeNode(streamOriginal)) {
@@ -376,7 +376,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             (0, utils_js_1.assert)(writableOriginal);
             writableOriginal.write(chunk);
             if (debug.isActivated) {
-                debug('data written (Node.js Writable)', String(chunk));
+                debug('data written (Node.js Writable)', getChunkAsString(chunk));
             }
         };
         // For libraries such as https://www.npmjs.com/package/compression
@@ -449,7 +449,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             (0, utils_js_1.assert)(writerOriginal);
             writerOriginal.write(encodeForWebStream(chunk));
             if (debug.isActivated) {
-                debug('data written (Web Writable)', String(chunk));
+                debug('data written (Web Writable)', getChunkAsString(chunk));
             }
         };
         // Web Streams have compression built-in
@@ -542,12 +542,12 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
             !controllerProxyIsClosed) {
                 controllerProxy.enqueue(encodeForWebStream(chunk));
                 if (debug.isActivated) {
-                    debug('data written (Web Readable)', String(chunk));
+                    debug('data written (Web Readable)', getChunkAsString(chunk));
                 }
             }
             else {
                 if (debug.isActivated) {
-                    debug('data emitted but not written (Web Readable)', String(chunk));
+                    debug('data emitted but not written (Web Readable)', getChunkAsString(chunk));
                 }
             }
         };
@@ -569,7 +569,7 @@ async function createStreamWrapper({ streamOriginal, onError, onData, onEnd, onF
         const writeChunk = (chunk) => {
             readableProxy.push(chunk);
             if (debug.isActivated) {
-                debug('data written (Node.js Readable)', String(chunk));
+                debug('data written (Node.js Readable)', getChunkAsString(chunk));
             }
         };
         // Readables don't have the notion of flushing
@@ -621,7 +621,7 @@ function isStream(something) {
         isStreamReadableNode(something) ||
         isStreamPipeNode(something) ||
         isStreamPipeWeb(something) ||
-        (0, react_streaming_js_1.isStreamReactStreaming)(something)) {
+        (0, react_streaming_js_1.isStreamFromReactStreamingPackage)(something)) {
         (0, utils_js_1.checkType)(something);
         return true;
     }
@@ -733,8 +733,8 @@ async function streamToString(stream) {
     if (isStreamPipeWeb(stream)) {
         return await streamPipeWebToString(getStreamPipeWeb(stream));
     }
-    if ((0, react_streaming_js_1.isStreamReactStreaming)(stream)) {
-        return await (0, react_streaming_js_1.streamReactStreamingToString)(stream);
+    if ((0, react_streaming_js_1.isStreamFromReactStreamingPackage)(stream)) {
+        return await (0, react_streaming_js_1.streamFromReactStreamingPackageToString)(stream);
     }
     (0, utils_js_1.assert)(false);
 }
@@ -793,3 +793,11 @@ function inferStreamName(stream) {
     (0, utils_js_1.assert)(false);
 }
 exports.inferStreamName = inferStreamName;
+function getChunkAsString(chunk) {
+    try {
+        return new TextDecoder().decode(chunk);
+    }
+    catch (err) {
+        return String(chunk);
+    }
+}

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

@@ -70,3 +70,4 @@ __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
 __exportStar(require("../../utils/escapeHtml.js"), exports);
 __exportStar(require("../../utils/normalizeHeaders.js"), exports);
+__exportStar(require("../../utils/isVikeReactApp.js"), exports);

package/dist/cjs/utils/assert.js

@@ -23,7 +23,7 @@ const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts'
     },
     showStackTraceList: new WeakSet()
 });
-(0, assertSingleInstance_js_1.onAssertModuleLoad)();
+(0, assertSingleInstance_js_1.assertSingleInstance_onAssertModuleLoad)();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo_js_1.projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;