vike 0.4.236-commit-85d361d → 0.4.236-commit-64431e7

package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js

@@ -13,6 +13,8 @@ function pluginDistFileNames() {
         apply: 'build',
         enforce: 'post',
         configResolved(config) {
+            // TODO/now remove
+            // if (true as boolean) return
             const rollupOutputs = getRollupOutputs(config);
             // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
             rollupOutputs.forEach((rollupOutput) => {
@@ -101,6 +103,7 @@ function getIdHash(id) {
     return crypto.createHash('md5').update(id).digest('hex').slice(0, 8);
 }
 function getAssetFileName(assetInfo, config) {
+    const userRootDir = config.root;
     const assetsDir = getAssetsDir(config);
     const dir = assetsDir + '/static';
     let { name } = assetInfo;
@@ -118,11 +121,11 @@ function getAssetFileName(assetInfo, config) {
         // Vite 3
         name?.endsWith('?extractAssets&lang.css')) {
         name = name.split('.').slice(0, -2).join('.');
-        name = clean(name);
+        name = clean(name, userRootDir);
         return `${dir}/${name}.[hash][extname]`;
     }
     name = name.split('.').slice(0, -1).join('.');
-    name = clean(name);
+    name = clean(name, userRootDir);
     return `${dir}/${name}.[hash][extname]`;
 }
 function getChunkFileName(_chunkInfo, config) {
@@ -135,11 +138,12 @@ function getChunkFileName(_chunkInfo, config) {
     return name;
 }
 function getEntryFileName(chunkInfo, config, isEntry) {
+    const userRootDir = config.root;
     const assetsDir = getAssetsDir(config);
     const isForClientSide = !config.build.ssr;
     let { name } = chunkInfo;
     assertPosixPath(name);
-    name = clean(name, true, 
+    name = clean(name, userRootDir, true, 
     // Not needed for client-side because dist/ filenames contain `.[hash].js`
     !isForClientSide);
     if (isForClientSide) {
@@ -149,9 +153,14 @@ function getEntryFileName(chunkInfo, config, isEntry) {
         return `${name}.${isEntry ? 'mjs' : 'js'}`;
     }
 }
-function removePathSeparators(name) {
+function removePathSeparators(name, userRootDir) {
     assertPosixPath(name);
-    assert(!name.startsWith('/'));
+    if (name.startsWith(userRootDir)) {
+        name = name.slice(userRootDir.length);
+        if (name.startsWith('/'))
+            name = name.slice(1);
+    }
+    assert(!name.startsWith('/'), { name });
     const entryDir = 'entries/';
     const hasEntryDir = name.startsWith(entryDir);
     if (hasEntryDir) {
@@ -164,14 +173,14 @@ function removePathSeparators(name) {
     }
     return name;
 }
-function clean(name, removePathSep, fixGlob) {
+function clean(name, userRootDir, removePathSep, fixGlob) {
     name = fixExtractAssetsQuery(name);
     if (fixGlob) {
         name = workaroundGlob(name);
     }
     name = replaceNonLatinCharacters(name);
     if (removePathSep) {
-        name = removePathSeparators(name);
+        name = removePathSeparators(name, userRootDir);
     }
     name = removeLeadingUnderscoreInFilename(name);
     name = removeUnderscoreDoublets(name);

package/dist/esm/node/vite/plugins/pluginCommon.d.ts

@@ -10,4 +10,7 @@ declare module 'vite' {
         _viteConfigFromUserEnhanced?: InlineConfig;
     }
 }
+declare global {
+    var __VIKE__IS_PROCESS_SHARED_WITH_VITE: undefined | boolean;
+}
 declare function pluginCommon(vikeVitePluginOptions: unknown): Plugin[];

package/dist/esm/node/vite/plugins/pluginCommon.js

@@ -11,6 +11,7 @@ import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVi
 import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
 import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
 const pluginName = 'vike:pluginCommon';
+globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
 function pluginCommon(vikeVitePluginOptions) {
     return [
         {

package/dist/esm/node/vite/plugins/pluginViteRPC.d.ts

@@ -0,0 +1,25 @@
+export { pluginViteRPC };
+import type { Plugin, ViteDevServer } from 'vite';
+import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
+export type ViteRPC = ReturnType<typeof getViteRpcFunctions>;
+declare function getViteRpcFunctions(viteDevServer: ViteDevServer): {
+    transformIndexHtmlRPC(html: string): Promise<string>;
+    retrievePageAssetsDevRPC(clientDependencies: ClientDependency[], clientEntries: string[]): Promise<{
+        clientEntriesSrc: string[];
+        assetUrls: string[];
+    }>;
+    getViteConfigRuntimeRPC(): Promise<{
+        root: string;
+        build: {
+            outDir: string;
+        };
+        _baseViteOriginal: string;
+        vitePluginServerEntry: {
+            inject: boolean | undefined;
+        };
+    }>;
+};
+declare global {
+    var __VIKE__DYNAMIC_IMPORT: (module: string) => Promise<Record<string, unknown>>;
+}
+declare function pluginViteRPC(): Plugin;

package/dist/esm/node/vite/plugins/pluginViteRPC.js

@@ -0,0 +1,40 @@
+export { pluginViteRPC };
+import { createViteRPC, assertIsNotProductionRuntime, requireResolveVikeDistFile } from '../utils.js';
+import { resolveClientEntriesDev } from '../shared/resolveClientEntriesDev.js';
+import { retrieveAssetsDev } from '../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js';
+import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
+assertIsNotProductionRuntime();
+function getViteRpcFunctions(viteDevServer) {
+    return {
+        async transformIndexHtmlRPC(html) {
+            return await viteDevServer.transformIndexHtml('/', html);
+        },
+        async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
+            const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer));
+            const assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
+            return { clientEntriesSrc, assetUrls };
+        },
+        async getViteConfigRuntimeRPC() {
+            const viteConfigRuntime = getViteConfigRuntime(viteDevServer.config);
+            return viteConfigRuntime;
+        },
+    };
+}
+function pluginViteRPC() {
+    const runtimeFileWithDynamicImport = requireResolveVikeDistFile('dist/esm/node/runtime/globalContext.js');
+    return {
+        name: 'vike:pluginViteRPC',
+        configureServer(viteDevServer) {
+            createViteRPC(viteDevServer, getViteRpcFunctions);
+        },
+        transform(code, id) {
+            if (id !== runtimeFileWithDynamicImport)
+                return;
+            const envName = this.environment?.name;
+            if (!envName || ['client', 'ssr'].includes(envName))
+                return;
+            // TODO/now use magic-string
+            return code.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
+        },
+    };
+}

package/dist/esm/node/vite/shared/applyRegExWithMagicString.js

@@ -1,4 +1,5 @@
 export { applyRegExpWithMagicString };
+// TODO/now: replace with .replaceAll() ?
 function applyRegExpWithMagicString(magicString, regExp, replacement) {
     const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
     let match;

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -9,10 +9,10 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
 import { type Hook } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-declare function createGlobalContextShared<GlobalContextAddendum extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
+declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>, GlobalContextAddedAsync extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
     onCreateGlobalContextHooks?: Hook[];
-}, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>, addGlobalContextSync?: (globalContext: GlobalContextBase) => GlobalContextAddendum): Promise<{
+}, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     /**
      * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
      *
@@ -35,7 +35,7 @@ declare function createGlobalContextShared<GlobalContextAddendum extends Record<
     pages: {
         [k: string]: import("./page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
     };
-} & GlobalContextAddendum>;
+} & GlobalContextAdded & GlobalContextAddedAsync>;
 type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
 declare function createGlobalContextBase(virtualFileExports: unknown): {

package/dist/esm/shared/createGlobalContextShared.js

@@ -7,25 +7,33 @@ import { execHookGlobal } from './hooks/execHook.js';
 import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContextAsync, addGlobalContextSync) {
+async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext, 
+// TO-DO/next-major-release: we'll be able to remove addGlobalContextTmp after loadPageRoutes() is sync (it will be sync after we remove the old design)
+addGlobalContextTmp, addGlobalContextAsync) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     let isNewGlobalContext;
     if (!globalObject.globalContext) {
+        // We set globalObject.globalContext early and before any async operations, so that getGlobalContextSync() can be used early.
+        // - Required by vike-vercel
         globalObject.globalContext = globalContext;
         isNewGlobalContext = false;
     }
     else {
         isNewGlobalContext = true;
     }
-    if (addGlobalContextSync &&
+    if (addGlobalContext &&
         // TODO/next-major-release: remove
         globalContext._pageConfigs.length > 0) {
-        const globalContextAddendum = addGlobalContextSync?.(globalContext);
-        objectAssign(globalContext, globalContextAddendum);
+        const globalContextAdded = addGlobalContext?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
     }
     else {
-        const globalContextAddendum = await addGlobalContextAsync?.(globalContext);
-        objectAssign(globalContext, globalContextAddendum);
+        const globalContextAdded = await addGlobalContextTmp?.(globalContext);
+        objectAssign(globalContext, globalContextAdded);
+    }
+    {
+        const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
+        objectAssign(globalContext, globalContextAddedAsync);
     }
     const onCreateGlobalContextHooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
     let hooksCalled = false;

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.236-commit-85d361d";
+export declare const PROJECT_VERSION: "0.4.236-commit-64431e7";

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-85d361d';
+export const PROJECT_VERSION = '0.4.236-commit-64431e7';

package/dist/esm/utils/assertSetup.js

@@ -24,6 +24,9 @@ function assertIsNotProductionRuntime() {
     setup.shouldNotBeProduction = true;
 }
 function onSetupRuntime() {
+    // TODO/now
+    if (true)
+        return;
     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
+    const hot = import.meta.hot;
+    assert(hot);
+    const callbacks = [];
+    hot.on(`vike:rpc:response`, (dataResponse) => {
+        if (debug.isActivated)
+            debug('Response received', dataResponse);
+        const { callId, functionReturn } = dataResponse;
+        callbacks.forEach((c) => {
+            if (callId !== c.callId)
+                return;
+            c.cb(functionReturn);
+            callbacks.splice(callbacks.indexOf(c), 1);
+        });
+    });
+    const rpc = new Proxy({}, {
+        get(_, functionName) {
+            return async (...functionArgs) => {
+                // @ts-ignore
+                const hot = import.meta.hot;
+                assert(hot);
+                const callId = getRandomId();
+                const { promise, resolve } = genPromise({ timeout: 3 * 1000 });
+                callbacks.push({
+                    callId,
+                    cb: (functionReturn) => {
+                        resolve(functionReturn);
+                    },
+                });
+                const dataRequest = { callId, functionName, functionArgs };
+                if (debug.isActivated)
+                    debug('Request sent', dataRequest);
+                // Vite's type is wrong; it 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/package.json

@@ -1,10 +1,11 @@
 {
   "name": "vike",
-  "version": "0.4.236-commit-85d361d",
+  "version": "0.4.236-commit-64431e7",
   "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",