vike 0.4.236 → 0.4.237-commit-8749e81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/client/runtime-client-routing/globalContext.js +2 -2
- package/dist/cjs/client/runtime-server-routing/globalContext.js +2 -2
- package/dist/cjs/client/shared/createGetGlobalContextClient.js +21 -13
- package/dist/cjs/client/shared/getJsonSerializedInHtml.js +10 -1
- package/dist/cjs/client/shared/utils.js +1 -0
- package/dist/cjs/node/api/preview.js +1 -1
- package/dist/cjs/node/prerender/runPrerender.js +4 -4
- package/dist/cjs/node/runtime/globalContext.js +127 -41
- package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +2 -2
- package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js +3 -1
- package/dist/cjs/node/runtime/html/serializeContext.js +25 -64
- package/dist/cjs/node/runtime/html/stream.js +1 -1
- package/dist/cjs/node/runtime/renderPage/analyzePage.js +3 -3
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +4 -7
- package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js +5 -4
- package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsDev.js → retrievePageAssetsDev.js} +21 -2
- package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsProd.js → retrievePageAssetsProd.js} +19 -2
- package/dist/cjs/node/runtime/renderPage/getPageAssets.js +8 -34
- package/dist/cjs/node/runtime/renderPage/handlePageContextRequestUrl.js +50 -14
- package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +23 -9
- package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -5
- package/dist/cjs/node/runtime/renderPage.js +9 -8
- package/dist/cjs/node/runtime/utils.js +4 -0
- package/dist/cjs/node/shared/utils.js +1 -0
- package/dist/cjs/node/shared/virtualFileId.js +110 -0
- package/dist/cjs/node/vite/index.js +5 -3
- package/dist/cjs/node/vite/onLoad.js +5 -3
- package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js +31 -23
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js +29 -13
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js +20 -14
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildEntry.js +4 -4
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js +17 -5
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +1 -1
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js +6 -12
- package/dist/cjs/node/vite/plugins/pluginCommon.js +1 -0
- package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js +119 -73
- package/dist/cjs/node/vite/plugins/pluginEnvVars.js +8 -15
- package/dist/cjs/node/vite/plugins/pluginExtractAssets.js +8 -9
- package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js +7 -3
- package/dist/cjs/node/vite/plugins/pluginNonRunnableDev.js +47 -0
- package/dist/cjs/node/vite/plugins/pluginPreview.js +11 -4
- package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js +6 -13
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js} +11 -9
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFileEntry.js → generateVirtualFileGlobalEntryWithOldDesign.js} +11 -11
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js} +10 -11
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js +67 -0
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js +18 -17
- package/dist/cjs/node/vite/shared/findPageFiles.js +1 -1
- package/dist/cjs/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js} +2 -2
- package/dist/cjs/node/vite/shared/getMagicString.js +18 -0
- package/dist/cjs/node/vite/shared/getManifestFilePathRelative.js +10 -0
- package/dist/cjs/node/vite/shared/getOutDirs.js +18 -12
- package/dist/cjs/node/vite/shared/getViteConfigRuntime.js +1 -1
- package/dist/cjs/node/vite/shared/isViteServerBuild.js +56 -31
- package/dist/cjs/node/vite/shared/loggerVite.js +1 -1
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +31 -3
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +1 -3
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal.js +8 -19
- package/dist/cjs/node/vite/utils.js +1 -0
- package/dist/cjs/shared/createGlobalContextShared.js +36 -15
- package/dist/cjs/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js} +20 -20
- package/dist/cjs/shared/getProxyForPublicUsage.js +2 -2
- package/dist/cjs/shared/modifyUrlSameOrigin.js +9 -4
- package/dist/cjs/shared/page-configs/loadPageEntry.js +25 -0
- package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js +4 -4
- package/dist/cjs/shared/page-configs/serialize/{parsePageConfigs.js → parsePageConfigsSerialized.js} +2 -2
- package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js +16 -16
- package/dist/cjs/shared/utils.js +2 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/assertSetup.js +7 -5
- package/dist/cjs/utils/cast.js +1 -1
- package/dist/cjs/utils/debug.js +1 -0
- package/dist/cjs/utils/getViteRPC.js +79 -0
- package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js +1 -0
- package/dist/cjs/utils/isRunnableDevEnvironment.js +9 -0
- package/dist/cjs/utils/virtualFileId.js +39 -0
- package/dist/esm/client/node.js +1 -1
- package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts +3 -3
- package/dist/esm/client/runtime-client-routing/getPageContextCurrent.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts +14 -14
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.js +35 -48
- package/dist/esm/client/runtime-client-routing/globalContext.d.ts +3 -3
- package/dist/esm/client/runtime-client-routing/globalContext.js +2 -2
- package/dist/esm/client/runtime-client-routing/history.d.ts +3 -5
- package/dist/esm/client/runtime-client-routing/history.js +39 -22
- package/dist/esm/client/runtime-client-routing/initClientRouter.js +2 -3
- package/dist/esm/client/runtime-client-routing/prefetch/getPrefetchSettings.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/prefetch.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/prefetch.js +2 -2
- package/dist/esm/client/runtime-client-routing/preparePageContextForPublicUsageClient.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts +5 -5
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.js +43 -30
- package/dist/esm/client/runtime-client-routing/utils.d.ts +2 -0
- package/dist/esm/client/runtime-client-routing/utils.js +2 -0
- package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts +4 -4
- package/dist/esm/client/runtime-server-routing/globalContext.d.ts +3 -3
- package/dist/esm/client/runtime-server-routing/globalContext.js +2 -2
- package/dist/esm/client/runtime-server-routing/preparePageContextForPublicUsageClient.d.ts +2 -2
- package/dist/esm/client/shared/createGetGlobalContextClient.d.ts +4 -4
- package/dist/esm/client/shared/createGetGlobalContextClient.js +21 -13
- package/dist/esm/client/shared/execHookOnRenderClient.d.ts +2 -2
- package/dist/esm/client/shared/getJsonSerializedInHtml.js +10 -1
- package/dist/esm/client/shared/loadPageConfigsLazyClientSide.d.ts +1 -1
- package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js +4 -4
- package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.d.ts +2 -2
- package/dist/esm/client/shared/utils.d.ts +1 -0
- package/dist/esm/client/shared/utils.js +1 -0
- package/dist/esm/node/api/preview.js +1 -1
- package/dist/esm/node/prerender/runPrerender.d.ts +49 -141
- package/dist/esm/node/prerender/runPrerender.js +4 -4
- package/dist/esm/node/runtime/globalContext.d.ts +43 -63
- package/dist/esm/node/runtime/globalContext.js +128 -42
- package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +2 -2
- package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js +4 -2
- package/dist/esm/node/runtime/html/serializeContext.d.ts +11 -6
- package/dist/esm/node/runtime/html/serializeContext.js +25 -64
- package/dist/esm/node/runtime/html/stream.js +1 -1
- package/dist/esm/node/runtime/renderPage/analyzePage.js +3 -3
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +13 -36
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +4 -7
- package/dist/esm/node/runtime/renderPage/execHookServer.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js +5 -4
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrievePageAssetsDev.d.ts +10 -0
- package/dist/esm/node/runtime/renderPage/getPageAssets/{retrieveAssetsDev.js → retrievePageAssetsDev.js} +22 -3
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrievePageAssetsProd.d.ts +10 -0
- package/dist/esm/node/runtime/renderPage/getPageAssets/{retrieveAssetsProd.js → retrievePageAssetsProd.js} +19 -2
- package/dist/esm/node/runtime/renderPage/getPageAssets.d.ts +0 -6
- package/dist/esm/node/runtime/renderPage/getPageAssets.js +8 -34
- package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/handlePageContextRequestUrl.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/handlePageContextRequestUrl.js +51 -15
- package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.d.ts +3 -3
- package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +26 -12
- package/dist/esm/node/runtime/renderPage/log404/index.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/preparePageContextForPublicUsageServer.d.ts +2 -3
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts +30 -77
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +3 -5
- package/dist/esm/node/runtime/renderPage.d.ts +13 -35
- package/dist/esm/node/runtime/renderPage.js +9 -8
- package/dist/esm/node/runtime/utils.d.ts +4 -0
- package/dist/esm/node/runtime/utils.js +4 -0
- package/dist/esm/node/shared/utils.d.ts +1 -0
- package/dist/esm/node/shared/utils.js +1 -0
- package/dist/esm/node/shared/virtualFileId.d.ts +28 -0
- package/dist/esm/node/shared/virtualFileId.js +107 -0
- package/dist/esm/node/vite/index.js +5 -3
- package/dist/esm/node/vite/onLoad.js +5 -3
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +3 -3
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js +32 -24
- package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +3 -3
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildApp.js +29 -13
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.d.ts +0 -2
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js +21 -14
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildEntry.js +4 -4
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js +17 -5
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +1 -1
- package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.js +7 -10
- package/dist/esm/node/vite/plugins/pluginCommon.d.ts +3 -0
- package/dist/esm/node/vite/plugins/pluginCommon.js +1 -0
- package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js +121 -75
- package/dist/esm/node/vite/plugins/pluginEnvVars.js +6 -10
- package/dist/esm/node/vite/plugins/pluginExtractAssets.js +7 -8
- package/dist/esm/node/vite/plugins/pluginExtractExportNames.js +6 -2
- package/dist/esm/node/vite/plugins/pluginNonRunnableDev.d.ts +26 -0
- package/dist/esm/node/vite/plugins/pluginNonRunnableDev.js +45 -0
- package/dist/esm/node/vite/plugins/pluginPreview.js +13 -6
- package/dist/esm/node/vite/plugins/pluginReplaceConstants.js +6 -10
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.d.ts +2 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js} +11 -9
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.d.ts +6 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/{getVirtualFileEntry.js → generateVirtualFileGlobalEntryWithOldDesign.js} +11 -11
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.d.ts +3 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js} +10 -11
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.d.ts +14 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js +65 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles.js +17 -16
- package/dist/esm/node/vite/shared/findPageFiles.js +1 -1
- package/dist/esm/node/vite/shared/getClientEntrySrcDev.d.ts +4 -0
- package/dist/esm/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js} +2 -2
- package/dist/esm/node/vite/shared/getMagicString.d.ts +9 -0
- package/dist/esm/node/vite/shared/getMagicString.js +13 -0
- package/dist/esm/node/vite/shared/getManifestFilePathRelative.d.ts +2 -0
- package/dist/esm/node/vite/shared/getManifestFilePathRelative.js +8 -0
- package/dist/esm/node/vite/shared/getOutDirs.d.ts +6 -3
- package/dist/esm/node/vite/shared/getOutDirs.js +19 -13
- package/dist/esm/node/vite/shared/getViteConfigRuntime.js +1 -1
- package/dist/esm/node/vite/shared/isViteServerBuild.d.ts +14 -11
- package/dist/esm/node/vite/shared/isViteServerBuild.js +58 -31
- package/dist/esm/node/vite/shared/loggerVite.js +1 -1
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.d.ts +2 -2
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +31 -3
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +1 -3
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts +3 -5
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js +10 -21
- package/dist/esm/node/vite/utils.d.ts +1 -0
- package/dist/esm/node/vite/utils.js +1 -0
- package/dist/esm/shared/createGlobalContextShared.d.ts +8 -8
- package/dist/esm/shared/createGlobalContextShared.js +38 -17
- package/dist/esm/shared/getPageFiles/{parseVirtualFileExports.d.ts → parseVirtualFileExportsGlobalEntry.d.ts} +2 -2
- package/dist/esm/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js} +20 -20
- package/dist/esm/shared/getPageFiles.d.ts +1 -1
- package/dist/esm/shared/hooks/execHook.d.ts +2 -2
- package/dist/esm/shared/hooks/getHook.d.ts +3 -3
- package/dist/esm/shared/modifyUrlSameOrigin.d.ts +1 -1
- package/dist/esm/shared/modifyUrlSameOrigin.js +9 -4
- package/dist/esm/shared/page-configs/loadPageEntry.d.ts +3 -0
- package/dist/esm/shared/page-configs/loadPageEntry.js +23 -0
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.d.ts +9 -9
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js +4 -4
- package/dist/esm/shared/page-configs/serialize/PageConfigSerialized.d.ts +1 -1
- package/dist/esm/shared/page-configs/serialize/{parsePageConfigs.d.ts → parsePageConfigsSerialized.d.ts} +2 -2
- package/dist/esm/shared/page-configs/serialize/{parsePageConfigs.js → parsePageConfigsSerialized.js} +2 -2
- package/dist/esm/shared/page-configs/serialize/serializeConfigValues.d.ts +3 -2
- package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js +17 -17
- package/dist/esm/shared/utils.d.ts +2 -0
- package/dist/esm/shared/utils.js +2 -0
- package/dist/esm/types/Config.d.ts +33 -98
- package/dist/esm/types/PageConfig.d.ts +9 -7
- package/dist/esm/types/VikeNamespace.d.ts +13 -0
- package/dist/esm/types/index.d.ts +3 -1
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/assertSetup.js +7 -5
- package/dist/esm/utils/cast.d.ts +2 -2
- package/dist/esm/utils/cast.js +1 -1
- package/dist/esm/utils/debug.d.ts +1 -1
- package/dist/esm/utils/debug.js +1 -0
- package/dist/esm/utils/getViteRPC.d.ts +6 -0
- package/dist/esm/utils/getViteRPC.js +77 -0
- package/dist/esm/utils/isFilePathAbsoluteFilesystem.d.ts +7 -0
- package/dist/esm/utils/isFilePathAbsoluteFilesystem.js +1 -0
- package/dist/esm/utils/isRunnableDevEnvironment.d.ts +3 -0
- package/dist/esm/utils/isRunnableDevEnvironment.js +7 -0
- package/dist/esm/utils/objectFilter.d.ts +1 -1
- package/dist/esm/utils/virtualFileId.d.ts +6 -0
- package/dist/esm/{node/shared/virtualFiles.js → utils/virtualFileId.js} +15 -17
- package/package.json +16 -7
- package/dist/cjs/node/shared/virtualFiles/virtualFileEntry.js +0 -29
- package/dist/cjs/node/shared/virtualFiles/virtualFilePageConfigLazy.js +0 -39
- package/dist/cjs/node/shared/virtualFiles.js +0 -41
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/isRuntimeEnvMatch.js +0 -23
- package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js +0 -10
- package/dist/cjs/shared/page-configs/loadConfigValues.js +0 -21
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.d.ts +0 -4
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.d.ts +0 -4
- package/dist/esm/node/shared/virtualFiles/virtualFileEntry.d.ts +0 -11
- package/dist/esm/node/shared/virtualFiles/virtualFileEntry.js +0 -26
- package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.d.ts +0 -9
- package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.js +0 -37
- package/dist/esm/node/shared/virtualFiles.d.ts +0 -8
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getVirtualFileEntry.d.ts +0 -5
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigLazy.d.ts +0 -3
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigsEager.d.ts +0 -2
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/isRuntimeEnvMatch.d.ts +0 -7
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/isRuntimeEnvMatch.js +0 -21
- package/dist/esm/node/vite/shared/applyRegExWithMagicString.d.ts +0 -3
- package/dist/esm/node/vite/shared/applyRegExWithMagicString.js +0 -8
- package/dist/esm/node/vite/shared/resolveClientEntriesDev.d.ts +0 -4
- package/dist/esm/shared/page-configs/loadConfigValues.d.ts +0 -3
- package/dist/esm/shared/page-configs/loadConfigValues.js +0 -19
|
@@ -6,7 +6,7 @@ export { getPageContextClient };
|
|
|
6
6
|
export type { PageContextBegin };
|
|
7
7
|
import { type PageContextFromRewrite } from '../../shared/route/abort.js';
|
|
8
8
|
import { type ScrollTarget } from './setScrollPosition.js';
|
|
9
|
-
import type {
|
|
9
|
+
import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
|
|
10
10
|
import type { PageContextClient } from '../../types/PageContext.js';
|
|
11
11
|
declare const firstRenderStartPromise: Promise<void>;
|
|
12
12
|
type PageContextRouted = {
|
|
@@ -43,7 +43,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
|
|
|
43
43
|
_globalContext: {
|
|
44
44
|
isGlobalContext: true;
|
|
45
45
|
_isOriginalObject: true;
|
|
46
|
-
|
|
46
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
47
47
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
48
48
|
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
49
49
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -56,14 +56,14 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
|
|
|
56
56
|
};
|
|
57
57
|
config: import("../../types/index.js").ConfigResolved;
|
|
58
58
|
pages: {
|
|
59
|
-
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
59
|
+
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
60
60
|
};
|
|
61
61
|
} & {
|
|
62
62
|
isClientSide: true;
|
|
63
63
|
} & {
|
|
64
64
|
_pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
|
|
65
65
|
_onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
|
|
66
|
-
}
|
|
66
|
+
} & Record<string, any>;
|
|
67
67
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
68
68
|
_urlHandler: null;
|
|
69
69
|
_urlRewrite: null | string;
|
|
@@ -83,7 +83,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
|
|
|
83
83
|
isHydration: boolean;
|
|
84
84
|
previousPageContext: ({
|
|
85
85
|
pageId: string;
|
|
86
|
-
} &
|
|
86
|
+
} & VikeConfigPublicPageLazyLoaded & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
|
|
87
87
|
isPageContext: true;
|
|
88
88
|
Page: import("../../types/Config.js").Config["Page"];
|
|
89
89
|
routeParams: Record<string, string>;
|
|
@@ -84,7 +84,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
//
|
|
87
|
+
// Get pageContext serialized in <script id="vike_pageContext" type="application/json">
|
|
88
88
|
if (isFirstRender) {
|
|
89
89
|
const pageContextSerialized = getPageContextFromHooks_serialized();
|
|
90
90
|
// TO-DO/eventually: create helper assertPageContextFromHook()
|
|
@@ -93,7 +93,9 @@ async function renderPageClientSide(renderArgs) {
|
|
|
93
93
|
// TO-DO/pageContext-prefetch: remove or change, because this only makes sense for a pre-rendered page
|
|
94
94
|
populatePageContextPrefetchCache(pageContext, { pageContextFromServerHooks: pageContextSerialized });
|
|
95
95
|
}
|
|
96
|
-
|
|
96
|
+
// Route
|
|
97
|
+
// - We must also run it upon hydration to call the onBeforeRoute() hook, which is needed for i18n URL locale extraction.
|
|
98
|
+
{
|
|
97
99
|
let pageContextFromRoute;
|
|
98
100
|
try {
|
|
99
101
|
pageContextFromRoute = await route(pageContext);
|
|
@@ -104,38 +106,49 @@ async function renderPageClientSide(renderArgs) {
|
|
|
104
106
|
}
|
|
105
107
|
if (isRenderOutdated())
|
|
106
108
|
return;
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
//
|
|
111
|
-
//
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
await renderErrorPage({ is404: true })
|
|
116
|
-
*/
|
|
117
|
-
redirectHard(urlOriginal);
|
|
118
|
-
return;
|
|
109
|
+
// TO-DO/eventually: create helper assertPageContextFromHook()
|
|
110
|
+
assert(!('urlOriginal' in pageContextFromRoute));
|
|
111
|
+
if (isFirstRender) {
|
|
112
|
+
// Set pageContext properties set by onBeforeRoute()
|
|
113
|
+
// - But we skip pageId and routeParams because routing may have been aborted by a server-side `throw render()`
|
|
114
|
+
const { pageId, routeParams, ...rest } = pageContextFromRoute;
|
|
115
|
+
objectAssign(pageContext, rest);
|
|
116
|
+
assert(hasProp(pageContext, 'routeParams', 'string{}')); // Help TS
|
|
119
117
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (isRenderOutdated())
|
|
123
|
-
return;
|
|
124
|
-
if (!isClientRoutable) {
|
|
125
|
-
redirectHard(urlOriginal);
|
|
126
|
-
return;
|
|
118
|
+
else {
|
|
119
|
+
objectAssign(pageContext, pageContextFromRoute);
|
|
127
120
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
121
|
+
if (!isFirstRender) {
|
|
122
|
+
if (!pageContextFromRoute.pageId) {
|
|
123
|
+
/*
|
|
124
|
+
// We don't use the client router to render the 404 page:
|
|
125
|
+
// - So that the +redirects setting (https://vike.dev/redirects) can be applied.
|
|
126
|
+
// - This is the main argument.
|
|
127
|
+
// - See also failed CI: https://github.com/vikejs/vike/pull/1871
|
|
128
|
+
// - So that server-side error tracking can track 404 links?
|
|
129
|
+
// - We do use the client router for rendering the error page, so I don't think this is much of an argument.
|
|
130
|
+
await renderErrorPage({ is404: true })
|
|
131
|
+
*/
|
|
132
|
+
redirectHard(urlOriginal);
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
const isClientRoutable = await isClientSideRoutable(pageContextFromRoute.pageId, pageContext);
|
|
136
|
+
if (isRenderOutdated())
|
|
137
|
+
return;
|
|
138
|
+
if (!isClientRoutable) {
|
|
139
|
+
redirectHard(urlOriginal);
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
const isSamePage = pageContextFromRoute.pageId &&
|
|
143
|
+
previousPageContext?.pageId &&
|
|
144
|
+
pageContextFromRoute.pageId === previousPageContext.pageId;
|
|
145
|
+
if (doNotRenderIfSamePage && isSamePage) {
|
|
146
|
+
// Skip's Vike's rendering; let the user handle the navigation
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
134
149
|
}
|
|
135
|
-
// TO-DO/eventually: create helper assertPageContextFromHook()
|
|
136
|
-
assert(!('urlOriginal' in pageContextFromRoute));
|
|
137
|
-
objectAssign(pageContext, pageContextFromRoute);
|
|
138
150
|
}
|
|
151
|
+
assert(hasProp(pageContext, 'pageId', 'string')); // Help TS
|
|
139
152
|
const res = await loadPageConfigsLazyClientSideAndExecHook(pageContext, isFirstRender, isRenderOutdated);
|
|
140
153
|
/* Already called inside loadPageConfigsLazyClientSideAndExecHook()
|
|
141
154
|
if (isRenderOutdated()) return
|
|
@@ -22,3 +22,5 @@ export * from '../../utils/PROJECT_VERSION.js';
|
|
|
22
22
|
export * from '../../utils/genPromise.js';
|
|
23
23
|
export * from '../../utils/catchInfiniteLoop.js';
|
|
24
24
|
export * from '../../utils/changeEnumerable.js';
|
|
25
|
+
export * from '../../utils/deepEqual.js';
|
|
26
|
+
export * from '../../utils/cast.js';
|
|
@@ -26,3 +26,5 @@ export * from '../../utils/PROJECT_VERSION.js';
|
|
|
26
26
|
export * from '../../utils/genPromise.js';
|
|
27
27
|
export * from '../../utils/catchInfiniteLoop.js';
|
|
28
28
|
export * from '../../utils/changeEnumerable.js';
|
|
29
|
+
export * from '../../utils/deepEqual.js';
|
|
30
|
+
export * from '../../utils/cast.js';
|
|
@@ -9,7 +9,7 @@ declare function createPageContextClientSide(): Promise<{
|
|
|
9
9
|
_globalContext: {
|
|
10
10
|
isGlobalContext: true;
|
|
11
11
|
_isOriginalObject: true;
|
|
12
|
-
|
|
12
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
13
13
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
14
14
|
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
15
15
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -22,11 +22,11 @@ declare function createPageContextClientSide(): Promise<{
|
|
|
22
22
|
};
|
|
23
23
|
config: import("../../types/index.js").ConfigResolved;
|
|
24
24
|
pages: {
|
|
25
|
-
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
25
|
+
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
26
26
|
};
|
|
27
27
|
} & {
|
|
28
28
|
isClientSide: true;
|
|
29
|
-
} & object
|
|
29
|
+
} & object & Record<string, any>;
|
|
30
30
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
31
31
|
isBackwardNavigation: null;
|
|
32
32
|
_hasPageContextFromServer: true;
|
|
@@ -38,6 +38,6 @@ declare function createPageContextClientSide(): Promise<{
|
|
|
38
38
|
_source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
|
|
39
39
|
_sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
|
|
40
40
|
_from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
|
|
41
|
-
} & import("../../shared/getPageFiles.js").
|
|
41
|
+
} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
|
|
42
42
|
_pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
|
|
43
43
|
}>;
|
|
@@ -7,7 +7,7 @@ type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof ge
|
|
|
7
7
|
declare const getGlobalContextClientInternal: () => Promise<{
|
|
8
8
|
isGlobalContext: true;
|
|
9
9
|
_isOriginalObject: true;
|
|
10
|
-
|
|
10
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
11
11
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
12
12
|
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
13
13
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -20,8 +20,8 @@ declare const getGlobalContextClientInternal: () => Promise<{
|
|
|
20
20
|
};
|
|
21
21
|
config: import("../../types/index.js").ConfigResolved;
|
|
22
22
|
pages: {
|
|
23
|
-
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
23
|
+
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
24
24
|
};
|
|
25
25
|
} & {
|
|
26
26
|
isClientSide: true;
|
|
27
|
-
} & object
|
|
27
|
+
} & object & Record<string, any>>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { getGlobalContextClientInternal };
|
|
2
2
|
import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
|
|
3
3
|
// @ts-ignore
|
|
4
|
-
import * as
|
|
5
|
-
const getGlobalContextClientInternal = createGetGlobalContextClient(
|
|
4
|
+
import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:server-routing';
|
|
5
|
+
const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExportsGlobalEntry, false);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export { preparePageContextForPublicUsageClient };
|
|
2
2
|
export type { PageContextForPublicUsageClient };
|
|
3
|
-
import type {
|
|
3
|
+
import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
|
|
4
4
|
import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
|
|
5
5
|
import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
|
|
6
|
-
type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting &
|
|
6
|
+
type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & VikeConfigPublicPageLazyLoaded;
|
|
7
7
|
declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {
|
|
8
8
|
Page: unknown;
|
|
9
9
|
};
|
|
@@ -5,10 +5,10 @@ export type GlobalContextClientInternalShared = GlobalContextClientInternal | Gl
|
|
|
5
5
|
import { type GlobalContextBase } from '../../shared/createGlobalContextShared.js';
|
|
6
6
|
import type { GlobalContextClientInternal } from '../runtime-client-routing/globalContext.js';
|
|
7
7
|
import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/globalContext.js';
|
|
8
|
-
declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(
|
|
8
|
+
declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExportsGlobalEntry: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): () => Promise<{
|
|
9
9
|
isGlobalContext: true;
|
|
10
10
|
_isOriginalObject: true;
|
|
11
|
-
|
|
11
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
12
12
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
13
13
|
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
14
14
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -21,7 +21,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
|
|
|
21
21
|
};
|
|
22
22
|
config: import("../../types/index.js").ConfigResolved;
|
|
23
23
|
pages: {
|
|
24
|
-
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
24
|
+
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
25
25
|
};
|
|
26
26
|
} & {
|
|
27
27
|
/**
|
|
@@ -30,7 +30,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
|
|
|
30
30
|
* We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
|
|
31
31
|
*/
|
|
32
32
|
isClientSide: true;
|
|
33
|
-
} & Awaited<GlobalContextAddendum>>;
|
|
33
|
+
} & Awaited<GlobalContextAddendum> & Record<string, any>>;
|
|
34
34
|
type NeverExported = never;
|
|
35
35
|
declare function getGlobalContext(): Promise<NeverExported>;
|
|
36
36
|
declare function getGlobalContextSync(): NeverExported;
|
|
@@ -5,29 +5,31 @@ export { getGlobalContextSync };
|
|
|
5
5
|
export { createGetGlobalContextClient };
|
|
6
6
|
import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared/createGlobalContextShared.js';
|
|
7
7
|
import { getGlobalContextSerializedInHtml } from './getJsonSerializedInHtml.js';
|
|
8
|
-
import { assert, assertUsage, genPromise, getGlobalObject, objectAssign } from './utils.js';
|
|
8
|
+
import { assert, assertUsage, genPromise, getGlobalObject, objectAssign, checkType } from './utils.js';
|
|
9
9
|
const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
|
|
10
|
-
const { promise:
|
|
10
|
+
const { promise: globalContextInitialPromise, resolve: globalContextInitialPromiseResolve } = genPromise();
|
|
11
11
|
return {
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
globalContextInitialPromise,
|
|
13
|
+
globalContextInitialPromiseResolve,
|
|
14
14
|
};
|
|
15
15
|
})());
|
|
16
|
-
function createGetGlobalContextClient(
|
|
16
|
+
function createGetGlobalContextClient(virtualFileExportsGlobalEntry, isClientRouting, addGlobalContext) {
|
|
17
17
|
assert(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
|
|
18
18
|
globalObject.isClientRouting = isClientRouting;
|
|
19
19
|
// Eagerly call onCreateGlobalContext() hook
|
|
20
20
|
getGlobalContext();
|
|
21
21
|
return getGlobalContext;
|
|
22
22
|
async function getGlobalContext() {
|
|
23
|
-
//
|
|
24
|
-
if (globalObject.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
// HMR => virtualFileExportsGlobalEntry differ
|
|
24
|
+
if (globalObject.virtualFileExportsGlobalEntry === virtualFileExportsGlobalEntry) {
|
|
25
|
+
const globalContext = await globalObject.globalContextPromise;
|
|
26
|
+
return globalContext;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
globalObject.virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry;
|
|
28
30
|
}
|
|
29
31
|
// Create
|
|
30
|
-
const
|
|
32
|
+
const globalContextPromise = createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, undefined, async (globalContext) => {
|
|
31
33
|
const globalContextAddendum = {
|
|
32
34
|
/**
|
|
33
35
|
* Whether the environment is client-side or server-side / pre-rendering.
|
|
@@ -40,18 +42,24 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
|
|
|
40
42
|
objectAssign(globalContextAddendum, await addGlobalContext?.(globalContext));
|
|
41
43
|
return globalContextAddendum;
|
|
42
44
|
});
|
|
43
|
-
|
|
44
|
-
|
|
45
|
+
globalObject.globalContextPromise = globalContextPromise;
|
|
46
|
+
const globalContext = await globalContextPromise;
|
|
47
|
+
assert(globalObject.globalContext === globalContext);
|
|
48
|
+
globalObject.globalContextInitialPromiseResolve();
|
|
45
49
|
// Return
|
|
46
50
|
return globalContext;
|
|
47
51
|
}
|
|
48
52
|
}
|
|
49
53
|
async function getGlobalContext() {
|
|
54
|
+
await globalObject.globalContextInitialPromise;
|
|
50
55
|
const globalContext = await globalObject.globalContextPromise;
|
|
56
|
+
assert(globalContext);
|
|
57
|
+
checkType(globalContext);
|
|
51
58
|
return globalContext;
|
|
52
59
|
}
|
|
53
60
|
function getGlobalContextSync() {
|
|
54
61
|
const { globalContext } = globalObject;
|
|
55
62
|
assertUsage(globalContext, getGlobalContextSyncErrMsg);
|
|
63
|
+
checkType(globalContext);
|
|
56
64
|
return globalContext;
|
|
57
65
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { execHookOnRenderClient };
|
|
2
2
|
export type { PageContextBeforeRenderClient };
|
|
3
|
-
import type { PageFile,
|
|
3
|
+
import type { PageFile, VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
|
|
4
4
|
import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
|
|
5
5
|
import type { GlobalContextClientInternalShared } from './createGetGlobalContextClient.js';
|
|
6
6
|
type PageContextBeforeRenderClient = {
|
|
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
|
|
|
9
9
|
urlPathname?: string;
|
|
10
10
|
pageId: string;
|
|
11
11
|
_globalContext: GlobalContextClientInternalShared;
|
|
12
|
-
} &
|
|
12
|
+
} & VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClientShared;
|
|
13
13
|
declare function execHookOnRenderClient<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;
|
|
@@ -24,6 +24,15 @@ function findAndParseJson(id) {
|
|
|
24
24
|
`Couldn't find #${id} (which Vike automatically injects in the HTML): make sure it exists (i.e. don't remove it and make sure your HTML isn't malformed)`);
|
|
25
25
|
const jsonStr = elem.textContent;
|
|
26
26
|
assert(jsonStr);
|
|
27
|
-
const json = parse(jsonStr
|
|
27
|
+
const json = parse(jsonStr, {
|
|
28
|
+
// Prevent Google from crawling URLs in JSON:
|
|
29
|
+
// - https://github.com/vikejs/vike/pull/2603
|
|
30
|
+
// - https://github.com/brillout/json-serializer/blob/38edbb9945de4938da1e65d6285ce1dd123a45ef/test/main.spec.ts#L44-L95
|
|
31
|
+
reviver(_key, value) {
|
|
32
|
+
if (typeof value === 'string') {
|
|
33
|
+
return { replacement: value.replaceAll('\\/', '/'), resolved: false };
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
});
|
|
28
37
|
return json;
|
|
29
38
|
}
|
|
@@ -11,7 +11,7 @@ type PageContext_loadPageConfigsLazyClientSide = {
|
|
|
11
11
|
_pageConfigGlobal: PageConfigGlobalRuntime;
|
|
12
12
|
};
|
|
13
13
|
};
|
|
14
|
-
declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").
|
|
14
|
+
declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
|
|
15
15
|
_pageFilesLoaded: PageFile[];
|
|
16
16
|
}>;
|
|
17
17
|
declare function isErrorFetchingStaticAssets(err: unknown): boolean;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export { loadPageConfigsLazyClientSide };
|
|
2
2
|
export { isErrorFetchingStaticAssets };
|
|
3
3
|
import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
|
|
4
|
-
import {
|
|
4
|
+
import { resolveVikeConfigPublicPageLazyLoaded } from '../../shared/page-configs/resolveVikeConfigPublic.js';
|
|
5
5
|
import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
|
|
6
|
-
import {
|
|
6
|
+
import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
|
|
7
7
|
import { objectAssign } from '../runtime-server-routing/utils.js';
|
|
8
8
|
const errStamp = '_isAssetsError';
|
|
9
9
|
async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
|
|
@@ -16,7 +16,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
|
|
|
16
16
|
// prettier-ignore
|
|
17
17
|
// biome-ignore format:
|
|
18
18
|
const result = await Promise.all([
|
|
19
|
-
pageConfig &&
|
|
19
|
+
pageConfig && loadPageEntry(pageConfig, isDev),
|
|
20
20
|
...pageFilesClientSide.map((p) => p.loadFile?.()),
|
|
21
21
|
]);
|
|
22
22
|
pageConfigLoaded = result[0];
|
|
@@ -30,7 +30,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
|
|
|
30
30
|
}
|
|
31
31
|
throw err;
|
|
32
32
|
}
|
|
33
|
-
const configPublicPageLazy =
|
|
33
|
+
const configPublicPageLazy = resolveVikeConfigPublicPageLazyLoaded(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
|
|
34
34
|
const pageContextAddendum = {};
|
|
35
35
|
objectAssign(pageContextAddendum, configPublicPageLazy);
|
|
36
36
|
objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { preparePageContextForPublicUsageClientShared };
|
|
2
2
|
export { preparePageContextForPublicUsageClientMinimal };
|
|
3
3
|
export type { PageContextForPublicUsageClientShared };
|
|
4
|
-
import type {
|
|
4
|
+
import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
|
|
5
5
|
import { type PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
|
|
6
6
|
import type { PageContextInternalClient } from '../../types/PageContext.js';
|
|
7
|
-
type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient &
|
|
7
|
+
type PageContextForPublicUsageClientShared = PageContextPrepareMinimum & PageContextInternalClient & VikeConfigPublicPageLazyLoaded;
|
|
8
8
|
declare function preparePageContextForPublicUsageClientShared<PageContext extends PageContextForPublicUsageClientShared>(pageContext: PageContext): PageContext & {
|
|
9
9
|
Page: unknown;
|
|
10
10
|
};
|
|
@@ -16,7 +16,7 @@ async function preview(options = {}) {
|
|
|
16
16
|
onSetupPreview();
|
|
17
17
|
const { viteConfigFromUserEnhanced, viteConfigResolved } = await prepareViteApiCall(options, 'preview');
|
|
18
18
|
if (viteConfigResolved.vitePluginServerEntry?.inject) {
|
|
19
|
-
const outDir = getOutDirs(viteConfigResolved).outDirRoot;
|
|
19
|
+
const outDir = getOutDirs(viteConfigResolved, undefined).outDirRoot;
|
|
20
20
|
const { outServerIndex } = await importServerProductionIndex({ outDir });
|
|
21
21
|
const outServerIndexRelative = path.relative(viteConfigResolved.root, outServerIndex);
|
|
22
22
|
assertWarning(false, `Never run ${pc.cyan('$ vike preview')} in production, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, { onlyOnce: true });
|