vike 0.4.143 → 0.4.144-commit-68c730d

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 (187) hide show
  1. package/dist/cjs/node/plugin/index.js +2 -2
  2. package/dist/cjs/node/plugin/plugins/buildConfig.js +1 -1
  3. package/dist/cjs/node/plugin/plugins/config/index.js +1 -1
  4. package/dist/cjs/node/plugin/plugins/devConfig/determineOptimizeDeps.js +31 -30
  5. package/dist/cjs/node/plugin/plugins/importUserCode/generateEagerImport.js +19 -8
  6. package/dist/cjs/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js +19 -10
  7. package/dist/cjs/node/plugin/plugins/importUserCode/index.js +4 -4
  8. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.js +7 -1
  9. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +4 -4
  10. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +251 -209
  11. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js +11 -35
  12. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js +60 -95
  13. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/helpers.js +12 -5
  14. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/isRuntimeEnvMatch.js +18 -0
  15. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.js +25 -25
  16. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js +25 -24
  17. package/dist/cjs/node/plugin/shared/findPageFiles.js +2 -1
  18. package/dist/cjs/node/plugin/shared/{getConfigValueSource.js → getConfigValueSourcesRelevant.js} +1 -12
  19. package/dist/cjs/node/plugin/shared/loggerNotProd.js +1 -1
  20. package/dist/cjs/node/plugin/utils.js +2 -3
  21. package/dist/cjs/node/prerender/runPrerender.js +18 -20
  22. package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +1 -1
  23. package/dist/cjs/node/runtime/renderPage/analyzePage.js +2 -2
  24. package/dist/cjs/node/runtime/renderPage/loadPageFilesServerSide.js +2 -2
  25. package/dist/cjs/node/runtime/renderPage/log404/index.js +10 -5
  26. package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -2
  27. package/dist/cjs/node/runtime/renderPage.js +1 -1
  28. package/dist/cjs/node/shared/getClientEntryFilePath.js +1 -7
  29. package/dist/cjs/shared/assertPageContextProvidedByUser.js +1 -1
  30. package/dist/cjs/shared/error-page.js +1 -1
  31. package/dist/cjs/shared/getPageFiles/getExports.js +8 -11
  32. package/dist/cjs/shared/getPageFiles/parseGlobResults.js +10 -44
  33. package/dist/cjs/shared/hooks/getHook.js +3 -1
  34. package/dist/cjs/shared/page-configs/assertExports.js +60 -0
  35. package/dist/cjs/shared/page-configs/getExportPath.js +9 -10
  36. package/dist/cjs/shared/page-configs/loadConfigValues.js +18 -0
  37. package/dist/cjs/shared/page-configs/serialize/PageConfigSerialized.js +2 -0
  38. package/dist/cjs/shared/page-configs/serialize/assertPageConfigs.js +19 -0
  39. package/dist/cjs/shared/page-configs/serialize/parseConfigValuesImported.js +56 -0
  40. package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js +65 -0
  41. package/dist/cjs/shared/page-configs/serialize/serializeConfigValue.js +58 -0
  42. package/dist/cjs/shared/page-configs/utils.js +65 -42
  43. package/dist/cjs/shared/route/loadPageRoutes.js +12 -15
  44. package/dist/cjs/shared/route/resolveRedirects.js +1 -1
  45. package/dist/cjs/shared/route/resolveRouteFunction.js +1 -0
  46. package/dist/cjs/shared/utils.js +0 -1
  47. package/dist/cjs/utils/getFilePathAbsolute.js +11 -11
  48. package/dist/cjs/utils/getOutDirs.js +25 -18
  49. package/dist/cjs/utils/getValuePrintable.js +1 -1
  50. package/dist/cjs/utils/objectAssign.js +3 -1
  51. package/dist/cjs/utils/parseUrl.js +1 -1
  52. package/dist/cjs/utils/projectInfo.js +1 -1
  53. package/dist/cjs/utils/{resolve.js → requireResolve.js} +3 -3
  54. package/dist/cjs/utils/warnIfErrorIsNotObject.js +1 -1
  55. package/dist/esm/__internal/index.d.ts +3 -3
  56. package/dist/esm/client/client-routing-runtime/createPageContext.d.ts +2 -2
  57. package/dist/esm/client/client-routing-runtime/getPageContext.d.ts +2 -2
  58. package/dist/esm/client/client-routing-runtime/getPageId.d.ts +2 -2
  59. package/dist/esm/client/client-routing-runtime/useClientRouter.js +3 -3
  60. package/dist/esm/client/server-routing-runtime/getPageContext.d.ts +1 -1
  61. package/dist/esm/client/shared/executeOnRenderClientHook.d.ts +2 -2
  62. package/dist/esm/client/shared/loadPageFilesClientSide.d.ts +2 -2
  63. package/dist/esm/client/shared/loadPageFilesClientSide.js +2 -2
  64. package/dist/esm/client/shared/preparePageContextForUserConsumptionClientSide.d.ts +2 -2
  65. package/dist/esm/node/plugin/index.js +3 -2
  66. package/dist/esm/node/plugin/plugins/buildConfig.js +2 -2
  67. package/dist/esm/node/plugin/plugins/config/index.js +2 -2
  68. package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js +31 -30
  69. package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.d.ts +13 -2
  70. package/dist/esm/node/plugin/plugins/importUserCode/generateEagerImport.js +19 -8
  71. package/dist/esm/node/plugin/plugins/importUserCode/getVirtualFileImportUserCode.js +20 -11
  72. package/dist/esm/node/plugin/plugins/importUserCode/index.js +5 -5
  73. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.d.ts +20 -3
  74. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getFilePathToShowToUser.js +7 -1
  75. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.d.ts +5 -4
  76. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js +4 -4
  77. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts +4 -4
  78. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js +252 -210
  79. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.d.ts +1 -1
  80. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigValuesAll.js +11 -32
  81. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.d.ts +3 -3
  82. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVirtualFilePageConfigs.js +60 -95
  83. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/helpers.d.ts +3 -3
  84. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/helpers.js +12 -5
  85. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/isRuntimeEnvMatch.d.ts +7 -0
  86. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/isRuntimeEnvMatch.js +15 -0
  87. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.d.ts +18 -6
  88. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/replaceImportStatements.js +25 -25
  89. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.d.ts +2 -2
  90. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/transpileAndExecuteFile.js +25 -24
  91. package/dist/esm/node/plugin/shared/findPageFiles.js +3 -2
  92. package/dist/esm/node/plugin/shared/{getConfigValueSource.d.ts → getConfigValueSourcesRelevant.d.ts} +0 -2
  93. package/dist/esm/node/plugin/shared/{getConfigValueSource.js → getConfigValueSourcesRelevant.js} +0 -11
  94. package/dist/esm/node/plugin/shared/loggerNotProd.js +2 -2
  95. package/dist/esm/node/plugin/utils.d.ts +1 -2
  96. package/dist/esm/node/plugin/utils.js +2 -3
  97. package/dist/esm/node/prerender/runPrerender.js +20 -22
  98. package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +1 -1
  99. package/dist/esm/node/runtime/html/injectAssets.d.ts +2 -2
  100. package/dist/esm/node/runtime/html/serializePageContextClientSide.d.ts +2 -2
  101. package/dist/esm/node/runtime/renderPage/analyzePage.d.ts +2 -2
  102. package/dist/esm/node/runtime/renderPage/analyzePage.js +2 -2
  103. package/dist/esm/node/runtime/renderPage/createHttpResponseObject.d.ts +2 -2
  104. package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts +2 -2
  105. package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.d.ts +2 -2
  106. package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts +2 -2
  107. package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.d.ts +2 -2
  108. package/dist/esm/node/runtime/renderPage/loadPageFilesServerSide.js +2 -2
  109. package/dist/esm/node/runtime/renderPage/log404/index.js +10 -5
  110. package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts +2 -2
  111. package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +13 -13
  112. package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -2
  113. package/dist/esm/node/runtime/renderPage.js +1 -1
  114. package/dist/esm/node/shared/getClientEntryFilePath.d.ts +2 -2
  115. package/dist/esm/node/shared/getClientEntryFilePath.js +2 -8
  116. package/dist/esm/shared/addIs404ToPageProps.d.ts +2 -2
  117. package/dist/esm/shared/addUrlComputedProps.d.ts +4 -2
  118. package/dist/esm/shared/assertPageContextProvidedByUser.js +1 -1
  119. package/dist/esm/shared/error-page.d.ts +3 -3
  120. package/dist/esm/shared/error-page.js +1 -1
  121. package/dist/esm/shared/getPageFiles/analyzeClientSide.d.ts +2 -2
  122. package/dist/esm/shared/getPageFiles/getExports.d.ts +3 -4
  123. package/dist/esm/shared/getPageFiles/getExports.js +7 -10
  124. package/dist/esm/shared/getPageFiles/parseGlobResults.d.ts +3 -3
  125. package/dist/esm/shared/getPageFiles/parseGlobResults.js +9 -43
  126. package/dist/esm/shared/getPageFiles/setPageFiles.d.ts +3 -3
  127. package/dist/esm/shared/hooks/getHook.js +3 -1
  128. package/dist/esm/shared/page-configs/Config.d.ts +201 -14
  129. package/dist/esm/shared/page-configs/PageConfig.d.ts +80 -73
  130. package/dist/esm/shared/page-configs/assertExports.d.ts +6 -0
  131. package/dist/esm/shared/page-configs/assertExports.js +54 -0
  132. package/dist/esm/shared/page-configs/findPageConfig.d.ts +2 -2
  133. package/dist/esm/shared/page-configs/getExportPath.d.ts +1 -1
  134. package/dist/esm/shared/page-configs/getExportPath.js +9 -10
  135. package/dist/esm/shared/page-configs/loadConfigValues.d.ts +3 -0
  136. package/dist/esm/shared/page-configs/loadConfigValues.js +15 -0
  137. package/dist/esm/shared/page-configs/serialize/PageConfigSerialized.d.ts +32 -0
  138. package/dist/esm/shared/page-configs/serialize/PageConfigSerialized.js +1 -0
  139. package/dist/esm/shared/page-configs/serialize/assertPageConfigs.d.ts +5 -0
  140. package/dist/esm/shared/page-configs/serialize/assertPageConfigs.js +16 -0
  141. package/dist/esm/shared/page-configs/serialize/parseConfigValuesImported.d.ts +4 -0
  142. package/dist/esm/shared/page-configs/serialize/parseConfigValuesImported.js +50 -0
  143. package/dist/esm/shared/page-configs/serialize/parsePageConfigs.d.ts +7 -0
  144. package/dist/esm/shared/page-configs/serialize/parsePageConfigs.js +62 -0
  145. package/dist/esm/shared/page-configs/serialize/serializeConfigValue.d.ts +8 -0
  146. package/dist/esm/shared/page-configs/serialize/serializeConfigValue.js +52 -0
  147. package/dist/esm/shared/page-configs/utils.d.ts +21 -14
  148. package/dist/esm/shared/page-configs/utils.js +64 -41
  149. package/dist/esm/shared/route/executeGuardHook.d.ts +2 -2
  150. package/dist/esm/shared/route/index.d.ts +3 -3
  151. package/dist/esm/shared/route/loadPageRoutes.d.ts +2 -2
  152. package/dist/esm/shared/route/loadPageRoutes.js +13 -16
  153. package/dist/esm/shared/route/resolveRedirects.js +1 -1
  154. package/dist/esm/shared/route/resolveRouteFunction.js +1 -0
  155. package/dist/esm/shared/types.d.ts +8 -6
  156. package/dist/esm/shared/utils.d.ts +0 -1
  157. package/dist/esm/shared/utils.js +0 -1
  158. package/dist/esm/types/index.d.ts +2 -1
  159. package/dist/esm/utils/getFilePathAbsolute.d.ts +1 -1
  160. package/dist/esm/utils/getFilePathAbsolute.js +11 -11
  161. package/dist/esm/utils/getOutDirs.d.ts +0 -2
  162. package/dist/esm/utils/getOutDirs.js +24 -17
  163. package/dist/esm/utils/getValuePrintable.js +1 -1
  164. package/dist/esm/utils/objectAssign.js +3 -1
  165. package/dist/esm/utils/parseUrl.js +1 -1
  166. package/dist/esm/utils/projectInfo.d.ts +1 -1
  167. package/dist/esm/utils/projectInfo.js +1 -1
  168. package/dist/esm/utils/requireResolve.d.ts +2 -0
  169. package/dist/esm/utils/{resolve.js → requireResolve.js} +2 -2
  170. package/dist/esm/utils/warnIfErrorIsNotObject.js +1 -1
  171. package/package.json +2 -3
  172. package/dist/cjs/node/plugin/plugins/importUserCode/v1-design/isConfigEnvMatch.js +0 -13
  173. package/dist/cjs/shared/getPageFiles/assertPageConfigs.js +0 -19
  174. package/dist/cjs/shared/page-configs/loadPageCode.js +0 -63
  175. package/dist/cjs/utils/assertDefaultExport.js +0 -53
  176. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/isConfigEnvMatch.d.ts +0 -3
  177. package/dist/esm/node/plugin/plugins/importUserCode/v1-design/isConfigEnvMatch.js +0 -10
  178. package/dist/esm/shared/getPageFiles/assertPageConfigs.d.ts +0 -5
  179. package/dist/esm/shared/getPageFiles/assertPageConfigs.js +0 -16
  180. package/dist/esm/shared/page-configs/loadPageCode.d.ts +0 -3
  181. package/dist/esm/shared/page-configs/loadPageCode.js +0 -57
  182. package/dist/esm/utils/assertDefaultExport.d.ts +0 -8
  183. package/dist/esm/utils/assertDefaultExport.js +0 -47
  184. package/dist/esm/utils/resolve.d.ts +0 -2
  185. /package/dist/cjs/shared/getPageFiles/{assertExports.js → assert_exports_old_design.js} +0 -0
  186. /package/dist/esm/shared/getPageFiles/{assertExports.d.ts → assert_exports_old_design.d.ts} +0 -0
  187. /package/dist/esm/shared/getPageFiles/{assertExports.js → assert_exports_old_design.js} +0 -0
@@ -1,98 +1,105 @@
1
- export type { PageConfig };
2
- export type { PageConfigLoaded };
1
+ export type { PageConfigRuntime };
2
+ export type { PageConfigRuntimeLoaded };
3
3
  export type { PageConfigBuildTime };
4
- export type { PageConfigCommon };
5
- export type { ConfigEnvInternal };
6
4
  export type { ConfigEnv };
7
- export type { PageConfigGlobal };
8
- export type { PageConfigGlobalData };
9
- export type { ConfigSource };
5
+ export type { ConfigEnvInternal };
6
+ export type { PageConfigGlobalRuntime };
7
+ export type { PageConfigGlobalBuildTime };
10
8
  export type { ConfigValue };
11
9
  export type { ConfigValues };
12
10
  export type { ConfigValueSource };
13
11
  export type { ConfigValueSources };
14
- export type { DefinedAtInfo };
15
- export type { DefinedAtInfoFull };
16
- type ConfigEnv = 'client-only' | 'server-only' | 'server-and-client' | 'config-only';
17
- type ConfigEnvInternal = ConfigEnv | '_routing-eager' | '_routing-lazy';
18
- type PageConfigBuildTime = PageConfigCommon & {
19
- configValueSources: ConfigValueSources;
20
- };
21
- type PageConfigCommon = {
12
+ export type { ConfigValueComputed };
13
+ export type { ConfigValuesComputed };
14
+ export type { DefinedAt };
15
+ export type { DefinedAtFile };
16
+ export type { DefinedAtFileInfo };
17
+ import type { ConfigValueImported } from './serialize/PageConfigSerialized.js';
18
+ type PageConfigBase = {
22
19
  pageId: string;
23
- isErrorPage: boolean;
24
- routeFilesystem: null | {
20
+ isErrorPage?: true;
21
+ routeFilesystem?: {
25
22
  routeString: string;
26
23
  definedBy: string;
27
24
  };
25
+ };
26
+ /** Page config data structure available and used at runtime */
27
+ type PageConfigRuntime = PageConfigBase & {
28
+ /** Loaded config values */
28
29
  configValues: ConfigValues;
30
+ /** Load config values that are lazily loaded such as config.Page */
31
+ loadConfigValuesAll: () => Promise<ConfigValueImported[]>;
32
+ };
33
+ /** Same as PageConfigRuntime but also contains all lazily loaded config values such as config.Page */
34
+ type PageConfigRuntimeLoaded = PageConfigRuntime & {
35
+ /** Whether loadConfigValuesAll() was called */
36
+ isLoaded: true;
29
37
  };
38
+ /** Page config data structure available and used at build-time */
39
+ type PageConfigBuildTime = PageConfigBase & {
40
+ configValues: ConfigValues;
41
+ configValueSources: ConfigValueSources;
42
+ configValuesComputed: ConfigValuesComputed;
43
+ };
44
+ /** Page config that applies to all pages */
45
+ type PageConfigGlobalRuntime = {
46
+ configValues: ConfigValues;
47
+ };
48
+ type PageConfigGlobalBuildTime = {
49
+ configValueSources: ConfigValueSources;
50
+ };
51
+ type ConfigEnv = 'client-only' | 'server-only' | 'server-and-client' | 'config-only';
52
+ /** For Vike internal use */
53
+ type ConfigEnvInternal = ConfigEnv | '_routing-eager' | '_routing-lazy';
30
54
  type ConfigValueSource = {
31
- configEnv: ConfigEnvInternal;
32
- valueSerialized?: string;
33
55
  value?: unknown;
56
+ configEnv: ConfigEnvInternal;
57
+ definedAtInfo: DefinedAtFileInfo;
58
+ /** Wether the config value is loaded at run-time, for example config.Page or config.onBeforeRender */
34
59
  valueIsImportedAtRuntime: boolean;
60
+ /** Whether the config value is a file path, for example config.client */
35
61
  valueIsFilePath?: true;
36
- } & ({
37
- isComputed: false;
38
- definedAtInfo: DefinedAtInfo;
39
- } | {
40
- isComputed: true;
41
- definedAtInfo: null;
42
- valueIsImportedAtRuntime: false;
43
- });
62
+ };
63
+ type ConfigValueComputed = {
64
+ configEnv: ConfigEnvInternal;
65
+ value: unknown;
66
+ };
67
+ type ConfigValuesComputed = Record<string, ConfigValueComputed>;
44
68
  type ConfigValueSources = Record<string, ConfigValueSource[]>;
45
69
  type ConfigValue = {
46
70
  value: unknown;
47
- valueSerialized?: string;
48
- definedAtInfo: null | DefinedAtInfo;
71
+ definedAt: DefinedAt;
49
72
  };
50
73
  type ConfigValues = Record<string, ConfigValue>;
51
- type DefinedAtInfo = {
52
- filePath: string;
53
- fileExportPath: string[];
54
- };
55
- type DefinedAtInfoFull = {
56
- filePathRelativeToUserRootDir?: string;
57
- filePathAbsolute: string;
58
- fileExportPath: string[];
59
- };
60
- type ConfigSource = {
61
- configSourceFile: string;
62
- } & ({
63
- configSourceFileExportName: string;
64
- configSourceFileDefaultExportKey?: undefined;
74
+ type DefinedAt = {
75
+ file: DefinedAtFile;
76
+ isEffect?: true;
77
+ isComputed?: undefined;
78
+ isCumulative?: undefined;
65
79
  } | {
66
- configSourceFileDefaultExportKey: string;
67
- configSourceFileExportName?: undefined;
68
- });
69
- type PageConfig = PageConfigCommon & {
70
- loadConfigValuesAll: LoadConfigValuesAll;
71
- isLoaded?: true;
72
- };
73
- type PageConfigLoaded = PageConfig & {
74
- isLoaded: true;
75
- };
76
- type PageConfigGlobalData = {
77
- onPrerenderStart: null | ConfigValueSource;
78
- onBeforeRoute: null | ConfigValueSource;
80
+ isCumulative: true;
81
+ files: DefinedAtFile[];
82
+ isEffect?: undefined;
83
+ isComputed?: undefined;
84
+ } | {
85
+ isComputed: true;
86
+ isEffect?: undefined;
87
+ isCumulative?: undefined;
79
88
  };
80
- type PageConfigGlobal = {
81
- onPrerenderStart: null | (ConfigValueSource & {
82
- value: unknown;
83
- });
84
- onBeforeRoute: null | (ConfigValueSource & {
85
- value: unknown;
86
- });
89
+ type DefinedAtFile = {
90
+ filePathToShowToUser: string;
91
+ fileExportPath: null | string[];
87
92
  };
88
- type LoadConfigValuesAll = () => Promise<({
89
- configName: string;
90
- importFilePath: string;
91
- } & ({
92
- isPlusFile: true;
93
- importFileExports: Record<string, unknown>;
93
+ type DefinedAtFileInfo = // TODO: replace filePathRelativeToUserRootDir and importPathAbsolute with following?
94
+ ({
95
+ filePathRelativeToUserRootDir: string;
96
+ filePathAbsoluteFilesystem: string;
97
+ importPathAbsolute: null;
94
98
  } | {
95
- isPlusFile: false;
96
- importFileExportName: string;
97
- importFileExportValue: unknown;
98
- }))[]>;
99
+ filePathRelativeToUserRootDir: null;
100
+ filePathAbsoluteFilesystem: string | null;
101
+ importPathAbsolute: string;
102
+ }) & {
103
+ exportName?: string;
104
+ fileExportPath: null | string[];
105
+ };
@@ -0,0 +1,6 @@
1
+ export { assertExportsOfValueFile };
2
+ export { assertExportsOfConfigFile };
3
+ declare function assertExportsOfValueFile(fileExports: Record<string, unknown>, filePathToShowToUser: string, configName: string): void;
4
+ declare function assertExportsOfConfigFile(fileExports: Record<string, unknown>, filePathToShowToUser: string): asserts fileExports is {
5
+ default: Record<string, unknown>;
6
+ };
@@ -0,0 +1,54 @@
1
+ export { assertExportsOfValueFile };
2
+ export { assertExportsOfConfigFile };
3
+ import { assert, assertUsage, assertWarning, isObject } from '../utils.js';
4
+ import pc from '@brillout/picocolors';
5
+ const EXPORTS_IGNORE = [
6
+ // vite-plugin-solid adds `export { $$registrations }`
7
+ '$$registrations',
8
+ // @vitejs/plugin-vue adds `export { _rerender_only }`
9
+ '_rerender_only'
10
+ ];
11
+ // Tolerate `export { frontmatter }` in .mdx files
12
+ const TOLERATE_SIDE_EXPORTS = ['.md', '.mdx'];
13
+ function assertExportsOfValueFile(fileExports, filePathToShowToUser, configName) {
14
+ assertExports(fileExports, filePathToShowToUser, configName);
15
+ }
16
+ function assertExportsOfConfigFile(fileExports, filePathToShowToUser) {
17
+ assertExports(fileExports, filePathToShowToUser);
18
+ const exportDefault = fileExports.default;
19
+ assertUsage(isObject(exportDefault), `The ${pc.cyan('export default')} of ${filePathToShowToUser} should be an object (but it's ${pc.cyan(`typeof exportDefault === ${JSON.stringify(typeof exportDefault)}`)} instead)`);
20
+ }
21
+ function assertExports(fileExports, filePathToShowToUser, configName) {
22
+ const exportsAll = Object.keys(fileExports);
23
+ const exportsRelevant = exportsAll.filter((exportName) => !EXPORTS_IGNORE.includes(exportName));
24
+ const exportsInvalid = exportsRelevant.filter((e) => e !== 'default' &&
25
+ // !!configName => isValueFile
26
+ e !== configName);
27
+ if (exportsInvalid.length === 0) {
28
+ if (exportsRelevant.length === 1) {
29
+ return;
30
+ }
31
+ else {
32
+ assert(exportsRelevant.length === 0);
33
+ let errMsg = `${filePathToShowToUser} doesn't export any value, but it should have a ${pc.cyan('export default')}`;
34
+ if (configName)
35
+ errMsg += ` or ${pc.cyan(`export { ${configName} }`)}`;
36
+ assertUsage(false, errMsg);
37
+ }
38
+ }
39
+ else {
40
+ // !configName => isConfigFile
41
+ if (!configName) {
42
+ const exportsInvalidStr = exportsInvalid.join(', ');
43
+ assertUsage(false, `${filePathToShowToUser} replace ${pc.cyan(`export { ${exportsInvalidStr} }`)} with ${pc.cyan(`export default { ${exportsInvalidStr} }`)}`);
44
+ }
45
+ // !!configName => isValueFile
46
+ else {
47
+ if (TOLERATE_SIDE_EXPORTS.some((ext) => filePathToShowToUser.endsWith(ext)))
48
+ return;
49
+ exportsInvalid.forEach((exportInvalid) => {
50
+ assertWarning(false, `${filePathToShowToUser} should have only a single export: move ${pc.cyan(`export { ${exportInvalid} }`)} to +config.h.js or its own +${exportsInvalid}.js`, { onlyOnce: true });
51
+ });
52
+ }
53
+ }
54
+ }
@@ -1,3 +1,3 @@
1
1
  export { findPageConfig };
2
- import type { PageConfig } from './PageConfig.js';
3
- declare function findPageConfig(pageConfigs: PageConfig[], pageId: string): null | PageConfig;
2
+ import type { PageConfigRuntime } from './PageConfig.js';
3
+ declare function findPageConfig(pageConfigs: PageConfigRuntime[], pageId: string): null | PageConfigRuntime;
@@ -1,2 +1,2 @@
1
1
  export { getExportPath };
2
- declare function getExportPath(fileExportPath: string[]): null | string;
2
+ declare function getExportPath(fileExportPath: null | string[], configName: string): null | string;
@@ -1,18 +1,17 @@
1
1
  export { getExportPath };
2
2
  import { assert } from '../utils.js';
3
- // TODO: return null instead of 'export default'
4
- // - Also return null insead of 'export *'?
5
- function getExportPath(fileExportPath) {
6
- let prefix = '';
7
- let suffix = '';
3
+ function getExportPath(fileExportPath, configName) {
4
+ if (!fileExportPath)
5
+ return null;
8
6
  let [exportName, ...exportObjectPath] = fileExportPath;
9
7
  if (!exportName)
10
8
  return null;
11
- if (exportName === '*') {
12
- assert(exportObjectPath.length === 0);
13
- return 'export *';
14
- }
15
- else if (exportName === 'default') {
9
+ if (exportObjectPath.length === 0 && ['*', 'default', configName].includes(exportName))
10
+ return null;
11
+ assert(exportName !== '*');
12
+ let prefix = '';
13
+ let suffix = '';
14
+ if (exportName === 'default') {
16
15
  prefix = 'export default';
17
16
  }
18
17
  else {
@@ -0,0 +1,3 @@
1
+ export { loadConfigValues };
2
+ import type { PageConfigRuntime, PageConfigRuntimeLoaded } from './PageConfig.js';
3
+ declare function loadConfigValues(pageConfig: PageConfigRuntime, isDev: boolean): Promise<PageConfigRuntimeLoaded>;
@@ -0,0 +1,15 @@
1
+ export { loadConfigValues };
2
+ import { objectAssign } from '../utils.js';
3
+ import { parseConfigValuesImported } from './serialize/parseConfigValuesImported.js';
4
+ async function loadConfigValues(pageConfig, isDev) {
5
+ if ('isLoaded' in pageConfig &&
6
+ // We don't need to cache in dev, since Vite already caches the virtual module
7
+ !isDev) {
8
+ return pageConfig;
9
+ }
10
+ const configValuesImported = await pageConfig.loadConfigValuesAll();
11
+ const configValuesAddendum = parseConfigValuesImported(configValuesImported);
12
+ Object.assign(pageConfig.configValues, configValuesAddendum);
13
+ objectAssign(pageConfig, { isLoaded: true });
14
+ return pageConfig;
15
+ }
@@ -0,0 +1,32 @@
1
+ export type { PageConfigRuntimeSerialized };
2
+ export type { PageConfigGlobalRuntimeSerialized };
3
+ export type { ConfigValueSerialized };
4
+ export type { ConfigValueImported };
5
+ import type { DefinedAt, PageConfigRuntime } from '../PageConfig.js';
6
+ /** page config data structure serialized in virtual files: parsing it results in PageConfigRuntime */
7
+ type PageConfigRuntimeSerialized = Omit<PageConfigRuntime, 'configValues'> & {
8
+ /** Config values that are loaded eagerly and serializable such as config.passToClient */
9
+ configValuesSerialized: Record<string, ConfigValueSerialized>;
10
+ /** Config values imported eagerly such as config.route */
11
+ configValuesImported: ConfigValueImported[];
12
+ };
13
+ type PageConfigGlobalRuntimeSerialized = {
14
+ configValuesImported: ConfigValueImported[];
15
+ };
16
+ /** Value is serialized. */
17
+ type ConfigValueSerialized = {
18
+ valueSerialized: string;
19
+ definedAt: DefinedAt;
20
+ };
21
+ /** Value is imported. */
22
+ type ConfigValueImported = {
23
+ configName: string;
24
+ importPath: string;
25
+ } & ({
26
+ isValueFile: true;
27
+ exportValues: Record<string, unknown>;
28
+ } | {
29
+ isValueFile: false;
30
+ exportName: string;
31
+ exportValue: unknown;
32
+ });
@@ -0,0 +1,5 @@
1
+ export { assertPageConfigsSerialized };
2
+ export { assertPageConfigGlobalSerialized };
3
+ import type { PageConfigGlobalRuntimeSerialized, PageConfigRuntimeSerialized } from './PageConfigSerialized.js';
4
+ declare function assertPageConfigsSerialized(pageConfigsSerialized: unknown): asserts pageConfigsSerialized is PageConfigRuntimeSerialized[];
5
+ declare function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized: unknown): asserts pageConfigGlobalSerialized is PageConfigGlobalRuntimeSerialized;
@@ -0,0 +1,16 @@
1
+ export { assertPageConfigsSerialized };
2
+ export { assertPageConfigGlobalSerialized };
3
+ import { assert, isObject, hasProp } from '../../utils.js';
4
+ function assertPageConfigsSerialized(pageConfigsSerialized) {
5
+ assert(Array.isArray(pageConfigsSerialized));
6
+ pageConfigsSerialized.forEach((pageConfigSerialized) => {
7
+ assert(isObject(pageConfigSerialized));
8
+ assert(hasProp(pageConfigSerialized, 'pageId', 'string'));
9
+ assert(hasProp(pageConfigSerialized, 'routeFilesystem'));
10
+ assert(hasProp(pageConfigSerialized, 'configValuesSerialized'));
11
+ assert(hasProp(pageConfigSerialized, 'configValuesImported'));
12
+ });
13
+ }
14
+ function assertPageConfigGlobalSerialized(pageConfigGlobalSerialized) {
15
+ assert(hasProp(pageConfigGlobalSerialized, 'configValuesImported'));
16
+ }
@@ -0,0 +1,4 @@
1
+ export { parseConfigValuesImported };
2
+ import type { ConfigValues } from '../PageConfig.js';
3
+ import type { ConfigValueImported } from './PageConfigSerialized.js';
4
+ declare function parseConfigValuesImported(configValuesImported: ConfigValueImported[]): ConfigValues;
@@ -0,0 +1,50 @@
1
+ export { parseConfigValuesImported };
2
+ import { assert, assertUsage } from '../../utils.js';
3
+ import { assertExportsOfValueFile } from '../assertExports.js';
4
+ import pc from '@brillout/picocolors';
5
+ function parseConfigValuesImported(configValuesImported) {
6
+ const configValues = {};
7
+ const addConfigValue = (configName, value, importPath, exportName) => {
8
+ configValues[configName] = {
9
+ value,
10
+ definedAt: {
11
+ file: {
12
+ // importPath cannot be relative to the current file, since the current file is a virtual file
13
+ filePathToShowToUser: importPath,
14
+ fileExportPath: [configName, 'default'].includes(exportName)
15
+ ? []
16
+ : // Side-effect config
17
+ [exportName]
18
+ }
19
+ }
20
+ };
21
+ assertIsNotNull(value, configName, importPath);
22
+ };
23
+ configValuesImported.forEach((configValueLoaded) => {
24
+ if (configValueLoaded.isValueFile) {
25
+ const { exportValues, importPath, configName } = configValueLoaded;
26
+ if (configName !== 'client') {
27
+ assertExportsOfValueFile(exportValues, importPath, configName);
28
+ }
29
+ Object.entries(exportValues).forEach(([exportName, exportValue]) => {
30
+ const isSideExport = exportName !== 'default'; // .md files may have "side-exports" such as `export { frontmatter }`
31
+ const configName = isSideExport ? exportName : configValueLoaded.configName;
32
+ if (isSideExport && configName in configValues) {
33
+ // We can't avoid side-export conflicts upstream. (Because we cannot know about side-exports upstream at build-time.)
34
+ // Side-exports have the lowest priority.
35
+ return;
36
+ }
37
+ addConfigValue(configName, exportValue, importPath, exportName);
38
+ });
39
+ }
40
+ else {
41
+ const { configName, importPath, exportValue, exportName } = configValueLoaded;
42
+ addConfigValue(configName, exportValue, importPath, exportName);
43
+ }
44
+ });
45
+ return configValues;
46
+ }
47
+ function assertIsNotNull(configValue, configName, importPath) {
48
+ assert(!importPath.includes('+config.'));
49
+ assertUsage(configValue !== null, `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`);
50
+ }
@@ -0,0 +1,7 @@
1
+ export { parsePageConfigs };
2
+ import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../PageConfig.js';
3
+ import type { PageConfigGlobalRuntimeSerialized, PageConfigRuntimeSerialized } from './PageConfigSerialized.js';
4
+ declare function parsePageConfigs(pageConfigsSerialized: PageConfigRuntimeSerialized[], pageConfigGlobalSerialized: PageConfigGlobalRuntimeSerialized): {
5
+ pageConfigs: PageConfigRuntime[];
6
+ pageConfigGlobal: PageConfigGlobalRuntime;
7
+ };
@@ -0,0 +1,62 @@
1
+ export { parsePageConfigs };
2
+ import { parse } from '@brillout/json-serializer/parse';
3
+ import { parseConfigValuesImported } from './parseConfigValuesImported.js';
4
+ import { assert, assertUsage, isCallable } from '../../utils.js';
5
+ import { getConfigDefinedAtString } from '../utils.js';
6
+ function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
7
+ const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
8
+ const configValues = {};
9
+ {
10
+ const { configValuesSerialized } = pageConfigSerialized;
11
+ Object.entries(configValuesSerialized).forEach(([configName, configValueSeriliazed]) => {
12
+ {
13
+ const { valueSerialized, definedAt } = configValueSeriliazed;
14
+ assert(valueSerialized);
15
+ assert(!configValues[configName]);
16
+ configValues[configName] = {
17
+ value: parse(valueSerialized),
18
+ definedAt
19
+ };
20
+ }
21
+ });
22
+ }
23
+ {
24
+ const { configValuesImported } = pageConfigSerialized;
25
+ const configValuesAddendum = parseConfigValuesImported(configValuesImported);
26
+ Object.assign(configValues, configValuesAddendum);
27
+ }
28
+ const { pageId, isErrorPage, routeFilesystem, loadConfigValuesAll } = pageConfigSerialized;
29
+ assertRouteConfigValue(configValues);
30
+ return {
31
+ pageId,
32
+ isErrorPage,
33
+ routeFilesystem,
34
+ configValues,
35
+ loadConfigValuesAll
36
+ };
37
+ });
38
+ const pageConfigGlobal = { configValues: {} };
39
+ {
40
+ const configValuesAddendum = parseConfigValuesImported(pageConfigGlobalSerialized.configValuesImported);
41
+ Object.assign(pageConfigGlobal.configValues, configValuesAddendum);
42
+ }
43
+ return { pageConfigs, pageConfigGlobal };
44
+ }
45
+ function assertRouteConfigValue(configValues) {
46
+ const configName = 'route';
47
+ const configValue = configValues[configName];
48
+ if (!configValue)
49
+ return;
50
+ const { value } = configValue;
51
+ const configValueType = typeof value;
52
+ const configDefinedAt = getConfigDefinedAtString(configName, configValue, true);
53
+ assertUsage(configValueType === 'string' || isCallable(value), `${configDefinedAt} has an invalid type '${configValueType}': it should be a string or a function instead, see https://vike.dev/route`);
54
+ /* We don't use assertRouteString() in order to avoid unnecessarily bloating the client-side bundle when using Server Routing:
55
+ * - When using Server Routing, this file is loaded => loading assertRouteString() would bloat the client bundle.
56
+ * - assertRouteString() is already called on the server-side
57
+ * - When using Server Routing, client-side validation is superfluous as Route Strings only need to be validated on the server-side
58
+ if (typeof configValue === 'string') {
59
+ assertRouteString(configValue, `${configElement.configDefinedAt} defines an`)
60
+ }
61
+ */
62
+ }
@@ -0,0 +1,8 @@
1
+ export { serializeConfigValue };
2
+ export { serializeConfigValueImported };
3
+ import { ConfigValueSource } from '../PageConfig.js';
4
+ import { ConfigValueSerialized } from './PageConfigSerialized.js';
5
+ declare function serializeConfigValue(lines: string[], configName: string, configValueSerialized: ConfigValueSerialized): void;
6
+ declare function serializeConfigValueImported(configValueSource: ConfigValueSource, configName: string, whitespace: string, varCounterContainer: {
7
+ varCounter: number;
8
+ }, importStatements: string[]): string[];
@@ -0,0 +1,52 @@
1
+ export { serializeConfigValue };
2
+ export { serializeConfigValueImported };
3
+ // This file is never loaded on the client-side but we save it under the vike/shared/ directory in order to collocate it with:
4
+ // - vike/shared/page-configs/serialize/parsePageConfigs.ts
5
+ // - vike/shared/page-configs/serialize/parseConfigValuesImported.ts
6
+ // Both parsePageConfigs() parseConfigValuesImported() and are loaded on the client-side and server-side
7
+ import { assertIsNotProductionRuntime } from '../../../utils/assertIsNotProductionRuntime.js';
8
+ assertIsNotProductionRuntime();
9
+ import path from 'path';
10
+ import { assert, assertPosixPath } from '../../utils.js';
11
+ import { generateEagerImport } from '../../../node/plugin/plugins/importUserCode/generateEagerImport.js';
12
+ function serializeConfigValue(lines, configName, configValueSerialized) {
13
+ let whitespace = ' ';
14
+ lines.push(`${whitespace}['${configName}']: {`);
15
+ whitespace += ' ';
16
+ Object.entries(configValueSerialized).forEach(([key, val]) => {
17
+ const valSerialized = key === 'definedAt' ? JSON.stringify(val) : val;
18
+ lines.push(`${whitespace} ${key}: ${valSerialized},`);
19
+ });
20
+ whitespace = whitespace.slice(2);
21
+ lines.push(`${whitespace}},`);
22
+ }
23
+ function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
24
+ assert(!configValueSource.valueIsFilePath);
25
+ assert(whitespace.replaceAll(' ', '').length === 0);
26
+ const { valueIsImportedAtRuntime, definedAtInfo } = configValueSource;
27
+ assert(valueIsImportedAtRuntime);
28
+ const { filePathRelativeToUserRootDir, importPathAbsolute, exportName } = definedAtInfo;
29
+ const importPath = filePathRelativeToUserRootDir ?? importPathAbsolute;
30
+ assertPosixPath(importPath);
31
+ const fileName = path.posix.basename(importPath);
32
+ const isValueFile = fileName.startsWith('+');
33
+ if (isValueFile)
34
+ assert(exportName === undefined);
35
+ const { importName, importStatement } = generateEagerImport(importPath, varCounterContainer.varCounter++, exportName);
36
+ importStatements.push(importStatement);
37
+ const lines = [];
38
+ lines.push(` {`);
39
+ lines.push(` configName: '${configName}',`);
40
+ lines.push(` importPath: '${importPath}',`);
41
+ lines.push(` isValueFile: ${JSON.stringify(isValueFile)},`);
42
+ if (isValueFile) {
43
+ lines.push(` exportValues: ${importName},`);
44
+ }
45
+ else {
46
+ lines.push(` exportValue: ${importName},`);
47
+ assert(exportName);
48
+ lines.push(` exportName: ${JSON.stringify(exportName)},`);
49
+ }
50
+ lines.push(` },`);
51
+ return lines;
52
+ }
@@ -1,28 +1,35 @@
1
1
  export { getConfigValue };
2
2
  export { getPageConfig };
3
3
  export { getConfigDefinedAtString };
4
- export { getConfigDefinedAtInfo };
5
4
  export { getDefinedAtString };
6
- import type { DefinedAtInfo, PageConfig, PageConfigCommon } from './PageConfig.js';
5
+ export { getConfigValueFilePathToShowToUser };
6
+ export { getHookFilePathToShowToUser };
7
+ import type { PageConfigRuntime, PageConfigBuildTime, ConfigValue, DefinedAt } from './PageConfig.js';
7
8
  import type { ConfigNameBuiltIn } from './Config.js';
9
+ type PageConfigCommon = PageConfigRuntime | PageConfigBuildTime;
8
10
  type ConfigName = ConfigNameBuiltIn;
9
- declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName, type: 'string'): null | {
11
+ declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName, type: 'string'): null | ConfigValue & {
10
12
  value: string;
11
13
  };
12
- declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName, type: 'boolean'): null | {
14
+ declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName, type: 'boolean'): null | ConfigValue & {
13
15
  value: boolean;
14
16
  };
15
- declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName): null | {
17
+ declare function getConfigValue(pageConfig: PageConfigCommon, configName: ConfigName): null | ConfigValue & {
16
18
  value: unknown;
17
19
  };
18
- declare function getConfigDefinedAtInfo(pageConfig: PageConfigCommon, configName: ConfigName): DefinedAtInfo;
19
- declare function getPageConfig(pageId: string, pageConfigs: PageConfig[]): PageConfig;
20
- type ConfigDefinedAtUppercase<ConfigName extends string> = `Config ${ConfigName}${string}`;
21
- type ConfigDefinedAtLowercase<ConfigName extends string> = `config ${ConfigName}${string}`;
22
- declare function getConfigDefinedAtString<ConfigName extends string>(configName: ConfigName, { definedAtInfo }: {
23
- definedAtInfo: null | DefinedAtInfo;
20
+ declare function getPageConfig(pageId: string, pageConfigs: PageConfigRuntime[]): PageConfigRuntime;
21
+ type ConfigDefinedAtUppercase<ConfigName extends string> = `Config ${ConfigName} defined ${'internally' | `at ${string}`}`;
22
+ type ConfigDefinedAtLowercase<ConfigName extends string> = `config ${ConfigName} defined ${'internally' | `at ${string}`}`;
23
+ declare function getConfigDefinedAtString<ConfigName extends string>(configName: ConfigName, { definedAt }: {
24
+ definedAt: DefinedAt;
24
25
  }, sentenceBegin: true, append?: 'effect'): ConfigDefinedAtUppercase<ConfigName>;
25
- declare function getConfigDefinedAtString<ConfigName extends string>(configName: ConfigName, { definedAtInfo }: {
26
- definedAtInfo: null | DefinedAtInfo;
26
+ declare function getConfigDefinedAtString<ConfigName extends string>(configName: ConfigName, { definedAt }: {
27
+ definedAt: DefinedAt;
27
28
  }, sentenceBegin: false, append?: 'effect'): ConfigDefinedAtLowercase<ConfigName>;
28
- declare function getDefinedAtString(definedAtInfo: DefinedAtInfo, append?: 'effect'): string;
29
+ declare function getDefinedAtString(configValue: ConfigValue, configName: string): string;
30
+ declare function getConfigValueFilePathToShowToUser({ definedAt }: {
31
+ definedAt: DefinedAt;
32
+ }): null | string;
33
+ declare function getHookFilePathToShowToUser({ definedAt }: {
34
+ definedAt: DefinedAt;
35
+ }): string;