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
|
@@ -5,6 +5,7 @@ import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlCo
|
|
|
5
5
|
import { HttpResponse } from './createHttpResponse.js';
|
|
6
6
|
import { PageContext_loadPageConfigsLazyServerSide, type PageConfigsLazy } from './loadPageConfigsLazyServerSide.js';
|
|
7
7
|
import type { PageContextCreated } from './createPageContextServerSide.js';
|
|
8
|
+
import type { PageContextBegin } from '../renderPage.js';
|
|
8
9
|
type PageContextAfterRender = {
|
|
9
10
|
httpResponse: HttpResponse;
|
|
10
11
|
errorWhileRendering: null | Error;
|
|
@@ -16,7 +17,7 @@ declare function renderPageAlreadyRouted<PageContext extends {
|
|
|
16
17
|
routeParams: Record<string, string>;
|
|
17
18
|
errorWhileRendering: null | Error;
|
|
18
19
|
_httpRequestId: number;
|
|
19
|
-
} & PageContextCreated & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
|
|
20
|
+
} & PageContextCreated & PageContextBegin & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
|
|
20
21
|
declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy & {
|
|
21
22
|
routeParams: Record<string, string>;
|
|
22
23
|
pageId: string;
|
|
@@ -41,7 +42,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
41
42
|
_globalContext: {
|
|
42
43
|
isGlobalContext: true;
|
|
43
44
|
_isOriginalObject: true;
|
|
44
|
-
|
|
45
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
45
46
|
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
46
47
|
_pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
|
|
47
48
|
_pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -54,26 +55,14 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
54
55
|
};
|
|
55
56
|
config: import("../../../types/index.js").ConfigResolved;
|
|
56
57
|
pages: {
|
|
57
|
-
[k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
58
|
+
[k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
58
59
|
};
|
|
59
|
-
} & ({
|
|
60
|
+
} & (({
|
|
60
61
|
_isProduction: false;
|
|
61
62
|
_isPrerendering: false;
|
|
62
63
|
assetsManifest: null;
|
|
63
|
-
_viteDevServer: import("vite").ViteDevServer;
|
|
64
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
65
|
-
viteConfigRuntime: {
|
|
66
|
-
root: string;
|
|
67
|
-
build: {
|
|
68
|
-
outDir: string;
|
|
69
|
-
};
|
|
70
|
-
_baseViteOriginal: string;
|
|
71
|
-
vitePluginServerEntry: {
|
|
72
|
-
inject: boolean | undefined;
|
|
73
|
-
};
|
|
74
|
-
};
|
|
75
|
-
baseServer: string;
|
|
76
|
-
baseAssets: string;
|
|
64
|
+
_viteDevServer: import("vite").ViteDevServer | undefined;
|
|
65
|
+
viteConfig: import("vite").ResolvedConfig | undefined;
|
|
77
66
|
isClientSide: false;
|
|
78
67
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
79
68
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -83,19 +72,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
83
72
|
_isProduction: true;
|
|
84
73
|
assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
|
|
85
74
|
_viteDevServer: null;
|
|
86
|
-
viteConfigRuntime: {
|
|
87
|
-
root: string;
|
|
88
|
-
build: {
|
|
89
|
-
outDir: string;
|
|
90
|
-
};
|
|
91
|
-
_baseViteOriginal: string;
|
|
92
|
-
vitePluginServerEntry: {
|
|
93
|
-
inject: boolean | undefined;
|
|
94
|
-
};
|
|
95
|
-
};
|
|
96
75
|
_usesClientRouter: boolean;
|
|
97
|
-
baseServer: string;
|
|
98
|
-
baseAssets: string;
|
|
99
76
|
isClientSide: false;
|
|
100
77
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
101
78
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -105,6 +82,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
105
82
|
_isProduction: true;
|
|
106
83
|
assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
|
|
107
84
|
_viteDevServer: null;
|
|
85
|
+
_usesClientRouter: boolean;
|
|
86
|
+
isClientSide: false;
|
|
87
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
88
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
89
|
+
}) & {
|
|
90
|
+
baseServer: string;
|
|
91
|
+
baseAssets: string;
|
|
108
92
|
viteConfigRuntime: {
|
|
109
93
|
root: string;
|
|
110
94
|
build: {
|
|
@@ -115,12 +99,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
115
99
|
inject: boolean | undefined;
|
|
116
100
|
};
|
|
117
101
|
};
|
|
118
|
-
_usesClientRouter: boolean;
|
|
119
|
-
baseServer: string;
|
|
120
|
-
baseAssets: string;
|
|
121
|
-
isClientSide: false;
|
|
122
|
-
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
123
|
-
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
124
102
|
});
|
|
125
103
|
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
126
104
|
_baseServer: string;
|
|
@@ -140,7 +118,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
140
118
|
url: string;
|
|
141
119
|
} & {
|
|
142
120
|
headers: Record<string, string> | null;
|
|
143
|
-
} & import("../../../shared/getPageFiles.js").
|
|
121
|
+
} & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
|
|
144
122
|
Page: unknown;
|
|
145
123
|
_isHtmlOnly: boolean;
|
|
146
124
|
_passToClient: import("../html/serializeContext.js").PassToClient;
|
|
@@ -157,8 +135,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
157
135
|
_pageContextAlreadyProvidedByOnPrerenderHook?: true;
|
|
158
136
|
is404: boolean;
|
|
159
137
|
} & {
|
|
160
|
-
|
|
161
|
-
_urlHandler: null;
|
|
138
|
+
_isPageContextJsonRequest: null;
|
|
162
139
|
};
|
|
163
140
|
} | {
|
|
164
141
|
documentHtml: string;
|
|
@@ -176,7 +153,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
176
153
|
_globalContext: {
|
|
177
154
|
isGlobalContext: true;
|
|
178
155
|
_isOriginalObject: true;
|
|
179
|
-
|
|
156
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
180
157
|
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
181
158
|
_pageConfigs: import("../../../types/PageConfig.js").PageConfigRuntime[];
|
|
182
159
|
_pageConfigGlobal: import("../../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -189,26 +166,14 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
189
166
|
};
|
|
190
167
|
config: import("../../../types/index.js").ConfigResolved;
|
|
191
168
|
pages: {
|
|
192
|
-
[k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
169
|
+
[k: string]: import("../../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
193
170
|
};
|
|
194
|
-
} & ({
|
|
171
|
+
} & (({
|
|
195
172
|
_isProduction: false;
|
|
196
173
|
_isPrerendering: false;
|
|
197
174
|
assetsManifest: null;
|
|
198
|
-
_viteDevServer: import("vite").ViteDevServer;
|
|
199
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
200
|
-
viteConfigRuntime: {
|
|
201
|
-
root: string;
|
|
202
|
-
build: {
|
|
203
|
-
outDir: string;
|
|
204
|
-
};
|
|
205
|
-
_baseViteOriginal: string;
|
|
206
|
-
vitePluginServerEntry: {
|
|
207
|
-
inject: boolean | undefined;
|
|
208
|
-
};
|
|
209
|
-
};
|
|
210
|
-
baseServer: string;
|
|
211
|
-
baseAssets: string;
|
|
175
|
+
_viteDevServer: import("vite").ViteDevServer | undefined;
|
|
176
|
+
viteConfig: import("vite").ResolvedConfig | undefined;
|
|
212
177
|
isClientSide: false;
|
|
213
178
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
214
179
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -218,19 +183,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
218
183
|
_isProduction: true;
|
|
219
184
|
assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
|
|
220
185
|
_viteDevServer: null;
|
|
221
|
-
viteConfigRuntime: {
|
|
222
|
-
root: string;
|
|
223
|
-
build: {
|
|
224
|
-
outDir: string;
|
|
225
|
-
};
|
|
226
|
-
_baseViteOriginal: string;
|
|
227
|
-
vitePluginServerEntry: {
|
|
228
|
-
inject: boolean | undefined;
|
|
229
|
-
};
|
|
230
|
-
};
|
|
231
186
|
_usesClientRouter: boolean;
|
|
232
|
-
baseServer: string;
|
|
233
|
-
baseAssets: string;
|
|
234
187
|
isClientSide: false;
|
|
235
188
|
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
236
189
|
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -240,6 +193,13 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
240
193
|
_isProduction: true;
|
|
241
194
|
assetsManifest: import("../../../types/ViteManifest.js").ViteManifest;
|
|
242
195
|
_viteDevServer: null;
|
|
196
|
+
_usesClientRouter: boolean;
|
|
197
|
+
isClientSide: false;
|
|
198
|
+
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
199
|
+
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
200
|
+
}) & {
|
|
201
|
+
baseServer: string;
|
|
202
|
+
baseAssets: string;
|
|
243
203
|
viteConfigRuntime: {
|
|
244
204
|
root: string;
|
|
245
205
|
build: {
|
|
@@ -250,12 +210,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
250
210
|
inject: boolean | undefined;
|
|
251
211
|
};
|
|
252
212
|
};
|
|
253
|
-
_usesClientRouter: boolean;
|
|
254
|
-
baseServer: string;
|
|
255
|
-
baseAssets: string;
|
|
256
|
-
isClientSide: false;
|
|
257
|
-
_pageRoutes: import("../../../__internal/index.js").PageRoutes;
|
|
258
|
-
_onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
|
|
259
213
|
});
|
|
260
214
|
_pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
|
|
261
215
|
_baseServer: string;
|
|
@@ -275,7 +229,7 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
275
229
|
url: string;
|
|
276
230
|
} & {
|
|
277
231
|
headers: Record<string, string> | null;
|
|
278
|
-
} & import("../../../shared/getPageFiles.js").
|
|
232
|
+
} & import("../../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
|
|
279
233
|
Page: unknown;
|
|
280
234
|
_isHtmlOnly: boolean;
|
|
281
235
|
_passToClient: import("../html/serializeContext.js").PassToClient;
|
|
@@ -292,7 +246,6 @@ declare function prerenderPage(pageContext: PageContextCreated & PageConfigsLazy
|
|
|
292
246
|
_pageContextAlreadyProvidedByOnPrerenderHook?: true;
|
|
293
247
|
is404: boolean;
|
|
294
248
|
} & {
|
|
295
|
-
|
|
296
|
-
_urlHandler: null;
|
|
249
|
+
_isPageContextJsonRequest: null;
|
|
297
250
|
};
|
|
298
251
|
}>;
|
|
@@ -45,7 +45,7 @@ async function renderPageAlreadyRouted(pageContext) {
|
|
|
45
45
|
if (isError) {
|
|
46
46
|
objectAssign(pageContext, { [isServerSideError]: true });
|
|
47
47
|
}
|
|
48
|
-
const pageContextSerialized = getPageContextClientSerialized(pageContext);
|
|
48
|
+
const pageContextSerialized = getPageContextClientSerialized(pageContext, false);
|
|
49
49
|
const httpResponse = await createHttpResponsePageContextJson(pageContextSerialized);
|
|
50
50
|
objectAssign(pageContext, { httpResponse });
|
|
51
51
|
return pageContext;
|
|
@@ -58,8 +58,7 @@ async function renderPageAlreadyRouted(pageContext) {
|
|
|
58
58
|
}
|
|
59
59
|
async function prerenderPage(pageContext) {
|
|
60
60
|
objectAssign(pageContext, {
|
|
61
|
-
|
|
62
|
-
_urlHandler: null,
|
|
61
|
+
_isPageContextJsonRequest: null,
|
|
63
62
|
});
|
|
64
63
|
/* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
|
|
65
64
|
* - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
|
|
@@ -68,14 +67,13 @@ async function prerenderPage(pageContext) {
|
|
|
68
67
|
await execHookDataAndOnBeforeRender(pageContext);
|
|
69
68
|
const { htmlRender, renderHook } = await execHookOnRenderHtml(pageContext);
|
|
70
69
|
assertUsage(htmlRender !== null, `Cannot pre-render ${pc.cyan(pageContext.urlOriginal)} because the ${renderHook.hookName}() hook defined by ${renderHook.hookFilePath} didn't return an HTML string.`);
|
|
71
|
-
assert(pageContext.isClientSideNavigation === false);
|
|
72
70
|
const documentHtml = await getHtmlString(htmlRender);
|
|
73
71
|
assert(typeof documentHtml === 'string');
|
|
74
72
|
if (!pageContext._usesClientRouter) {
|
|
75
73
|
return { documentHtml, pageContextSerialized: null, pageContext };
|
|
76
74
|
}
|
|
77
75
|
else {
|
|
78
|
-
const pageContextSerialized = getPageContextClientSerialized(pageContext);
|
|
76
|
+
const pageContextSerialized = getPageContextClientSerialized(pageContext, false);
|
|
79
77
|
return { documentHtml, pageContextSerialized, pageContext };
|
|
80
78
|
}
|
|
81
79
|
}
|
|
@@ -31,7 +31,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
31
31
|
_globalContext: {
|
|
32
32
|
isGlobalContext: true;
|
|
33
33
|
_isOriginalObject: true;
|
|
34
|
-
|
|
34
|
+
_virtualFileExportsGlobalEntry: unknown;
|
|
35
35
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
36
36
|
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
37
37
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
@@ -44,26 +44,14 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
44
44
|
};
|
|
45
45
|
config: import("../../types/index.js").ConfigResolved;
|
|
46
46
|
pages: {
|
|
47
|
-
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").
|
|
47
|
+
[k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
|
|
48
48
|
};
|
|
49
|
-
} & ({
|
|
49
|
+
} & (({
|
|
50
50
|
_isProduction: false;
|
|
51
51
|
_isPrerendering: false;
|
|
52
52
|
assetsManifest: null;
|
|
53
|
-
_viteDevServer: import("vite").ViteDevServer;
|
|
54
|
-
viteConfig: import("vite").ResolvedConfig;
|
|
55
|
-
viteConfigRuntime: {
|
|
56
|
-
root: string;
|
|
57
|
-
build: {
|
|
58
|
-
outDir: string;
|
|
59
|
-
};
|
|
60
|
-
_baseViteOriginal: string;
|
|
61
|
-
vitePluginServerEntry: {
|
|
62
|
-
inject: boolean | undefined;
|
|
63
|
-
};
|
|
64
|
-
};
|
|
65
|
-
baseServer: string;
|
|
66
|
-
baseAssets: string;
|
|
53
|
+
_viteDevServer: import("vite").ViteDevServer | undefined;
|
|
54
|
+
viteConfig: import("vite").ResolvedConfig | undefined;
|
|
67
55
|
isClientSide: false;
|
|
68
56
|
_pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
|
|
69
57
|
_onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -73,19 +61,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
73
61
|
_isProduction: true;
|
|
74
62
|
assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
|
|
75
63
|
_viteDevServer: null;
|
|
76
|
-
viteConfigRuntime: {
|
|
77
|
-
root: string;
|
|
78
|
-
build: {
|
|
79
|
-
outDir: string;
|
|
80
|
-
};
|
|
81
|
-
_baseViteOriginal: string;
|
|
82
|
-
vitePluginServerEntry: {
|
|
83
|
-
inject: boolean | undefined;
|
|
84
|
-
};
|
|
85
|
-
};
|
|
86
64
|
_usesClientRouter: boolean;
|
|
87
|
-
baseServer: string;
|
|
88
|
-
baseAssets: string;
|
|
89
65
|
isClientSide: false;
|
|
90
66
|
_pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
|
|
91
67
|
_onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
|
|
@@ -95,6 +71,13 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
95
71
|
_isProduction: true;
|
|
96
72
|
assetsManifest: import("../../types/ViteManifest.js").ViteManifest;
|
|
97
73
|
_viteDevServer: null;
|
|
74
|
+
_usesClientRouter: boolean;
|
|
75
|
+
isClientSide: false;
|
|
76
|
+
_pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
|
|
77
|
+
_onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
|
|
78
|
+
}) & {
|
|
79
|
+
baseServer: string;
|
|
80
|
+
baseAssets: string;
|
|
98
81
|
viteConfigRuntime: {
|
|
99
82
|
root: string;
|
|
100
83
|
build: {
|
|
@@ -105,12 +88,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
105
88
|
inject: boolean | undefined;
|
|
106
89
|
};
|
|
107
90
|
};
|
|
108
|
-
_usesClientRouter: boolean;
|
|
109
|
-
baseServer: string;
|
|
110
|
-
baseAssets: string;
|
|
111
|
-
isClientSide: false;
|
|
112
|
-
_pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
|
|
113
|
-
_onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
|
|
114
91
|
});
|
|
115
92
|
_pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
|
|
116
93
|
_baseServer: string;
|
|
@@ -132,4 +109,5 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
132
109
|
headers: Record<string, string> | null;
|
|
133
110
|
} & {
|
|
134
111
|
_httpRequestId: number;
|
|
112
|
+
_isPageContextJsonRequest: boolean;
|
|
135
113
|
};
|
|
@@ -307,7 +307,7 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
|
|
|
307
307
|
return pageContext;
|
|
308
308
|
}
|
|
309
309
|
function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
|
|
310
|
-
const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
|
|
310
|
+
const { isClientSideNavigation, _urlHandler, _isPageContextJsonRequest } = handlePageContextUrl(pageContextInit.urlOriginal);
|
|
311
311
|
const pageContextBegin = createPageContextServerSide(pageContextInit, globalContext, {
|
|
312
312
|
isPrerendering: false,
|
|
313
313
|
ssr: {
|
|
@@ -315,13 +315,14 @@ function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
|
|
|
315
315
|
isClientSideNavigation,
|
|
316
316
|
},
|
|
317
317
|
});
|
|
318
|
-
objectAssign(pageContextBegin, { _httpRequestId: httpRequestId });
|
|
318
|
+
objectAssign(pageContextBegin, { _httpRequestId: httpRequestId, _isPageContextJsonRequest });
|
|
319
319
|
return pageContextBegin;
|
|
320
320
|
}
|
|
321
321
|
function handlePageContextUrl(urlOriginal) {
|
|
322
|
-
const {
|
|
322
|
+
const { isPageContextJsonRequest } = handlePageContextRequestUrl(urlOriginal);
|
|
323
323
|
return {
|
|
324
|
-
isClientSideNavigation:
|
|
324
|
+
isClientSideNavigation: !!isPageContextJsonRequest,
|
|
325
|
+
_isPageContextJsonRequest: isPageContextJsonRequest,
|
|
325
326
|
_urlHandler: (url) => handlePageContextRequestUrl(url).urlWithoutPageContextRequestSuffix,
|
|
326
327
|
};
|
|
327
328
|
}
|
|
@@ -345,8 +346,8 @@ async function normalizeUrl(pageContextBegin, globalContext, httpRequestId) {
|
|
|
345
346
|
if (disableUrlNormalization)
|
|
346
347
|
return null;
|
|
347
348
|
const { urlOriginal } = pageContext;
|
|
348
|
-
const {
|
|
349
|
-
if (
|
|
349
|
+
const { isPageContextJsonRequest } = handlePageContextRequestUrl(urlOriginal);
|
|
350
|
+
if (isPageContextJsonRequest)
|
|
350
351
|
return null;
|
|
351
352
|
const urlNormalized = normalizeUrlPathname(urlOriginal, trailingSlash ?? false, globalContext.baseServer);
|
|
352
353
|
if (!urlNormalized)
|
|
@@ -419,10 +420,10 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
|
|
|
419
420
|
objectAssign(pageContext, pageContextErrorPageInit, true);
|
|
420
421
|
augmentType(pageContext, await loadPageConfigsLazyServerSideAndExecHook(pageContext));
|
|
421
422
|
// We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
|
|
422
|
-
pageContextSerialized = getPageContextClientSerialized(pageContext);
|
|
423
|
+
pageContextSerialized = getPageContextClientSerialized(pageContext, false);
|
|
423
424
|
}
|
|
424
425
|
else {
|
|
425
|
-
pageContextSerialized = getPageContextClientSerializedAbort(pageContextAbort);
|
|
426
|
+
pageContextSerialized = getPageContextClientSerializedAbort(pageContextAbort, false);
|
|
426
427
|
}
|
|
427
428
|
const httpResponse = await createHttpResponsePageContextJson(pageContextSerialized);
|
|
428
429
|
const pageContextReturn = { httpResponse };
|
|
@@ -42,6 +42,7 @@ export * from '../../utils/assertSetup.js';
|
|
|
42
42
|
export * from '../../utils/path.js';
|
|
43
43
|
export * from '../../utils/isHtml.js';
|
|
44
44
|
export * from '../../utils/warnIfErrorIsNotObject.js';
|
|
45
|
+
export * from '../../utils/virtualFileId.js';
|
|
45
46
|
export * from '../../utils/stripAnsi.js';
|
|
46
47
|
export * from '../../utils/getTerminWidth.js';
|
|
47
48
|
export * from '../../utils/truncateString.js';
|
|
@@ -56,3 +57,6 @@ export * from '../../utils/PROJECT_VERSION.js';
|
|
|
56
57
|
export * from '../../utils/genPromise.js';
|
|
57
58
|
export * from '../../utils/augmentType.js';
|
|
58
59
|
export * from '../../utils/changeEnumerable.js';
|
|
60
|
+
export * from '../../utils/getViteRPC.js';
|
|
61
|
+
export * from '../../utils/isRunnableDevEnvironment.js';
|
|
62
|
+
export * from '../../utils/assertIsNotBrowser.js';
|
|
@@ -46,6 +46,7 @@ export * from '../../utils/assertSetup.js';
|
|
|
46
46
|
export * from '../../utils/path.js';
|
|
47
47
|
export * from '../../utils/isHtml.js';
|
|
48
48
|
export * from '../../utils/warnIfErrorIsNotObject.js';
|
|
49
|
+
export * from '../../utils/virtualFileId.js';
|
|
49
50
|
export * from '../../utils/stripAnsi.js';
|
|
50
51
|
export * from '../../utils/getTerminWidth.js';
|
|
51
52
|
export * from '../../utils/truncateString.js';
|
|
@@ -60,3 +61,6 @@ export * from '../../utils/PROJECT_VERSION.js';
|
|
|
60
61
|
export * from '../../utils/genPromise.js';
|
|
61
62
|
export * from '../../utils/augmentType.js';
|
|
62
63
|
export * from '../../utils/changeEnumerable.js';
|
|
64
|
+
export * from '../../utils/getViteRPC.js';
|
|
65
|
+
export * from '../../utils/isRunnableDevEnvironment.js';
|
|
66
|
+
export * from '../../utils/assertIsNotBrowser.js';
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export { parseVirtualFileId };
|
|
2
|
+
export { generateVirtualFileId };
|
|
3
|
+
export { virtualFileIdGlobalEntryServer };
|
|
4
|
+
export { virtualFileIdGlobalEntryClientSR };
|
|
5
|
+
export { virtualFileIdGlobalEntryClientCR };
|
|
6
|
+
declare const virtualFileIdGlobalEntryServer = "virtual:vike:global-entry:server";
|
|
7
|
+
declare const virtualFileIdGlobalEntryClientSR = "virtual:vike:global-entry:client:server-routing";
|
|
8
|
+
declare const virtualFileIdGlobalEntryClientCR = "virtual:vike:global-entry:client:client-routing";
|
|
9
|
+
type VirtualFileIdEntryParsed = {
|
|
10
|
+
type: 'global-entry';
|
|
11
|
+
isForClientSide: boolean;
|
|
12
|
+
isClientRouting: boolean;
|
|
13
|
+
} | {
|
|
14
|
+
type: 'page-entry';
|
|
15
|
+
isForClientSide: boolean;
|
|
16
|
+
pageId: string;
|
|
17
|
+
isExtractAssets: boolean;
|
|
18
|
+
};
|
|
19
|
+
declare function parseVirtualFileId(id: string): false | VirtualFileIdEntryParsed;
|
|
20
|
+
declare function generateVirtualFileId(args: {
|
|
21
|
+
type: 'global-entry';
|
|
22
|
+
isForClientSide: boolean;
|
|
23
|
+
isClientRouting: boolean;
|
|
24
|
+
} | {
|
|
25
|
+
type: 'page-entry';
|
|
26
|
+
pageId: string;
|
|
27
|
+
isForClientSide: boolean;
|
|
28
|
+
}): string;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
export { parseVirtualFileId };
|
|
2
|
+
export { generateVirtualFileId };
|
|
3
|
+
export { virtualFileIdGlobalEntryServer };
|
|
4
|
+
export { virtualFileIdGlobalEntryClientSR };
|
|
5
|
+
export { virtualFileIdGlobalEntryClientCR };
|
|
6
|
+
import { extractAssetsRemoveQuery } from './extractAssetsQuery.js';
|
|
7
|
+
import { assert, assertIsNotBrowser, removeVirtualFileIdPrefix } from './utils.js';
|
|
8
|
+
assertIsNotBrowser();
|
|
9
|
+
// Global entries
|
|
10
|
+
const virtualFileIdGlobalEntryServer =
|
|
11
|
+
//
|
|
12
|
+
'virtual:vike:global-entry:server';
|
|
13
|
+
const virtualFileIdGlobalEntryClientSR =
|
|
14
|
+
//
|
|
15
|
+
'virtual:vike:global-entry:client:server-routing';
|
|
16
|
+
const virtualFileIdGlobalEntryClientCR =
|
|
17
|
+
//
|
|
18
|
+
'virtual:vike:global-entry:client:client-routing';
|
|
19
|
+
// Page entries
|
|
20
|
+
const virtualFileIdPageEntryClient =
|
|
21
|
+
//
|
|
22
|
+
'virtual:vike:page-entry:client:'; // ${pageId}
|
|
23
|
+
const virtualFileIdPageEntryServer =
|
|
24
|
+
//
|
|
25
|
+
'virtual:vike:page-entry:server:'; // ${pageId}
|
|
26
|
+
// Virtual ID prefixes
|
|
27
|
+
const virtualFileIdPageEntryPrefix =
|
|
28
|
+
//
|
|
29
|
+
'virtual:vike:page-entry:';
|
|
30
|
+
const virtualFileIdGlobalEntryPrefix =
|
|
31
|
+
//
|
|
32
|
+
'virtual:vike:global-entry:';
|
|
33
|
+
const virtualFileIdGlobalEntries = [
|
|
34
|
+
virtualFileIdGlobalEntryServer,
|
|
35
|
+
virtualFileIdGlobalEntryClientCR,
|
|
36
|
+
virtualFileIdGlobalEntryClientSR,
|
|
37
|
+
];
|
|
38
|
+
assert(virtualFileIdGlobalEntries.every((v) =>
|
|
39
|
+
//
|
|
40
|
+
v.startsWith(virtualFileIdGlobalEntryPrefix)));
|
|
41
|
+
assert([virtualFileIdPageEntryClient, virtualFileIdPageEntryServer].every((v) =>
|
|
42
|
+
//
|
|
43
|
+
v.startsWith(virtualFileIdPageEntryPrefix)));
|
|
44
|
+
function parseVirtualFileId(id) {
|
|
45
|
+
id = removeVirtualFileIdPrefix(id);
|
|
46
|
+
if (!id.startsWith(virtualFileIdGlobalEntryPrefix) && !id.startsWith(virtualFileIdPageEntryPrefix))
|
|
47
|
+
return false;
|
|
48
|
+
// Global entry
|
|
49
|
+
if (id.includes(virtualFileIdGlobalEntryPrefix)) {
|
|
50
|
+
assert(virtualFileIdGlobalEntries.includes(id));
|
|
51
|
+
const isForClientSide = id !== virtualFileIdGlobalEntryServer;
|
|
52
|
+
const isClientRouting = id === virtualFileIdGlobalEntryClientCR;
|
|
53
|
+
return {
|
|
54
|
+
type: 'global-entry',
|
|
55
|
+
isForClientSide,
|
|
56
|
+
isClientRouting,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
// Page entry
|
|
60
|
+
if (id.includes(virtualFileIdPageEntryPrefix)) {
|
|
61
|
+
assert(id.startsWith(virtualFileIdPageEntryPrefix));
|
|
62
|
+
const idOriginal = id;
|
|
63
|
+
id = extractAssetsRemoveQuery(id);
|
|
64
|
+
const isExtractAssets = idOriginal !== id;
|
|
65
|
+
if (id.startsWith(virtualFileIdPageEntryClient)) {
|
|
66
|
+
assert(isExtractAssets === false);
|
|
67
|
+
return {
|
|
68
|
+
type: 'page-entry',
|
|
69
|
+
pageId: id.slice(virtualFileIdPageEntryClient.length),
|
|
70
|
+
isForClientSide: true,
|
|
71
|
+
isExtractAssets,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
if (id.startsWith(virtualFileIdPageEntryServer)) {
|
|
75
|
+
return {
|
|
76
|
+
type: 'page-entry',
|
|
77
|
+
pageId: id.slice(virtualFileIdPageEntryServer.length),
|
|
78
|
+
isForClientSide: false,
|
|
79
|
+
isExtractAssets,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
assert(false);
|
|
83
|
+
}
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
function generateVirtualFileId(args) {
|
|
87
|
+
if (args.type === 'global-entry') {
|
|
88
|
+
const { isForClientSide, isClientRouting } = args;
|
|
89
|
+
assert(typeof isClientRouting === 'boolean');
|
|
90
|
+
if (!isForClientSide) {
|
|
91
|
+
return virtualFileIdGlobalEntryServer;
|
|
92
|
+
}
|
|
93
|
+
else if (isClientRouting) {
|
|
94
|
+
return virtualFileIdGlobalEntryClientCR;
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
return virtualFileIdGlobalEntryClientSR;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
if (args.type === 'page-entry') {
|
|
101
|
+
const { pageId, isForClientSide } = args;
|
|
102
|
+
assert(typeof pageId === 'string');
|
|
103
|
+
const id = `${isForClientSide ? virtualFileIdPageEntryClient : virtualFileIdPageEntryServer}${pageId}`;
|
|
104
|
+
return id;
|
|
105
|
+
}
|
|
106
|
+
assert(false);
|
|
107
|
+
}
|
|
@@ -17,13 +17,14 @@ import { pluginBaseUrls } from './plugins/pluginBaseUrls.js';
|
|
|
17
17
|
import { pluginEnvVars } from './plugins/pluginEnvVars.js';
|
|
18
18
|
import pc from '@brillout/picocolors';
|
|
19
19
|
import { pluginFileEnv } from './plugins/pluginFileEnv.js';
|
|
20
|
-
import {
|
|
21
|
-
import { resolveClientEntriesDev } from './shared/resolveClientEntriesDev.js';
|
|
20
|
+
import { getClientEntrySrcDev } from './shared/getClientEntrySrcDev.js';
|
|
22
21
|
import { pluginWorkaroundCssModuleHmr } from './plugins/pluginWorkaroundCssModuleHmr.js';
|
|
23
22
|
import { pluginWorkaroundVite6HmrRegression } from './plugins/pluginWorkaroundVite6HmrRegression.js';
|
|
24
23
|
import { pluginReplaceConstants } from './plugins/pluginReplaceConstants.js';
|
|
24
|
+
import { pluginNonRunnableDev } from './plugins/pluginNonRunnableDev.js';
|
|
25
|
+
import { setGetClientEntrySrcDev } from '../runtime/renderPage/getPageAssets/retrievePageAssetsDev.js';
|
|
25
26
|
// We don't call this in ./onLoad.ts to avoid a cyclic dependency with utils.ts
|
|
26
|
-
|
|
27
|
+
setGetClientEntrySrcDev(getClientEntrySrcDev);
|
|
27
28
|
// Return `PluginInterop` instead of `Plugin` to avoid type mismatch upon different Vite versions
|
|
28
29
|
function plugin(vikeVitePluginOptions = {}) {
|
|
29
30
|
const plugins = [
|
|
@@ -41,6 +42,7 @@ function plugin(vikeVitePluginOptions = {}) {
|
|
|
41
42
|
pluginWorkaroundCssModuleHmr(),
|
|
42
43
|
pluginWorkaroundVite6HmrRegression(),
|
|
43
44
|
pluginReplaceConstants(),
|
|
45
|
+
pluginNonRunnableDev(),
|
|
44
46
|
];
|
|
45
47
|
Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
|
|
46
48
|
return plugins;
|
|
@@ -9,9 +9,11 @@ function onLoad() {
|
|
|
9
9
|
assertIsNotBrowser();
|
|
10
10
|
assertNodeVersion();
|
|
11
11
|
// package.json#peerDependencies isn't enough as users often ignore it
|
|
12
|
-
// This assertion isn't reliable: the user may still use a Vite version older than
|
|
13
|
-
// TO-DO/eventually: let's also use this.meta.viteVersion
|
|
14
|
-
|
|
12
|
+
// This assertion isn't reliable: the user may still use a Vite version older than 6.0.0 — see https://github.com/vitejs/vite/pull/19355
|
|
13
|
+
// TO-DO/eventually: let's also use this.meta.viteVersion
|
|
14
|
+
// - https://github.com/vitejs/vite/pull/20088
|
|
15
|
+
// - https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md#700-2025-06-24
|
|
16
|
+
assertVersion('Vite', version, '6.0.0');
|
|
15
17
|
// Ensure we don't bloat the server runtime with heavy dependencies such Vite and esbuild
|
|
16
18
|
assertIsNotProductionRuntime();
|
|
17
19
|
}
|
|
@@ -7,13 +7,13 @@ import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
|
|
|
7
7
|
type Bundle = Rollup.OutputBundle;
|
|
8
8
|
declare function handleAssetsManifest_isFixEnabled(config: ResolvedConfig | UserConfig): boolean;
|
|
9
9
|
declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
|
|
10
|
-
declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig): void;
|
|
10
|
+
declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig, env: Environment): void;
|
|
11
11
|
declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promise<{
|
|
12
12
|
readonly ssrEmitAssets: true | undefined;
|
|
13
13
|
readonly cssMinify: "esbuild" | undefined;
|
|
14
|
-
readonly manifest:
|
|
14
|
+
readonly manifest: true;
|
|
15
15
|
readonly copyPublicDir: boolean | undefined;
|
|
16
16
|
}>;
|
|
17
|
-
declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment
|
|
17
|
+
declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment, options: {
|
|
18
18
|
dir: string | undefined;
|
|
19
19
|
}, bundle: Bundle): Promise<void>;
|