vike 0.4.236-commit-e752d12 → 0.4.236-commit-79f1ef0

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.236-commit-e752d12';
+export const PROJECT_VERSION = '0.4.236-commit-79f1ef0';

package/dist/esm/utils/assertSetup.js

@@ -24,6 +24,8 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
+    if (true)
+        return; // TODO/now refactor this
     if (debug.isActivated)
         debug('assertSetup()', new Error().stack);
     if (isTest())

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

@@ -1,7 +1,7 @@
 export { createDebugger };
 export { isDebugActivated };
 export type { Debug };
-declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:resolve", "vike:routing", "vike:setup", "vike:stream", "vike:virtualFiles"];
+declare const flags: readonly ["vike:crawl", "vike:error", "vike:esbuild-resolve", "vike:pluginExtractAssets", "vike:pluginExtractExportNames", "vike:glob", "vike:globalContext", "vike:log", "vike:optimizeDeps", "vike:outDir", "vike:pageFiles", "vike:pointer-imports", "vike:resolve", "vike:routing", "vike:setup", "vike:stream", "vike:virtualFiles", "vike:vite-rpc"];
 type Flag = (typeof flags)[number];
 type Debug = ReturnType<typeof createDebugger>;
 type Options = {

package/dist/esm/utils/debug.js

@@ -30,6 +30,7 @@ const flags = [
     'vike:setup',
     'vike:stream',
     'vike:virtualFiles',
+    'vike:vite-rpc',
 ];
 const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;

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

@@ -0,0 +1,6 @@
+export { getViteRPC };
+export { createViteRPC };
+import type { ViteDevServer } from 'vite';
+declare function getViteRPC<RpcFunctions>(): RpcFunctions;
+type AsyncFunction = (...args: any[]) => Promise<unknown>;
+declare function createViteRPC(viteDevServer: ViteDevServer, getRpcFunctions: (viteDevServer: ViteDevServer) => Record<string, AsyncFunction>): void;

package/dist/esm/utils/getViteRPC.js

@@ -0,0 +1,77 @@
+export { getViteRPC }; // consumer (aka RPC client)
+export { createViteRPC }; // provider (aka RPC server)
+import { assert } from './assert.js';
+import { genPromise } from './genPromise.js';
+import { getRandomId } from './getRandomId.js';
+import { getGlobalObject } from './getGlobalObject.js';
+import { createDebugger } from './debug.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
+const globalObject = getGlobalObject('utils/getViteRPC.ts', {
+    rpc: null,
+});
+const debug = createDebugger('vike:vite-rpc');
+function getViteRPC() {
+    globalObject.rpc ?? (globalObject.rpc = createRpcClient());
+    return globalObject.rpc;
+}
+function createRpcClient() {
+    // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
+    const hot = import.meta.hot;
+    assert(hot);
+    const listeners = [];
+    hot.on(`vike:rpc:response`, (dataResponse) => {
+        if (debug.isActivated)
+            debug('Response received', dataResponse);
+        const { callId, functionReturn } = dataResponse;
+        listeners.forEach((l) => {
+            if (callId !== l.callId)
+                return;
+            l.cb(functionReturn);
+            listeners.splice(listeners.indexOf(l), 1);
+        });
+    });
+    const rpc = new Proxy({}, {
+        get(_, functionName) {
+            return async (...functionArgs) => {
+                // @ts-ignore CJS build doesn't support import.meta — TO-DO/eventually: let's remove this ts-ignore after we removed the CJS build
+                const hot = import.meta.hot;
+                assert(hot);
+                const callId = getRandomId();
+                const { promise, resolve } = genPromise({ timeout: 3 * 1000 });
+                listeners.push({
+                    callId,
+                    cb: (functionReturn) => {
+                        resolve(functionReturn);
+                    },
+                });
+                const dataRequest = { callId, functionName, functionArgs };
+                if (debug.isActivated)
+                    debug('Request sent', dataRequest);
+                // Vite's type is wrong: import.meta.hot.send() does seem to return a promise
+                await hot.send('vike:rpc:request', dataRequest);
+                const functionReturn = await promise;
+                return functionReturn;
+            };
+        },
+    });
+    return rpc;
+}
+function createViteRPC(viteDevServer, getRpcFunctions) {
+    const rpcFunctions = getRpcFunctions(viteDevServer);
+    const { environments } = viteDevServer;
+    for (const envName in environments) {
+        debug('Listening to environment', envName);
+        const env = environments[envName];
+        env.hot.on('vike:rpc:request', async (dataRequest) => {
+            if (debug.isActivated)
+                debug('Request received', dataRequest);
+            const { callId, functionName, functionArgs } = dataRequest;
+            const functionReturn = await rpcFunctions[functionName](...functionArgs);
+            const dataResponse = { callId, functionReturn };
+            if (debug.isActivated)
+                debug('Response sent', dataResponse);
+            env.hot.send('vike:rpc:response', dataResponse);
+        });
+    }
+}

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

@@ -1,4 +1,5 @@
 export { assertFilePathAbsoluteFilesystem };
+export { isFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 /**
  * Asserts that `filePath` is an absolute file path starting from the filesystem root.
@@ -6,6 +7,12 @@ export { isFilePathAbsolute };
  * It isn't reliable for Linux users, but that's okay because the assertion will eventually fail on windows.
  */
 declare function assertFilePathAbsoluteFilesystem(filePath: string): void;
+/**
+ * Whether `filePath` is an absolute file path starting from the filesystem root.
+ *
+ * Isn't reliable for Linux users: it returns `true` for an absolute path starting from the user root dir.
+ */
+declare function isFilePathAbsoluteFilesystem(filePath: string): boolean;
 /**
  * Whether `filePath` is an absolute file path.
  *

package/dist/esm/utils/isFilePathAbsoluteFilesystem.js

@@ -1,4 +1,5 @@
 export { assertFilePathAbsoluteFilesystem };
+export { isFilePathAbsoluteFilesystem };
 export { isFilePathAbsolute };
 import path from 'node:path';
 import { assert } from './assert.js';

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

@@ -0,0 +1,3 @@
+export { isRunnableDevEnvironment };
+import type { Environment, RunnableDevEnvironment } from 'vite';
+declare function isRunnableDevEnvironment(environment: Environment | undefined): environment is RunnableDevEnvironment;

package/dist/esm/utils/isRunnableDevEnvironment.js

@@ -0,0 +1,7 @@
+export { isRunnableDevEnvironment };
+// We use this instead of `import { isRunnableDevEnvironment } from 'vite'` because:
+// - Vite's isRunnableDevEnvironment() isn't reliable in monorepos where multiple Vite instances can be used simultaneously (it uses `instanceof RunnableDevEnvironment` which fails)
+// - We can use this in Vike's server production runtime without having to load the 'vite' package
+function isRunnableDevEnvironment(environment) {
+    return !!environment && 'runner' in environment && !!environment.runner;
+}

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

@@ -0,0 +1,6 @@
+export { isVirtualFileId };
+export { addVirtualFileIdPrefix };
+export { removeVirtualFileIdPrefix };
+declare function isVirtualFileId(id: string): boolean;
+declare function addVirtualFileIdPrefix(id: string): string;
+declare function removeVirtualFileIdPrefix(id: string): string;

package/dist/esm/{node/shared/virtualFiles.js → utils/virtualFileId.js}

@@ -1,36 +1,34 @@
 export { isVirtualFileId };
-export { getVirtualFileId };
-export { resolveVirtualFileId };
-export { removeVirtualIdTag };
+export { addVirtualFileIdPrefix };
+export { removeVirtualFileIdPrefix };
 import pc from '@brillout/picocolors';
-import { assert, assertUsage } from './utils.js';
+import { assert, assertUsage } from './assert.js';
+import { assertIsNotBrowser } from './assertIsNotBrowser.js';
+assertIsNotBrowser();
 const idBase = 'virtual:vike:';
 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const virtualIdTag = '\0';
+const prefix = '\0';
 function isVirtualFileId(id) {
     if (id.startsWith(idBase))
         return true;
-    if (id.startsWith(virtualIdTag + idBase))
+    if (id.startsWith(prefix + idBase))
         return true;
     // https://github.com/vikejs/vike/issues/1985
     assertUsage(!id.includes(idBase), `Encountered a module ID ${pc.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
     return false;
 }
-function getVirtualFileId(id) {
-    return removeVirtualIdTag(id);
-}
-function resolveVirtualFileId(id) {
+function addVirtualFileIdPrefix(id) {
     assert(isVirtualFileId(id));
-    if (!id.startsWith(virtualIdTag)) {
-        id = virtualIdTag + id;
+    if (!id.startsWith(prefix)) {
+        id = prefix + id;
     }
-    assert(id.startsWith(virtualIdTag));
+    assert(id.startsWith(prefix));
     return id;
 }
-function removeVirtualIdTag(id) {
-    if (id.startsWith(virtualIdTag)) {
-        id = id.slice(virtualIdTag.length);
+function removeVirtualFileIdPrefix(id) {
+    if (id.startsWith(prefix)) {
+        id = id.slice(prefix.length);
     }
-    assert(!id.startsWith(virtualIdTag));
+    assert(!id.startsWith(prefix));
     return id;
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "vike",
-  "version": "0.4.236-commit-e752d12",
+  "version": "0.4.236-commit-79f1ef0",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
       "worker": "./dist/esm/node/runtime/index.js",
+      "workerd": "./dist/esm/node/runtime/index.js",
       "require": "./dist/cjs/node/runtime/index.js",
       "node": "./dist/esm/node/runtime/index.js",
       "browser": "./dist/esm/client/node.js",
@@ -19,6 +20,7 @@
     },
     "./client/router": {
       "worker": "./dist/esm/node/client/router.js",
+      "workerd": "./dist/esm/node/client/router.js",
       "require": "./dist/cjs/node/client/router.js",
       "node": "./dist/esm/node/client/router.js",
       "browser": "./dist/esm/client/runtime-client-routing/index.js",
@@ -27,6 +29,7 @@
     },
     "./routing": {
       "worker": "./dist/esm/shared/route/routing.js",
+      "workerd": "./dist/esm/shared/route/routing.js",
       "require": "./dist/cjs/shared/route/routing.js",
       "node": "./dist/esm/shared/route/routing.js",
       "browser": "./dist/esm/shared/route/routing.js",
@@ -59,6 +62,7 @@
     },
     "./RenderErrorPage": {
       "worker": "./dist/esm/shared/RenderErrorPage.js",
+      "workerd": "./dist/esm/shared/RenderErrorPage.js",
       "require": "./dist/cjs/shared/RenderErrorPage.js",
       "node": "./dist/esm/shared/RenderErrorPage.js",
       "browser": "./dist/esm/shared/RenderErrorPage.js",
@@ -67,6 +71,7 @@
     },
     "./abort": {
       "worker": "./dist/esm/shared/abort.js",
+      "workerd": "./dist/esm/shared/abort.js",
       "require": "./dist/cjs/shared/abort.js",
       "node": "./dist/esm/shared/abort.js",
       "browser": "./dist/esm/shared/abort.js",
@@ -75,6 +80,7 @@
     },
     "./getPageContext": {
       "worker": "./dist/esm/shared/getPageContext.js",
+      "workerd": "./dist/esm/shared/getPageContext.js",
       "require": "./dist/cjs/shared/getPageContext.js",
       "node": "./dist/esm/shared/getPageContext.js",
       "browser": "./dist/esm/shared/getPageContext.js",
@@ -83,6 +89,7 @@
     },
     "./modifyUrl": {
       "worker": "./dist/esm/shared/modifyUrl.js",
+      "workerd": "./dist/esm/shared/modifyUrl.js",
       "require": "./dist/cjs/shared/modifyUrl.js",
       "node": "./dist/esm/shared/modifyUrl.js",
       "browser": "./dist/esm/shared/modifyUrl.js",
@@ -91,6 +98,7 @@
     },
     "./universal-middleware": {
       "worker": "./dist/esm/node/runtime/universal-middleware.js",
+      "workerd": "./dist/esm/node/runtime/universal-middleware.js",
       "require": "./dist/cjs/node/runtime/universal-middleware.js",
       "node": "./dist/esm/node/runtime/universal-middleware.js",
       "browser": "./dist/esm/client/node.js",
@@ -111,6 +119,7 @@
     },
     ".": {
       "worker": "./dist/esm/node/runtime/index.js",
+      "workerd": "./dist/esm/node/runtime/index.js",
       "require": "./dist/cjs/node/runtime/index.js",
       "node": "./dist/esm/node/runtime/index.js",
       "browser": "./dist/esm/client/index.js",
@@ -123,7 +132,7 @@
     "@brillout/json-serializer": "^0.5.16",
     "@brillout/picocolors": "^1.0.26",
     "@brillout/require-shim": "^0.1.2",
-    "@brillout/vite-plugin-server-entry": "^0.7.8",
+    "@brillout/vite-plugin-server-entry": "^0.7.12",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^1.0.0",
@@ -254,7 +263,7 @@
     "react-streaming": "^0.4.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vite": "^6.3.2"
+    "vite": "^7.0.6"
   },
   "scripts": {
     "dev": "tsc --watch",

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

@@ -1,41 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVirtualFileId = isVirtualFileId;
-exports.getVirtualFileId = getVirtualFileId;
-exports.resolveVirtualFileId = resolveVirtualFileId;
-exports.removeVirtualIdTag = removeVirtualIdTag;
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_1 = require("./utils.js");
-const idBase = 'virtual:vike:';
-// https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-const virtualIdTag = '\0';
-function isVirtualFileId(id) {
-    if (id.startsWith(idBase))
-        return true;
-    if (id.startsWith(virtualIdTag + idBase))
-        return true;
-    // https://github.com/vikejs/vike/issues/1985
-    (0, utils_js_1.assertUsage)(!id.includes(idBase), `Encountered a module ID ${picocolors_1.default.cyan(id)} that is unexpected. Are you using a tool that modifies the ID of modules? For example, the baseUrl setting in tsconfig.json cannot be used.`);
-    return false;
-}
-function getVirtualFileId(id) {
-    return removeVirtualIdTag(id);
-}
-function resolveVirtualFileId(id) {
-    (0, utils_js_1.assert)(isVirtualFileId(id));
-    if (!id.startsWith(virtualIdTag)) {
-        id = virtualIdTag + id;
-    }
-    (0, utils_js_1.assert)(id.startsWith(virtualIdTag));
-    return id;
-}
-function removeVirtualIdTag(id) {
-    if (id.startsWith(virtualIdTag)) {
-        id = id.slice(virtualIdTag.length);
-    }
-    (0, utils_js_1.assert)(!id.startsWith(virtualIdTag));
-    return id;
-}

package/dist/esm/node/shared/virtualFiles.d.ts

@@ -1,8 +0,0 @@
-export { isVirtualFileId };
-export { getVirtualFileId };
-export { resolveVirtualFileId };
-export { removeVirtualIdTag };
-declare function isVirtualFileId(id: string): boolean;
-declare function getVirtualFileId(id: string): string;
-declare function resolveVirtualFileId(id: string): string;
-declare function removeVirtualIdTag(id: string): string;