vike 0.4.249 → 0.4.250-commit-193dea3

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 (77) hide show
  1. package/bin.js +3 -0
  2. package/dist/client/runtime-client-routing/createPageContextClientSide.d.ts +1 -1
  3. package/dist/client/runtime-client-routing/getPageContext.js +0 -2
  4. package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +136 -4
  5. package/dist/client/runtime-client-routing/history.d.ts +1 -1
  6. package/dist/client/runtime-client-routing/history.js +4 -11
  7. package/dist/client/runtime-client-routing/prefetch.d.ts +2 -2
  8. package/dist/client/runtime-client-routing/renderPageClient.d.ts +601 -6
  9. package/dist/client/runtime-client-routing/utils.d.ts +0 -1
  10. package/dist/client/runtime-client-routing/utils.js +0 -1
  11. package/dist/client/runtime-server-routing/createPageContextClientSide.d.ts +2 -6
  12. package/dist/client/runtime-server-routing/createPageContextClientSide.js +1 -21
  13. package/dist/client/runtime-server-routing/entry.js +15 -1
  14. package/dist/client/shared/execHookOnRenderClient.d.ts +4 -1
  15. package/dist/node/vite/index.js +5 -2
  16. package/dist/node/vite/plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js +38 -13
  17. package/dist/node/vite/plugins/pluginAssertFileEnv.js +22 -13
  18. package/dist/node/vite/plugins/pluginExtractAssets.js +2 -0
  19. package/dist/node/vite/plugins/pluginExtractExportNames.js +2 -0
  20. package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.js +2 -0
  21. package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js +3 -1
  22. package/dist/node/vite/plugins/pluginReplaceConstantsPageContext.js +2 -0
  23. package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.d.ts +126 -0
  24. package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.js +421 -0
  25. package/dist/node/vite/plugins/pluginStaticReplace.d.ts +4 -0
  26. package/dist/node/vite/plugins/pluginStaticReplace.js +88 -0
  27. package/dist/node/vite/plugins/pluginVirtualFiles.js +73 -113
  28. package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.d.ts +2 -1
  29. package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.js +1 -3
  30. package/dist/node/vite/shared/importString.d.ts +50 -0
  31. package/dist/node/vite/shared/importString.js +63 -0
  32. package/dist/node/vite/shared/loggerDev.d.ts +3 -3
  33. package/dist/node/vite/shared/loggerDev.js +3 -3
  34. package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.d.ts +1 -1
  35. package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +10 -1
  36. package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles.d.ts → crawlPlusFilePaths.d.ts} +2 -2
  37. package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles.js → crawlPlusFilePaths.js} +4 -4
  38. package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesAll.d.ts → getPlusFilesByLocationId.d.ts} +8 -6
  39. package/dist/node/vite/shared/resolveVikeConfigInternal/{getPlusFilesAll.js → getPlusFilesByLocationId.js} +47 -59
  40. package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.d.ts +1 -1
  41. package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.js +11 -18
  42. package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts +1 -1
  43. package/dist/node/vite/shared/resolveVikeConfigInternal.js +66 -64
  44. package/dist/server/onLoad.js +2 -2
  45. package/dist/server/runtime/logErrorServer.d.ts +2 -2
  46. package/dist/server/runtime/logErrorServer.js +0 -2
  47. package/dist/server/runtime/loggerRuntime.d.ts +3 -2
  48. package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts +4 -2
  49. package/dist/server/runtime/renderPageServer/createHttpResponse.js +16 -8
  50. package/dist/server/runtime/renderPageServer/createPageContextServerSide.d.ts +5 -2
  51. package/dist/server/runtime/renderPageServer/createPageContextServerSide.js +1 -0
  52. package/dist/server/runtime/renderPageServer/csp.js +2 -0
  53. package/dist/server/runtime/renderPageServer/execHookOnError.d.ts +2 -2
  54. package/dist/server/runtime/renderPageServer/handleErrorWithoutErrorPage.d.ts +4 -4
  55. package/dist/server/runtime/renderPageServer/handleErrorWithoutErrorPage.js +3 -4
  56. package/dist/server/runtime/renderPageServer/html/serializeContext.d.ts +2 -2
  57. package/dist/server/runtime/renderPageServer/html/stream.js +12 -13
  58. package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +2 -2
  59. package/dist/server/runtime/renderPageServer/log404/index.d.ts +2 -2
  60. package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +3 -3
  61. package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.js +2 -2
  62. package/dist/server/runtime/renderPageServer.js +19 -19
  63. package/dist/shared-server-client/hooks/execHook.d.ts +5 -1
  64. package/dist/types/Config/ConfigResolved.d.ts +3 -2
  65. package/dist/types/Config.d.ts +38 -31
  66. package/dist/types/PageConfig.d.ts +1 -1
  67. package/dist/types/index.d.ts +2 -1
  68. package/dist/utils/PROJECT_VERSION.d.ts +1 -1
  69. package/dist/utils/PROJECT_VERSION.js +1 -1
  70. package/dist/utils/assert.d.ts +5 -5
  71. package/dist/utils/assert.js +8 -8
  72. package/dist/utils/debug.d.ts +1 -1
  73. package/dist/utils/debug.js +1 -0
  74. package/package.json +9 -7
  75. package/node/cli/bin.js +0 -3
  76. /package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles → crawlPlusFilePaths}/ignorePatternsBuiltIn.d.ts +0 -0
  77. /package/dist/node/vite/shared/resolveVikeConfigInternal/{crawlPlusFiles → crawlPlusFilePaths}/ignorePatternsBuiltIn.js +0 -0
package/bin.js ADDED
@@ -0,0 +1,3 @@
1
+ #!/usr/bin/env node
2
+
3
+ import './dist/node/cli/entry.js'
@@ -1,5 +1,5 @@
1
1
  export { createPageContextClientSide };
2
- export type PageContextCreated = Awaited<ReturnType<typeof createPageContextClientSide>>;
2
+ export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClientSide>>;
3
3
  declare function createPageContextClientSide(urlOriginal: string): Promise<{
4
4
  _isOriginalObject: true;
5
5
  isPageContext: true;
@@ -1,8 +1,6 @@
1
1
  export { getPageContext };
2
2
  export { providePageContext };
3
3
  // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`
4
- // TODO/next-release: update vike-{react,vue,solid} usage
5
- // TODO/next-release: contact Da-Jin about `window.history.state?.vike` https://vike.dev/navigate#history-pushstate
6
4
  import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
7
5
  import { getPageContextClient } from './renderPageClient.js';
8
6
  function getPageContext({ asyncHook } = {}) {
@@ -5,7 +5,7 @@ export { getPageContextFromHooksServer_firstRender };
5
5
  export { setPageContextInitIsPassedToClient };
6
6
  export type { PageContextFromHooksServer };
7
7
  import type { PageContextConfig, PageFile } from '../../shared-server-client/getPageFiles.js';
8
- import type { PageContextCreated } from './createPageContextClientSide.js';
8
+ import type { PageContextCreatedClient } from './createPageContextClientSide.js';
9
9
  import type { PageContextBegin } from './renderPageClient.js';
10
10
  import { type PageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
11
11
  type PageContextSerialized = {
@@ -94,7 +94,73 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
94
94
  } & PageContextConfig & {
95
95
  pageId: string;
96
96
  routeParams: Record<string, string>;
97
- } & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
97
+ } & {
98
+ _isOriginalObject: true;
99
+ isPageContext: true;
100
+ } & {
101
+ isClientSide: true;
102
+ isPrerendering: false;
103
+ urlOriginal: string;
104
+ _globalContext: {
105
+ _globalConfigPublic: {
106
+ pages: {
107
+ [k: string]: {
108
+ config: import("../../types/index.js").ConfigResolved;
109
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
110
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
111
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
112
+ } & ({
113
+ route: import("../../types/Config.js").Route;
114
+ isErrorPage?: undefined;
115
+ } | {
116
+ route?: undefined;
117
+ isErrorPage: true;
118
+ });
119
+ };
120
+ config: import("../../types/index.js").ConfigResolved;
121
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
122
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
123
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
124
+ };
125
+ pages: {
126
+ [k: string]: {
127
+ config: import("../../types/index.js").ConfigResolved;
128
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
129
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
130
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
131
+ } & ({
132
+ route: import("../../types/Config.js").Route;
133
+ isErrorPage?: undefined;
134
+ } | {
135
+ route?: undefined;
136
+ isErrorPage: true;
137
+ });
138
+ };
139
+ config: import("../../types/index.js").ConfigResolved;
140
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
141
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
142
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
143
+ isGlobalContext: true;
144
+ _isOriginalObject: true;
145
+ _virtualFileExportsGlobalEntry: unknown;
146
+ _pageFilesAll: PageFile[];
147
+ _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
148
+ _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
149
+ _allPageIds: string[];
150
+ } & {
151
+ isClientSide: true;
152
+ } & {
153
+ _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
154
+ _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
155
+ };
156
+ _pageFilesAll: PageFile[];
157
+ _urlHandler: null;
158
+ _baseServer: string;
159
+ } & {
160
+ urlParsed: import("./utils.js").UrlPublic;
161
+ urlPathname: string;
162
+ url: string;
163
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
98
164
  isPageContext: true;
99
165
  Page: import("../../types/Config.js").Config["Page"];
100
166
  routeParams: Record<string, string>;
@@ -232,7 +298,7 @@ type PageContextFromHooksServer = {
232
298
  };
233
299
  declare function getPageContextFromHooksServer(pageContext: {
234
300
  pageId: string;
235
- } & PageContextCreated, isErrorPage: boolean): Promise<{
301
+ } & PageContextCreatedClient, isErrorPage: boolean): Promise<{
236
302
  is404ServerSideRouted: true;
237
303
  } | {
238
304
  is404ServerSideRouted?: undefined;
@@ -320,7 +386,73 @@ declare function getPageContextFromHooksClient(pageContext: {
320
386
  } & PageContextConfig & {
321
387
  pageId: string;
322
388
  routeParams: Record<string, string>;
323
- } & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
389
+ } & {
390
+ _isOriginalObject: true;
391
+ isPageContext: true;
392
+ } & {
393
+ isClientSide: true;
394
+ isPrerendering: false;
395
+ urlOriginal: string;
396
+ _globalContext: {
397
+ _globalConfigPublic: {
398
+ pages: {
399
+ [k: string]: {
400
+ config: import("../../types/index.js").ConfigResolved;
401
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
402
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
403
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
404
+ } & ({
405
+ route: import("../../types/Config.js").Route;
406
+ isErrorPage?: undefined;
407
+ } | {
408
+ route?: undefined;
409
+ isErrorPage: true;
410
+ });
411
+ };
412
+ config: import("../../types/index.js").ConfigResolved;
413
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
414
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
415
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
416
+ };
417
+ pages: {
418
+ [k: string]: {
419
+ config: import("../../types/index.js").ConfigResolved;
420
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
421
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
422
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
423
+ } & ({
424
+ route: import("../../types/Config.js").Route;
425
+ isErrorPage?: undefined;
426
+ } | {
427
+ route?: undefined;
428
+ isErrorPage: true;
429
+ });
430
+ };
431
+ config: import("../../types/index.js").ConfigResolved;
432
+ _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
433
+ _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
434
+ _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
435
+ isGlobalContext: true;
436
+ _isOriginalObject: true;
437
+ _virtualFileExportsGlobalEntry: unknown;
438
+ _pageFilesAll: PageFile[];
439
+ _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
440
+ _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
441
+ _allPageIds: string[];
442
+ } & {
443
+ isClientSide: true;
444
+ } & {
445
+ _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
446
+ _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
447
+ };
448
+ _pageFilesAll: PageFile[];
449
+ _urlHandler: null;
450
+ _baseServer: string;
451
+ } & {
452
+ urlParsed: import("./utils.js").UrlPublic;
453
+ urlPathname: string;
454
+ url: string;
455
+ } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
324
456
  isPageContext: true;
325
457
  Page: import("../../types/Config.js").Config["Page"];
326
458
  routeParams: Record<string, string>;
@@ -18,7 +18,7 @@ type ScrollPosition = {
18
18
  };
19
19
  declare function saveScrollPosition(): void;
20
20
  declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
21
- declare function replaceHistoryStateOriginal(state: unknown, url: Parameters<typeof window.history.replaceState>[2]): void;
21
+ declare function replaceHistoryStateOriginal(state: unknown, url?: Parameters<typeof window.history.replaceState>[2]): void;
22
22
  type HistoryInfo = {
23
23
  url: `/${string}`;
24
24
  state: StateEnhanced;
@@ -4,7 +4,7 @@ export { onPopStateBegin };
4
4
  export { saveScrollPosition };
5
5
  export { initHistory };
6
6
  import { getCurrentUrl } from '../shared/getCurrentUrl.js';
7
- import { assert, assertUsage, getGlobalObject, isObject, deepEqual, redirectHard } from './utils.js';
7
+ import { assert, assertUsage, getGlobalObject, isObject, redirectHard } from './utils.js';
8
8
  const globalObject = getGlobalObject('history.ts', {
9
9
  monkeyPatched: false,
10
10
  previous: undefined,
@@ -102,26 +102,19 @@ function monkeyPatchHistoryAPI() {
102
102
  triggeredBy: 'user',
103
103
  },
104
104
  };
105
- assertIsEnhanced(state);
106
105
  funcOriginal(state, ...rest);
107
- // TO-DO/eventually remove excessive assertions to save client-side KBs
108
- assert(isEqual(state, window.history.state));
106
+ assertIsEnhanced(window.history.state);
109
107
  globalObject.previous = getHistoryInfo();
110
108
  // Workaround https://github.com/vikejs/vike/issues/2504#issuecomment-3149764736
111
109
  queueMicrotask(() => {
112
- if (isEqual(state, window.history.state))
110
+ if (isEnhanced(window.history.state))
113
111
  return;
114
112
  Object.assign(state, window.history.state);
115
- assertIsEnhanced(state);
116
- replaceHistoryStateOriginal(state, rest[1]);
117
- assert(isEqual(state, window.history.state));
113
+ replaceHistoryStateOriginal(state);
118
114
  });
119
115
  };
120
116
  });
121
117
  }
122
- function isEqual(state1, state2) {
123
- return deepEqual(state1?.vike, state2?.vike);
124
- }
125
118
  function isEnhanced(state) {
126
119
  if (state?.vike) {
127
120
  /* We don't use the assert() below to save client-side KBs.
@@ -5,11 +5,11 @@ export { populatePageContextPrefetchCache };
5
5
  export { addLinkPrefetchHandlers };
6
6
  export { addLinkPrefetchHandlers_watch };
7
7
  export { addLinkPrefetchHandlers_unwatch };
8
- import { type PageContextCreated } from './createPageContextClientSide.js';
8
+ import { type PageContextCreatedClient } from './createPageContextClientSide.js';
9
9
  import { type PageContextFromHooksServer, getPageContextFromHooksServer } from './getPageContextFromHooks.js';
10
10
  import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
11
11
  type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromHooksServer>>;
12
- type PageContextForPrefetch = PageContextCreated & {
12
+ type PageContextForPrefetch = PageContextCreatedClient & {
13
13
  pageId: string;
14
14
  };
15
15
  declare function getPageContextPrefetched(pageContext: {