vike 0.4.236-commit-64431e7 → 0.4.236-commit-e752d12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/client/shared/createGetGlobalContextClient.js +1 -1
- package/dist/cjs/node/runtime/globalContext.js +17 -79
- package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js +1 -8
- package/dist/cjs/node/runtime/renderPage/getPageAssets.js +1 -3
- package/dist/cjs/node/runtime/utils.js +0 -1
- package/dist/cjs/node/vite/index.js +0 -2
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js +1 -2
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js +0 -2
- package/dist/cjs/node/vite/plugins/pluginCommon.js +0 -1
- package/dist/cjs/node/vite/plugins/pluginEnvVars.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js +1 -1
- package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js +0 -1
- package/dist/cjs/shared/createGlobalContextShared.js +1 -5
- package/dist/cjs/shared/getProxyForPublicUsage.js +2 -2
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/assertSetup.js +0 -3
- package/dist/cjs/utils/debug.js +0 -1
- package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts +1 -1
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/globalContext.d.ts +1 -1
- package/dist/esm/client/runtime-client-routing/history.d.ts +2 -4
- package/dist/esm/client/runtime-client-routing/history.js +35 -13
- package/dist/esm/client/runtime-client-routing/initClientRouter.js +2 -3
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts +1 -1
- package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts +1 -1
- package/dist/esm/client/runtime-server-routing/globalContext.d.ts +1 -1
- package/dist/esm/client/shared/createGetGlobalContextClient.d.ts +1 -1
- package/dist/esm/node/prerender/runPrerender.d.ts +132 -40
- package/dist/esm/node/runtime/globalContext.d.ts +52 -32
- package/dist/esm/node/runtime/globalContext.js +18 -80
- package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js +1 -8
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +33 -10
- package/dist/esm/node/runtime/renderPage/getPageAssets.js +2 -4
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +66 -20
- package/dist/esm/node/runtime/renderPage.d.ts +33 -10
- package/dist/esm/node/runtime/utils.d.ts +0 -1
- package/dist/esm/node/runtime/utils.js +0 -1
- package/dist/esm/node/vite/index.js +0 -2
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +1 -1
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.d.ts +1 -1
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js +1 -2
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js +0 -2
- package/dist/esm/node/vite/plugins/pluginCommon.d.ts +0 -3
- package/dist/esm/node/vite/plugins/pluginCommon.js +0 -1
- package/dist/esm/node/vite/shared/applyRegExWithMagicString.js +0 -1
- package/dist/esm/shared/createGlobalContextShared.d.ts +3 -3
- package/dist/esm/shared/createGlobalContextShared.js +1 -5
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/assertSetup.js +0 -3
- package/dist/esm/utils/debug.d.ts +1 -1
- package/dist/esm/utils/debug.js +0 -1
- package/package.json +1 -10
- package/dist/cjs/node/vite/plugins/pluginViteRPC.js +0 -42
- package/dist/cjs/utils/getViteRPC.js +0 -79
- package/dist/esm/node/vite/plugins/pluginViteRPC.d.ts +0 -25
- package/dist/esm/node/vite/plugins/pluginViteRPC.js +0 -40
- package/dist/esm/utils/getViteRPC.d.ts +0 -6
- package/dist/esm/utils/getViteRPC.js +0 -77
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getViteRPC = getViteRPC;
|
|
4
|
-
exports.createViteRPC = createViteRPC;
|
|
5
|
-
const assert_js_1 = require("./assert.js");
|
|
6
|
-
const genPromise_js_1 = require("./genPromise.js");
|
|
7
|
-
const getRandomId_js_1 = require("./getRandomId.js");
|
|
8
|
-
const getGlobalObject_js_1 = require("./getGlobalObject.js");
|
|
9
|
-
const debug_js_1 = require("./debug.js");
|
|
10
|
-
const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
|
|
11
|
-
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
12
|
-
const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/getViteRPC.ts', {
|
|
13
|
-
rpc: null,
|
|
14
|
-
});
|
|
15
|
-
const debug = (0, debug_js_1.createDebugger)('vike:vite-rpc');
|
|
16
|
-
function getViteRPC() {
|
|
17
|
-
globalObject.rpc ?? (globalObject.rpc = createRpcClient());
|
|
18
|
-
return globalObject.rpc;
|
|
19
|
-
}
|
|
20
|
-
function createRpcClient() {
|
|
21
|
-
// @ts-ignore
|
|
22
|
-
const hot = (undefined);
|
|
23
|
-
(0, assert_js_1.assert)(hot);
|
|
24
|
-
const callbacks = [];
|
|
25
|
-
hot.on(`vike:rpc:response`, (dataResponse) => {
|
|
26
|
-
if (debug.isActivated)
|
|
27
|
-
debug('Response received', dataResponse);
|
|
28
|
-
const { callId, functionReturn } = dataResponse;
|
|
29
|
-
callbacks.forEach((c) => {
|
|
30
|
-
if (callId !== c.callId)
|
|
31
|
-
return;
|
|
32
|
-
c.cb(functionReturn);
|
|
33
|
-
callbacks.splice(callbacks.indexOf(c), 1);
|
|
34
|
-
});
|
|
35
|
-
});
|
|
36
|
-
const rpc = new Proxy({}, {
|
|
37
|
-
get(_, functionName) {
|
|
38
|
-
return async (...functionArgs) => {
|
|
39
|
-
// @ts-ignore
|
|
40
|
-
const hot = (undefined);
|
|
41
|
-
(0, assert_js_1.assert)(hot);
|
|
42
|
-
const callId = (0, getRandomId_js_1.getRandomId)();
|
|
43
|
-
const { promise, resolve } = (0, genPromise_js_1.genPromise)({ timeout: 3 * 1000 });
|
|
44
|
-
callbacks.push({
|
|
45
|
-
callId,
|
|
46
|
-
cb: (functionReturn) => {
|
|
47
|
-
resolve(functionReturn);
|
|
48
|
-
},
|
|
49
|
-
});
|
|
50
|
-
const dataRequest = { callId, functionName, functionArgs };
|
|
51
|
-
if (debug.isActivated)
|
|
52
|
-
debug('Request sent', dataRequest);
|
|
53
|
-
// Vite's type is wrong; it (undefined).send() does seem to return a promise
|
|
54
|
-
await hot.send('vike:rpc:request', dataRequest);
|
|
55
|
-
const functionReturn = await promise;
|
|
56
|
-
return functionReturn;
|
|
57
|
-
};
|
|
58
|
-
},
|
|
59
|
-
});
|
|
60
|
-
return rpc;
|
|
61
|
-
}
|
|
62
|
-
function createViteRPC(viteDevServer, getRpcFunctions) {
|
|
63
|
-
const rpcFunctions = getRpcFunctions(viteDevServer);
|
|
64
|
-
const { environments } = viteDevServer;
|
|
65
|
-
for (const envName in environments) {
|
|
66
|
-
debug('Listening to environment', envName);
|
|
67
|
-
const env = environments[envName];
|
|
68
|
-
env.hot.on('vike:rpc:request', async (dataRequest) => {
|
|
69
|
-
if (debug.isActivated)
|
|
70
|
-
debug('Request received', dataRequest);
|
|
71
|
-
const { callId, functionName, functionArgs } = dataRequest;
|
|
72
|
-
const functionReturn = await rpcFunctions[functionName](...functionArgs);
|
|
73
|
-
const dataResponse = { callId, functionReturn };
|
|
74
|
-
if (debug.isActivated)
|
|
75
|
-
debug('Response sent', dataResponse);
|
|
76
|
-
env.hot.send('vike:rpc:response', dataResponse);
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
|
-
}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
export { pluginViteRPC };
|
|
2
|
-
import type { Plugin, ViteDevServer } from 'vite';
|
|
3
|
-
import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency.js';
|
|
4
|
-
export type ViteRPC = ReturnType<typeof getViteRpcFunctions>;
|
|
5
|
-
declare function getViteRpcFunctions(viteDevServer: ViteDevServer): {
|
|
6
|
-
transformIndexHtmlRPC(html: string): Promise<string>;
|
|
7
|
-
retrievePageAssetsDevRPC(clientDependencies: ClientDependency[], clientEntries: string[]): Promise<{
|
|
8
|
-
clientEntriesSrc: string[];
|
|
9
|
-
assetUrls: string[];
|
|
10
|
-
}>;
|
|
11
|
-
getViteConfigRuntimeRPC(): Promise<{
|
|
12
|
-
root: string;
|
|
13
|
-
build: {
|
|
14
|
-
outDir: string;
|
|
15
|
-
};
|
|
16
|
-
_baseViteOriginal: string;
|
|
17
|
-
vitePluginServerEntry: {
|
|
18
|
-
inject: boolean | undefined;
|
|
19
|
-
};
|
|
20
|
-
}>;
|
|
21
|
-
};
|
|
22
|
-
declare global {
|
|
23
|
-
var __VIKE__DYNAMIC_IMPORT: (module: string) => Promise<Record<string, unknown>>;
|
|
24
|
-
}
|
|
25
|
-
declare function pluginViteRPC(): Plugin;
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
export { pluginViteRPC };
|
|
2
|
-
import { createViteRPC, assertIsNotProductionRuntime, requireResolveVikeDistFile } from '../utils.js';
|
|
3
|
-
import { resolveClientEntriesDev } from '../shared/resolveClientEntriesDev.js';
|
|
4
|
-
import { retrieveAssetsDev } from '../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js';
|
|
5
|
-
import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
|
|
6
|
-
assertIsNotProductionRuntime();
|
|
7
|
-
function getViteRpcFunctions(viteDevServer) {
|
|
8
|
-
return {
|
|
9
|
-
async transformIndexHtmlRPC(html) {
|
|
10
|
-
return await viteDevServer.transformIndexHtml('/', html);
|
|
11
|
-
},
|
|
12
|
-
async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
|
|
13
|
-
const clientEntriesSrc = clientEntries.map((clientEntry) => resolveClientEntriesDev(clientEntry, viteDevServer));
|
|
14
|
-
const assetUrls = await retrieveAssetsDev(clientDependencies, viteDevServer);
|
|
15
|
-
return { clientEntriesSrc, assetUrls };
|
|
16
|
-
},
|
|
17
|
-
async getViteConfigRuntimeRPC() {
|
|
18
|
-
const viteConfigRuntime = getViteConfigRuntime(viteDevServer.config);
|
|
19
|
-
return viteConfigRuntime;
|
|
20
|
-
},
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
function pluginViteRPC() {
|
|
24
|
-
const runtimeFileWithDynamicImport = requireResolveVikeDistFile('dist/esm/node/runtime/globalContext.js');
|
|
25
|
-
return {
|
|
26
|
-
name: 'vike:pluginViteRPC',
|
|
27
|
-
configureServer(viteDevServer) {
|
|
28
|
-
createViteRPC(viteDevServer, getViteRpcFunctions);
|
|
29
|
-
},
|
|
30
|
-
transform(code, id) {
|
|
31
|
-
if (id !== runtimeFileWithDynamicImport)
|
|
32
|
-
return;
|
|
33
|
-
const envName = this.environment?.name;
|
|
34
|
-
if (!envName || ['client', 'ssr'].includes(envName))
|
|
35
|
-
return;
|
|
36
|
-
// TODO/now use magic-string
|
|
37
|
-
return code.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
|
|
38
|
-
},
|
|
39
|
-
};
|
|
40
|
-
}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
export { getViteRPC };
|
|
2
|
-
export { createViteRPC };
|
|
3
|
-
import type { ViteDevServer } from 'vite';
|
|
4
|
-
declare function getViteRPC<RpcFunctions>(): RpcFunctions;
|
|
5
|
-
type AsyncFunction = (...args: any[]) => Promise<unknown>;
|
|
6
|
-
declare function createViteRPC(viteDevServer: ViteDevServer, getRpcFunctions: (viteDevServer: ViteDevServer) => Record<string, AsyncFunction>): void;
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
export { getViteRPC }; // consumer (aka RPC client)
|
|
2
|
-
export { createViteRPC }; // provider (aka RPC server)
|
|
3
|
-
import { assert } from './assert.js';
|
|
4
|
-
import { genPromise } from './genPromise.js';
|
|
5
|
-
import { getRandomId } from './getRandomId.js';
|
|
6
|
-
import { getGlobalObject } from './getGlobalObject.js';
|
|
7
|
-
import { createDebugger } from './debug.js';
|
|
8
|
-
import { assertIsNotBrowser } from './assertIsNotBrowser.js';
|
|
9
|
-
assertIsNotBrowser();
|
|
10
|
-
const globalObject = getGlobalObject('utils/getViteRPC.ts', {
|
|
11
|
-
rpc: null,
|
|
12
|
-
});
|
|
13
|
-
const debug = createDebugger('vike:vite-rpc');
|
|
14
|
-
function getViteRPC() {
|
|
15
|
-
globalObject.rpc ?? (globalObject.rpc = createRpcClient());
|
|
16
|
-
return globalObject.rpc;
|
|
17
|
-
}
|
|
18
|
-
function createRpcClient() {
|
|
19
|
-
// @ts-ignore
|
|
20
|
-
const hot = import.meta.hot;
|
|
21
|
-
assert(hot);
|
|
22
|
-
const callbacks = [];
|
|
23
|
-
hot.on(`vike:rpc:response`, (dataResponse) => {
|
|
24
|
-
if (debug.isActivated)
|
|
25
|
-
debug('Response received', dataResponse);
|
|
26
|
-
const { callId, functionReturn } = dataResponse;
|
|
27
|
-
callbacks.forEach((c) => {
|
|
28
|
-
if (callId !== c.callId)
|
|
29
|
-
return;
|
|
30
|
-
c.cb(functionReturn);
|
|
31
|
-
callbacks.splice(callbacks.indexOf(c), 1);
|
|
32
|
-
});
|
|
33
|
-
});
|
|
34
|
-
const rpc = new Proxy({}, {
|
|
35
|
-
get(_, functionName) {
|
|
36
|
-
return async (...functionArgs) => {
|
|
37
|
-
// @ts-ignore
|
|
38
|
-
const hot = import.meta.hot;
|
|
39
|
-
assert(hot);
|
|
40
|
-
const callId = getRandomId();
|
|
41
|
-
const { promise, resolve } = genPromise({ timeout: 3 * 1000 });
|
|
42
|
-
callbacks.push({
|
|
43
|
-
callId,
|
|
44
|
-
cb: (functionReturn) => {
|
|
45
|
-
resolve(functionReturn);
|
|
46
|
-
},
|
|
47
|
-
});
|
|
48
|
-
const dataRequest = { callId, functionName, functionArgs };
|
|
49
|
-
if (debug.isActivated)
|
|
50
|
-
debug('Request sent', dataRequest);
|
|
51
|
-
// Vite's type is wrong; it import.meta.hot.send() does seem to return a promise
|
|
52
|
-
await hot.send('vike:rpc:request', dataRequest);
|
|
53
|
-
const functionReturn = await promise;
|
|
54
|
-
return functionReturn;
|
|
55
|
-
};
|
|
56
|
-
},
|
|
57
|
-
});
|
|
58
|
-
return rpc;
|
|
59
|
-
}
|
|
60
|
-
function createViteRPC(viteDevServer, getRpcFunctions) {
|
|
61
|
-
const rpcFunctions = getRpcFunctions(viteDevServer);
|
|
62
|
-
const { environments } = viteDevServer;
|
|
63
|
-
for (const envName in environments) {
|
|
64
|
-
debug('Listening to environment', envName);
|
|
65
|
-
const env = environments[envName];
|
|
66
|
-
env.hot.on('vike:rpc:request', async (dataRequest) => {
|
|
67
|
-
if (debug.isActivated)
|
|
68
|
-
debug('Request received', dataRequest);
|
|
69
|
-
const { callId, functionName, functionArgs } = dataRequest;
|
|
70
|
-
const functionReturn = await rpcFunctions[functionName](...functionArgs);
|
|
71
|
-
const dataResponse = { callId, functionReturn };
|
|
72
|
-
if (debug.isActivated)
|
|
73
|
-
debug('Response sent', dataResponse);
|
|
74
|
-
env.hot.send('vike:rpc:response', dataResponse);
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
}
|