vike 0.4.178 → 0.4.179

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

@@ -5,6 +5,10 @@ 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

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

@@ -28,6 +28,7 @@ function inferAssetTag(pageAsset) {
         return `<script src="${src}" ${scriptAttrs}></script>`;
     }
     if (assetType === 'style') {
+        // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L29
         return `<link rel="stylesheet" type="text/css" href="${src}">`;
     }
     (0, utils_js_1.assert)(false, { pageAsset });

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

@@ -11,12 +11,12 @@ function injectHtmlTags(htmlString, htmlTags, position) {
     return htmlString;
 }
 exports.injectHtmlTags = injectHtmlTags;
-async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+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 });
+        streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
     }
 }
 exports.injectHtmlTagsUsingStream = injectHtmlTagsUsingStream;

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

@@ -29,7 +29,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         htmlTags = (0, getHtmlTags_js_1.getHtmlTags)(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
         htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
-        await (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
+        (0, injectHtmlTags_js_1.injectHtmlTagsUsingStream)(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {

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

@@ -35,6 +35,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
                 return;
             }
             // https://github.com/vikejs/vike/issues/401
+            // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L28
             src = src + '?direct';
         }
         const isEntry = clientEntriesSrc.includes(src) ||

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;

package/dist/cjs/utils/assertSingleInstance.js

@@ -3,7 +3,7 @@ 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;
+exports.assertSingleInstance_onAssertModuleLoad = exports.assertSingleInstance_onClientEntryClientRouting = exports.assertSingleInstance_onClientEntryServerRouting = void 0;
 //  - Throw error if there are two different versions of vike loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
 //  - Show warning if vike is loaded twice
@@ -35,7 +35,7 @@ function assertSingleInstance() {
         //*/
     }
 }
-function onClientEntry_ServerRouting(isProduction) {
+function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -49,8 +49,8 @@ function onClientEntry_ServerRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-exports.onClientEntry_ServerRouting = onClientEntry_ServerRouting;
-function onClientEntry_ClientRouting(isProduction) {
+exports.assertSingleInstance_onClientEntryServerRouting = assertSingleInstance_onClientEntryServerRouting;
+function assertSingleInstance_onClientEntryClientRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -64,13 +64,13 @@ function onClientEntry_ClientRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-exports.onClientEntry_ClientRouting = onClientEntry_ClientRouting;
+exports.assertSingleInstance_onClientEntryClientRouting = assertSingleInstance_onClientEntryClientRouting;
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
-function onAssertModuleLoad() {
+function assertSingleInstance_onAssertModuleLoad() {
     globalObject.instances.push(projectInfo_js_1.projectInfo.projectVersion);
     assertSingleInstance();
 }
-exports.onAssertModuleLoad = onAssertModuleLoad;
+exports.assertSingleInstance_onAssertModuleLoad = assertSingleInstance_onAssertModuleLoad;
 function assertUsage(condition, errorMessage) {
     if (condition) {
         return;

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.178';
+const PROJECT_VERSION = '0.4.179';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -2,8 +2,11 @@ import { assertClientRouting } from '../../utils/assertRoutingType.js';
 assertClientRouting();
 import './pageFiles';
 import { installClientRouter } from './installClientRouter.js';
-import { onClientEntry_ClientRouting } from './utils.js';
+import { assertSingleInstance_onClientEntryClientRouting } from './utils.js';
+import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
-onClientEntry_ClientRouting(isProd);
+assertSingleInstance_onClientEntryClientRouting(isProd);
+if (import.meta.env.DEV)
+    removeFoucBuster();
 installClientRouter();

package/dist/esm/client/server-routing-runtime/entry.js

@@ -4,10 +4,13 @@ import './pageFiles';
 import { getPageContext } from './getPageContext.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
 import { assertHook } from '../../shared/hooks/getHook.js';
-import { onClientEntry_ServerRouting } from './utils.js';
+import { assertSingleInstance_onClientEntryServerRouting } from './utils.js';
+import { removeFoucBuster } from '../shared/removeFoucBuster.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
-onClientEntry_ServerRouting(isProd);
+assertSingleInstance_onClientEntryServerRouting(isProd);
+if (import.meta.env.DEV)
+    removeFoucBuster();
 hydrate();
 async function hydrate() {
     const pageContext = await getPageContext();

package/dist/esm/client/shared/removeFoucBuster.d.ts

@@ -0,0 +1,2 @@
+export { removeFoucBuster };
+declare function removeFoucBuster(): void;

package/dist/esm/client/shared/removeFoucBuster.js

@@ -0,0 +1,44 @@
+export { removeFoucBuster };
+import { assert } from './utils.js';
+// See also:
+// - Alternative approach of exactly injecting what Vite injects:
+//   - https://github.com/remix-run/remix/issues/8830#issuecomment-1968368351
+//   - https://github.com/rakkasjs/rakkasjs/blob/7d75ccc915e93bca04e6bab37dc6abdb68a85e4a/packages/rakkasjs/src/features/pages/middleware.tsx#L701
+// - https://github.com/remix-run/remix/issues/8830
+function removeFoucBuster() {
+    assert(import.meta.env.DEV);
+    let sleep = 2;
+    const runClean = () => {
+        const isClean = clean();
+        if (!isClean) {
+            if (sleep < 1000)
+                sleep = 2 * sleep;
+            setTimeout(runClean, sleep);
+        }
+    };
+    setTimeout(runClean, sleep);
+}
+function clean() {
+    const VITE_ID = 'data-vite-dev-id';
+    const injectedByVite = [...document.querySelectorAll(`style[${VITE_ID}]`)].map((style) => style.getAttribute(VITE_ID));
+    // ```
+    // <link rel="stylesheet" type="text/css" href="/renderer/css/index.css?direct">
+    // <link rel="stylesheet" type="text/css" href="/renderer/Layout.css?direct">
+    // ```
+    const suffix = '?direct';
+    // <link> defined by:
+    //  - https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/node/runtime/html/injectAssets/inferHtmlTags.ts#L35
+    //  - https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/node/runtime/renderPage/getPageAssets.ts#L68
+    const injectedByVike = [...document.querySelectorAll(`link[rel="stylesheet"][type="text/css"][href$="${suffix}"]`)];
+    let isClean = true;
+    injectedByVike.forEach((link) => {
+        const filePathAbsoluteUserRootDir = link.getAttribute('href').slice(0, -suffix.length);
+        if (injectedByVite.some((filePathAbsoluteFilesystem) => filePathAbsoluteFilesystem.endsWith(filePathAbsoluteUserRootDir))) {
+            link.remove();
+        }
+        else {
+            isClean = false;
+        }
+    });
+    return isClean;
+}

package/dist/esm/client/shared/utils.d.ts

@@ -0,0 +1 @@
+export * from '../../utils/assert.js';

package/dist/esm/client/shared/utils.js

@@ -0,0 +1 @@
+export * from '../../utils/assert.js';

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

@@ -5,6 +5,10 @@ import { loadEnv } from 'vite';
 import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, isArray, lowerFirst } from '../utils.js';
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 import { getModuleFilePath } from '../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

package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.js

@@ -27,6 +27,7 @@ function inferAssetTag(pageAsset) {
         return `<script src="${src}" ${scriptAttrs}></script>`;
     }
     if (assetType === 'style') {
+        // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L29
         return `<link rel="stylesheet" type="text/css" href="${src}">`;
     }
     assert(false, { pageAsset });

package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.d.ts

@@ -7,7 +7,7 @@ import type { StreamFromReactStreamingPackage } from '../stream/react-streaming.
 import type { HtmlTag } from './getHtmlTags.js';
 type Position = 'HTML_BEGIN' | 'HTML_END';
 declare function injectHtmlTags(htmlString: string, htmlTags: HtmlTag[], position: Position): string;
-declare function injectHtmlTagsUsingStream(htmlTags: HtmlTag[], streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage): Promise<void>;
+declare function injectHtmlTagsUsingStream(htmlTags: HtmlTag[], streamFromReactStreamingPackage: null | StreamFromReactStreamingPackage): void;
 declare function injectAtOpeningTag(tag: 'head' | 'html' | '!doctype', htmlString: string, htmlFragment: string): string;
 declare function injectAtClosingTag(tag: 'body' | 'html', htmlString: string, htmlFragment: string): string;
 declare function createHtmlHeadIfMissing(htmlString: string): string;

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

@@ -13,12 +13,12 @@ function injectHtmlTags(htmlString, htmlTags, position) {
     }
     return htmlString;
 }
-async function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
+function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
     const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
     if (htmlFragment) {
         assert(streamFromReactStreamingPackage);
         assert(!streamFromReactStreamingPackage.hasStreamEnded());
-        await streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
+        streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });
     }
 }
 function joinHtmlTags(htmlTags) {

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

@@ -27,7 +27,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         htmlTags = getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter, pageAssets, viteDevScript);
         let htmlBegin = htmlPartsToString(htmlPartsBegin, pageAssets);
         htmlBegin = injectToHtmlBegin(htmlBegin, htmlTags);
-        await injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage);
+        injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage);
         return htmlBegin;
     }
     async function injectAtStreamEnd(htmlPartsEnd) {

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

@@ -34,6 +34,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
                 return;
             }
             // https://github.com/vikejs/vike/issues/401
+            // WARNING: if changing following line, then also update https://github.com/vikejs/vike/blob/fae90a15d88e5e87ca9fcbb54cf2dc8773d2f229/vike/client/shared/removeFoucBuster.ts#L28
             src = src + '?direct';
         }
         const isEntry = clientEntriesSrc.includes(src) ||

package/dist/esm/utils/assert.js

@@ -8,7 +8,7 @@ export { getAssertErrMsg };
 export { overwriteAssertProductionLogger };
 export { isBug };
 export { setAlwaysShowStackTrace };
-import { onAssertModuleLoad } from './assertSingleInstance.js';
+import { assertSingleInstance_onAssertModuleLoad } from './assertSingleInstance.js';
 import { createErrorWithCleanStackTrace } from './createErrorWithCleanStackTrace.js';
 import { getGlobalObject } from './getGlobalObject.js';
 import { isObject } from './isObject.js';
@@ -27,7 +27,7 @@ const globalObject = getGlobalObject('utils/assert.ts', {
     },
     showStackTraceList: new WeakSet()
 });
-onAssertModuleLoad();
+assertSingleInstance_onAssertModuleLoad();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;

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

@@ -1,6 +1,6 @@
-export { onClientEntry_ServerRouting };
-export { onClientEntry_ClientRouting };
-export { onAssertModuleLoad };
-declare function onClientEntry_ServerRouting(isProduction: boolean): void;
-declare function onClientEntry_ClientRouting(isProduction: boolean): void;
-declare function onAssertModuleLoad(): void;
+export { assertSingleInstance_onClientEntryServerRouting };
+export { assertSingleInstance_onClientEntryClientRouting };
+export { assertSingleInstance_onAssertModuleLoad };
+declare function assertSingleInstance_onClientEntryServerRouting(isProduction: boolean): void;
+declare function assertSingleInstance_onClientEntryClientRouting(isProduction: boolean): void;
+declare function assertSingleInstance_onAssertModuleLoad(): void;

package/dist/esm/utils/assertSingleInstance.js

@@ -1,6 +1,6 @@
-export { onClientEntry_ServerRouting };
-export { onClientEntry_ClientRouting };
-export { onAssertModuleLoad };
+export { assertSingleInstance_onClientEntryServerRouting };
+export { assertSingleInstance_onClientEntryClientRouting };
+export { assertSingleInstance_onAssertModuleLoad };
 //  - Throw error if there are two different versions of vike loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
 //  - Show warning if vike is loaded twice
@@ -32,7 +32,7 @@ function assertSingleInstance() {
         //*/
     }
 }
-function onClientEntry_ServerRouting(isProduction) {
+function assertSingleInstance_onClientEntryServerRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -46,7 +46,7 @@ function onClientEntry_ServerRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-function onClientEntry_ClientRouting(isProduction) {
+function assertSingleInstance_onClientEntryClientRouting(isProduction) {
     assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
         onlyOnce: true,
         showStackTrace: true
@@ -61,7 +61,7 @@ function onClientEntry_ClientRouting(isProduction) {
     assertSingleInstance();
 }
 // Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
-function onAssertModuleLoad() {
+function assertSingleInstance_onAssertModuleLoad() {
     globalObject.instances.push(projectInfo.projectVersion);
     assertSingleInstance();
 }

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.178";
+declare const PROJECT_VERSION: "0.4.179";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.178";
+    projectVersion: "0.4.179";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.178';
+const PROJECT_VERSION = '0.4.179';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.178",
+  "version": "0.4.179",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -138,7 +138,7 @@
     }
   },
   "peerDependencies": {
-    "react-streaming": ">=0.3.36",
+    "react-streaming": ">=0.3.41",
     "vite": ">=4.4.0"
   },
   "peerDependenciesMeta": {
@@ -209,7 +209,7 @@
     "es-module-lexer": "^1.4.1",
     "esbuild": "^0.19.10",
     "fast-glob": "^3.3.2",
-    "react-streaming": "^0.3.36",
+    "react-streaming": "^0.3.41",
     "rimraf": "^5.0.5",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",