vike 0.4.231-commit-e1c3295 → 0.4.232-commit-134207d
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/README.md +4 -2
- package/dist/cjs/__internal/index.js +2 -2
- package/dist/cjs/client/runtime-client-routing/globalContext.js +1 -1
- package/dist/cjs/client/shared/createGetGlobalContextClient.js +2 -2
- package/dist/cjs/client/shared/preparePageContextForPublicUsageClientShared.js +2 -2
- package/dist/cjs/node/api/build.js +6 -2
- package/dist/cjs/node/api/dev.js +1 -1
- package/dist/cjs/node/api/prepareViteApiCall.js +8 -8
- package/dist/cjs/node/api/prerender.js +1 -1
- package/dist/cjs/node/api/preview.js +2 -2
- package/dist/cjs/node/cli/entry.js +1 -1
- package/dist/cjs/node/cli/parseCli.js +2 -2
- package/dist/cjs/node/client/router.js +1 -1
- package/dist/cjs/node/createPageRenderer.js +1 -1
- package/dist/cjs/node/prerender/context.js +1 -1
- package/dist/cjs/node/prerender/resolvePrerenderConfig.js +3 -2
- package/dist/cjs/node/prerender/runPrerender.js +91 -46
- package/dist/cjs/node/prerender/runPrerenderEntry.js +1 -1
- package/dist/cjs/node/prerender/utils.js +1 -0
- package/dist/cjs/node/runtime/globalContext.js +22 -15
- package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js +7 -7
- package/dist/cjs/node/runtime/html/injectAssets/getViteDevScript.js +1 -1
- package/dist/cjs/node/runtime/html/injectAssets/inferHtmlTags.js +1 -1
- package/dist/cjs/node/runtime/html/injectAssets/injectAssets__public.js +5 -5
- package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js +3 -3
- package/dist/cjs/node/runtime/html/injectAssets.js +1 -1
- package/dist/cjs/node/runtime/html/renderHtml.js +8 -8
- package/dist/cjs/node/runtime/html/serializeContext.js +5 -5
- package/dist/cjs/node/runtime/html/stream.js +19 -19
- package/dist/cjs/node/runtime/index-deprecated.js +2 -2
- package/dist/cjs/node/runtime/index.js +1 -1
- package/dist/cjs/node/runtime/renderPage/analyzePage.js +4 -4
- package/dist/cjs/node/runtime/renderPage/assertArguments.js +1 -1
- package/dist/cjs/node/runtime/renderPage/createHttpResponse/assertNoInfiniteHttpRedirect.js +1 -1
- package/dist/cjs/node/runtime/renderPage/createHttpResponse.js +5 -6
- package/dist/cjs/node/runtime/renderPage/createPageContextServerSide.js +4 -4
- package/dist/cjs/node/runtime/renderPage/debugPageFiles.js +1 -1
- package/dist/cjs/node/runtime/renderPage/execHookServer.js +1 -4
- package/dist/cjs/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +1 -1
- package/dist/cjs/node/runtime/renderPage/executeOnRenderHtmlHook.js +3 -3
- package/dist/cjs/node/runtime/renderPage/getEarlyHints.js +1 -1
- package/dist/cjs/node/runtime/renderPage/getHttpResponseBody.js +1 -1
- package/dist/cjs/node/runtime/renderPage/getPageAssets/getManifestEntry.js +1 -1
- package/dist/cjs/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js +1 -1
- package/dist/cjs/node/runtime/renderPage/getPageAssets.js +2 -2
- package/dist/cjs/node/runtime/renderPage/handleErrorWithoutErrorPage.js +1 -1
- package/dist/cjs/node/runtime/renderPage/handlePageContextRequestUrl.js +1 -1
- package/dist/cjs/node/runtime/renderPage/isFontFallback.js +3 -3
- package/dist/cjs/node/runtime/renderPage/isNewError.js +2 -1
- package/dist/cjs/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +10 -10
- package/dist/cjs/node/runtime/renderPage/log404/index.js +4 -8
- package/dist/cjs/node/runtime/renderPage/logErrorHint/errors.js +2 -2
- package/dist/cjs/node/runtime/renderPage/logErrorHint.js +18 -18
- package/dist/cjs/node/runtime/renderPage/loggerProd.js +3 -3
- package/dist/cjs/node/runtime/renderPage/renderPageAlreadyRouted.js +1 -1
- package/dist/cjs/node/runtime/renderPage/resolveRedirects.js +22 -4
- package/dist/cjs/node/runtime/renderPage.js +17 -34
- package/dist/cjs/node/runtime/universal-middleware.js +2 -2
- package/dist/cjs/node/runtime/utils.js +1 -1
- package/dist/cjs/node/runtime-dev/createDevMiddleware.js +3 -3
- package/dist/cjs/node/shared/extractAssetsQuery.js +1 -1
- package/dist/cjs/node/shared/getVikeConfigError.js +22 -0
- package/dist/cjs/node/shared/resolveBase.js +1 -1
- package/dist/cjs/node/shared/utils.js +1 -0
- package/dist/cjs/node/shared/virtualFiles/virtualFilePageConfigLazy.js +2 -2
- package/dist/cjs/node/vite/index.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginBaseUrls.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginBuild/handleAssetsManifest.js +30 -28
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +10 -10
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildApp.js +10 -10
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildConfig.js +10 -10
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginBuildEntry.js +12 -13
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistFileNames.js +14 -12
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginModuleBanner.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginBuild/pluginSuppressRollupWarning.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginBuild.js +1 -1
- package/dist/cjs/node/vite/plugins/pluginCommon/assertResolveAlias.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginCommon.js +14 -14
- package/dist/cjs/node/vite/plugins/pluginDev/determineFsAllowList.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginDev/determineOptimizeDeps.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginDev.js +8 -8
- package/dist/cjs/node/vite/plugins/pluginEnvVars.js +4 -4
- package/dist/cjs/node/vite/plugins/pluginExtractAssets.js +6 -6
- package/dist/cjs/node/vite/plugins/pluginExtractExportNames.js +2 -2
- package/dist/cjs/node/vite/plugins/pluginFileEnv.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginPreview.js +9 -9
- package/dist/cjs/node/vite/plugins/pluginReplaceConstants.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginSetGlobalContext.js +6 -6
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getVirtualFileEntry.js +10 -10
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigLazy.js +11 -1
- package/dist/cjs/node/vite/plugins/pluginVirtualFiles.js +3 -3
- package/dist/cjs/node/vite/plugins/pluginWorkaroundCssModuleHmr.js +1 -1
- package/dist/cjs/node/vite/plugins/pluginWorkaroundVite6HmrRegression.js +2 -2
- package/dist/cjs/node/vite/shared/addSsrMiddleware.js +3 -3
- package/dist/cjs/node/vite/shared/findPageFiles.js +1 -1
- package/dist/cjs/node/vite/shared/getFilePath.js +24 -24
- package/dist/cjs/node/vite/shared/getHttpRequestAsyncStore.js +4 -4
- package/dist/cjs/node/vite/shared/getOutDirs.js +2 -2
- package/dist/cjs/node/vite/shared/getViteConfigRuntime.js +3 -3
- package/dist/cjs/node/vite/shared/isAsset.js +1 -1
- package/dist/cjs/node/vite/shared/isViteCliCall.js +1 -1
- package/dist/cjs/node/vite/shared/isViteServerBuild.js +2 -2
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errBabelReact.js +1 -1
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errBabelSolid.js +1 -1
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errEsbuild.js +5 -5
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx1.js +3 -3
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js +10 -10
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errPostcss.js +2 -2
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errSwc.js +2 -2
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errSwcBig.js +2 -2
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueCss.js +2 -2
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueHtml.js +1 -1
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueJavascript.js +1 -1
- package/dist/cjs/node/vite/shared/loggerNotProd/errorWithCodeSnippet.js +3 -3
- package/dist/cjs/node/vite/shared/loggerNotProd.js +1 -1
- package/dist/cjs/node/vite/shared/resolveClientEntriesDev.js +2 -2
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/assertExtensions.js +2 -2
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +50 -50
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles/ignorePatternsBuiltIn.js +1 -1
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +13 -13
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js +14 -5
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js +4 -4
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.js +1 -1
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/pointerImports.js +5 -5
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js +5 -5
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js +25 -25
- package/dist/cjs/node/vite/shared/resolveVikeConfigInternal.js +46 -46
- package/dist/cjs/node/vite/utils.js +2 -7
- package/dist/cjs/shared/assertHookReturnedObject.js +1 -1
- package/dist/cjs/shared/assertPageContextProvidedByUser.js +2 -2
- package/dist/cjs/shared/createGlobalContextShared.js +26 -18
- package/dist/cjs/shared/createPageContextShared.js +1 -1
- package/dist/cjs/shared/getPageContextRequestUrl.js +1 -1
- package/dist/cjs/shared/getPageContextUrlComputed.js +5 -5
- package/dist/cjs/shared/getPageFiles/analyzePageClientSide/analyzeExports.js +3 -3
- package/dist/cjs/shared/getPageFiles/analyzePageClientSide/determineClientEntry.js +1 -1
- package/dist/cjs/shared/getPageFiles/analyzePageClientSide.js +3 -3
- package/dist/cjs/shared/getPageFiles/fileTypes.js +1 -1
- package/dist/cjs/shared/getPageFiles/getAllPageIdFiles.js +2 -2
- package/dist/cjs/shared/getPageFiles/getPageFileObject.js +1 -1
- package/dist/cjs/shared/getProxyForPublicUsage.js +2 -2
- package/dist/cjs/shared/hooks/execHook.js +2 -2
- package/dist/cjs/shared/hooks/getHook.js +4 -4
- package/dist/cjs/shared/modifyUrl.js +1 -1
- package/dist/cjs/shared/page-configs/assertPlusFileExport.js +2 -2
- package/dist/cjs/shared/page-configs/getConfigValueBuildTime.js +4 -4
- package/dist/cjs/shared/page-configs/resolveVikeConfigPublic.js +21 -21
- package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js +3 -3
- package/dist/cjs/shared/page-configs/serialize/serializeConfigValues.js +9 -9
- package/dist/cjs/shared/preparePageContextForPublicUsage.js +3 -3
- package/dist/cjs/shared/route/abort.js +7 -7
- package/dist/cjs/shared/route/debug.js +1 -1
- package/dist/cjs/shared/route/deduceRouteStringFromFilesystemPath.js +1 -1
- package/dist/cjs/shared/route/executeOnBeforeRouteHook.js +3 -3
- package/dist/cjs/shared/route/index.js +5 -5
- package/dist/cjs/shared/route/loadPageRoutes.js +8 -8
- package/dist/cjs/shared/route/resolvePrecedence.js +2 -2
- package/dist/cjs/shared/route/resolveRoute.js +1 -1
- package/dist/cjs/shared/route/resolveRouteFunction.js +2 -2
- package/dist/cjs/shared/utils.js +1 -0
- package/dist/cjs/utils/PROJECT_VERSION.js +1 -1
- package/dist/cjs/utils/assert.js +9 -9
- package/dist/cjs/utils/assertKeys.js +1 -1
- package/dist/cjs/utils/assertSetup.js +1 -1
- package/dist/cjs/utils/assertSingleInstance.js +5 -5
- package/dist/cjs/utils/catchInfiniteLoop.js +1 -1
- package/dist/cjs/utils/debug.js +1 -1
- package/dist/cjs/utils/findFile.js +5 -5
- package/dist/cjs/utils/findPackageJson.js +3 -3
- package/dist/cjs/utils/formatHintLog.js +1 -1
- package/dist/cjs/utils/freezePartial.js +1 -1
- package/dist/cjs/utils/genPromise.js +2 -2
- package/dist/cjs/utils/getMostSimilar.js +1 -1
- package/dist/cjs/utils/injectRollupInputs.js +2 -2
- package/dist/cjs/utils/isFilePathAbsoluteFilesystem.js +1 -1
- package/dist/cjs/utils/objectAssignSafe.js +1 -1
- package/dist/cjs/utils/pLimit.js +4 -4
- package/dist/cjs/utils/parseNpmPackage.js +2 -2
- package/dist/cjs/utils/parseUrl.js +3 -3
- package/dist/cjs/utils/path.js +1 -1
- package/dist/cjs/utils/preservePropertyGetters.js +1 -1
- package/dist/cjs/utils/{removeFileExtention.js → removeFileExtension.js} +2 -2
- package/dist/cjs/utils/requireResolve.js +10 -10
- package/dist/cjs/utils/rollupSourceMap.js +2 -2
- package/dist/cjs/utils/stripAnsi.js +1 -1
- package/dist/cjs/utils/styleFileRE.js +1 -0
- package/dist/cjs/utils/trimWithAnsi.js +1 -1
- package/dist/esm/__internal/index.js +2 -2
- package/dist/esm/client/index.d.ts +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/client/node.js +1 -1
- package/dist/esm/client/runtime-client-routing/createPageContextClientSide.js +1 -1
- package/dist/esm/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.js +1 -1
- package/dist/esm/client/runtime-client-routing/getPageContextCurrent.js +1 -1
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.d.ts +2 -3
- package/dist/esm/client/runtime-client-routing/getPageContextFromHooks.js +5 -5
- package/dist/esm/client/runtime-client-routing/globalContext.js +1 -1
- package/dist/esm/client/runtime-client-routing/history.js +6 -6
- package/dist/esm/client/runtime-client-routing/initClientRouter.js +1 -1
- package/dist/esm/client/runtime-client-routing/initOnLinkClick.js +1 -1
- package/dist/esm/client/runtime-client-routing/initOnPopState.js +1 -1
- package/dist/esm/client/runtime-client-routing/isClientSideRoutable.js +1 -1
- package/dist/esm/client/runtime-client-routing/navigate.js +1 -1
- package/dist/esm/client/runtime-client-routing/prefetch/getPrefetchSettings.js +2 -2
- package/dist/esm/client/runtime-client-routing/prefetch.js +10 -10
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts +1 -1
- package/dist/esm/client/runtime-client-routing/renderPageClientSide.js +20 -20
- package/dist/esm/client/runtime-client-routing/setScrollPosition.js +1 -1
- package/dist/esm/client/runtime-server-routing/createPageContextClientSide.js +1 -1
- package/dist/esm/client/shared/createGetGlobalContextClient.js +3 -3
- package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js +1 -1
- package/dist/esm/client/shared/preparePageContextForPublicUsageClientShared.js +3 -3
- package/dist/esm/node/api/build.js +6 -2
- package/dist/esm/node/api/dev.js +1 -1
- package/dist/esm/node/api/prepareViteApiCall.js +8 -8
- package/dist/esm/node/api/prerender.js +1 -1
- package/dist/esm/node/api/preview.js +2 -2
- package/dist/esm/node/cli/entry.js +1 -1
- package/dist/esm/node/cli/parseCli.js +2 -2
- package/dist/esm/node/client/router.js +1 -1
- package/dist/esm/node/createPageRenderer.js +1 -1
- package/dist/esm/node/prerender/context.d.ts +1 -1
- package/dist/esm/node/prerender/context.js +1 -1
- package/dist/esm/node/prerender/resolvePrerenderConfig.d.ts +1 -0
- package/dist/esm/node/prerender/resolvePrerenderConfig.js +3 -2
- package/dist/esm/node/prerender/runPrerender.d.ts +9 -6
- package/dist/esm/node/prerender/runPrerender.js +90 -45
- package/dist/esm/node/prerender/runPrerenderEntry.js +1 -1
- package/dist/esm/node/prerender/utils.d.ts +1 -0
- package/dist/esm/node/prerender/utils.js +1 -0
- package/dist/esm/node/runtime/globalContext.js +25 -18
- package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.js +8 -8
- package/dist/esm/node/runtime/html/injectAssets/getViteDevScript.js +1 -1
- package/dist/esm/node/runtime/html/injectAssets/inferHtmlTags.js +1 -1
- package/dist/esm/node/runtime/html/injectAssets/injectAssets__public.js +5 -5
- package/dist/esm/node/runtime/html/injectAssets/injectHtmlTags.js +3 -3
- package/dist/esm/node/runtime/html/injectAssets.js +2 -2
- package/dist/esm/node/runtime/html/renderHtml.js +10 -10
- package/dist/esm/node/runtime/html/serializeContext.js +5 -5
- package/dist/esm/node/runtime/html/stream.d.ts +1 -1
- package/dist/esm/node/runtime/html/stream.js +21 -21
- package/dist/esm/node/runtime/index-deprecated.js +2 -2
- package/dist/esm/node/runtime/index.js +1 -1
- package/dist/esm/node/runtime/renderPage/analyzePage.js +4 -4
- package/dist/esm/node/runtime/renderPage/assertArguments.js +1 -1
- package/dist/esm/node/runtime/renderPage/createHttpResponse/assertNoInfiniteHttpRedirect.js +1 -1
- package/dist/esm/node/runtime/renderPage/createHttpResponse.js +5 -6
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js +4 -4
- package/dist/esm/node/runtime/renderPage/debugPageFiles.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/debugPageFiles.js +1 -1
- package/dist/esm/node/runtime/renderPage/execHookServer.js +2 -5
- package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js +1 -1
- package/dist/esm/node/runtime/renderPage/executeOnRenderHtmlHook.js +5 -5
- package/dist/esm/node/runtime/renderPage/getEarlyHints.js +1 -1
- package/dist/esm/node/runtime/renderPage/getHttpResponseBody.js +2 -2
- package/dist/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js +1 -1
- package/dist/esm/node/runtime/renderPage/getPageAssets/retrieveAssetsProd.js +1 -1
- package/dist/esm/node/runtime/renderPage/getPageAssets.js +2 -2
- package/dist/esm/node/runtime/renderPage/handleErrorWithoutErrorPage.js +1 -1
- package/dist/esm/node/runtime/renderPage/handlePageContextRequestUrl.js +1 -1
- package/dist/esm/node/runtime/renderPage/isFontFallback.js +3 -3
- package/dist/esm/node/runtime/renderPage/isNewError.d.ts +2 -0
- package/dist/esm/node/runtime/renderPage/isNewError.js +2 -1
- package/dist/esm/node/runtime/renderPage/loadPageConfigsLazyServerSide.js +11 -11
- package/dist/esm/node/runtime/renderPage/log404/index.js +5 -9
- package/dist/esm/node/runtime/renderPage/logErrorHint/errors.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/logErrorHint/errors.js +1 -1
- package/dist/esm/node/runtime/renderPage/logErrorHint.js +18 -18
- package/dist/esm/node/runtime/renderPage/loggerProd.d.ts +1 -1
- package/dist/esm/node/runtime/renderPage/loggerProd.js +3 -3
- package/dist/esm/node/runtime/renderPage/preparePageContextForPublicUsageServer.js +1 -1
- package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js +2 -2
- package/dist/esm/node/runtime/renderPage/resolveRedirects.d.ts +2 -0
- package/dist/esm/node/runtime/renderPage/resolveRedirects.js +24 -6
- package/dist/esm/node/runtime/renderPage.d.ts +0 -11
- package/dist/esm/node/runtime/renderPage.js +20 -37
- package/dist/esm/node/runtime/universal-middleware.js +2 -2
- package/dist/esm/node/runtime/utils.d.ts +1 -1
- package/dist/esm/node/runtime/utils.js +1 -1
- package/dist/esm/node/runtime-dev/createDevMiddleware.js +3 -3
- package/dist/esm/node/shared/extractAssetsQuery.js +1 -1
- package/dist/esm/node/shared/getVikeConfigError.d.ts +13 -0
- package/dist/esm/node/shared/getVikeConfigError.js +20 -0
- package/dist/esm/node/shared/resolveBase.js +1 -1
- package/dist/esm/node/shared/utils.d.ts +1 -0
- package/dist/esm/node/shared/utils.js +1 -0
- package/dist/esm/node/shared/virtualFiles/virtualFilePageConfigLazy.js +2 -2
- package/dist/esm/node/vite/index.js +2 -2
- package/dist/esm/node/vite/plugins/pluginBaseUrls.js +3 -3
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.d.ts +3 -2
- package/dist/esm/node/vite/plugins/pluginBuild/handleAssetsManifest.js +14 -12
- package/dist/esm/node/vite/plugins/pluginBuild/pluginAutoFullBuild.js +10 -10
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildApp.js +10 -10
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildConfig.js +12 -12
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildEntry.d.ts +1 -2
- package/dist/esm/node/vite/plugins/pluginBuild/pluginBuildEntry.js +11 -12
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistFileNames.js +11 -9
- package/dist/esm/node/vite/plugins/pluginBuild/pluginDistPackageJsonFile.js +2 -2
- package/dist/esm/node/vite/plugins/pluginBuild/pluginModuleBanner.js +3 -3
- package/dist/esm/node/vite/plugins/pluginBuild/pluginSuppressRollupWarning.js +3 -3
- package/dist/esm/node/vite/plugins/pluginBuild.js +1 -1
- package/dist/esm/node/vite/plugins/pluginCommon/assertResolveAlias.js +2 -2
- package/dist/esm/node/vite/plugins/pluginCommon.js +14 -14
- package/dist/esm/node/vite/plugins/pluginDev/determineFsAllowList.js +1 -1
- package/dist/esm/node/vite/plugins/pluginDev/determineOptimizeDeps.js +5 -5
- package/dist/esm/node/vite/plugins/pluginDev.js +8 -8
- package/dist/esm/node/vite/plugins/pluginEnvVars.js +5 -5
- package/dist/esm/node/vite/plugins/pluginExtractAssets.js +8 -8
- package/dist/esm/node/vite/plugins/pluginExtractExportNames.js +3 -3
- package/dist/esm/node/vite/plugins/pluginFileEnv.js +4 -4
- package/dist/esm/node/vite/plugins/pluginPreview.js +5 -5
- package/dist/esm/node/vite/plugins/pluginReplaceConstants.js +3 -3
- package/dist/esm/node/vite/plugins/pluginSetGlobalContext.js +7 -7
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getVirtualFileEntry.js +11 -11
- package/dist/esm/node/vite/plugins/pluginVirtualFiles/getVirtualFilePageConfigLazy.js +13 -3
- package/dist/esm/node/vite/plugins/pluginVirtualFiles.js +3 -3
- package/dist/esm/node/vite/plugins/pluginWorkaroundCssModuleHmr.js +1 -1
- package/dist/esm/node/vite/plugins/pluginWorkaroundVite6HmrRegression.js +2 -2
- package/dist/esm/node/vite/shared/addSsrMiddleware.js +3 -3
- package/dist/esm/node/vite/shared/findPageFiles.js +1 -1
- package/dist/esm/node/vite/shared/getFilePath.d.ts +5 -5
- package/dist/esm/node/vite/shared/getFilePath.js +22 -22
- package/dist/esm/node/vite/shared/getHttpRequestAsyncStore.js +4 -4
- package/dist/esm/node/vite/shared/getOutDirs.js +2 -2
- package/dist/esm/node/vite/shared/getViteConfigRuntime.js +3 -3
- package/dist/esm/node/vite/shared/isAsset.js +1 -1
- package/dist/esm/node/vite/shared/isViteCliCall.js +1 -1
- package/dist/esm/node/vite/shared/isViteServerBuild.js +2 -2
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errBabelReact.js +1 -1
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errBabelSolid.js +1 -1
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errEsbuild.js +5 -5
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx1.js +3 -3
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errMdx2.js +10 -10
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errPostcss.js +2 -2
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errSwc.js +2 -2
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errSwcBig.js +2 -2
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueCss.js +2 -2
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueHtml.js +1 -1
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet/fixture-errors/errVueJavascript.js +1 -1
- package/dist/esm/node/vite/shared/loggerNotProd/errorWithCodeSnippet.js +4 -4
- package/dist/esm/node/vite/shared/loggerNotProd.js +3 -3
- package/dist/esm/node/vite/shared/resolveClientEntriesDev.js +3 -3
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/assertExtensions.js +1 -1
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +50 -50
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles/ignorePatternsBuiltIn.js +1 -1
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/crawlPlusFiles.js +10 -10
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js +14 -5
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/getPlusFilesAll.js +4 -4
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.js +1 -1
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/pointerImports.js +5 -5
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js +6 -6
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js +14 -14
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.d.ts +2 -2
- package/dist/esm/node/vite/shared/resolveVikeConfigInternal.js +52 -52
- package/dist/esm/node/vite/utils.d.ts +0 -6
- package/dist/esm/node/vite/utils.js +2 -7
- package/dist/esm/shared/assertHookReturnedObject.js +1 -1
- package/dist/esm/shared/assertPageContextProvidedByUser.d.ts +1 -1
- package/dist/esm/shared/assertPageContextProvidedByUser.js +2 -2
- package/dist/esm/shared/createGlobalContextShared.d.ts +2 -0
- package/dist/esm/shared/createGlobalContextShared.js +28 -20
- package/dist/esm/shared/createPageContextShared.js +1 -1
- package/dist/esm/shared/getPageContextRequestUrl.js +1 -1
- package/dist/esm/shared/getPageContextUrlComputed.js +5 -5
- package/dist/esm/shared/getPageFiles/analyzePageClientSide/analyzeExports.d.ts +1 -1
- package/dist/esm/shared/getPageFiles/analyzePageClientSide/analyzeExports.js +3 -3
- package/dist/esm/shared/getPageFiles/analyzePageClientSide/determineClientEntry.d.ts +1 -1
- package/dist/esm/shared/getPageFiles/analyzePageClientSide/determineClientEntry.js +1 -1
- package/dist/esm/shared/getPageFiles/analyzePageClientSide.js +3 -3
- package/dist/esm/shared/getPageFiles/fileTypes.js +1 -1
- package/dist/esm/shared/getPageFiles/getAllPageIdFiles.js +2 -2
- package/dist/esm/shared/getPageFiles/getPageFileObject.js +1 -1
- package/dist/esm/shared/getProxyForPublicUsage.js +2 -2
- package/dist/esm/shared/hooks/execHook.js +3 -3
- package/dist/esm/shared/hooks/getHook.js +4 -4
- package/dist/esm/shared/modifyUrl.js +1 -1
- package/dist/esm/shared/modifyUrlSameOrigin.js +1 -1
- package/dist/esm/shared/page-configs/assertPlusFileExport.js +2 -2
- package/dist/esm/shared/page-configs/getConfigValueBuildTime.js +4 -4
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.d.ts +2 -2
- package/dist/esm/shared/page-configs/resolveVikeConfigPublic.js +22 -22
- package/dist/esm/shared/page-configs/serialize/parsePageConfigs.js +3 -3
- package/dist/esm/shared/page-configs/serialize/serializeConfigValues.js +11 -11
- package/dist/esm/shared/preparePageContextForPublicUsage.js +4 -4
- package/dist/esm/shared/route/abort.js +8 -8
- package/dist/esm/shared/route/debug.js +1 -1
- package/dist/esm/shared/route/deduceRouteStringFromFilesystemPath.js +1 -1
- package/dist/esm/shared/route/executeOnBeforeRouteHook.js +5 -5
- package/dist/esm/shared/route/index.js +6 -6
- package/dist/esm/shared/route/loadPageRoutes.js +8 -8
- package/dist/esm/shared/route/resolvePrecedence.d.ts +2 -2
- package/dist/esm/shared/route/resolvePrecedence.js +2 -2
- package/dist/esm/shared/route/resolveRoute.js +1 -1
- package/dist/esm/shared/route/resolveRouteFunction.js +2 -2
- package/dist/esm/shared/utils.d.ts +1 -0
- package/dist/esm/shared/utils.js +1 -0
- package/dist/esm/types/Config.d.ts +6 -0
- package/dist/esm/types/FilePath.d.ts +1 -1
- package/dist/esm/types/PageConfig.d.ts +1 -1
- package/dist/esm/types/PageContext.d.ts +2 -2
- package/dist/esm/types/index-dreprecated.d.ts +1 -1
- package/dist/esm/types/index.d.ts +3 -3
- package/dist/esm/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/esm/utils/PROJECT_VERSION.js +1 -1
- package/dist/esm/utils/assert.js +9 -9
- package/dist/esm/utils/assertKeys.js +1 -1
- package/dist/esm/utils/assertSetup.js +1 -1
- package/dist/esm/utils/assertSingleInstance.js +5 -5
- package/dist/esm/utils/catchInfiniteLoop.js +1 -1
- package/dist/esm/utils/debug.js +1 -1
- package/dist/esm/utils/findFile.js +2 -2
- package/dist/esm/utils/findPackageJson.js +2 -2
- package/dist/esm/utils/formatHintLog.js +1 -1
- package/dist/esm/utils/freezePartial.js +1 -1
- package/dist/esm/utils/genPromise.d.ts +1 -1
- package/dist/esm/utils/genPromise.js +2 -2
- package/dist/esm/utils/getMostSimilar.js +1 -1
- package/dist/esm/utils/injectRollupInputs.js +2 -2
- package/dist/esm/utils/isFilePathAbsoluteFilesystem.js +1 -1
- package/dist/esm/utils/objectAssignSafe.js +1 -1
- package/dist/esm/utils/pLimit.js +4 -4
- package/dist/esm/utils/parseNpmPackage.js +2 -2
- package/dist/esm/utils/parseUrl.js +3 -3
- package/dist/esm/utils/path.js +1 -1
- package/dist/esm/utils/preservePropertyGetters.js +1 -1
- package/dist/esm/utils/removeFileExtension.d.ts +1 -0
- package/dist/esm/utils/{removeFileExtention.js → removeFileExtension.js} +1 -1
- package/dist/esm/utils/requireResolve.d.ts +3 -3
- package/dist/esm/utils/requireResolve.js +10 -10
- package/dist/esm/utils/rollupSourceMap.js +2 -2
- package/dist/esm/utils/stripAnsi.js +1 -1
- package/dist/esm/utils/styleFileRE.js +1 -0
- package/dist/esm/utils/trimWithAnsi.js +1 -1
- package/package.json +2 -2
- package/dist/esm/utils/removeFileExtention.d.ts +0 -1
|
@@ -2,7 +2,7 @@ export { setPageContextCurrent };
|
|
|
2
2
|
export { getPageContextCurrent };
|
|
3
3
|
import { getGlobalObject } from './utils.js';
|
|
4
4
|
const globalObject = getGlobalObject('runtime-client-routing/getPageContextCurrent.ts', {
|
|
5
|
-
pageContextCurrent: null
|
|
5
|
+
pageContextCurrent: null,
|
|
6
6
|
});
|
|
7
7
|
function getPageContextCurrent() {
|
|
8
8
|
const { pageContextCurrent } = globalObject;
|
|
@@ -6,7 +6,6 @@ export { setPageContextInitIsPassedToClient };
|
|
|
6
6
|
export { execHookClient };
|
|
7
7
|
export type { PageContextFromServerHooks };
|
|
8
8
|
import type { VikeConfigPublicPageLazy, PageFile } from '../../shared/getPageFiles.js';
|
|
9
|
-
import type { PageConfigRuntime } from '../../types/PageConfig.js';
|
|
10
9
|
import type { HookName } from '../../types/Config.js';
|
|
11
10
|
import type { PageContextCreated } from './createPageContextClientSide.js';
|
|
12
11
|
import type { PageContextBegin } from './renderPageClientSide.js';
|
|
@@ -33,7 +32,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
|
|
|
33
32
|
_isOriginalObject: true;
|
|
34
33
|
_virtualFileExports: unknown;
|
|
35
34
|
_pageFilesAll: PageFile[];
|
|
36
|
-
_pageConfigs: PageConfigRuntime[];
|
|
35
|
+
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
37
36
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
38
37
|
_allPageIds: string[];
|
|
39
38
|
_vikeConfigPublicGlobal: {
|
|
@@ -243,7 +242,7 @@ declare function getPageContextFromClientHooks(pageContext: {
|
|
|
243
242
|
_isOriginalObject: true;
|
|
244
243
|
_virtualFileExports: unknown;
|
|
245
244
|
_pageFilesAll: PageFile[];
|
|
246
|
-
_pageConfigs: PageConfigRuntime[];
|
|
245
|
+
_pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
|
|
247
246
|
_pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
|
|
248
247
|
_allPageIds: string[];
|
|
249
248
|
_vikeConfigPublicGlobal: {
|
|
@@ -4,7 +4,7 @@ export { getPageContextFromServerHooks };
|
|
|
4
4
|
export { getPageContextFromClientHooks };
|
|
5
5
|
export { setPageContextInitIsPassedToClient };
|
|
6
6
|
export { execHookClient };
|
|
7
|
-
import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject } from './utils.js';
|
|
7
|
+
import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject, } from './utils.js';
|
|
8
8
|
import { parse } from '@brillout/json-serializer/parse';
|
|
9
9
|
import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
|
|
10
10
|
import { analyzePageServerSide } from '../../shared/getPageFiles/analyzePageServerSide.js';
|
|
@@ -18,7 +18,7 @@ import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
|
|
|
18
18
|
import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
|
|
19
19
|
import { isServerSideError } from '../../shared/misc/isServerSideError.js';
|
|
20
20
|
import { execHook } from '../../shared/hooks/execHook.js';
|
|
21
|
-
import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
|
|
21
|
+
import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
|
|
22
22
|
const globalObject = getGlobalObject('runtime-client-routing/getPageContextFromHooks.ts', {});
|
|
23
23
|
// TO-DO/eventually: rename
|
|
24
24
|
function getPageContextFromHooks_serialized() {
|
|
@@ -26,7 +26,7 @@ function getPageContextFromHooks_serialized() {
|
|
|
26
26
|
assertUsage(!('urlOriginal' in pageContextSerialized), "Adding 'urlOriginal' to passToClient is forbidden");
|
|
27
27
|
processPageContextFromServer(pageContextSerialized);
|
|
28
28
|
objectAssign(pageContextSerialized, {
|
|
29
|
-
_hasPageContextFromServer: true
|
|
29
|
+
_hasPageContextFromServer: true,
|
|
30
30
|
});
|
|
31
31
|
return pageContextSerialized;
|
|
32
32
|
}
|
|
@@ -41,7 +41,7 @@ async function getPageContextFromHooks_isHydration(pageContext) {
|
|
|
41
41
|
}
|
|
42
42
|
async function getPageContextFromServerHooks(pageContext, isErrorPage) {
|
|
43
43
|
const pageContextFromServerHooks = {
|
|
44
|
-
_hasPageContextFromServer: false
|
|
44
|
+
_hasPageContextFromServer: false,
|
|
45
45
|
};
|
|
46
46
|
// If pageContextInit has some client data or if one of the hooks guard(), data() or onBeforeRender() is server-side
|
|
47
47
|
// only, then we need to fetch pageContext from the server.
|
|
@@ -227,7 +227,7 @@ async function fetchPageContextFromServer(pageContext) {
|
|
|
227
227
|
if (isAbortPageContext(pageContextFromServer)) {
|
|
228
228
|
throw AbortRender(pageContextFromServer);
|
|
229
229
|
}
|
|
230
|
-
// Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error
|
|
230
|
+
// Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occurred on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
|
|
231
231
|
if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
|
|
232
232
|
throw getProjectError(`pageContext couldn't be fetched because an error occurred on the server-side`);
|
|
233
233
|
}
|
|
@@ -8,6 +8,6 @@ async function addGlobalContext(globalContext) {
|
|
|
8
8
|
const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
|
|
9
9
|
return {
|
|
10
10
|
_pageRoutes: pageRoutes,
|
|
11
|
-
_onBeforeRouteHook: onBeforeRouteHook
|
|
11
|
+
_onBeforeRouteHook: onBeforeRouteHook,
|
|
12
12
|
};
|
|
13
13
|
}
|
|
@@ -29,7 +29,7 @@ function enhance(stateNotEnhanced) {
|
|
|
29
29
|
timestamp,
|
|
30
30
|
scrollPosition,
|
|
31
31
|
triggeredBy,
|
|
32
|
-
_isVikeEnhanced: true
|
|
32
|
+
_isVikeEnhanced: true,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
@@ -38,7 +38,7 @@ function enhance(stateNotEnhanced) {
|
|
|
38
38
|
timestamp: stateNotEnhanced.timestamp ?? timestamp,
|
|
39
39
|
scrollPosition: stateNotEnhanced.scrollPosition ?? scrollPosition,
|
|
40
40
|
triggeredBy: stateNotEnhanced.triggeredBy ?? triggeredBy,
|
|
41
|
-
_isVikeEnhanced: true
|
|
41
|
+
_isVikeEnhanced: true,
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
assert(isVikeEnhanced(stateVikeEnhanced));
|
|
@@ -77,9 +77,9 @@ function pushHistoryState(url, overwriteLastHistoryEntry) {
|
|
|
77
77
|
// I don't remember why I set it to `null`, maybe because setting it now would be too early? (Maybe there is a delay between renderPageClientSide() is finished and the browser updating the scroll position.) Anyways, it seems like autoSaveScrollPosition() is enough.
|
|
78
78
|
scrollPosition: null,
|
|
79
79
|
triggeredBy: 'vike',
|
|
80
|
-
_isVikeEnhanced: true
|
|
80
|
+
_isVikeEnhanced: true,
|
|
81
81
|
};
|
|
82
|
-
// Calling the monkey patched history.pushState() (and not the
|
|
82
|
+
// Calling the monkey patched history.pushState() (and not the original) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls.
|
|
83
83
|
// - https://github.com/vikejs/vike/issues/1582
|
|
84
84
|
window.history.pushState(state, '', url);
|
|
85
85
|
}
|
|
@@ -112,7 +112,7 @@ function monkeyPatchHistoryAPI() {
|
|
|
112
112
|
scrollPosition: getScrollPosition(),
|
|
113
113
|
timestamp: getTimestamp(),
|
|
114
114
|
triggeredBy: 'user',
|
|
115
|
-
...stateOriginal
|
|
115
|
+
...stateOriginal,
|
|
116
116
|
};
|
|
117
117
|
assert(isVikeEnhanced(stateEnhanced));
|
|
118
118
|
const ret = funcOriginal(stateEnhanced, ...rest);
|
|
@@ -139,7 +139,7 @@ function isVikeEnhanced(state) {
|
|
|
139
139
|
function getHistoryInfo() {
|
|
140
140
|
return {
|
|
141
141
|
url: getCurrentUrl(),
|
|
142
|
-
state: getState()
|
|
142
|
+
state: getState(),
|
|
143
143
|
};
|
|
144
144
|
}
|
|
145
145
|
function onPopStateBegin() {
|
|
@@ -3,7 +3,7 @@ import { onPopStateBegin } from './history.js';
|
|
|
3
3
|
import { renderPageClientSide } from './renderPageClientSide.js';
|
|
4
4
|
import { setScrollPosition } from './setScrollPosition.js';
|
|
5
5
|
import { catchInfiniteLoop } from './utils.js';
|
|
6
|
-
// The 'popstate' event is
|
|
6
|
+
// The 'popstate' event is triggered when the browser doesn't fully load the new URL, for example:
|
|
7
7
|
// - `location.hash='#foo'` triggers the popstate event while `location.href='/foo'` doesn't.
|
|
8
8
|
// - Clicking on the browser's back-/forward button triggers a popstate event only if the history entry was generated with history.pushState() — no popstate event is fired upon Server Routing.
|
|
9
9
|
// Concretely, 'popstate' is fired when:
|
|
@@ -5,7 +5,7 @@ import { analyzeClientSide } from '../../shared/getPageFiles/analyzeClientSide.j
|
|
|
5
5
|
// TODO/next-major-release: make it sync
|
|
6
6
|
async function isClientSideRoutable(pageId, pageContext) {
|
|
7
7
|
await analyzePageClientSideInit(pageContext._pageFilesAll, pageId, {
|
|
8
|
-
sharedPageFilesAlreadyLoaded: false
|
|
8
|
+
sharedPageFilesAlreadyLoaded: false,
|
|
9
9
|
});
|
|
10
10
|
const pageConfig = findPageConfig(pageContext._globalContext._pageConfigs, pageId);
|
|
11
11
|
const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
|
|
@@ -6,11 +6,11 @@ import { assertUsage, assertInfo } from '../utils.js';
|
|
|
6
6
|
const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
|
|
7
7
|
const prefetchSettingTrue = {
|
|
8
8
|
staticAssets: 'hover',
|
|
9
|
-
pageContext: PAGE_CONTEXT_MAX_AGE_DEFAULT
|
|
9
|
+
pageContext: PAGE_CONTEXT_MAX_AGE_DEFAULT,
|
|
10
10
|
};
|
|
11
11
|
const prefetchSettingFalse = {
|
|
12
12
|
staticAssets: 'hover',
|
|
13
|
-
pageContext: false
|
|
13
|
+
pageContext: false,
|
|
14
14
|
};
|
|
15
15
|
// TODO/v1-release: change to `prefetchSettingTrue`?
|
|
16
16
|
const prefetchSettingDefault = prefetchSettingFalse;
|
|
@@ -5,7 +5,7 @@ export { populatePageContextPrefetchCache };
|
|
|
5
5
|
export { addLinkPrefetchHandlers };
|
|
6
6
|
export { addLinkPrefetchHandlers_watch };
|
|
7
7
|
export { addLinkPrefetchHandlers_unwatch };
|
|
8
|
-
import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign } from './utils.js';
|
|
8
|
+
import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign, } from './utils.js';
|
|
9
9
|
import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
|
|
10
10
|
import { skipLink } from './skipLink.js';
|
|
11
11
|
import { disableClientRouting } from './renderPageClientSide.js';
|
|
@@ -15,7 +15,7 @@ import { route } from '../../shared/route/index.js';
|
|
|
15
15
|
import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
|
|
16
16
|
import { getPageContextFromServerHooks } from './getPageContextFromHooks.js';
|
|
17
17
|
import { getPageContextCurrent } from './getPageContextCurrent.js';
|
|
18
|
-
import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/getPrefetchSettings.js';
|
|
18
|
+
import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings, } from './prefetch/getPrefetchSettings.js';
|
|
19
19
|
import pc from '@brillout/picocolors';
|
|
20
20
|
import { normalizeUrlArgument } from './normalizeUrlArgument.js';
|
|
21
21
|
assertClientRouting();
|
|
@@ -25,7 +25,7 @@ const globalObject = getGlobalObject('runtime-client-routing/prefetch.ts', {
|
|
|
25
25
|
mutationObserver: new MutationObserver(addLinkPrefetchHandlers),
|
|
26
26
|
// `linkTags` [is automatically updated](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCollection#:~:text=An%20HTMLCollection%20in%20the%20HTML%20DOM%20is%20live%3B%20it%20is%20automatically%20updated%20when%20the%20underlying%20document%20is%20changed.)
|
|
27
27
|
linkTags: document.getElementsByTagName('A'),
|
|
28
|
-
prefetchedPageContexts: {}
|
|
28
|
+
prefetchedPageContexts: {},
|
|
29
29
|
});
|
|
30
30
|
function getPageContextPrefetched(pageContext) {
|
|
31
31
|
const prefetchSettings = getPrefetchSettings(pageContext, null);
|
|
@@ -74,7 +74,7 @@ function setPageContextPrefetchCache(pageContext, result, resultMaxAge) {
|
|
|
74
74
|
globalObject.prefetchedPageContexts[key] = {
|
|
75
75
|
resultFetchedAt: Date.now(),
|
|
76
76
|
resultMaxAge,
|
|
77
|
-
result
|
|
77
|
+
result,
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
function getResultMaxAge() {
|
|
@@ -103,17 +103,17 @@ options?: {
|
|
|
103
103
|
options_) {
|
|
104
104
|
const options = {
|
|
105
105
|
staticAssets: true,
|
|
106
|
-
pageContext: options_?.pageContext ?? false
|
|
106
|
+
pageContext: options_?.pageContext ?? false,
|
|
107
107
|
};
|
|
108
108
|
assertUsage(checkIfClientRouting(), 'prefetch() only works with Client Routing, see https://vike.dev/prefetch', {
|
|
109
|
-
showStackTrace: true
|
|
109
|
+
showStackTrace: true,
|
|
110
110
|
});
|
|
111
111
|
url = normalizeUrlArgument(url, 'prefetch');
|
|
112
112
|
const pageContextLink = await getPageContextLink(url);
|
|
113
113
|
if (!pageContextLink?.pageId) {
|
|
114
114
|
assertWarning(false, `[prefetch(url)] ${pc.string(url)} ${noRouteMatch}`, {
|
|
115
115
|
showStackTrace: true,
|
|
116
|
-
onlyOnce: false
|
|
116
|
+
onlyOnce: false,
|
|
117
117
|
});
|
|
118
118
|
return;
|
|
119
119
|
}
|
|
@@ -130,7 +130,7 @@ options_) {
|
|
|
130
130
|
const resultMaxAge = typeof options?.pageContext === 'number' ? options.pageContext : null;
|
|
131
131
|
await prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge);
|
|
132
132
|
}
|
|
133
|
-
})()
|
|
133
|
+
})(),
|
|
134
134
|
]);
|
|
135
135
|
}
|
|
136
136
|
// Lazy execution logic copied from: https://github.com/withastro/astro/blob/2594eb088d53a98181ac820243bcb1a765856ecf/packages/astro/src/runtime/client/dev-toolbar/apps/audit/index.ts#L53-L72
|
|
@@ -159,7 +159,7 @@ function addLinkPrefetchHandlers_watch() {
|
|
|
159
159
|
// - https://stackoverflow.com/questions/55046093/listening-for-changes-in-htmlcollection-or-achieving-a-similar-effect
|
|
160
160
|
globalObject.mutationObserver.observe(document.body, {
|
|
161
161
|
childList: true,
|
|
162
|
-
subtree: true
|
|
162
|
+
subtree: true,
|
|
163
163
|
});
|
|
164
164
|
}
|
|
165
165
|
function addLinkPrefetchHandlers_unwatch() {
|
|
@@ -230,7 +230,7 @@ async function prefetchOnEvent(linkTag, event) {
|
|
|
230
230
|
await prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge);
|
|
231
231
|
}
|
|
232
232
|
}
|
|
233
|
-
})()
|
|
233
|
+
})(),
|
|
234
234
|
]);
|
|
235
235
|
}
|
|
236
236
|
function isExpired(found) {
|
|
@@ -26,7 +26,7 @@ type RenderArgs = {
|
|
|
26
26
|
pageContextInitClient?: Record<string, unknown>;
|
|
27
27
|
};
|
|
28
28
|
declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;
|
|
29
|
-
declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender }: {
|
|
29
|
+
declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender, }: {
|
|
30
30
|
urlOriginal: string;
|
|
31
31
|
isBackwardNavigation: boolean | null;
|
|
32
32
|
pageContextsFromRewrite: PageContextFromRewrite[];
|
|
@@ -3,15 +3,15 @@ export { getRenderCount };
|
|
|
3
3
|
export { disableClientRouting };
|
|
4
4
|
export { firstRenderStartPromise };
|
|
5
5
|
export { getPageContextClient };
|
|
6
|
-
import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop } from './utils.js';
|
|
7
|
-
import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient } from './getPageContextFromHooks.js';
|
|
6
|
+
import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
|
|
7
|
+
import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
|
|
8
8
|
import { createPageContextClientSide } from './createPageContextClientSide.js';
|
|
9
|
-
import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache } from './prefetch.js';
|
|
9
|
+
import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
|
|
10
10
|
import { assertInfo, assertWarning, isReact } from './utils.js';
|
|
11
11
|
import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
|
|
12
12
|
import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
|
|
13
13
|
import { pushHistoryState } from './history.js';
|
|
14
|
-
import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled } from '../../shared/route/abort.js';
|
|
14
|
+
import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled, } from '../../shared/route/abort.js';
|
|
15
15
|
import { route } from '../../shared/route/index.js';
|
|
16
16
|
import { isClientSideRoutable } from './isClientSideRoutable.js';
|
|
17
17
|
import { setScrollPosition } from './setScrollPosition.js';
|
|
@@ -20,8 +20,8 @@ import { getErrorPageId } from '../../shared/error-page.js';
|
|
|
20
20
|
import { setPageContextCurrent } from './getPageContextCurrent.js';
|
|
21
21
|
import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
|
|
22
22
|
import { getCurrentUrl } from '../shared/getCurrentUrl.js';
|
|
23
|
-
import { execHooksErrorHandling, execHookErrorHandling } from '../../shared/hooks/execHook.js';
|
|
24
|
-
import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
|
|
23
|
+
import { execHooksErrorHandling, execHookErrorHandling, } from '../../shared/hooks/execHook.js';
|
|
24
|
+
import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
|
|
25
25
|
import { getHookFromPageContextNew } from '../../shared/hooks/getHook.js';
|
|
26
26
|
import { preparePageContextForPublicUsageClientMinimal } from '../shared/preparePageContextForPublicUsageClientShared.js';
|
|
27
27
|
const globalObject = getGlobalObject('runtime-client-routing/renderPageClientSide.ts', (() => {
|
|
@@ -29,13 +29,13 @@ const globalObject = getGlobalObject('runtime-client-routing/renderPageClientSid
|
|
|
29
29
|
return {
|
|
30
30
|
renderCounter: 0,
|
|
31
31
|
firstRenderStartPromise,
|
|
32
|
-
firstRenderStartPromiseResolve
|
|
32
|
+
firstRenderStartPromiseResolve,
|
|
33
33
|
};
|
|
34
34
|
})());
|
|
35
35
|
const { firstRenderStartPromise } = globalObject;
|
|
36
36
|
async function renderPageClientSide(renderArgs) {
|
|
37
37
|
catchInfiniteLoop('renderPageClientSide()');
|
|
38
|
-
const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient } = renderArgs;
|
|
38
|
+
const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient, } = renderArgs;
|
|
39
39
|
let { scrollTarget } = renderArgs;
|
|
40
40
|
const { previousPageContext } = globalObject;
|
|
41
41
|
addLinkPrefetchHandlers_unwatch();
|
|
@@ -47,7 +47,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
47
47
|
pageContextsFromRewrite,
|
|
48
48
|
isClientSideNavigation,
|
|
49
49
|
pageContextInitClient,
|
|
50
|
-
isFirstRender
|
|
50
|
+
isFirstRender,
|
|
51
51
|
};
|
|
52
52
|
if (globalObject.clientRoutingIsDisabled) {
|
|
53
53
|
redirectHard(urlOriginal);
|
|
@@ -264,7 +264,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
264
264
|
await renderPageClientSide({
|
|
265
265
|
...renderArgs,
|
|
266
266
|
scrollTarget: undefined,
|
|
267
|
-
pageContextsFromRewrite: [...pageContextsFromRewrite, pageContextAbort]
|
|
267
|
+
pageContextsFromRewrite: [...pageContextsFromRewrite, pageContextAbort],
|
|
268
268
|
});
|
|
269
269
|
return;
|
|
270
270
|
}
|
|
@@ -283,7 +283,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
283
283
|
urlOriginal: urlRedirect,
|
|
284
284
|
overwriteLastHistoryEntry: false,
|
|
285
285
|
isBackwardNavigation: false,
|
|
286
|
-
redirectCount: redirectCount + 1
|
|
286
|
+
redirectCount: redirectCount + 1,
|
|
287
287
|
});
|
|
288
288
|
}
|
|
289
289
|
return;
|
|
@@ -304,7 +304,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
304
304
|
if (!errorPageId)
|
|
305
305
|
throw new Error('No error page defined.');
|
|
306
306
|
objectAssign(pageContext, {
|
|
307
|
-
pageId: errorPageId
|
|
307
|
+
pageId: errorPageId,
|
|
308
308
|
});
|
|
309
309
|
const isClientRoutable = await isClientSideRoutable(pageContext.pageId, pageContext);
|
|
310
310
|
if (isRenderOutdated())
|
|
@@ -452,7 +452,7 @@ async function renderPageClientSide(renderArgs) {
|
|
|
452
452
|
stampFinished(urlOriginal);
|
|
453
453
|
}
|
|
454
454
|
}
|
|
455
|
-
async function getPageContextBegin(isForErrorPage, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender }) {
|
|
455
|
+
async function getPageContextBegin(isForErrorPage, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender, }) {
|
|
456
456
|
const previousPageContext = globalObject.previousPageContext ?? null;
|
|
457
457
|
const pageContext = await createPageContextClientSide(urlOriginal);
|
|
458
458
|
objectAssign(pageContext, {
|
|
@@ -460,18 +460,18 @@ async function getPageContextBegin(isForErrorPage, { urlOriginal, isBackwardNavi
|
|
|
460
460
|
isClientSideNavigation,
|
|
461
461
|
isHydration: isFirstRender && !isForErrorPage,
|
|
462
462
|
previousPageContext,
|
|
463
|
-
...pageContextInitClient
|
|
463
|
+
...pageContextInitClient,
|
|
464
464
|
});
|
|
465
465
|
// TODO/next-major-release: remove
|
|
466
466
|
Object.defineProperty(pageContext, '_previousPageContext', {
|
|
467
467
|
get() {
|
|
468
468
|
assertWarning(false, 'pageContext._previousPageContext has been renamed pageContext.previousPageContext', {
|
|
469
469
|
showStackTrace: true,
|
|
470
|
-
onlyOnce: true
|
|
470
|
+
onlyOnce: true,
|
|
471
471
|
});
|
|
472
472
|
return previousPageContext;
|
|
473
473
|
},
|
|
474
|
-
enumerable: false
|
|
474
|
+
enumerable: false,
|
|
475
475
|
});
|
|
476
476
|
{
|
|
477
477
|
const pageContextFromAllRewrites = getPageContextFromAllRewrites(pageContextsFromRewrite);
|
|
@@ -520,7 +520,7 @@ function disableClientRouting(err, log) {
|
|
|
520
520
|
'Failed to fetch static asset.',
|
|
521
521
|
isProd ? 'This usually happens when a new frontend is deployed.' : null,
|
|
522
522
|
'Falling back to Server Routing.',
|
|
523
|
-
'(The next page navigation will use Server Routing instead of Client Routing.)'
|
|
523
|
+
'(The next page navigation will use Server Routing instead of Client Routing.)',
|
|
524
524
|
]
|
|
525
525
|
.filter(Boolean)
|
|
526
526
|
.join(' '), { onlyOnce: true });
|
|
@@ -547,7 +547,7 @@ function getIsRenderOutdated() {
|
|
|
547
547
|
return {
|
|
548
548
|
isRenderOutdated,
|
|
549
549
|
setHydrationCanBeAborted,
|
|
550
|
-
isFirstRender: renderNumber === 1
|
|
550
|
+
isFirstRender: renderNumber === 1,
|
|
551
551
|
};
|
|
552
552
|
}
|
|
553
553
|
function getRenderCount() {
|
|
@@ -563,7 +563,7 @@ function getKeepScrollPositionSetting(pageContext) {
|
|
|
563
563
|
const routeParameterList = getRouteStringParameterList(configDefinedAt);
|
|
564
564
|
if (isCallable(val))
|
|
565
565
|
val = val(pageContext, {
|
|
566
|
-
configDefinedAt: c.definedAt
|
|
566
|
+
configDefinedAt: c.definedAt,
|
|
567
567
|
/* We don't pass routeParameterList because it's useless: the user knows the parameter list.
|
|
568
568
|
routeParameterList
|
|
569
569
|
*/
|
|
@@ -575,7 +575,7 @@ function getKeepScrollPositionSetting(pageContext) {
|
|
|
575
575
|
const val = pageContext.routeParams[param];
|
|
576
576
|
assert(val);
|
|
577
577
|
return val;
|
|
578
|
-
})
|
|
578
|
+
}),
|
|
579
579
|
];
|
|
580
580
|
}
|
|
581
581
|
// We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
|
|
@@ -89,7 +89,7 @@ function setScroll(scrollPosition) {
|
|
|
89
89
|
// In principle, `requestAnimationFrame() -> setTimeout(, 0)` should be enough.
|
|
90
90
|
// - https://stackoverflow.com/questions/61281139/waiting-for-repaint-in-javascript
|
|
91
91
|
// - But it's not enough for `Firefox 97.0.1`.
|
|
92
|
-
// - The following strategy is very
|
|
92
|
+
// - The following strategy is very aggressive. It doesn't need to be that aggressive for Firefox. But we do it to be safe.
|
|
93
93
|
const start = new Date().getTime();
|
|
94
94
|
while (true) {
|
|
95
95
|
await sleep(10);
|
|
@@ -16,7 +16,7 @@ async function createPageContextClientSide() {
|
|
|
16
16
|
_globalContext: globalContext,
|
|
17
17
|
_pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
|
|
18
18
|
isBackwardNavigation: null,
|
|
19
|
-
_hasPageContextFromServer: true
|
|
19
|
+
_hasPageContextFromServer: true,
|
|
20
20
|
});
|
|
21
21
|
objectAssign(pageContextCreated, getPageContextSerializedInHtml());
|
|
22
22
|
// Sets pageContext.config to global configs
|
|
@@ -3,14 +3,14 @@ export { getGlobalContext };
|
|
|
3
3
|
export { getGlobalContextSync };
|
|
4
4
|
// Internal usage
|
|
5
5
|
export { createGetGlobalContextClient };
|
|
6
|
-
import { createGlobalContextShared, getGlobalContextSyncErrMsg } from '../../shared/createGlobalContextShared.js';
|
|
6
|
+
import { createGlobalContextShared, getGlobalContextSyncErrMsg, } from '../../shared/createGlobalContextShared.js';
|
|
7
7
|
import { getGlobalContextSerializedInHtml } from './getJsonSerializedInHtml.js';
|
|
8
8
|
import { assert, assertUsage, genPromise, getGlobalObject, objectAssign } from './utils.js';
|
|
9
9
|
const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
|
|
10
10
|
const { promise: globalContextPromise, resolve: globalContextPromiseResolve } = genPromise();
|
|
11
11
|
return {
|
|
12
12
|
globalContextPromise,
|
|
13
|
-
globalContextPromiseResolve
|
|
13
|
+
globalContextPromiseResolve,
|
|
14
14
|
};
|
|
15
15
|
})());
|
|
16
16
|
function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
|
|
@@ -34,7 +34,7 @@ function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGl
|
|
|
34
34
|
*
|
|
35
35
|
* We recommend using `import.meta.env.SSR` instead, see https://vike.dev/globalContext
|
|
36
36
|
*/
|
|
37
|
-
isClientSide: true
|
|
37
|
+
isClientSide: true,
|
|
38
38
|
};
|
|
39
39
|
objectAssign(globalContextAddendum, getGlobalContextSerializedInHtml());
|
|
40
40
|
objectAssign(globalContextAddendum, await addGlobalContext?.(globalContext));
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { preparePageContextForPublicUsageClientShared };
|
|
2
2
|
export { preparePageContextForPublicUsageClientMinimal };
|
|
3
3
|
import { objectAssign } from '../runtime-server-routing/utils.js';
|
|
4
|
-
import { assertPropertyGetters, preparePageContextForPublicUsage } from '../../shared/preparePageContextForPublicUsage.js';
|
|
4
|
+
import { assertPropertyGetters, preparePageContextForPublicUsage, } from '../../shared/preparePageContextForPublicUsage.js';
|
|
5
5
|
function preparePageContextForPublicUsageClientShared(pageContext) {
|
|
6
6
|
// TODO/now-proxy use proxy
|
|
7
7
|
const Page = pageContext.config?.Page ||
|
|
@@ -20,7 +20,7 @@ function preparePageContextForPublicUsageClientMinimal(pageContext) {
|
|
|
20
20
|
const pageContextPublic = preparePageContextForPublicUsage(pageContext);
|
|
21
21
|
return pageContextPublic;
|
|
22
22
|
}
|
|
23
|
-
// With Vue +
|
|
23
|
+
// With Vue + Client Routing, the `pageContext` is made reactive:
|
|
24
24
|
// ```js
|
|
25
25
|
// import { reactive } from 'vue'
|
|
26
26
|
// // See /examples/vue-full/renderer/createVueApp.ts
|
|
@@ -29,7 +29,7 @@ function preparePageContextForPublicUsageClientMinimal(pageContext) {
|
|
|
29
29
|
function supportVueReactiviy(pageContext) {
|
|
30
30
|
resolveGetters(pageContext);
|
|
31
31
|
}
|
|
32
|
-
// Remove
|
|
32
|
+
// Remove property descriptor getters because they break Vue's reactivity.
|
|
33
33
|
// E.g. resolve the `pageContext.urlPathname` getter.
|
|
34
34
|
function resolveGetters(pageContext) {
|
|
35
35
|
Object.entries(pageContext).forEach(([key, val]) => {
|
|
@@ -32,9 +32,13 @@ async function build(options = {}) {
|
|
|
32
32
|
// > Rationale: https://github.com/vikejs/vike/issues/2123
|
|
33
33
|
await buildVite(viteConfigFromUserEnhanced);
|
|
34
34
|
// After pre-rendering, when using the Vike CLI, the process is forcefully exited at the end of the buildVite() call above.
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
if (
|
|
36
|
+
// When calling Vike's prerender() API pre-rendering is run without force exit
|
|
37
|
+
![false, 'prerender()'].includes(wasPrerenderRun()) &&
|
|
38
|
+
// When calling Vike's build() API pre-rendering is auto run without force exit
|
|
39
|
+
isVikeCli()) {
|
|
37
40
|
assert(false);
|
|
41
|
+
}
|
|
38
42
|
}
|
|
39
43
|
return {
|
|
40
44
|
/* We don't return `viteConfig` because `viteConfigFromUserEnhanced` is `InlineConfig` not `ResolvedConfig`
|
package/dist/esm/node/api/dev.js
CHANGED
|
@@ -4,8 +4,8 @@ export { assertViteRoot };
|
|
|
4
4
|
export { normalizeViteRoot };
|
|
5
5
|
import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite';
|
|
6
6
|
import { clearContextApiOperation, setContextApiOperation } from './context.js';
|
|
7
|
-
import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext } from '../vite/shared/resolveVikeConfigInternal.js';
|
|
8
|
-
import path from 'path';
|
|
7
|
+
import { getVikeConfigInternal, getVikeConfigFromCliOrEnv, setVikeConfigContext, } from '../vite/shared/resolveVikeConfigInternal.js';
|
|
8
|
+
import path from 'node:path';
|
|
9
9
|
import { assert, assertUsage, getGlobalObject, isObject, pick, toPosixPath } from './utils.js';
|
|
10
10
|
import pc from '@brillout/picocolors';
|
|
11
11
|
import { clearGlobalContext } from '../runtime/globalContext.js';
|
|
@@ -27,7 +27,7 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
|
|
|
27
27
|
setVikeConfigContext({
|
|
28
28
|
userRootDir: viteInfo.root,
|
|
29
29
|
isDev: operation === 'dev',
|
|
30
|
-
vikeVitePluginOptions: viteInfo.vikeVitePluginOptions
|
|
30
|
+
vikeVitePluginOptions: viteInfo.vikeVitePluginOptions,
|
|
31
31
|
});
|
|
32
32
|
const vikeConfig = await getVikeConfigInternal();
|
|
33
33
|
const viteConfigFromUserEnhanced = applyVikeViteConfig(viteInfo.viteConfigFromUserEnhanced, vikeConfig);
|
|
@@ -35,7 +35,7 @@ async function resolveConfigs(viteConfigFromUserApiOptions, operation) {
|
|
|
35
35
|
return {
|
|
36
36
|
vikeConfig,
|
|
37
37
|
viteConfigResolved, // ONLY USE if strictly necessary. (We plan to remove assertViteRoot2() as explained in the comments of that function.)
|
|
38
|
-
viteConfigFromUserEnhanced
|
|
38
|
+
viteConfigFromUserEnhanced,
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
41
|
// Apply +vite
|
|
@@ -60,10 +60,10 @@ async function getViteRoot(operation) {
|
|
|
60
60
|
async function getViteInfo(viteConfigFromUserApiOptions, operation) {
|
|
61
61
|
let viteConfigFromUserEnhanced = viteConfigFromUserApiOptions;
|
|
62
62
|
// Precedence:
|
|
63
|
-
// 1) viteConfigFromUserEnvVar (highest
|
|
63
|
+
// 1) viteConfigFromUserEnvVar (highest precedence)
|
|
64
64
|
// 2) viteConfigFromUserVikeConfig
|
|
65
65
|
// 2) viteConfigFromUserApiOptions
|
|
66
|
-
// 3) viteConfigFromUserViteFile (lowest
|
|
66
|
+
// 3) viteConfigFromUserViteFile (lowest precedence)
|
|
67
67
|
// Resolve Vike's +mode setting
|
|
68
68
|
{
|
|
69
69
|
const viteConfigFromUserVikeConfig = pick(getVikeConfigFromCliOrEnv().vikeConfigFromCliOrEnv, ['mode']);
|
|
@@ -97,7 +97,7 @@ async function getViteInfo(viteConfigFromUserApiOptions, operation) {
|
|
|
97
97
|
const { plugin: vikePlugin } = await import('../vite/index.js');
|
|
98
98
|
viteConfigFromUserEnhanced = {
|
|
99
99
|
...viteConfigFromUserEnhanced,
|
|
100
|
-
plugins: [...(viteConfigFromUserEnhanced?.plugins ?? []), vikePlugin()]
|
|
100
|
+
plugins: [...(viteConfigFromUserEnhanced?.plugins ?? []), vikePlugin()],
|
|
101
101
|
};
|
|
102
102
|
const res = findVikeVitePlugin(viteConfigFromUserEnhanced);
|
|
103
103
|
assert(res);
|
|
@@ -130,7 +130,7 @@ async function loadViteConfigFile(viteConfigFromUserApiOptions, operation) {
|
|
|
130
130
|
mode,
|
|
131
131
|
command,
|
|
132
132
|
isSsrBuild: command === 'build' && !!config.build?.ssr,
|
|
133
|
-
isPreview
|
|
133
|
+
isPreview,
|
|
134
134
|
};
|
|
135
135
|
let { configFile } = config;
|
|
136
136
|
if (configFile !== false) {
|