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.
Files changed (60) hide show
  1. package/dist/cjs/client/shared/createGetGlobalContextClient.js +1 -1
  2. package/dist/cjs/node/runtime/globalContext.js +17 -79
  3. package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js +1 -8
  4. package/dist/cjs/node/runtime/renderPage/getPageAssets.js +1 -3
  5. package/dist/cjs/node/runtime/utils.js +0 -1
  6. package/dist/cjs/node/vite/index.js +0 -2
  7. package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js +1 -2
  8. package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js +0 -2
  9. package/dist/cjs/node/vite/plugins/pluginCommon.js +0 -1
  10. package/dist/cjs/node/vite/plugins/pluginEnvVars.js +3 -3
  11. package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js +2 -2
  12. package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js +1 -1
  13. package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js +0 -1
  14. package/dist/cjs/shared/createGlobalContextShared.js +1 -5
  15. package/dist/cjs/shared/getProxyForPublicUsage.js +2 -2
  16. package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
  17. package/dist/cjs/utils/assertSetup.js +0 -3
  18. package/dist/cjs/utils/debug.js +0 -1
  19. package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts +1 -1
  20. package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts +2 -2
  21. package/dist/esm/client/runtime-client-routing/globalContext.d.ts +1 -1
  22. package/dist/esm/client/runtime-client-routing/history.d.ts +2 -4
  23. package/dist/esm/client/runtime-client-routing/history.js +35 -13
  24. package/dist/esm/client/runtime-client-routing/initClientRouter.js +2 -3
  25. package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts +1 -1
  26. package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts +1 -1
  27. package/dist/esm/client/runtime-server-routing/globalContext.d.ts +1 -1
  28. package/dist/esm/client/shared/createGetGlobalContextClient.d.ts +1 -1
  29. package/dist/esm/node/prerender/runPrerender.d.ts +132 -40
  30. package/dist/esm/node/runtime/globalContext.d.ts +52 -32
  31. package/dist/esm/node/runtime/globalContext.js +18 -80
  32. package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js +1 -8
  33. package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +33 -10
  34. package/dist/esm/node/runtime/renderPage/getPageAssets.js +2 -4
  35. package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +66 -20
  36. package/dist/esm/node/runtime/renderPage.d.ts +33 -10
  37. package/dist/esm/node/runtime/utils.d.ts +0 -1
  38. package/dist/esm/node/runtime/utils.js +0 -1
  39. package/dist/esm/node/vite/index.js +0 -2
  40. package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +1 -1
  41. package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.d.ts +1 -1
  42. package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js +1 -2
  43. package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js +0 -2
  44. package/dist/esm/node/vite/plugins/pluginCommon.d.ts +0 -3
  45. package/dist/esm/node/vite/plugins/pluginCommon.js +0 -1
  46. package/dist/esm/node/vite/shared/applyRegExWithMagicString.js +0 -1
  47. package/dist/esm/shared/createGlobalContextShared.d.ts +3 -3
  48. package/dist/esm/shared/createGlobalContextShared.js +1 -5
  49. package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
  50. package/dist/esm/utils/PROJECT_VERSION.js +1 -1
  51. package/dist/esm/utils/assertSetup.js +0 -3
  52. package/dist/esm/utils/debug.d.ts +1 -1
  53. package/dist/esm/utils/debug.js +0 -1
  54. package/package.json +1 -10
  55. package/dist/cjs/node/vite/plugins/pluginViteRPC.js +0 -42
  56. package/dist/cjs/utils/getViteRPC.js +0 -79
  57. package/dist/esm/node/vite/plugins/pluginViteRPC.d.ts +0 -25
  58. package/dist/esm/node/vite/plugins/pluginViteRPC.js +0 -40
  59. package/dist/esm/utils/getViteRPC.d.ts +0 -6
  60. package/dist/esm/utils/getViteRPC.js +0 -77
@@ -41,12 +41,24 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
41
41
  pages: {
42
42
  [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
43
43
  };
44
- } & (({
44
+ } & ({
45
45
  _isProduction: false;
46
46
  _isPrerendering: false;
47
47
  assetsManifest: null;
48
- _viteDevServer: import("vite").ViteDevServer | undefined;
49
- viteConfig: import("vite").ResolvedConfig | undefined;
48
+ _viteDevServer: import("vite").ViteDevServer;
49
+ viteConfig: import("vite").ResolvedConfig;
50
+ viteConfigRuntime: {
51
+ root: string;
52
+ build: {
53
+ outDir: string;
54
+ };
55
+ _baseViteOriginal: string;
56
+ vitePluginServerEntry: {
57
+ inject: boolean | undefined;
58
+ };
59
+ };
60
+ baseServer: string;
61
+ baseAssets: string;
50
62
  isClientSide: false;
51
63
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
52
64
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -56,7 +68,19 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
56
68
  _isProduction: true;
57
69
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
58
70
  _viteDevServer: null;
71
+ viteConfigRuntime: {
72
+ root: string;
73
+ build: {
74
+ outDir: string;
75
+ };
76
+ _baseViteOriginal: string;
77
+ vitePluginServerEntry: {
78
+ inject: boolean | undefined;
79
+ };
80
+ };
59
81
  _usesClientRouter: boolean;
82
+ baseServer: string;
83
+ baseAssets: string;
60
84
  isClientSide: false;
61
85
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
62
86
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -66,13 +90,6 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
66
90
  _isProduction: true;
67
91
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
68
92
  _viteDevServer: null;
69
- _usesClientRouter: boolean;
70
- isClientSide: false;
71
- _pageRoutes: import("../../../__internal/index.js").PageRoutes;
72
- _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
73
- }) & {
74
- baseServer: string;
75
- baseAssets: string;
76
93
  viteConfigRuntime: {
77
94
  root: string;
78
95
  build: {
@@ -83,6 +100,12 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
83
100
  inject: boolean | undefined;
84
101
  };
85
102
  };
103
+ _usesClientRouter: boolean;
104
+ baseServer: string;
105
+ baseAssets: string;
106
+ isClientSide: false;
107
+ _pageRoutes: import("../../../__internal/index.js").PageRoutes;
108
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
86
109
  });
87
110
  _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
88
111
  _baseServer: string;
@@ -1,7 +1,7 @@
1
1
  export { getPageAssets };
2
2
  export { setResolveClientEntriesDev };
3
3
  export { resolveIncludeAssetsImportedByServer };
4
- import { assert, prependBase, toPosixPath, unique, getGlobalObject, getViteRPC } from '../utils.js';
4
+ import { assert, prependBase, toPosixPath, unique, getGlobalObject } from '../utils.js';
5
5
  import { retrieveAssetsDev } from './getPageAssets/retrieveAssetsDev.js';
6
6
  import { retrieveAssetsProd } from './getPageAssets/retrieveAssetsProd.js';
7
7
  import { inferMediaType } from './inferMediaType.js';
@@ -15,9 +15,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
15
15
  const { _isProduction: isProduction } = globalContext;
16
16
  const isDev = !isProduction;
17
17
  const { assetUrls, clientEntriesSrc } = isDev
18
- ? !globalContext._viteDevServer
19
- ? await getViteRPC().retrievePageAssetsDevRPC(clientDependencies, clientEntries)
20
- : await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
18
+ ? await retrievePageAssetsDev(globalContext._viteDevServer, clientDependencies, clientEntries)
21
19
  : retrievePageAssetsProd(globalContext.assetsManifest, clientDependencies, clientEntries, resolveIncludeAssetsImportedByServer(globalContext.config));
22
20
  let pageAssets = [];
23
21
  unique([...clientEntriesSrc, ...assetUrls]).forEach((src) => {
@@ -56,12 +56,24 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
56
56
  pages: {
57
57
  [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
58
58
  };
59
- } & (({
59
+ } & ({
60
60
  _isProduction: false;
61
61
  _isPrerendering: false;
62
62
  assetsManifest: null;
63
- _viteDevServer: import("vite").ViteDevServer | undefined;
64
- viteConfig: import("vite").ResolvedConfig | undefined;
63
+ _viteDevServer: import("vite").ViteDevServer;
64
+ viteConfig: import("vite").ResolvedConfig;
65
+ viteConfigRuntime: {
66
+ root: string;
67
+ build: {
68
+ outDir: string;
69
+ };
70
+ _baseViteOriginal: string;
71
+ vitePluginServerEntry: {
72
+ inject: boolean | undefined;
73
+ };
74
+ };
75
+ baseServer: string;
76
+ baseAssets: string;
65
77
  isClientSide: false;
66
78
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
67
79
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -71,7 +83,19 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
71
83
  _isProduction: true;
72
84
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
73
85
  _viteDevServer: null;
86
+ viteConfigRuntime: {
87
+ root: string;
88
+ build: {
89
+ outDir: string;
90
+ };
91
+ _baseViteOriginal: string;
92
+ vitePluginServerEntry: {
93
+ inject: boolean | undefined;
94
+ };
95
+ };
74
96
  _usesClientRouter: boolean;
97
+ baseServer: string;
98
+ baseAssets: string;
75
99
  isClientSide: false;
76
100
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
77
101
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -81,13 +105,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
81
105
  _isProduction: true;
82
106
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
83
107
  _viteDevServer: null;
84
- _usesClientRouter: boolean;
85
- isClientSide: false;
86
- _pageRoutes: import("../../../__internal/index.js").PageRoutes;
87
- _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
88
- }) & {
89
- baseServer: string;
90
- baseAssets: string;
91
108
  viteConfigRuntime: {
92
109
  root: string;
93
110
  build: {
@@ -98,6 +115,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
98
115
  inject: boolean | undefined;
99
116
  };
100
117
  };
118
+ _usesClientRouter: boolean;
119
+ baseServer: string;
120
+ baseAssets: string;
121
+ isClientSide: false;
122
+ _pageRoutes: import("../../../__internal/index.js").PageRoutes;
123
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
101
124
  });
102
125
  _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
103
126
  _baseServer: string;
@@ -168,12 +191,24 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
168
191
  pages: {
169
192
  [k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
170
193
  };
171
- } & (({
194
+ } & ({
172
195
  _isProduction: false;
173
196
  _isPrerendering: false;
174
197
  assetsManifest: null;
175
- _viteDevServer: import("vite").ViteDevServer | undefined;
176
- viteConfig: import("vite").ResolvedConfig | undefined;
198
+ _viteDevServer: import("vite").ViteDevServer;
199
+ viteConfig: import("vite").ResolvedConfig;
200
+ viteConfigRuntime: {
201
+ root: string;
202
+ build: {
203
+ outDir: string;
204
+ };
205
+ _baseViteOriginal: string;
206
+ vitePluginServerEntry: {
207
+ inject: boolean | undefined;
208
+ };
209
+ };
210
+ baseServer: string;
211
+ baseAssets: string;
177
212
  isClientSide: false;
178
213
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
179
214
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -183,7 +218,19 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
183
218
  _isProduction: true;
184
219
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
185
220
  _viteDevServer: null;
221
+ viteConfigRuntime: {
222
+ root: string;
223
+ build: {
224
+ outDir: string;
225
+ };
226
+ _baseViteOriginal: string;
227
+ vitePluginServerEntry: {
228
+ inject: boolean | undefined;
229
+ };
230
+ };
186
231
  _usesClientRouter: boolean;
232
+ baseServer: string;
233
+ baseAssets: string;
187
234
  isClientSide: false;
188
235
  _pageRoutes: import("../../../__internal/index.js").PageRoutes;
189
236
  _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
@@ -193,13 +240,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
193
240
  _isProduction: true;
194
241
  assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
195
242
  _viteDevServer: null;
196
- _usesClientRouter: boolean;
197
- isClientSide: false;
198
- _pageRoutes: import("../../../__internal/index.js").PageRoutes;
199
- _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
200
- }) & {
201
- baseServer: string;
202
- baseAssets: string;
203
243
  viteConfigRuntime: {
204
244
  root: string;
205
245
  build: {
@@ -210,6 +250,12 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
210
250
  inject: boolean | undefined;
211
251
  };
212
252
  };
253
+ _usesClientRouter: boolean;
254
+ baseServer: string;
255
+ baseAssets: string;
256
+ isClientSide: false;
257
+ _pageRoutes: import("../../../__internal/index.js").PageRoutes;
258
+ _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
213
259
  });
214
260
  _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
215
261
  _baseServer: string;
@@ -46,12 +46,24 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
46
46
  pages: {
47
47
  [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
48
48
  };
49
- } & (({
49
+ } & ({
50
50
  _isProduction: false;
51
51
  _isPrerendering: false;
52
52
  assetsManifest: null;
53
- _viteDevServer: import("vite").ViteDevServer | undefined;
54
- viteConfig: import("vite").ResolvedConfig | undefined;
53
+ _viteDevServer: import("vite").ViteDevServer;
54
+ viteConfig: import("vite").ResolvedConfig;
55
+ viteConfigRuntime: {
56
+ root: string;
57
+ build: {
58
+ outDir: string;
59
+ };
60
+ _baseViteOriginal: string;
61
+ vitePluginServerEntry: {
62
+ inject: boolean | undefined;
63
+ };
64
+ };
65
+ baseServer: string;
66
+ baseAssets: string;
55
67
  isClientSide: false;
56
68
  _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
57
69
  _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -61,7 +73,19 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
61
73
  _isProduction: true;
62
74
  assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
63
75
  _viteDevServer: null;
76
+ viteConfigRuntime: {
77
+ root: string;
78
+ build: {
79
+ outDir: string;
80
+ };
81
+ _baseViteOriginal: string;
82
+ vitePluginServerEntry: {
83
+ inject: boolean | undefined;
84
+ };
85
+ };
64
86
  _usesClientRouter: boolean;
87
+ baseServer: string;
88
+ baseAssets: string;
65
89
  isClientSide: false;
66
90
  _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
67
91
  _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
@@ -71,13 +95,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
71
95
  _isProduction: true;
72
96
  assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
73
97
  _viteDevServer: null;
74
- _usesClientRouter: boolean;
75
- isClientSide: false;
76
- _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
77
- _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
78
- }) & {
79
- baseServer: string;
80
- baseAssets: string;
81
98
  viteConfigRuntime: {
82
99
  root: string;
83
100
  build: {
@@ -88,6 +105,12 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
88
105
  inject: boolean | undefined;
89
106
  };
90
107
  };
108
+ _usesClientRouter: boolean;
109
+ baseServer: string;
110
+ baseAssets: string;
111
+ isClientSide: false;
112
+ _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
113
+ _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
91
114
  });
92
115
  _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
93
116
  _baseServer: string;
@@ -56,4 +56,3 @@ export * from '../../utils/PROJECT_VERSION.js';
56
56
  export * from '../../utils/genPromise.js';
57
57
  export * from '../../utils/augmentType.js';
58
58
  export * from '../../utils/changeEnumerable.js';
59
- export * from '../../utils/getViteRPC.js';
@@ -60,4 +60,3 @@ export * from '../../utils/PROJECT_VERSION.js';
60
60
  export * from '../../utils/genPromise.js';
61
61
  export * from '../../utils/augmentType.js';
62
62
  export * from '../../utils/changeEnumerable.js';
63
- export * from '../../utils/getViteRPC.js';
@@ -22,7 +22,6 @@ import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
22
22
  import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModuleHmr.js';
23
23
  import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
24
24
  import { pluginReplaceConstants } from './plugins/pluginReplaceConstants.js';
25
- import { pluginViteRPC } from './plugins/pluginViteRPC.js';
26
25
  // We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
27
26
  setResolveClientEntriesDev(resolveClientEntriesDev);
28
27
  // Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
@@ -42,7 +41,6 @@ function plugin(vikeVitePluginOptions = {}) {
42
41
  pluginWorkaroundCssModuleHmr(),
43
42
  pluginWorkaroundVite6HmrRegression(),
44
43
  pluginReplaceConstants(),
45
- pluginViteRPC(),
46
44
  ];
47
45
  Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
48
46
  return plugins;
@@ -11,7 +11,7 @@ declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfi
11
11
  declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
12
12
  readonly ssrEmitAssets: true | undefined;
13
13
  readonly cssMinify: "esbuild" | undefined;
14
- readonly manifest: ".vite/manifest.json";
14
+ readonly manifest: "_temp_manifest.json";
15
15
  readonly copyPublicDir: boolean | undefined;
16
16
  }>;
17
17
  declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: {
@@ -4,7 +4,7 @@ export { analyzeClientEntries };
4
4
  export { manifestTempFile };
5
5
  import type { ResolvedConfig, Plugin } from 'vite';
6
6
  import type { PageConfigBuildTime } from '../../../../types/PageConfig.js';
7
- declare const manifestTempFile = ".vite/manifest.json";
7
+ declare const manifestTempFile = "_temp_manifest.json";
8
8
  declare function pluginBuildConfig(): Plugin[];
9
9
  declare function analyzeClientEntries(pageConfigs: PageConfigBuildTime[], config: ResolvedConfig): {
10
10
  hasClientRouting: boolean;
@@ -14,8 +14,7 @@ import { isViteServerBuild } from '../../shared/isViteServerBuild.js';
14
14
  import { resolveOutDir } from '../../shared/getOutDirs.js';
15
15
  import { handleAssetsManifest_assertUsageCssCodeSplit, handleAssetsManifest_getBuildConfig, } from './handleAssetsManifest.js';
16
16
  import { resolveIncludeAssetsImportedByServer } from '../../../runtime/renderPage/getPageAssets.js';
17
- // TODO/now: stop setting `manifest` altogether and use the resolved value instead? So that other tools can easily read the manifest (e.g. @cloudflare/plugin-vite reads the manifest).
18
- const manifestTempFile = '.vite/manifest.json';
17
+ const manifestTempFile = '_temp_manifest.json';
19
18
  function pluginBuildConfig() {
20
19
  let config;
21
20
  return [
@@ -13,8 +13,6 @@ function pluginDistFileNames() {
13
13
  apply: 'build',
14
14
  enforce: 'post',
15
15
  configResolved(config) {
16
- // TODO/now remove
17
- // if (true as boolean) return
18
16
  const rollupOutputs = getRollupOutputs(config);
19
17
  // We need to support multiple outputs: @vite/plugin-legacy adds an output, see https://github.com/vikejs/vike/issues/477#issuecomment-1406434802
20
18
  rollupOutputs.forEach((rollupOutput) => {
@@ -10,7 +10,4 @@ declare module 'vite' {
10
10
  _viteConfigFromUserEnhanced?: InlineConfig;
11
11
  }
12
12
  }
13
- declare global {
14
- var __VIKE__IS_PROCESS_SHARED_WITH_VITE: undefined | boolean;
15
- }
16
13
  declare function pluginCommon(vikeVitePluginOptions: unknown): Plugin[];
@@ -11,7 +11,6 @@ import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVi
11
11
  import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/prepareViteApiCall.js';
12
12
  import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
13
13
  const pluginName = 'vike:pluginCommon';
14
- globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
15
14
  function pluginCommon(vikeVitePluginOptions) {
16
15
  return [
17
16
  {
@@ -1,5 +1,4 @@
1
1
  export { applyRegExpWithMagicString };
2
- // TODO/now: replace with .replaceAll() ?
3
2
  function applyRegExpWithMagicString(magicString, regExp, replacement) {
4
3
  const envStatementRegEx = typeof regExp === 'string' ? new RegExp(regExp, 'g') : regExp;
5
4
  let match;
@@ -9,10 +9,10 @@ import type { GlobalContextServerInternal } from '../node/runtime/globalContext.
9
9
  import type { GlobalContextClientInternal } from '../client/runtime-client-routing/globalContext.js';
10
10
  import { type Hook } from './hooks/getHook.js';
11
11
  declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
12
- declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>, GlobalContextAddedAsync extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
12
+ declare function createGlobalContextShared<GlobalContextAdded extends Record<string, any>>(virtualFileExports: unknown, globalObject: {
13
13
  globalContext?: Record<string, unknown>;
14
14
  onCreateGlobalContextHooks?: Hook[];
15
- }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
15
+ }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>): Promise<{
16
16
  /**
17
17
  * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
18
18
  *
@@ -35,7 +35,7 @@ declare function createGlobalContextShared<GlobalContextAdded extends Record<str
35
35
  pages: {
36
36
  [k: string]: import("./page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
37
37
  };
38
- } & GlobalContextAdded & GlobalContextAddedAsync>;
38
+ } & GlobalContextAdded>;
39
39
  type GlobalContextBasePublic = Pick<GlobalContextBase, 'config' | 'pages' | 'isGlobalContext'>;
40
40
  type GlobalContextBase = ReturnType<typeof createGlobalContextBase>;
41
41
  declare function createGlobalContextBase(virtualFileExports: unknown): {
@@ -9,7 +9,7 @@ import { getHookFromPageConfigGlobalCumulative } from './hooks/getHook.js';
9
9
  const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
10
10
  async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext,
11
11
  // 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)
12
- addGlobalContextTmp, addGlobalContextAsync) {
12
+ addGlobalContextTmp) {
13
13
  const globalContext = createGlobalContextBase(virtualFileExports);
14
14
  let isNewGlobalContext;
15
15
  if (!globalObject.globalContext) {
@@ -31,10 +31,6 @@ addGlobalContextTmp, addGlobalContextAsync) {
31
31
  const globalContextAdded = await addGlobalContextTmp?.(globalContext);
32
32
  objectAssign(globalContext, globalContextAdded);
33
33
  }
34
- {
35
- const globalContextAddedAsync = await addGlobalContextAsync?.(globalContext);
36
- objectAssign(globalContext, globalContextAddedAsync);
37
- }
38
34
  const onCreateGlobalContextHooks = getHookFromPageConfigGlobalCumulative(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
39
35
  let hooksCalled = false;
40
36
  if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
@@ -1 +1 @@
1
- export declare const PROJECT_VERSION: "0.4.236-commit-64431e7";
1
+ export declare const PROJECT_VERSION: "0.4.236-commit-e752d12";
@@ -1,2 +1,2 @@
1
1
  // Automatically updated by @brillout/release-me
2
- export const PROJECT_VERSION = '0.4.236-commit-64431e7';
2
+ export const PROJECT_VERSION = '0.4.236-commit-e752d12';
@@ -24,9 +24,6 @@ function assertIsNotProductionRuntime() {
24
24
  setup.shouldNotBeProduction = true;
25
25
  }
26
26
  function onSetupRuntime() {
27
- // TODO/now
28
- if (true)
29
- return;
30
27
  if (debug.isActivated)
31
28
  debug('assertSetup()', new Error().stack);
32
29
  if (isTest())
@@ -1,7 +1,7 @@
1
1
  export { createDebugger };
2
2
  export { isDebugActivated };
3
3
  export type { Debug };
4
- 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"];
4
+ 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"];
5
5
  type Flag = (typeof flags)[number];
6
6
  type Debug = ReturnType<typeof createDebugger>;
7
7
  type Options = {
@@ -30,7 +30,6 @@ const flags = [
30
30
  'vike:setup',
31
31
  'vike:stream',
32
32
  'vike:virtualFiles',
33
- 'vike:vite-rpc',
34
33
  ];
35
34
  const flagsSkipWildcard = ['vike:log'];
36
35
  const flagRegex = /\bvike:[a-zA-Z-]+/g;
package/package.json CHANGED
@@ -1,11 +1,10 @@
1
1
  {
2
2
  "name": "vike",
3
- "version": "0.4.236-commit-64431e7",
3
+ "version": "0.4.236-commit-e752d12",
4
4
  "repository": "https://github.com/vikejs/vike",
5
5
  "exports": {
6
6
  "./server": {
7
7
  "worker": "./dist/esm/node/runtime/index.js",
8
- "workerd": "./dist/esm/node/runtime/index.js",
9
8
  "require": "./dist/cjs/node/runtime/index.js",
10
9
  "node": "./dist/esm/node/runtime/index.js",
11
10
  "browser": "./dist/esm/client/node.js",
@@ -20,7 +19,6 @@
20
19
  },
21
20
  "./client/router": {
22
21
  "worker": "./dist/esm/node/client/router.js",
23
- "workerd": "./dist/esm/node/client/router.js",
24
22
  "require": "./dist/cjs/node/client/router.js",
25
23
  "node": "./dist/esm/node/client/router.js",
26
24
  "browser": "./dist/esm/client/runtime-client-routing/index.js",
@@ -29,7 +27,6 @@
29
27
  },
30
28
  "./routing": {
31
29
  "worker": "./dist/esm/shared/route/routing.js",
32
- "workerd": "./dist/esm/shared/route/routing.js",
33
30
  "require": "./dist/cjs/shared/route/routing.js",
34
31
  "node": "./dist/esm/shared/route/routing.js",
35
32
  "browser": "./dist/esm/shared/route/routing.js",
@@ -62,7 +59,6 @@
62
59
  },
63
60
  "./RenderErrorPage": {
64
61
  "worker": "./dist/esm/shared/RenderErrorPage.js",
65
- "workerd": "./dist/esm/shared/RenderErrorPage.js",
66
62
  "require": "./dist/cjs/shared/RenderErrorPage.js",
67
63
  "node": "./dist/esm/shared/RenderErrorPage.js",
68
64
  "browser": "./dist/esm/shared/RenderErrorPage.js",
@@ -71,7 +67,6 @@
71
67
  },
72
68
  "./abort": {
73
69
  "worker": "./dist/esm/shared/abort.js",
74
- "workerd": "./dist/esm/shared/abort.js",
75
70
  "require": "./dist/cjs/shared/abort.js",
76
71
  "node": "./dist/esm/shared/abort.js",
77
72
  "browser": "./dist/esm/shared/abort.js",
@@ -80,7 +75,6 @@
80
75
  },
81
76
  "./getPageContext": {
82
77
  "worker": "./dist/esm/shared/getPageContext.js",
83
- "workerd": "./dist/esm/shared/getPageContext.js",
84
78
  "require": "./dist/cjs/shared/getPageContext.js",
85
79
  "node": "./dist/esm/shared/getPageContext.js",
86
80
  "browser": "./dist/esm/shared/getPageContext.js",
@@ -89,7 +83,6 @@
89
83
  },
90
84
  "./modifyUrl": {
91
85
  "worker": "./dist/esm/shared/modifyUrl.js",
92
- "workerd": "./dist/esm/shared/modifyUrl.js",
93
86
  "require": "./dist/cjs/shared/modifyUrl.js",
94
87
  "node": "./dist/esm/shared/modifyUrl.js",
95
88
  "browser": "./dist/esm/shared/modifyUrl.js",
@@ -98,7 +91,6 @@
98
91
  },
99
92
  "./universal-middleware": {
100
93
  "worker": "./dist/esm/node/runtime/universal-middleware.js",
101
- "workerd": "./dist/esm/node/runtime/universal-middleware.js",
102
94
  "require": "./dist/cjs/node/runtime/universal-middleware.js",
103
95
  "node": "./dist/esm/node/runtime/universal-middleware.js",
104
96
  "browser": "./dist/esm/client/node.js",
@@ -119,7 +111,6 @@
119
111
  },
120
112
  ".": {
121
113
  "worker": "./dist/esm/node/runtime/index.js",
122
- "workerd": "./dist/esm/node/runtime/index.js",
123
114
  "require": "./dist/cjs/node/runtime/index.js",
124
115
  "node": "./dist/esm/node/runtime/index.js",
125
116
  "browser": "./dist/esm/client/index.js",
@@ -1,42 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.pluginViteRPC = pluginViteRPC;
4
- const utils_js_1 = require("../utils.js");
5
- const resolveClientEntriesDev_js_1 = require("../shared/resolveClientEntriesDev.js");
6
- const retrieveAssetsDev_js_1 = require("../../runtime/renderPage/getPageAssets/retrieveAssetsDev.js");
7
- const getViteConfigRuntime_js_1 = require("../shared/getViteConfigRuntime.js");
8
- (0, utils_js_1.assertIsNotProductionRuntime)();
9
- function getViteRpcFunctions(viteDevServer) {
10
- return {
11
- async transformIndexHtmlRPC(html) {
12
- return await viteDevServer.transformIndexHtml('/', html);
13
- },
14
- async retrievePageAssetsDevRPC(clientDependencies, clientEntries) {
15
- const clientEntriesSrc = clientEntries.map((clientEntry) => (0, resolveClientEntriesDev_js_1.resolveClientEntriesDev)(clientEntry, viteDevServer));
16
- const assetUrls = await (0, retrieveAssetsDev_js_1.retrieveAssetsDev)(clientDependencies, viteDevServer);
17
- return { clientEntriesSrc, assetUrls };
18
- },
19
- async getViteConfigRuntimeRPC() {
20
- const viteConfigRuntime = (0, getViteConfigRuntime_js_1.getViteConfigRuntime)(viteDevServer.config);
21
- return viteConfigRuntime;
22
- },
23
- };
24
- }
25
- function pluginViteRPC() {
26
- const runtimeFileWithDynamicImport = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/node/runtime/globalContext.js');
27
- return {
28
- name: 'vike:pluginViteRPC',
29
- configureServer(viteDevServer) {
30
- (0, utils_js_1.createViteRPC)(viteDevServer, getViteRpcFunctions);
31
- },
32
- transform(code, id) {
33
- if (id !== runtimeFileWithDynamicImport)
34
- return;
35
- const envName = this.environment?.name;
36
- if (!envName || ['client', 'ssr'].includes(envName))
37
- return;
38
- // TODO/now use magic-string
39
- return code.replaceAll('__VIKE__DYNAMIC_IMPORT', 'import');
40
- },
41
- };
42
- }