vike 0.4.237 → 0.4.238-commit-3c1a09d
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/__internal/index.js +3 -3
- 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/runtime-server-routing/utils.js +1 -1
- package/dist/cjs/client/shared/createGetGlobalContextClient.js +5 -5
- package/dist/cjs/node/api/build.js +5 -31
- package/dist/cjs/node/api/context.js +13 -12
- package/dist/cjs/node/api/dev.js +0 -2
- package/dist/cjs/node/api/index.js +0 -2
- package/dist/cjs/node/api/onLoad.js +2 -2
- package/dist/cjs/node/api/prepareViteApiCall.js +2 -3
- package/dist/cjs/node/api/preview.js +2 -3
- package/dist/cjs/node/api/utils.js +1 -0
- package/dist/cjs/node/cli/index.js +2 -2
- package/dist/cjs/node/cli/onLoad.js +2 -2
- package/dist/cjs/node/prerender/runPrerender.js +7 -8
- package/dist/cjs/node/prerender/runPrerenderEntry.js +1 -1
- package/dist/cjs/node/runtime/csp.js +46 -0
- package/dist/cjs/node/runtime/globalContext.js +128 -112
- package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +11 -8
- package/dist/cjs/node/runtime/html/injectAssets/inferHtmlTags.js +5 -2
- package/dist/cjs/node/runtime/html/injectAssets/mergeScriptTags.js +4 -2
- package/dist/cjs/node/runtime/renderPage/analyzePage.js +6 -4
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +1 -1
- package/dist/cjs/node/runtime/renderPage/execHookOnRenderHtml.js +1 -11
- package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js +5 -4
- package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsDev.js → retrievePageAssetsDev.js} +21 -6
- package/dist/cjs/node/runtime/renderPage/getPageAssets/{retrieveAssetsProd.js → retrievePageAssetsProd.js} +19 -2
- package/dist/cjs/node/runtime/renderPage/getPageAssets.js +5 -34
- package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +57 -50
- package/dist/cjs/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.js} +3 -4
- package/dist/cjs/node/runtime/renderPage.js +18 -16
- package/dist/cjs/node/runtime/utils.js +3 -2
- package/dist/cjs/node/runtime-dev/createDevMiddleware.js +0 -2
- package/dist/cjs/node/shared/virtualFileId.js +110 -0
- package/dist/cjs/node/vite/index.js +3 -3
- package/dist/cjs/node/vite/onLoad.js +5 -3
- package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js +29 -30
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js +122 -10
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js +12 -17
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +2 -10
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js +5 -11
- package/dist/cjs/node/vite/plugins/pluginBuild/{pluginBuildEntry.js → pluginProdBuildEntry.js} +11 -11
- package/dist/cjs/node/vite/plugins/pluginBuild.js +2 -4
- package/dist/cjs/node/vite/plugins/pluginDev/determineFsAllowList.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js +6 -5
- package/dist/cjs/node/vite/plugins/pluginEnvVars.js +6 -13
- package/dist/cjs/node/vite/plugins/pluginExtractAssets.js +7 -7
- package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js +6 -2
- package/dist/cjs/node/vite/plugins/pluginFileEnv.js +4 -3
- package/dist/cjs/node/vite/plugins/pluginNonRunnableDev.js +11 -11
- package/dist/cjs/node/vite/plugins/pluginPreview.js +4 -7
- package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js +6 -13
- package/dist/cjs/node/vite/plugins/pluginSetGlobalContext.js +1 -1
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js} +5 -6
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFileEntry.js → generateVirtualFileGlobalEntryWithOldDesign.js} +12 -12
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js} +10 -11
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js +51 -21
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js +14 -12
- package/dist/cjs/node/vite/shared/findPageFiles.js +1 -1
- package/dist/cjs/node/vite/shared/{resolveClientEntriesDev.js → getClientEntrySrcDev.js} +3 -3
- package/dist/cjs/node/vite/shared/getHttpRequestAsyncStore.js +8 -6
- package/dist/cjs/node/vite/shared/getMagicString.js +1 -1
- package/dist/cjs/node/vite/shared/getOutDirs.js +21 -22
- package/dist/cjs/node/vite/shared/getViteConfigRuntime.js +1 -1
- package/dist/cjs/node/vite/shared/isViteServerSide.js +68 -0
- package/dist/cjs/node/vite/shared/loggerVite/removeSuperfluousViteLog.js +6 -4
- package/dist/cjs/node/vite/shared/loggerVite.js +1 -1
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +23 -36
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +5 -4
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal.js +46 -48
- package/dist/cjs/shared/createGlobalContextShared.js +16 -14
- package/dist/cjs/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js} +20 -26
- package/dist/cjs/shared/page-configs/loadAndParseVirtualFilePageEntry.js +25 -0
- package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js +10 -4
- package/dist/cjs/shared/page-configs/serialize/{parsePageConfigs.js → parsePageConfigsSerialized.js} +2 -2
- package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js +3 -3
- package/dist/cjs/shared/route/execHookOnBeforeRoute.js +0 -1
- package/dist/cjs/shared/route/index.js +0 -1
- package/dist/cjs/types/VikeGlobalInternal.js +2 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/assertSetup.js +2 -3
- package/dist/cjs/utils/assertVersion.js +2 -0
- package/dist/cjs/utils/debug.js +4 -4
- package/dist/cjs/utils/getGlobalObject.js +8 -15
- package/dist/cjs/utils/isNonRunnableDev.js +12 -0
- package/dist/cjs/utils/isScriptFile.js +1 -1
- package/dist/cjs/utils/path.js +5 -5
- package/dist/cjs/utils/requireResolve.js +13 -12
- package/dist/cjs/utils/{augmentType.js → updateType.js} +3 -3
- package/dist/esm/__internal/index.d.ts +2 -2
- package/dist/esm/__internal/index.js +3 -3
- package/dist/esm/client/runtime-client-routing/createPageContextClientSide.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/createPageContextClientSide.js +2 -2
- package/dist/esm/client/runtime-client-routing/getPageContextCurrent.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts +12 -12
- package/dist/esm/client/runtime-client-routing/globalContext.d.ts +2 -2
- package/dist/esm/client/runtime-client-routing/globalContext.js +2 -2
- 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 +6 -7
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.js +6 -6
- package/dist/esm/client/runtime-client-routing/utils.d.ts +1 -1
- package/dist/esm/client/runtime-client-routing/utils.js +1 -1
- package/dist/esm/client/runtime-server-routing/createPageContextClientSide.d.ts +3 -3
- package/dist/esm/client/runtime-server-routing/createPageContextClientSide.js +3 -3
- package/dist/esm/client/runtime-server-routing/globalContext.d.ts +2 -2
- 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/runtime-server-routing/utils.d.ts +1 -1
- package/dist/esm/client/runtime-server-routing/utils.js +1 -1
- package/dist/esm/client/shared/createGetGlobalContextClient.d.ts +3 -3
- package/dist/esm/client/shared/createGetGlobalContextClient.js +5 -5
- package/dist/esm/client/shared/execHookOnRenderClient.d.ts +2 -2
- 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/node/api/build.d.ts +2 -2
- package/dist/esm/node/api/build.js +6 -32
- package/dist/esm/node/api/context.d.ts +10 -10
- package/dist/esm/node/api/context.js +13 -12
- package/dist/esm/node/api/dev.d.ts +2 -2
- package/dist/esm/node/api/dev.js +0 -2
- package/dist/esm/node/api/index.js +0 -2
- package/dist/esm/node/api/onLoad.js +1 -1
- package/dist/esm/node/api/prepareViteApiCall.d.ts +3 -5
- package/dist/esm/node/api/prepareViteApiCall.js +3 -4
- package/dist/esm/node/api/preview.d.ts +2 -2
- package/dist/esm/node/api/preview.js +2 -3
- package/dist/esm/node/api/types.d.ts +4 -4
- package/dist/esm/node/api/utils.d.ts +1 -0
- package/dist/esm/node/api/utils.js +1 -0
- package/dist/esm/node/cli/index.js +1 -1
- package/dist/esm/node/cli/onLoad.js +1 -1
- package/dist/esm/node/prerender/runPrerender.d.ts +14 -303
- package/dist/esm/node/prerender/runPrerender.js +8 -9
- package/dist/esm/node/prerender/runPrerenderEntry.js +1 -1
- package/dist/esm/node/runtime/csp.d.ts +12 -0
- package/dist/esm/node/runtime/csp.js +44 -0
- package/dist/esm/node/runtime/globalContext.d.ts +13 -13
- package/dist/esm/node/runtime/globalContext.js +125 -109
- package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +11 -8
- package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.d.ts +2 -1
- package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.js +5 -2
- package/dist/esm/node/runtime/html/injectAssets/mergeScriptTags.d.ts +2 -1
- package/dist/esm/node/runtime/html/injectAssets/mergeScriptTags.js +4 -2
- package/dist/esm/node/runtime/html/serializeContext.d.ts +2 -1
- package/dist/esm/node/runtime/renderPage/analyzePage.d.ts +4 -3
- package/dist/esm/node/runtime/renderPage/analyzePage.js +6 -4
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +2 -2
- package/dist/esm/node/runtime/renderPage/execHookOnRenderHtml.d.ts +0 -1
- package/dist/esm/node/runtime/renderPage/execHookOnRenderHtml.js +1 -11
- 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 -7
- 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 +2 -10
- package/dist/esm/node/runtime/renderPage/getPageAssets.js +4 -33
- package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.d.ts +108 -20
- package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +59 -52
- package/dist/esm/node/runtime/renderPage/preparePageContextForPublicUsageServer.d.ts +2 -2
- package/dist/esm/node/runtime/renderPage/{renderPageAlreadyRouted.d.ts → renderPageAfterRoute.d.ts} +30 -10
- package/dist/esm/node/runtime/renderPage/{renderPageAlreadyRouted.js → renderPageAfterRoute.js} +5 -6
- package/dist/esm/node/runtime/renderPage.d.ts +9 -6
- package/dist/esm/node/runtime/renderPage.js +20 -18
- package/dist/esm/node/runtime/utils.d.ts +3 -2
- package/dist/esm/node/runtime/utils.js +3 -2
- package/dist/esm/node/runtime-dev/createDevMiddleware.d.ts +2 -2
- package/dist/esm/node/runtime-dev/createDevMiddleware.js +0 -2
- 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 +3 -3
- package/dist/esm/node/vite/onLoad.js +5 -3
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +5 -6
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js +31 -32
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildApp.js +119 -10
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js +12 -17
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +2 -10
- package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.js +5 -8
- package/dist/esm/node/vite/plugins/pluginBuild/{pluginBuildEntry.d.ts → pluginProdBuildEntry.d.ts} +2 -2
- package/dist/esm/node/vite/plugins/pluginBuild/{pluginBuildEntry.js → pluginProdBuildEntry.js} +12 -12
- package/dist/esm/node/vite/plugins/pluginBuild.js +2 -4
- package/dist/esm/node/vite/plugins/pluginDev/determineFsAllowList.js +3 -3
- package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js +6 -5
- package/dist/esm/node/vite/plugins/pluginEnvVars.js +6 -10
- package/dist/esm/node/vite/plugins/pluginExtractAssets.js +5 -5
- package/dist/esm/node/vite/plugins/pluginExtractExportNames.js +6 -2
- package/dist/esm/node/vite/plugins/pluginFileEnv.js +4 -3
- package/dist/esm/node/vite/plugins/pluginNonRunnableDev.js +12 -12
- package/dist/esm/node/vite/plugins/pluginPreview.js +5 -8
- package/dist/esm/node/vite/plugins/pluginReplaceConstants.js +6 -10
- package/dist/esm/node/vite/plugins/pluginSetGlobalContext.js +2 -2
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.d.ts +2 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigsEager.js → generateVirtualFileGlobalEntry.js} +5 -6
- 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 +2 -0
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/{getVirtualFilePageConfigLazy.js → generateVirtualFilePageEntry.js} +10 -11
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.d.ts +5 -1
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js +52 -22
- package/dist/esm/node/vite/plugins/pluginVirtualFiles.js +14 -12
- 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} +4 -4
- package/dist/esm/node/vite/shared/getHttpRequestAsyncStore.js +9 -7
- package/dist/esm/node/vite/shared/getMagicString.js +1 -1
- package/dist/esm/node/vite/shared/getOutDirs.d.ts +4 -3
- package/dist/esm/node/vite/shared/getOutDirs.js +21 -22
- package/dist/esm/node/vite/shared/getViteConfigRuntime.js +1 -1
- package/dist/esm/node/vite/shared/isViteServerSide.d.ts +18 -0
- package/dist/esm/node/vite/shared/isViteServerSide.js +66 -0
- package/dist/esm/node/vite/shared/loggerVite/removeSuperfluousViteLog.js +7 -5
- package/dist/esm/node/vite/shared/loggerVite.js +1 -1
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.d.ts +3 -2
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +24 -37
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +6 -5
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts +4 -2
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js +49 -51
- package/dist/esm/shared/createGlobalContextShared.d.ts +7 -6
- package/dist/esm/shared/createGlobalContextShared.js +18 -16
- package/dist/esm/shared/getPageFiles/{parseVirtualFileExports.d.ts → parseVirtualFileExportsGlobalEntry.d.ts} +2 -2
- package/dist/esm/shared/getPageFiles/{parseVirtualFileExports.js → parseVirtualFileExportsGlobalEntry.js} +20 -26
- 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/page-configs/loadAndParseVirtualFilePageEntry.d.ts +3 -0
- package/dist/esm/shared/page-configs/loadAndParseVirtualFilePageEntry.js +23 -0
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.d.ts +9 -9
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js +10 -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.js +3 -3
- package/dist/esm/shared/route/execHookOnBeforeRoute.d.ts +3 -3
- package/dist/esm/shared/route/execHookOnBeforeRoute.js +0 -1
- package/dist/esm/shared/route/index.d.ts +5 -6
- package/dist/esm/shared/route/index.js +0 -1
- package/dist/esm/types/Config.d.ts +13 -9
- package/dist/esm/types/PageConfig.d.ts +11 -9
- package/dist/esm/types/PageContext.d.ts +6 -0
- package/dist/esm/types/VikeGlobalInternal.d.ts +4 -0
- package/dist/esm/types/VikeGlobalInternal.js +1 -0
- package/dist/esm/types/VikeNamespace.d.ts +13 -0
- 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 +2 -3
- package/dist/esm/utils/assertVersion.js +2 -0
- package/dist/esm/utils/debug.js +3 -3
- package/dist/esm/utils/getGlobalObject.d.ts +6 -5
- package/dist/esm/utils/getGlobalObject.js +8 -15
- package/dist/esm/utils/isNonRunnableDev.d.ts +2 -0
- package/dist/esm/utils/isNonRunnableDev.js +10 -0
- package/dist/esm/utils/isScriptFile.d.ts +1 -1
- package/dist/esm/utils/isScriptFile.js +1 -1
- package/dist/esm/utils/path.d.ts +2 -0
- package/dist/esm/utils/path.js +5 -5
- package/dist/esm/utils/requireResolve.d.ts +4 -4
- package/dist/esm/utils/requireResolve.js +13 -12
- package/dist/esm/utils/updateType.d.ts +3 -0
- package/dist/esm/utils/updateType.js +7 -0
- package/package.json +6 -6
- package/dist/cjs/node/runtime/renderPage/debugPageFiles.js +0 -52
- package/dist/cjs/node/shared/virtualFiles/virtualFileEntry.js +0 -31
- package/dist/cjs/node/shared/virtualFiles/virtualFilePageConfigLazy.js +0 -45
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +0 -149
- package/dist/cjs/node/vite/shared/applyRegExWithMagicString.js +0 -11
- package/dist/cjs/node/vite/shared/isViteServerBuild.js +0 -47
- package/dist/cjs/shared/page-configs/loadConfigValues.js +0 -21
- package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts +0 -23
- package/dist/esm/node/runtime/renderPage/debugPageFiles.js +0 -47
- 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 -28
- package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.d.ts +0 -9
- package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.js +0 -43
- package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.d.ts +0 -5
- package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +0 -144
- 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/shared/applyRegExWithMagicString.d.ts +0 -3
- package/dist/esm/node/vite/shared/applyRegExWithMagicString.js +0 -9
- package/dist/esm/node/vite/shared/isViteServerBuild.d.ts +0 -15
- package/dist/esm/node/vite/shared/isViteServerBuild.js +0 -45
- 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
- package/dist/esm/utils/augmentType.d.ts +0 -3
- package/dist/esm/utils/augmentType.js +0 -7
- /package/dist/cjs/utils/{getTerminWidth.js → getTerminalWidth.js} +0 -0
- /package/dist/esm/utils/{getTerminWidth.d.ts → getTerminalWidth.d.ts} +0 -0
- /package/dist/esm/utils/{getTerminWidth.js → getTerminalWidth.js} +0 -0
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.setGlobalContext_prodBuildEntry = void 0;
|
|
4
4
|
exports.route = route;
|
|
5
5
|
exports.getPagesAndRoutes = getPagesAndRoutes;
|
|
6
|
-
//
|
|
6
|
+
// Used by vike:build:pluginProdBuildEntry
|
|
7
7
|
var globalContext_js_1 = require("../node/runtime/globalContext.js");
|
|
8
|
-
Object.defineProperty(exports, "
|
|
8
|
+
Object.defineProperty(exports, "setGlobalContext_prodBuildEntry", { enumerable: true, get: function () { return globalContext_js_1.setGlobalContext_prodBuildEntry; } });
|
|
9
9
|
const index_js_1 = require("../shared/route/index.js");
|
|
10
10
|
const globalContext_js_2 = require("../node/runtime/globalContext.js");
|
|
11
11
|
const assertSetup_js_1 = require("../utils/assertSetup.js");
|
|
@@ -37,8 +37,8 @@ exports.getGlobalContextClientInternal = void 0;
|
|
|
37
37
|
const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
|
|
38
38
|
const loadPageRoutes_js_1 = require("../../shared/route/loadPageRoutes.js");
|
|
39
39
|
// @ts-ignore
|
|
40
|
-
const
|
|
41
|
-
const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(
|
|
40
|
+
const virtualFileExportsGlobalEntry = __importStar(require("virtual:vike:global-entry:client:client-routing"));
|
|
41
|
+
const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExportsGlobalEntry, true, addGlobalContext);
|
|
42
42
|
exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
|
|
43
43
|
async function addGlobalContext(globalContext) {
|
|
44
44
|
const { pageRoutes, onBeforeRouteHook } = await (0, loadPageRoutes_js_1.loadPageRoutes)(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
|
|
@@ -36,6 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.getGlobalContextClientInternal = void 0;
|
|
37
37
|
const createGetGlobalContextClient_js_1 = require("../shared/createGetGlobalContextClient.js");
|
|
38
38
|
// @ts-ignore
|
|
39
|
-
const
|
|
40
|
-
const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(
|
|
39
|
+
const virtualFileExportsGlobalEntry = __importStar(require("virtual:vike:global-entry:client:server-routing"));
|
|
40
|
+
const getGlobalContextClientInternal = (0, createGetGlobalContextClient_js_1.createGetGlobalContextClient)(virtualFileExportsGlobalEntry, false);
|
|
41
41
|
exports.getGlobalContextClientInternal = getGlobalContextClientInternal;
|
|
@@ -30,5 +30,5 @@ __exportStar(require("../../utils/parseUrl.js"), exports);
|
|
|
30
30
|
__exportStar(require("../../utils/slice.js"), exports);
|
|
31
31
|
__exportStar(require("../../utils/unique.js"), exports); // Only used by Server Routing (not needed for Client Routing)
|
|
32
32
|
__exportStar(require("../../utils/getPropAccessNotation.js"), exports);
|
|
33
|
-
__exportStar(require("../../utils/
|
|
33
|
+
__exportStar(require("../../utils/updateType.js"), exports);
|
|
34
34
|
__exportStar(require("../../utils/changeEnumerable.js"), exports);
|
|
@@ -13,23 +13,23 @@ const globalObject = (0, utils_js_1.getGlobalObject)('createGetGlobalContextClie
|
|
|
13
13
|
globalContextInitialPromiseResolve,
|
|
14
14
|
};
|
|
15
15
|
})());
|
|
16
|
-
function createGetGlobalContextClient(
|
|
16
|
+
function createGetGlobalContextClient(virtualFileExportsGlobalEntry, isClientRouting, addGlobalContext) {
|
|
17
17
|
(0, utils_js_1.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
|
-
// HMR =>
|
|
24
|
-
if (globalObject.
|
|
23
|
+
// HMR => virtualFileExportsGlobalEntry differ
|
|
24
|
+
if (globalObject.virtualFileExportsGlobalEntry === virtualFileExportsGlobalEntry) {
|
|
25
25
|
const globalContext = await globalObject.globalContextPromise;
|
|
26
26
|
return globalContext;
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
|
-
globalObject.
|
|
29
|
+
globalObject.virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry;
|
|
30
30
|
}
|
|
31
31
|
// Create
|
|
32
|
-
const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(
|
|
32
|
+
const globalContextPromise = (0, createGlobalContextShared_js_1.createGlobalContextShared)(virtualFileExportsGlobalEntry, globalObject, undefined, async (globalContext) => {
|
|
33
33
|
const globalContextAddendum = {
|
|
34
34
|
/**
|
|
35
35
|
* Whether the environment is client-side or server-side / pre-rendering.
|
|
@@ -3,45 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.build = build;
|
|
4
4
|
const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
|
|
5
5
|
const vite_1 = require("vite");
|
|
6
|
-
const context_js_1 = require("../cli/context.js");
|
|
7
|
-
const context_js_2 = require("../prerender/context.js");
|
|
8
|
-
const utils_js_1 = require("./utils.js");
|
|
9
6
|
/**
|
|
10
7
|
* Programmatically trigger `$ vike build`
|
|
11
8
|
*
|
|
12
9
|
* https://vike.dev/api#build
|
|
13
10
|
*/
|
|
14
11
|
async function build(options = {}) {
|
|
15
|
-
const { viteConfigFromUserEnhanced
|
|
16
|
-
// Pass it to
|
|
12
|
+
const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'build');
|
|
13
|
+
// Pass it to vike:build:pluginBuildApp
|
|
17
14
|
if (viteConfigFromUserEnhanced)
|
|
18
15
|
viteConfigFromUserEnhanced._viteConfigFromUserEnhanced = viteConfigFromUserEnhanced;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const builder = await (0, vite_1.createBuilder)(viteConfigFromUserEnhanced);
|
|
23
|
-
// See Vite plugin vike:build:pluginBuildApp
|
|
24
|
-
await builder.buildApp();
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
// This buildVite() call does everything:
|
|
28
|
-
// 1. Build client-side
|
|
29
|
-
// 2. Build server-side
|
|
30
|
-
// > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L90
|
|
31
|
-
// 3. Pre-render (if enabled)
|
|
32
|
-
// > See: https://github.com/vikejs/vike/blob/c6c7533a56b3a16fc43ed644fc5c10c02d0ff375/vike/node/plugin/plugins/autoFullBuild.ts#L98
|
|
33
|
-
// > We purposely don't start the pre-rendering in this `build()` function but in a Rollup hook instead.
|
|
34
|
-
// > Rationale: https://github.com/vikejs/vike/issues/2123
|
|
35
|
-
await (0, vite_1.build)(viteConfigFromUserEnhanced);
|
|
36
|
-
// After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
|
|
37
|
-
if (
|
|
38
|
-
// When calling Vike's prerender() API pre-rendering is run without force exit
|
|
39
|
-
![false, 'prerender()'].includes((0, context_js_2.wasPrerenderRun)()) &&
|
|
40
|
-
// When calling Vike's build() API pre-rendering is auto run without force exit
|
|
41
|
-
(0, context_js_1.isVikeCli)()) {
|
|
42
|
-
(0, utils_js_1.assert)(false);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
16
|
+
const builder = await (0, vite_1.createBuilder)(viteConfigFromUserEnhanced);
|
|
17
|
+
// buildApp() is implemented by vike:build:pluginBuildApp
|
|
18
|
+
await builder.buildApp();
|
|
45
19
|
return {
|
|
46
20
|
/* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`
|
|
47
21
|
viteConfig: viteConfigFromUserEnhanced,
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isVikeCliOrApi = isVikeCliOrApi;
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
7
|
-
|
|
4
|
+
exports.setContextVikeApiOperation = setContextVikeApiOperation;
|
|
5
|
+
exports.clearContextVikeApiOperation = clearContextVikeApiOperation;
|
|
6
|
+
exports.getVikeApiOperation = getVikeApiOperation;
|
|
7
|
+
// We don't import from ./utils.js because we tolerate this file to be loaded in production
|
|
8
|
+
const utils_js_1 = require("../runtime/utils.js");
|
|
8
9
|
const globalObject = (0, utils_js_1.getGlobalObject)('api/context.ts', {});
|
|
9
|
-
function
|
|
10
|
-
return globalObject.
|
|
10
|
+
function getVikeApiOperation() {
|
|
11
|
+
return globalObject.vikeApiOperation ?? null;
|
|
11
12
|
}
|
|
12
13
|
function isVikeCliOrApi() {
|
|
13
14
|
// The CLI uses the API
|
|
14
|
-
return !!globalObject.
|
|
15
|
+
return !!globalObject.vikeApiOperation;
|
|
15
16
|
}
|
|
16
|
-
function
|
|
17
|
-
(0, utils_js_1.assert)(!globalObject.
|
|
18
|
-
globalObject.
|
|
17
|
+
function setContextVikeApiOperation(operation, options) {
|
|
18
|
+
(0, utils_js_1.assert)(!globalObject.vikeApiOperation);
|
|
19
|
+
globalObject.vikeApiOperation = { operation, options };
|
|
19
20
|
}
|
|
20
|
-
function
|
|
21
|
-
globalObject.
|
|
21
|
+
function clearContextVikeApiOperation() {
|
|
22
|
+
globalObject.vikeApiOperation = undefined;
|
|
22
23
|
}
|
package/dist/cjs/node/api/dev.js
CHANGED
|
@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.dev = dev;
|
|
4
4
|
const prepareViteApiCall_js_1 = require("./prepareViteApiCall.js");
|
|
5
5
|
const vite_1 = require("vite");
|
|
6
|
-
const globalContext_js_1 = require("../runtime/globalContext.js");
|
|
7
6
|
/**
|
|
8
7
|
* Programmatically trigger `$ vike dev`
|
|
9
8
|
*
|
|
10
9
|
* https://vike.dev/api#dev
|
|
11
10
|
*/
|
|
12
11
|
async function dev(options = {}) {
|
|
13
|
-
(0, globalContext_js_1.setGlobalContext_isProduction)(false);
|
|
14
12
|
const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'dev');
|
|
15
13
|
const server = await (0, vite_1.createServer)(viteConfigFromUserEnhanced);
|
|
16
14
|
return {
|
|
@@ -34,8 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.prerender = exports.preview = exports.dev = exports.build = void 0;
|
|
37
|
-
const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
|
|
38
|
-
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
39
37
|
const build_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./build.js')))).build(...args);
|
|
40
38
|
exports.build = build_;
|
|
41
39
|
const dev_ = async (...args) => (await Promise.resolve().then(() => __importStar(require('./dev.js')))).dev(...args);
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.onLoad = onLoad;
|
|
4
4
|
const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
|
|
5
|
-
const
|
|
5
|
+
const assertSetup_js_1 = require("../../utils/assertSetup.js");
|
|
6
6
|
function onLoad() {
|
|
7
7
|
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
8
|
-
(0,
|
|
8
|
+
(0, assertSetup_js_1.assertIsNotProductionRuntime)();
|
|
9
9
|
}
|
|
@@ -51,13 +51,13 @@ const getEnvVarObject_js_1 = require("../vite/shared/getEnvVarObject.js");
|
|
|
51
51
|
const globalObject = (0, utils_js_1.getGlobalObject)('api/prepareViteApiCall.ts', {});
|
|
52
52
|
async function prepareViteApiCall(options, operation) {
|
|
53
53
|
clear();
|
|
54
|
-
(0, context_js_1.
|
|
54
|
+
(0, context_js_1.setContextVikeApiOperation)(operation, options);
|
|
55
55
|
const viteConfigFromUserApiOptions = options.viteConfig;
|
|
56
56
|
return resolveConfigs(viteConfigFromUserApiOptions, operation);
|
|
57
57
|
}
|
|
58
58
|
// For subsequent API calls, e.g. calling prerender() after build()
|
|
59
59
|
function clear() {
|
|
60
|
-
(0, context_js_1.
|
|
60
|
+
(0, context_js_1.clearContextVikeApiOperation)();
|
|
61
61
|
(0, globalContext_js_1.clearGlobalContext)();
|
|
62
62
|
}
|
|
63
63
|
async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
|
|
@@ -71,7 +71,6 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
|
|
|
71
71
|
const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
|
|
72
72
|
const { viteConfigResolved } = await assertViteRoot2(viteInfo.root, viteConfigFromUserEnhanced, operation);
|
|
73
73
|
return {
|
|
74
|
-
vikeConfig,
|
|
75
74
|
viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
|
|
76
75
|
viteConfigFromUserEnhanced,
|
|
77
76
|
};
|
|
@@ -11,17 +11,16 @@ const getOutDirs_js_1 = require("../vite/shared/getOutDirs.js");
|
|
|
11
11
|
const utils_js_1 = require("./utils.js");
|
|
12
12
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
13
13
|
const node_path_1 = __importDefault(require("node:path"));
|
|
14
|
-
const utils_js_2 = require("../runtime/utils.js");
|
|
15
14
|
/**
|
|
16
15
|
* Programmatically trigger `$ vike preview`
|
|
17
16
|
*
|
|
18
17
|
* https://vike.dev/api#preview
|
|
19
18
|
*/
|
|
20
19
|
async function preview(options = {}) {
|
|
21
|
-
(0,
|
|
20
|
+
(0, utils_js_1.onSetupPreview)();
|
|
22
21
|
const { viteConfigFromUserEnhanced, viteConfigResolved } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(options, 'preview');
|
|
23
22
|
if (viteConfigResolved.vitePluginServerEntry?.inject) {
|
|
24
|
-
const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved).outDirRoot;
|
|
23
|
+
const outDir = (0, getOutDirs_js_1.getOutDirs)(viteConfigResolved, undefined).outDirRoot;
|
|
25
24
|
const { outServerIndex } = await (0, runtime_1.importServerProductionIndex)({ outDir });
|
|
26
25
|
const outServerIndexRelative = node_path_1.default.relative(viteConfigResolved.root, outServerIndex);
|
|
27
26
|
(0, utils_js_1.assertWarning)(false, `Never run ${picocolors_1.default.cyan('$ vike preview')} in production, run ${picocolors_1.default.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, { onlyOnce: true });
|
|
@@ -24,3 +24,4 @@ __exportStar(require("../../utils/path.js"), exports);
|
|
|
24
24
|
__exportStar(require("../../utils/isObject.js"), exports);
|
|
25
25
|
__exportStar(require("../../utils/assertVersion.js"), exports);
|
|
26
26
|
__exportStar(require("../../utils/pick.js"), exports);
|
|
27
|
+
__exportStar(require("../../utils/assertSetup.js"), exports);
|
|
@@ -7,6 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.prerender = void 0;
|
|
8
8
|
var prerender_js_1 = require("../api/prerender.js");
|
|
9
9
|
Object.defineProperty(exports, "prerender", { enumerable: true, get: function () { return prerender_js_1.prerender; } });
|
|
10
|
-
const
|
|
10
|
+
const utils_js_1 = require("./utils.js");
|
|
11
11
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
12
|
-
(0,
|
|
12
|
+
(0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan("import { prerender } from 'vike/cli'")} is deprecated in favor of ${picocolors_1.default.cyan("import { prerender } from 'vike/api'")}`, { onlyOnce: true });
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.onLoad = onLoad;
|
|
4
4
|
const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
|
|
5
|
-
const
|
|
5
|
+
const assertSetup_js_1 = require("../../utils/assertSetup.js");
|
|
6
6
|
function onLoad() {
|
|
7
7
|
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
8
|
-
(0,
|
|
8
|
+
(0, assertSetup_js_1.assertIsNotProductionRuntime)();
|
|
9
9
|
}
|
|
@@ -43,7 +43,7 @@ exports.runPrerender = runPrerender;
|
|
|
43
43
|
const node_path_1 = __importDefault(require("node:path"));
|
|
44
44
|
const index_js_1 = require("../../shared/route/index.js");
|
|
45
45
|
const utils_js_1 = require("./utils.js");
|
|
46
|
-
const
|
|
46
|
+
const renderPageAfterRoute_js_1 = require("../runtime/renderPage/renderPageAfterRoute.js");
|
|
47
47
|
const createPageContextServerSide_js_1 = require("../runtime/renderPage/createPageContextServerSide.js");
|
|
48
48
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
49
49
|
const node_os_1 = require("node:os");
|
|
@@ -53,7 +53,7 @@ const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
|
|
|
53
53
|
const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
|
|
54
54
|
const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
|
|
55
55
|
const getConfigValueRuntime_js_1 = require("../../shared/page-configs/getConfigValueRuntime.js");
|
|
56
|
-
const
|
|
56
|
+
const loadAndParseVirtualFilePageEntry_js_1 = require("../../shared/page-configs/loadAndParseVirtualFilePageEntry.js");
|
|
57
57
|
const error_page_js_1 = require("../../shared/error-page.js");
|
|
58
58
|
const abort_js_1 = require("../../shared/route/abort.js");
|
|
59
59
|
const loadPageConfigsLazyServerSide_js_1 = require("../runtime/renderPage/loadPageConfigsLazyServerSide.js");
|
|
@@ -82,7 +82,7 @@ async function runPrerender(options = {}, trigger) {
|
|
|
82
82
|
await disableReactStreaming();
|
|
83
83
|
const viteConfig = await (0, vite_1.resolveConfig)(options.viteConfig || {}, 'build', 'production');
|
|
84
84
|
const vikeConfig = await (0, resolveVikeConfigInternal_js_1.getVikeConfigInternal)();
|
|
85
|
-
const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
|
|
85
|
+
const { outDirServer } = (0, getOutDirs_js_1.getOutDirs)(viteConfig, undefined);
|
|
86
86
|
const prerenderConfigGlobal = (0, resolvePrerenderConfig_js_1.resolvePrerenderConfigGlobal)(vikeConfig);
|
|
87
87
|
const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
|
|
88
88
|
if (!isPrerenderingEnabled) {
|
|
@@ -212,7 +212,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
|
|
|
212
212
|
// V1 design
|
|
213
213
|
await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
|
|
214
214
|
const hookName = 'onBeforePrerenderStart';
|
|
215
|
-
const pageConfigLoaded = await (0,
|
|
215
|
+
const pageConfigLoaded = await (0, loadAndParseVirtualFilePageEntry_js_1.loadAndParseVirtualFilePageEntry)(pageConfig, false);
|
|
216
216
|
const hook = (0, getHook_js_1.getHookFromPageConfig)(pageConfigLoaded, hookName);
|
|
217
217
|
if (!hook)
|
|
218
218
|
return;
|
|
@@ -357,11 +357,10 @@ async function createPageContextPrerendering(urlOriginal, prerenderContext, glob
|
|
|
357
357
|
(0, utils_js_1.assert)(pageId);
|
|
358
358
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
359
359
|
pageId,
|
|
360
|
-
_debugRouteMatches: [],
|
|
361
360
|
routeParams: {},
|
|
362
361
|
});
|
|
363
362
|
}
|
|
364
|
-
(0, utils_js_2.
|
|
363
|
+
(0, utils_js_2.updateType)(pageContext, await (0, loadPageConfigsLazyServerSide_js_1.loadPageConfigsLazyServerSide)(pageContext));
|
|
365
364
|
let usesClientRouter;
|
|
366
365
|
{
|
|
367
366
|
const { pageId } = pageContext;
|
|
@@ -541,7 +540,7 @@ async function prerenderPages(prerenderContext, concurrencyLimit, onComplete) {
|
|
|
541
540
|
await Promise.all(prerenderContext.pageContexts.map((pageContextBeforeRender) => concurrencyLimit(async () => {
|
|
542
541
|
let res;
|
|
543
542
|
try {
|
|
544
|
-
res = await (0,
|
|
543
|
+
res = await (0, renderPageAfterRoute_js_1.prerenderPage)(pageContextBeforeRender);
|
|
545
544
|
}
|
|
546
545
|
catch (err) {
|
|
547
546
|
assertIsNotAbort(err, picocolors_1.default.cyan(pageContextBeforeRender.urlOriginal));
|
|
@@ -590,7 +589,7 @@ async function writeFiles({ pageContext, htmlString, pageContextSerialized }, vi
|
|
|
590
589
|
async function write(pageContext, fileType, fileContent, viteConfig, onPagePrerender, prerenderContext, logLevel) {
|
|
591
590
|
const { urlOriginal } = pageContext;
|
|
592
591
|
(0, utils_js_1.assert)(urlOriginal.startsWith('/'));
|
|
593
|
-
const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig);
|
|
592
|
+
const { outDirClient } = (0, getOutDirs_js_1.getOutDirs)(viteConfig, undefined);
|
|
594
593
|
const { root } = viteConfig;
|
|
595
594
|
let fileUrl;
|
|
596
595
|
if (fileType === 'HTML') {
|
|
@@ -35,7 +35,7 @@ async function runPrerenderFromAutoRun(viteConfig) {
|
|
|
35
35
|
await (0, runPrerender_js_1.runPrerender)({ viteConfig }, 'auto-run');
|
|
36
36
|
}
|
|
37
37
|
catch (err) {
|
|
38
|
-
// Avoid Rollup prefixing the error with [vike:build:
|
|
38
|
+
// Avoid Rollup prefixing the error with [vike:build:pluginBuildApp], see for example https://github.com/vikejs/vike/issues/472#issuecomment-1276274203
|
|
39
39
|
console.error(err);
|
|
40
40
|
(0, logErrorHint_js_1.logErrorHint)(err);
|
|
41
41
|
process.exit(1);
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolvePageContextCspNone = resolvePageContextCspNone;
|
|
4
|
+
exports.inferNonceAttr = inferNonceAttr;
|
|
5
|
+
exports.addCspHeader = addCspHeader;
|
|
6
|
+
const import_1 = require("@brillout/import");
|
|
7
|
+
async function resolvePageContextCspNone(pageContext) {
|
|
8
|
+
if (pageContext.cspNonce)
|
|
9
|
+
return; // already set by user e.g. `renderPage({ cspNonce: '123456789' })`
|
|
10
|
+
const { csp } = pageContext.config;
|
|
11
|
+
if (!csp?.nonce)
|
|
12
|
+
return;
|
|
13
|
+
let cspNonce;
|
|
14
|
+
if (csp.nonce === true) {
|
|
15
|
+
cspNonce = await generateNonce();
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
cspNonce = await csp.nonce(pageContext);
|
|
19
|
+
}
|
|
20
|
+
const pageContextAddendum = { cspNonce };
|
|
21
|
+
return pageContextAddendum;
|
|
22
|
+
}
|
|
23
|
+
// Generate a cryptographically secure nonce for Content Security Policy (CSP).
|
|
24
|
+
// Returns a base64url-encoded nonce string (URL-safe, no padding).
|
|
25
|
+
// https://github.com/vikejs/vike/issues/1554#issuecomment-3181128304
|
|
26
|
+
async function generateNonce() {
|
|
27
|
+
let cryptoModule;
|
|
28
|
+
try {
|
|
29
|
+
cryptoModule = (await (0, import_1.import_)('crypto')).default;
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return Math.random().toString(36).substring(2, 18);
|
|
33
|
+
}
|
|
34
|
+
return cryptoModule.randomBytes(16).toString('base64url');
|
|
35
|
+
}
|
|
36
|
+
function inferNonceAttr(pageContext) {
|
|
37
|
+
const nonceAttr = pageContext.cspNonce ? ` nonce="${pageContext.cspNonce}"` : '';
|
|
38
|
+
return nonceAttr;
|
|
39
|
+
}
|
|
40
|
+
function addCspHeader(pageContext, headersResponse) {
|
|
41
|
+
if (!pageContext.cspNonce)
|
|
42
|
+
return;
|
|
43
|
+
if (headersResponse.get('Content-Security-Policy'))
|
|
44
|
+
return;
|
|
45
|
+
headersResponse.set('Content-Security-Policy', `script-src 'self' 'nonce-${pageContext.cspNonce}'`);
|
|
46
|
+
}
|