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 { analyzeExports };
|
|
|
2
2
|
import { getExportNames } from './getExportNames.js';
|
|
3
3
|
import { assertUsage } from '../../utils.js';
|
|
4
4
|
// TODO/v1-release: remove
|
|
5
|
-
function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
|
|
5
|
+
function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId, }) {
|
|
6
6
|
return { isHtmlOnly: isHtmlOnly(), isClientRouting: isClientRouting() };
|
|
7
7
|
function isHtmlOnly() {
|
|
8
8
|
{
|
|
@@ -35,8 +35,8 @@ function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
|
|
|
35
35
|
'See https://vike.dev/render-modes for more information.',
|
|
36
36
|
[
|
|
37
37
|
'Loaded client-side page files (none of them `export { render }`):',
|
|
38
|
-
...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`)
|
|
39
|
-
].join('\n')
|
|
38
|
+
...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`),
|
|
39
|
+
].join('\n'),
|
|
40
40
|
].join(' '));
|
|
41
41
|
}
|
|
42
42
|
function isClientRouting() {
|
|
@@ -2,7 +2,7 @@ export { determineClientEntry };
|
|
|
2
2
|
export { getVikeClientEntry };
|
|
3
3
|
import type { ClientDependency } from './ClientDependency.js';
|
|
4
4
|
import type { PageFile } from '../../../shared/getPageFiles.js';
|
|
5
|
-
declare function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting }: {
|
|
5
|
+
declare function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting, }: {
|
|
6
6
|
pageFilesClientSide: PageFile[];
|
|
7
7
|
pageFilesServerSide: PageFile[];
|
|
8
8
|
isHtmlOnly: boolean;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// TODO/v1-release: remove
|
|
2
2
|
export { determineClientEntry };
|
|
3
3
|
export { getVikeClientEntry };
|
|
4
|
-
function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting }) {
|
|
4
|
+
function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting, }) {
|
|
5
5
|
let clientEntries = [];
|
|
6
6
|
const pageFilesServerSideOnly = pageFilesServerSide.filter((p) => !pageFilesClientSide.includes(p));
|
|
7
7
|
const clientDependencies = [];
|
|
@@ -14,13 +14,13 @@ function analyzePageClientSide(pageFilesAll, pageId) {
|
|
|
14
14
|
if (isHtmlOnly) {
|
|
15
15
|
// HTML-only pages don't need any client-side `render()` hook. For apps that have both HTML-only and SSR/SPA pages, we skip the `.page.client.js` file that defines `render()` for HTML-only pages.
|
|
16
16
|
pageFilesClientSide = pageFilesClientSide.filter((p) => p.isEnv('CLIENT_ONLY') && !getExportNames(p).includes('render'));
|
|
17
|
-
pageFilesClientSide =
|
|
17
|
+
pageFilesClientSide = removeOverriddenPageFiles(pageFilesClientSide);
|
|
18
18
|
}
|
|
19
19
|
const { clientEntries, clientDependencies } = determineClientEntry({
|
|
20
20
|
pageFilesClientSide,
|
|
21
21
|
pageFilesServerSide,
|
|
22
22
|
isHtmlOnly,
|
|
23
|
-
isClientRouting
|
|
23
|
+
isClientRouting,
|
|
24
24
|
});
|
|
25
25
|
return { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide };
|
|
26
26
|
}
|
|
@@ -45,7 +45,7 @@ async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFiles
|
|
|
45
45
|
}
|
|
46
46
|
// [WIP] Just an experiment needed by https://vike.dev/banner
|
|
47
47
|
// - Not sure I want to make something like a public API: the CSS of `_default.page.server.js` are still loaded -> weird DX.
|
|
48
|
-
function
|
|
48
|
+
function removeOverriddenPageFiles(pageFilesClientSide) {
|
|
49
49
|
const pageFilesClientSide_ = [];
|
|
50
50
|
for (const p of pageFilesClientSide) {
|
|
51
51
|
pageFilesClientSide_.push(p);
|
|
@@ -12,7 +12,7 @@ const fileTypes = [
|
|
|
12
12
|
// New type `.page.css`/`.page.server.css`/`.page.client.css` for `extensions[number].pageFileDist`.
|
|
13
13
|
// - Extensions using `pageFileDist` are expected to use a bundler that generates a `.css` colocated next to the original `.page.js` file (e.g. `/renderer/_default.page.server.css` for `/renderer/_default.page.server.js`.
|
|
14
14
|
// - Since these `.page.css` files Bundlers We can therefore expect that there isn't any `.page.server.sass`/...
|
|
15
|
-
'.css'
|
|
15
|
+
'.css',
|
|
16
16
|
];
|
|
17
17
|
function isValidFileType(filePath) {
|
|
18
18
|
return ['.js', '.mjs', '.cjs', '.css'].some((ext) => filePath.endsWith(ext));
|
|
@@ -28,10 +28,10 @@ function determine(pageFilesAll, pageId, envIsClient) {
|
|
|
28
28
|
const getRendererFile = (iso) => pageFilesRelevant.filter((p) => p.isRendererPageFile && p.isEnv(iso ? 'CLIENT_AND_SERVER' : env))[0];
|
|
29
29
|
const rendererFileEnv = getRendererFile(false);
|
|
30
30
|
const rendererFileIso = getRendererFile(true);
|
|
31
|
-
// A page can load multiple `
|
|
31
|
+
// A page can load multiple `_default.page.*` files of the same `fileType`. In other words: non-renderer `_default.page.*` files are cumulative.
|
|
32
32
|
// The exception being HTML-only pages because we pick a single page file as client entry. We handle that use case at `renderPage()`.
|
|
33
33
|
const defaultFilesNonRenderer = pageFilesRelevant.filter((p) => p.isDefaultPageFile && !p.isRendererPageFile && (p.isEnv(env) || p.isEnv('CLIENT_AND_SERVER')));
|
|
34
|
-
// Ordered by `pageContext.exports`
|
|
34
|
+
// Ordered by `pageContext.exports` precedence
|
|
35
35
|
const pageFiles = [pageIdFileEnv, pageIdFileIso, ...defaultFilesNonRenderer, rendererFileEnv, rendererFileIso].filter(isNotNullish);
|
|
36
36
|
return pageFiles;
|
|
37
37
|
}
|
|
@@ -30,7 +30,7 @@ function getPageFileObject(filePath) {
|
|
|
30
30
|
isDefaultPageFile: isDefaultFilePath(filePath),
|
|
31
31
|
isRendererPageFile: fileType !== '.css' && isDefaultFilePath(filePath) && isRendererFilePath(filePath),
|
|
32
32
|
isErrorPageFile: isErrorPageId(filePath, false),
|
|
33
|
-
pageId: determinePageIdOld(filePath)
|
|
33
|
+
pageId: determinePageIdOld(filePath),
|
|
34
34
|
};
|
|
35
35
|
return pageFile;
|
|
36
36
|
}
|
|
@@ -4,13 +4,13 @@ export { getProxyForPublicUsage };
|
|
|
4
4
|
// ```console
|
|
5
5
|
// TypeError: Invalid property descriptor. Cannot both specify accessors and a value or writable attribute, #<Object>
|
|
6
6
|
// ```
|
|
7
|
-
// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/
|
|
7
|
+
// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/4dbb354b0bcec04e862041fc9183fc4691bb8711/vike/utils/makePublicCopy.ts
|
|
8
8
|
// Show warning when user is accessing internal `_` properties.
|
|
9
9
|
import { NOT_SERIALIZABLE } from './NOT_SERIALIZABLE.js';
|
|
10
10
|
import { assert, assertUsage, assertWarning, getPropAccessNotation, isBrowser } from './utils.js';
|
|
11
11
|
function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
|
|
12
12
|
return new Proxy(obj, {
|
|
13
|
-
get: getTrapGet(obj, objName, skipOnInternalProp, fallback)
|
|
13
|
+
get: getTrapGet(obj, objName, skipOnInternalProp, fallback),
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
16
|
function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
|
|
@@ -14,10 +14,10 @@ import { getGlobalObject } from '../../utils/getGlobalObject.js';
|
|
|
14
14
|
import { humanizeTime } from '../../utils/humanizeTime.js';
|
|
15
15
|
import { isObject } from '../../utils/isObject.js';
|
|
16
16
|
import { getHookFromPageConfigGlobalCumulative, getHookFromPageContextNew } from './getHook.js';
|
|
17
|
-
import { preparePageContextForPublicUsage } from '../preparePageContextForPublicUsage.js';
|
|
17
|
+
import { preparePageContextForPublicUsage, } from '../preparePageContextForPublicUsage.js';
|
|
18
18
|
const globalObject = getGlobalObject('utils/execHook.ts', {
|
|
19
19
|
userHookErrors: new WeakMap(),
|
|
20
|
-
pageContext: null
|
|
20
|
+
pageContext: null,
|
|
21
21
|
});
|
|
22
22
|
async function execHookSingle(hook, pageContext, preparePageContextForPublicUsage) {
|
|
23
23
|
const res = await execHooksErrorHandling([hook], pageContext, preparePageContextForPublicUsage);
|
|
@@ -83,7 +83,7 @@ async function execHookWithoutPageContext(hookFnCaller, hook) {
|
|
|
83
83
|
return hookReturn;
|
|
84
84
|
}
|
|
85
85
|
function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
|
|
86
|
-
const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn } } = hook;
|
|
86
|
+
const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn }, } = hook;
|
|
87
87
|
let resolve;
|
|
88
88
|
let reject;
|
|
89
89
|
const promise = new Promise((resolve_, reject_) => {
|
|
@@ -117,7 +117,7 @@ function getHookTimeout(hooksTimeoutProvidedByUser, hookName) {
|
|
|
117
117
|
hookTimeout.warning = providedbyUser.warning;
|
|
118
118
|
return hookTimeout;
|
|
119
119
|
}
|
|
120
|
-
// Ideally this should be called only once and at build-time (to avoid bloating the client-side bundle), but we didn't implement any mechanism to
|
|
120
|
+
// Ideally this should be called only once and at build-time (to avoid bloating the client-side bundle), but we didn't implement any mechanism to valid config values at build-time yet
|
|
121
121
|
function getHooksTimeoutProvidedByUserNormalized(hooksTimeoutProvidedByUser) {
|
|
122
122
|
if (hooksTimeoutProvidedByUser === undefined)
|
|
123
123
|
return {};
|
|
@@ -148,13 +148,13 @@ function getHookTimeoutDefault(hookName) {
|
|
|
148
148
|
if (hookName === 'onBeforeRoute') {
|
|
149
149
|
return {
|
|
150
150
|
error: 5 * 1000,
|
|
151
|
-
warning: 1 * 1000
|
|
151
|
+
warning: 1 * 1000,
|
|
152
152
|
};
|
|
153
153
|
}
|
|
154
154
|
if (globalObject.isPrerendering) {
|
|
155
155
|
return {
|
|
156
156
|
error: 2 * 60 * 1000,
|
|
157
|
-
warning: 30 * 1000
|
|
157
|
+
warning: 30 * 1000,
|
|
158
158
|
};
|
|
159
159
|
}
|
|
160
160
|
else {
|
|
@@ -162,7 +162,7 @@ function getHookTimeoutDefault(hookName) {
|
|
|
162
162
|
}
|
|
163
163
|
return {
|
|
164
164
|
error: 30 * 1000,
|
|
165
|
-
warning: 4 * 1000
|
|
165
|
+
warning: 4 * 1000,
|
|
166
166
|
};
|
|
167
167
|
}
|
|
168
168
|
function getHook_setIsPrerenderering() {
|
|
@@ -14,7 +14,7 @@ function modifyUrl(url, modify) {
|
|
|
14
14
|
// Origin
|
|
15
15
|
const originParts = [
|
|
16
16
|
modify.protocol ?? urlParsed.protocol ?? '',
|
|
17
|
-
modify.hostname ?? urlParsed.hostname ?? ''
|
|
17
|
+
modify.hostname ?? urlParsed.hostname ?? '',
|
|
18
18
|
];
|
|
19
19
|
const port = modify.port ?? urlParsed.port;
|
|
20
20
|
if (port || port === 0) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { modifyUrlSameOrigin };
|
|
2
|
-
import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathnameAbsolute } from './utils.js';
|
|
2
|
+
import { createUrlFromComponents, isNotNullish_keyVal, parseUrl, objectFilter, assertUsageUrlPathnameAbsolute, } from './utils.js';
|
|
3
3
|
function modifyUrlSameOrigin(url, modify) {
|
|
4
4
|
const urlParsed = parseUrl(url, '/');
|
|
5
5
|
// Pathname
|
|
@@ -5,7 +5,7 @@ const SIDE_EXPORTS_TOLERATE = [
|
|
|
5
5
|
// vite-plugin-solid adds `export { $$registrations }`
|
|
6
6
|
'$$registrations',
|
|
7
7
|
// @vitejs/plugin-vue adds `export { _rerender_only }`
|
|
8
|
-
'_rerender_only'
|
|
8
|
+
'_rerender_only',
|
|
9
9
|
];
|
|
10
10
|
// Tolerate `export { frontmatter }` in .mdx files
|
|
11
11
|
const SIDE_EXPORTS_DO_NOT_CHECK = ['.md', '.mdx'];
|
|
@@ -30,7 +30,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
|
|
|
30
30
|
if (!SIDE_EXPORTS_DO_NOT_CHECK.some((ext) => filePathToShowToUser.endsWith(ext))) {
|
|
31
31
|
exportNamesInvalid.forEach((exportInvalid) => {
|
|
32
32
|
assertWarning(false, `${filePathToShowToUser} unexpected ${pc.cyan(`export { ${exportInvalid} }`)}, see https://vike.dev/no-side-exports`, {
|
|
33
|
-
onlyOnce: true
|
|
33
|
+
onlyOnce: true,
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -16,7 +16,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
16
16
|
return {
|
|
17
17
|
type: 'computed',
|
|
18
18
|
value: configValueComputed.value,
|
|
19
|
-
definedAtData: null
|
|
19
|
+
definedAtData: null,
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
const sources = configValueSources[configName];
|
|
@@ -31,7 +31,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
31
31
|
return {
|
|
32
32
|
type: 'standard',
|
|
33
33
|
value: configValueSource.value,
|
|
34
|
-
definedAtData: getDefinedAt(configValueSource)
|
|
34
|
+
definedAtData: getDefinedAt(configValueSource),
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
@@ -40,7 +40,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
40
40
|
return {
|
|
41
41
|
type: 'cumulative',
|
|
42
42
|
value,
|
|
43
|
-
definedAtData
|
|
43
|
+
definedAtData,
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
46
|
}
|
|
@@ -61,6 +61,6 @@ function getDefinedAt(configValueSource) {
|
|
|
61
61
|
return definedAt;
|
|
62
62
|
return {
|
|
63
63
|
filePathToShowToUser: definedAt.filePathToShowToUser,
|
|
64
|
-
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
|
|
64
|
+
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
|
|
65
65
|
};
|
|
66
66
|
}
|
|
@@ -26,7 +26,7 @@ type ExportsAll = Record<string, {
|
|
|
26
26
|
/** @deprecated */
|
|
27
27
|
_filePath: string | null;
|
|
28
28
|
}[]>;
|
|
29
|
-
/** All the config's values (including
|
|
29
|
+
/** All the config's values (including overridden ones) and where they come from.
|
|
30
30
|
*
|
|
31
31
|
* https://vike.dev/pageContext
|
|
32
32
|
*/
|
|
@@ -93,7 +93,7 @@ type WithRoute = {
|
|
|
93
93
|
type VikeConfigPublicPageEager = VikeConfigPublic & WithRoute;
|
|
94
94
|
type VikeConfigPublicGlobal = VikeConfigPublic;
|
|
95
95
|
declare function resolveVikeConfigPublicPageEager(pageConfigGlobalValues: ConfigValues, pageConfig: PageConfigRuntime | PageConfigBuildTime, pageConfigValues: ConfigValues): [string, VikeConfigPublicPageEager];
|
|
96
|
-
declare function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues }: {
|
|
96
|
+
declare function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }: {
|
|
97
97
|
pageConfigGlobalValues: ConfigValues;
|
|
98
98
|
}): VikeConfigPublicGlobal;
|
|
99
99
|
declare function resolveVikeConfigPublicPageLazy(pageFiles: PageFile[], // V0.4 design
|
|
@@ -6,7 +6,7 @@ export { resolveVikeConfigPublicPageLazy };
|
|
|
6
6
|
import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
|
|
7
7
|
import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
|
|
8
8
|
import { getConfigValueFilePathToShowToUser } from './helpers.js';
|
|
9
|
-
import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile, objectDefineProperty } from '../utils.js';
|
|
9
|
+
import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile, objectDefineProperty, } from '../utils.js';
|
|
10
10
|
import pc from '@brillout/picocolors';
|
|
11
11
|
function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
|
|
12
12
|
const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
|
|
@@ -16,13 +16,13 @@ function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pa
|
|
|
16
16
|
const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
|
|
17
17
|
page = {
|
|
18
18
|
...vikeConfigPublicPage,
|
|
19
|
-
route
|
|
19
|
+
route,
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
page = {
|
|
24
24
|
...vikeConfigPublicPage,
|
|
25
|
-
isErrorPage: true
|
|
25
|
+
isErrorPage: true,
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
return [pageConfig.pageId, page];
|
|
@@ -32,14 +32,14 @@ function getPublicCopy(vikeConfigPublic) {
|
|
|
32
32
|
config: vikeConfigPublic.config,
|
|
33
33
|
_source: vikeConfigPublic.source,
|
|
34
34
|
_sources: vikeConfigPublic.sources,
|
|
35
|
-
_from: vikeConfigPublic.from
|
|
35
|
+
_from: vikeConfigPublic.from,
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
|
-
function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues }) {
|
|
38
|
+
function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
|
|
39
39
|
const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
|
|
40
40
|
return resolveVikeConfigPublic_V1Design({ configValues });
|
|
41
41
|
}
|
|
42
|
-
function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues }) {
|
|
42
|
+
function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
|
|
43
43
|
const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
|
|
44
44
|
return getPublicCopy(vikeConfigPublicGlobal);
|
|
45
45
|
}
|
|
@@ -62,7 +62,7 @@ pageConfigGlobal) {
|
|
|
62
62
|
filePath: pageFile.filePath,
|
|
63
63
|
_filePath: pageFile.filePath, // TODO/next-major-release: remove
|
|
64
64
|
_fileType: pageFile.fileType,
|
|
65
|
-
_isFromDefaultExport: isFromDefaultExport
|
|
65
|
+
_isFromDefaultExport: isFromDefaultExport,
|
|
66
66
|
});
|
|
67
67
|
});
|
|
68
68
|
});
|
|
@@ -72,7 +72,7 @@ pageConfigGlobal) {
|
|
|
72
72
|
if (pageConfig) {
|
|
73
73
|
const res = resolveVikeConfigPublic_base({
|
|
74
74
|
pageConfigGlobalValues: pageConfigGlobal.configValues,
|
|
75
|
-
pageConfigValues: pageConfig.configValues
|
|
75
|
+
pageConfigValues: pageConfig.configValues,
|
|
76
76
|
});
|
|
77
77
|
source = res.source;
|
|
78
78
|
sources = res.sources;
|
|
@@ -87,7 +87,7 @@ pageConfigGlobal) {
|
|
|
87
87
|
from = {
|
|
88
88
|
configsStandard: {},
|
|
89
89
|
configsCumulative: {},
|
|
90
|
-
configsComputed: {}
|
|
90
|
+
configsComputed: {},
|
|
91
91
|
};
|
|
92
92
|
}
|
|
93
93
|
const pageExports = {};
|
|
@@ -113,7 +113,7 @@ pageConfigGlobal) {
|
|
|
113
113
|
// TODO/now-flat-pageContext: deprecate every prop below
|
|
114
114
|
configEntries,
|
|
115
115
|
exports,
|
|
116
|
-
exportsAll
|
|
116
|
+
exportsAll,
|
|
117
117
|
};
|
|
118
118
|
// TODO/v1-release: remove
|
|
119
119
|
objectDefineProperty(pageContextExports, 'pageExports', {
|
|
@@ -122,13 +122,13 @@ pageConfigGlobal) {
|
|
|
122
122
|
if (!isBrowser()) {
|
|
123
123
|
assertWarning(false, 'pageContext.pageExports is outdated, use pageContext.exports instead', {
|
|
124
124
|
onlyOnce: true,
|
|
125
|
-
showStackTrace: true
|
|
125
|
+
showStackTrace: true,
|
|
126
126
|
});
|
|
127
127
|
}
|
|
128
128
|
return pageExports;
|
|
129
129
|
},
|
|
130
130
|
enumerable: false,
|
|
131
|
-
configurable: true
|
|
131
|
+
configurable: true,
|
|
132
132
|
});
|
|
133
133
|
return pageContextExports;
|
|
134
134
|
}
|
|
@@ -142,7 +142,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
142
142
|
const from = {
|
|
143
143
|
configsStandard: {},
|
|
144
144
|
configsCumulative: {},
|
|
145
|
-
configsComputed: {}
|
|
145
|
+
configsComputed: {},
|
|
146
146
|
};
|
|
147
147
|
const addSrc = (src, configName) => {
|
|
148
148
|
source[configName] = src;
|
|
@@ -156,7 +156,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
156
156
|
configEntries[configName].push({
|
|
157
157
|
configValue: value,
|
|
158
158
|
configDefinedAt,
|
|
159
|
-
configDefinedByFile: configValueFilePathToShowToUser
|
|
159
|
+
configDefinedByFile: configValueFilePathToShowToUser,
|
|
160
160
|
});
|
|
161
161
|
// TODO/v1-release: remove
|
|
162
162
|
const exportName = configName;
|
|
@@ -167,7 +167,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
167
167
|
filePath: configValueFilePathToShowToUser,
|
|
168
168
|
_filePath: configValueFilePathToShowToUser,
|
|
169
169
|
_fileType: null,
|
|
170
|
-
_isFromDefaultExport: null
|
|
170
|
+
_isFromDefaultExport: null,
|
|
171
171
|
});
|
|
172
172
|
};
|
|
173
173
|
Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
|
|
@@ -177,7 +177,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
177
177
|
const src = {
|
|
178
178
|
type: 'configsStandard',
|
|
179
179
|
value: configValue.value,
|
|
180
|
-
definedAt: getDefinedAtString(configValue.definedAtData, configName)
|
|
180
|
+
definedAt: getDefinedAtString(configValue.definedAtData, configName),
|
|
181
181
|
};
|
|
182
182
|
addSrc(src, configName);
|
|
183
183
|
from.configsStandard[configName] = src;
|
|
@@ -194,9 +194,9 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
194
194
|
addLegacy(configName, value, definedAtFile);
|
|
195
195
|
return {
|
|
196
196
|
value,
|
|
197
|
-
definedAt
|
|
197
|
+
definedAt,
|
|
198
198
|
};
|
|
199
|
-
})
|
|
199
|
+
}),
|
|
200
200
|
};
|
|
201
201
|
addSrc(src, configName);
|
|
202
202
|
from.configsCumulative[configName] = src;
|
|
@@ -205,7 +205,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
205
205
|
const src = {
|
|
206
206
|
type: 'configsComputed',
|
|
207
207
|
definedAt: 'Vike', // Vike currently doesn't support user-land computed configs => computed configs are always defined by Vike => there isn't any file path to show.
|
|
208
|
-
value: configValue.value
|
|
208
|
+
value: configValue.value,
|
|
209
209
|
};
|
|
210
210
|
addSrc(src, configName);
|
|
211
211
|
from.configsComputed[configName] = src;
|
|
@@ -218,7 +218,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
218
218
|
exportsAll,
|
|
219
219
|
source,
|
|
220
220
|
sources,
|
|
221
|
-
from
|
|
221
|
+
from,
|
|
222
222
|
};
|
|
223
223
|
}
|
|
224
224
|
function getExportValues(pageFile) {
|
|
@@ -241,7 +241,7 @@ function getExportValues(pageFile) {
|
|
|
241
241
|
exportValues.push({
|
|
242
242
|
exportName: defaultExportName,
|
|
243
243
|
exportValue: defaultExportValue,
|
|
244
|
-
isFromDefaultExport
|
|
244
|
+
isFromDefaultExport,
|
|
245
245
|
});
|
|
246
246
|
});
|
|
247
247
|
return;
|
|
@@ -250,7 +250,7 @@ function getExportValues(pageFile) {
|
|
|
250
250
|
exportValues.push({
|
|
251
251
|
exportName,
|
|
252
252
|
exportValue,
|
|
253
|
-
isFromDefaultExport
|
|
253
|
+
isFromDefaultExport,
|
|
254
254
|
});
|
|
255
255
|
});
|
|
256
256
|
exportValues.forEach(({ exportName, isFromDefaultExport }) => {
|
|
@@ -117,9 +117,9 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
|
|
|
117
117
|
value: exportValue,
|
|
118
118
|
definedAtData: {
|
|
119
119
|
filePathToShowToUser: definedAtFile.filePathToShowToUser,
|
|
120
|
-
fileExportPathToShowToUser: [exportName]
|
|
121
|
-
}
|
|
122
|
-
}
|
|
120
|
+
fileExportPathToShowToUser: [exportName],
|
|
121
|
+
},
|
|
122
|
+
},
|
|
123
123
|
});
|
|
124
124
|
}
|
|
125
125
|
});
|
|
@@ -2,12 +2,12 @@ export { serializeConfigValues };
|
|
|
2
2
|
export { getConfigValuesBase };
|
|
3
3
|
export { isJsonValue };
|
|
4
4
|
import { assertIsNotProductionRuntime } from '../../../utils/assertSetup.js';
|
|
5
|
-
import { assert, assertPosixPath, assertUsage, deepEqual, getPropAccessNotation, isImportPathRelative } from '../../../node/vite/utils.js';
|
|
5
|
+
import { assert, assertPosixPath, assertUsage, deepEqual, getPropAccessNotation, isImportPathRelative, } from '../../../node/vite/utils.js';
|
|
6
6
|
import { parsePointerImportData } from '../../../node/vite/shared/resolveVikeConfigInternal/pointerImports.js';
|
|
7
7
|
import { getConfigValueFilePathToShowToUser } from '../helpers.js';
|
|
8
8
|
import { stringify } from '@brillout/json-serializer/stringify';
|
|
9
9
|
import pc from '@brillout/picocolors';
|
|
10
|
-
import {
|
|
10
|
+
import { isOverridden } from '../../../node/vite/shared/resolveVikeConfigInternal.js';
|
|
11
11
|
const stringifyOptions = { forbidReactElements: true };
|
|
12
12
|
const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
|
|
13
13
|
const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
|
|
@@ -106,14 +106,14 @@ function getValueSerializedWithImport(configValueSource, importStatements, files
|
|
|
106
106
|
const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
|
|
107
107
|
return {
|
|
108
108
|
type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
|
|
109
|
-
valueAsJsCode: importName
|
|
109
|
+
valueAsJsCode: importName,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
112
|
function getValueSerializedWithJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
|
|
113
113
|
const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv);
|
|
114
114
|
return {
|
|
115
115
|
type: 'js-serialized',
|
|
116
|
-
valueAsJsCode
|
|
116
|
+
valueAsJsCode,
|
|
117
117
|
};
|
|
118
118
|
}
|
|
119
119
|
function valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
|
|
@@ -136,7 +136,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
|
|
|
136
136
|
return { replacement };
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
-
}
|
|
139
|
+
},
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
catch (err) {
|
|
@@ -185,7 +185,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
185
185
|
return 'SKIP';
|
|
186
186
|
const configValueBase = {
|
|
187
187
|
type: 'computed',
|
|
188
|
-
definedAtData: null
|
|
188
|
+
definedAtData: null,
|
|
189
189
|
};
|
|
190
190
|
return { configValueBase, value, configName, configEnv };
|
|
191
191
|
});
|
|
@@ -202,13 +202,13 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
202
202
|
const definedAtFile = getDefinedAtFileSource(source);
|
|
203
203
|
const configValueBase = {
|
|
204
204
|
type: 'standard',
|
|
205
|
-
definedAtData: definedAtFile
|
|
205
|
+
definedAtData: definedAtFile,
|
|
206
206
|
};
|
|
207
207
|
return { configValueBase, sourceRelevant: source, configName };
|
|
208
208
|
}
|
|
209
209
|
else {
|
|
210
210
|
const sourcesRelevant = sources
|
|
211
|
-
.filter((source) => !
|
|
211
|
+
.filter((source) => !isOverridden(source, configName, pageConfig))
|
|
212
212
|
.filter((source) => isEnvMatch(source.configEnv));
|
|
213
213
|
if (sourcesRelevant.length === 0)
|
|
214
214
|
return 'SKIP';
|
|
@@ -219,7 +219,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
219
219
|
});
|
|
220
220
|
const configValueBase = {
|
|
221
221
|
type: 'cumulative',
|
|
222
|
-
definedAtData
|
|
222
|
+
definedAtData,
|
|
223
223
|
};
|
|
224
224
|
return { configValueBase, sourcesRelevant, configName };
|
|
225
225
|
}
|
|
@@ -232,7 +232,7 @@ function getDefinedAtFileSource(source) {
|
|
|
232
232
|
return definedAt;
|
|
233
233
|
const definedAtFile = {
|
|
234
234
|
filePathToShowToUser: definedAt.filePathToShowToUser,
|
|
235
|
-
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
|
|
235
|
+
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
|
|
236
236
|
};
|
|
237
237
|
return definedAtFile;
|
|
238
238
|
}
|
|
@@ -279,7 +279,7 @@ function assertFileEnv(importPath, configEnv, configName, filesEnv) {
|
|
|
279
279
|
assertUsage(false, [
|
|
280
280
|
`${importPath} defines the value of configs living in different environments:`,
|
|
281
281
|
...[fileEnvDiff, fileEnvNew].map((c) => ` - config ${pc.code(c.configName)} which value lives in environment ${pc.code(JSON.stringify(c.configEnv))}`),
|
|
282
|
-
'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
|
|
282
|
+
'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports',
|
|
283
283
|
].join('\n'));
|
|
284
284
|
}
|
|
285
285
|
}
|
|
@@ -2,7 +2,7 @@ export { preparePageContextForPublicUsage };
|
|
|
2
2
|
export { assertPropertyGetters };
|
|
3
3
|
import { assert, assertWarning, compareString, isPropertyGetter } from './utils.js';
|
|
4
4
|
import { addIs404ToPageProps } from './addIs404ToPageProps.js';
|
|
5
|
-
import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
|
|
5
|
+
import { prepareGlobalContextForPublicUsage, } from './prepareGlobalContextForPublicUsage.js';
|
|
6
6
|
import { getProxyForPublicUsage } from './getProxyForPublicUsage.js';
|
|
7
7
|
function preparePageContextForPublicUsage(pageContext) {
|
|
8
8
|
assert(!pageContext._isProxyObject);
|
|
@@ -15,11 +15,11 @@ function preparePageContextForPublicUsage(pageContext) {
|
|
|
15
15
|
get() {
|
|
16
16
|
assertWarning(false, 'pageContext._pageId has been renamed to pageContext.pageId', {
|
|
17
17
|
showStackTrace: true,
|
|
18
|
-
onlyOnce: true
|
|
18
|
+
onlyOnce: true,
|
|
19
19
|
});
|
|
20
20
|
return pageContext.pageId;
|
|
21
21
|
},
|
|
22
|
-
enumerable: false
|
|
22
|
+
enumerable: false,
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
// For a more readable `console.log(pageContext)` output
|
|
@@ -70,7 +70,7 @@ function assertPropertyGetters(pageContext) {
|
|
|
70
70
|
// TODO/v1-release: remove
|
|
71
71
|
'url',
|
|
72
72
|
// TODO/v1-release: remove
|
|
73
|
-
'pageExports'
|
|
73
|
+
'pageExports',
|
|
74
74
|
].forEach((prop) => {
|
|
75
75
|
if (pageContext.prop)
|
|
76
76
|
assert(isPropertyGetter(pageContext, prop));
|
|
@@ -8,7 +8,7 @@ export { getPageContextFromAllRewrites };
|
|
|
8
8
|
export { AbortRender };
|
|
9
9
|
export { assertNoInfiniteAbortLoop };
|
|
10
10
|
import { isUserHookError } from '../hooks/execHook.js';
|
|
11
|
-
import { assert, assertInfo, assertUsage, assertUsageUrlPathnameAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, joinEnglish, objectAssign, truncateString } from './utils.js';
|
|
11
|
+
import { assert, assertInfo, assertUsage, assertUsageUrlPathnameAbsolute, assertUsageUrlRedirectTarget, assertWarning, checkType, hasProp, joinEnglish, objectAssign, truncateString, } from './utils.js';
|
|
12
12
|
import pc from '@brillout/picocolors';
|
|
13
13
|
/**
|
|
14
14
|
* Abort the rendering of the current page, and redirect the user to another URL instead.
|
|
@@ -35,8 +35,8 @@ function redirect(url, statusCode) {
|
|
|
35
35
|
_abortCall: `redirect(${args.join(', ')})`,
|
|
36
36
|
_urlRedirect: {
|
|
37
37
|
url,
|
|
38
|
-
statusCode
|
|
39
|
-
}
|
|
38
|
+
statusCode,
|
|
39
|
+
},
|
|
40
40
|
});
|
|
41
41
|
return AbortRender(pageContextAbort);
|
|
42
42
|
}
|
|
@@ -52,7 +52,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
52
52
|
const pageContextAbort = {
|
|
53
53
|
abortReason,
|
|
54
54
|
_abortCaller: abortCaller,
|
|
55
|
-
_abortCall: abortCall
|
|
55
|
+
_abortCall: abortCall,
|
|
56
56
|
};
|
|
57
57
|
if (pageContextAddendum) {
|
|
58
58
|
assert(pageContextAddendum._isLegacyRenderErrorPage === true);
|
|
@@ -62,7 +62,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
62
62
|
const url = urlOrStatusCode;
|
|
63
63
|
assertUsageUrlPathnameAbsolute(url, getErrPrefix(abortCaller));
|
|
64
64
|
objectAssign(pageContextAbort, {
|
|
65
|
-
_urlRewrite: url
|
|
65
|
+
_urlRewrite: url,
|
|
66
66
|
});
|
|
67
67
|
return AbortRender(pageContextAbort);
|
|
68
68
|
}
|
|
@@ -71,7 +71,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
71
71
|
assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
|
|
72
72
|
objectAssign(pageContextAbort, {
|
|
73
73
|
abortStatusCode,
|
|
74
|
-
is404: abortStatusCode === 404
|
|
74
|
+
is404: abortStatusCode === 404,
|
|
75
75
|
});
|
|
76
76
|
return AbortRender(pageContextAbort);
|
|
77
77
|
}
|
|
@@ -128,7 +128,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
|
|
|
128
128
|
// hookLoc is missing when serializing abort errors from server to client
|
|
129
129
|
}
|
|
130
130
|
assertInfo(false, `${pc.cyan(abortCall)} thrown${thrownBy} while rendering ${pc.cyan(urlCurrent)}`, {
|
|
131
|
-
onlyOnce: false
|
|
131
|
+
onlyOnce: false,
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
134
|
function assertStatusCode(statusCode, expected, caller) {
|
|
@@ -162,7 +162,7 @@ function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
|
|
|
162
162
|
// prettier-ignore
|
|
163
163
|
// biome-ignore format:
|
|
164
164
|
rewriteCount > 0 && pc.cyan("throw render('/some-url')"),
|
|
165
|
-
redirectCount > 0 && pc.cyan("throw redirect('/some-url')")
|
|
165
|
+
redirectCount > 0 && pc.cyan("throw redirect('/some-url')"),
|
|
166
166
|
]
|
|
167
167
|
.filter(Boolean)
|
|
168
168
|
.join(' and ');
|
|
@@ -2,7 +2,7 @@ export { debug };
|
|
|
2
2
|
export { setCreateDebugger };
|
|
3
3
|
// Using createDebugger() for isomorphic code without bloating the client-side.
|
|
4
4
|
// On the server-side, this is just a transparent proxy.
|
|
5
|
-
// On the client-side, this is an
|
|
5
|
+
// On the client-side, this is an empty shell.
|
|
6
6
|
import { getGlobalObject } from '../../utils/getGlobalObject.js';
|
|
7
7
|
const globalObject = getGlobalObject('route/debug.ts', {});
|
|
8
8
|
function debug(...args) {
|