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
|
@@ -30,10 +30,10 @@ function determine(pageFilesAll, pageId, envIsClient) {
|
|
|
30
30
|
const getRendererFile = (iso) => pageFilesRelevant.filter((p) => p.isRendererPageFile && p.isEnv(iso ? 'CLIENT_AND_SERVER' : env))[0];
|
|
31
31
|
const rendererFileEnv = getRendererFile(false);
|
|
32
32
|
const rendererFileIso = getRendererFile(true);
|
|
33
|
-
// A page can load multiple `
|
|
33
|
+
// A page can load multiple `_default.page.*` files of the same `fileType`. In other words: non-renderer `_default.page.*` files are cumulative.
|
|
34
34
|
// The exception being HTML-only pages because we pick a single page file as client entry. We handle that use case at `renderPage()`.
|
|
35
35
|
const defaultFilesNonRenderer = pageFilesRelevant.filter((p) => p.isDefaultPageFile && !p.isRendererPageFile && (p.isEnv(env) || p.isEnv('CLIENT_AND_SERVER')));
|
|
36
|
-
// Ordered by `pageContext.exports`
|
|
36
|
+
// Ordered by `pageContext.exports` precedence
|
|
37
37
|
const pageFiles = [pageIdFileEnv, pageIdFileIso, ...defaultFilesNonRenderer, rendererFileEnv, rendererFileIso].filter(utils_js_1.isNotNullish);
|
|
38
38
|
return pageFiles;
|
|
39
39
|
}
|
|
@@ -32,7 +32,7 @@ function getPageFileObject(filePath) {
|
|
|
32
32
|
isDefaultPageFile: isDefaultFilePath(filePath),
|
|
33
33
|
isRendererPageFile: fileType !== '.css' && isDefaultFilePath(filePath) && isRendererFilePath(filePath),
|
|
34
34
|
isErrorPageFile: (0, error_page_js_1.isErrorPageId)(filePath, false),
|
|
35
|
-
pageId: (0, determinePageIdOld_js_1.determinePageIdOld)(filePath)
|
|
35
|
+
pageId: (0, determinePageIdOld_js_1.determinePageIdOld)(filePath),
|
|
36
36
|
};
|
|
37
37
|
return pageFile;
|
|
38
38
|
}
|
|
@@ -6,13 +6,13 @@ exports.getProxyForPublicUsage = getProxyForPublicUsage;
|
|
|
6
6
|
// ```console
|
|
7
7
|
// TypeError: Invalid property descriptor. Cannot both specify accessors and a value or writable attribute, #<Object>
|
|
8
8
|
// ```
|
|
9
|
-
// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/
|
|
9
|
+
// - Previous implementation using property getters: https://github.com/vikejs/vike/blob/4dbb354b0bcec04e862041fc9183fc4691bb8711/vike/utils/makePublicCopy.ts
|
|
10
10
|
// Show warning when user is accessing internal `_` properties.
|
|
11
11
|
const NOT_SERIALIZABLE_js_1 = require("./NOT_SERIALIZABLE.js");
|
|
12
12
|
const utils_js_1 = require("./utils.js");
|
|
13
13
|
function getProxyForPublicUsage(obj, objName, skipOnInternalProp, fallback) {
|
|
14
14
|
return new Proxy(obj, {
|
|
15
|
-
get: getTrapGet(obj, objName, skipOnInternalProp, fallback)
|
|
15
|
+
get: getTrapGet(obj, objName, skipOnInternalProp, fallback),
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
function getTrapGet(obj, objName, skipOnInternalProp, fallback) {
|
|
@@ -19,7 +19,7 @@ const getHook_js_1 = require("./getHook.js");
|
|
|
19
19
|
const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
|
|
20
20
|
const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/execHook.ts', {
|
|
21
21
|
userHookErrors: new WeakMap(),
|
|
22
|
-
pageContext: null
|
|
22
|
+
pageContext: null,
|
|
23
23
|
});
|
|
24
24
|
async function execHookSingle(hook, pageContext, preparePageContextForPublicUsage) {
|
|
25
25
|
const res = await execHooksErrorHandling([hook], pageContext, preparePageContextForPublicUsage);
|
|
@@ -85,7 +85,7 @@ async function execHookWithoutPageContext(hookFnCaller, hook) {
|
|
|
85
85
|
return hookReturn;
|
|
86
86
|
}
|
|
87
87
|
function execHookAsync(hookFnCaller, hook, pageContextForPublicUsage) {
|
|
88
|
-
const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn } } = hook;
|
|
88
|
+
const { hookName, hookFilePath, hookTimeout: { error: timeoutErr, warning: timeoutWarn }, } = hook;
|
|
89
89
|
let resolve;
|
|
90
90
|
let reject;
|
|
91
91
|
const promise = new Promise((resolve_, reject_) => {
|
|
@@ -120,7 +120,7 @@ function getHookTimeout(hooksTimeoutProvidedByUser, hookName) {
|
|
|
120
120
|
hookTimeout.warning = providedbyUser.warning;
|
|
121
121
|
return hookTimeout;
|
|
122
122
|
}
|
|
123
|
-
// 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
|
|
123
|
+
// 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
|
|
124
124
|
function getHooksTimeoutProvidedByUserNormalized(hooksTimeoutProvidedByUser) {
|
|
125
125
|
if (hooksTimeoutProvidedByUser === undefined)
|
|
126
126
|
return {};
|
|
@@ -151,13 +151,13 @@ function getHookTimeoutDefault(hookName) {
|
|
|
151
151
|
if (hookName === 'onBeforeRoute') {
|
|
152
152
|
return {
|
|
153
153
|
error: 5 * 1000,
|
|
154
|
-
warning: 1 * 1000
|
|
154
|
+
warning: 1 * 1000,
|
|
155
155
|
};
|
|
156
156
|
}
|
|
157
157
|
if (globalObject.isPrerendering) {
|
|
158
158
|
return {
|
|
159
159
|
error: 2 * 60 * 1000,
|
|
160
|
-
warning: 30 * 1000
|
|
160
|
+
warning: 30 * 1000,
|
|
161
161
|
};
|
|
162
162
|
}
|
|
163
163
|
else {
|
|
@@ -165,7 +165,7 @@ function getHookTimeoutDefault(hookName) {
|
|
|
165
165
|
}
|
|
166
166
|
return {
|
|
167
167
|
error: 30 * 1000,
|
|
168
|
-
warning: 4 * 1000
|
|
168
|
+
warning: 4 * 1000,
|
|
169
169
|
};
|
|
170
170
|
}
|
|
171
171
|
function getHook_setIsPrerenderering() {
|
|
@@ -16,7 +16,7 @@ function modifyUrl(url, modify) {
|
|
|
16
16
|
// Origin
|
|
17
17
|
const originParts = [
|
|
18
18
|
modify.protocol ?? urlParsed.protocol ?? '',
|
|
19
|
-
modify.hostname ?? urlParsed.hostname ?? ''
|
|
19
|
+
modify.hostname ?? urlParsed.hostname ?? '',
|
|
20
20
|
];
|
|
21
21
|
const port = modify.port ?? urlParsed.port;
|
|
22
22
|
if (port || port === 0) {
|
|
@@ -10,7 +10,7 @@ const SIDE_EXPORTS_TOLERATE = [
|
|
|
10
10
|
// vite-plugin-solid adds `export { $$registrations }`
|
|
11
11
|
'$$registrations',
|
|
12
12
|
// @vitejs/plugin-vue adds `export { _rerender_only }`
|
|
13
|
-
'_rerender_only'
|
|
13
|
+
'_rerender_only',
|
|
14
14
|
];
|
|
15
15
|
// Tolerate `export { frontmatter }` in .mdx files
|
|
16
16
|
const SIDE_EXPORTS_DO_NOT_CHECK = ['.md', '.mdx'];
|
|
@@ -35,7 +35,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
|
|
|
35
35
|
if (!SIDE_EXPORTS_DO_NOT_CHECK.some((ext) => filePathToShowToUser.endsWith(ext))) {
|
|
36
36
|
exportNamesInvalid.forEach((exportInvalid) => {
|
|
37
37
|
(0, utils_js_1.assertWarning)(false, `${filePathToShowToUser} unexpected ${picocolors_1.default.cyan(`export { ${exportInvalid} }`)}, see https://vike.dev/no-side-exports`, {
|
|
38
|
-
onlyOnce: true
|
|
38
|
+
onlyOnce: true,
|
|
39
39
|
});
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -18,7 +18,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
18
18
|
return {
|
|
19
19
|
type: 'computed',
|
|
20
20
|
value: configValueComputed.value,
|
|
21
|
-
definedAtData: null
|
|
21
|
+
definedAtData: null,
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
const sources = configValueSources[configName];
|
|
@@ -33,7 +33,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
33
33
|
return {
|
|
34
34
|
type: 'standard',
|
|
35
35
|
value: configValueSource.value,
|
|
36
|
-
definedAtData: getDefinedAt(configValueSource)
|
|
36
|
+
definedAtData: getDefinedAt(configValueSource),
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
@@ -42,7 +42,7 @@ function getConfigValue(pageConfig, configName) {
|
|
|
42
42
|
return {
|
|
43
43
|
type: 'cumulative',
|
|
44
44
|
value,
|
|
45
|
-
definedAtData
|
|
45
|
+
definedAtData,
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -63,6 +63,6 @@ function getDefinedAt(configValueSource) {
|
|
|
63
63
|
return definedAt;
|
|
64
64
|
return {
|
|
65
65
|
filePathToShowToUser: definedAt.filePathToShowToUser,
|
|
66
|
-
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
|
|
66
|
+
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
|
|
67
67
|
};
|
|
68
68
|
}
|
|
@@ -19,13 +19,13 @@ function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pa
|
|
|
19
19
|
const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
|
|
20
20
|
page = {
|
|
21
21
|
...vikeConfigPublicPage,
|
|
22
|
-
route
|
|
22
|
+
route,
|
|
23
23
|
};
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
page = {
|
|
27
27
|
...vikeConfigPublicPage,
|
|
28
|
-
isErrorPage: true
|
|
28
|
+
isErrorPage: true,
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
return [pageConfig.pageId, page];
|
|
@@ -35,14 +35,14 @@ function getPublicCopy(vikeConfigPublic) {
|
|
|
35
35
|
config: vikeConfigPublic.config,
|
|
36
36
|
_source: vikeConfigPublic.source,
|
|
37
37
|
_sources: vikeConfigPublic.sources,
|
|
38
|
-
_from: vikeConfigPublic.from
|
|
38
|
+
_from: vikeConfigPublic.from,
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
|
-
function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues }) {
|
|
41
|
+
function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues, }) {
|
|
42
42
|
const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
|
|
43
43
|
return resolveVikeConfigPublic_V1Design({ configValues });
|
|
44
44
|
}
|
|
45
|
-
function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues }) {
|
|
45
|
+
function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues, }) {
|
|
46
46
|
const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
|
|
47
47
|
return getPublicCopy(vikeConfigPublicGlobal);
|
|
48
48
|
}
|
|
@@ -65,7 +65,7 @@ pageConfigGlobal) {
|
|
|
65
65
|
filePath: pageFile.filePath,
|
|
66
66
|
_filePath: pageFile.filePath, // TODO/next-major-release: remove
|
|
67
67
|
_fileType: pageFile.fileType,
|
|
68
|
-
_isFromDefaultExport: isFromDefaultExport
|
|
68
|
+
_isFromDefaultExport: isFromDefaultExport,
|
|
69
69
|
});
|
|
70
70
|
});
|
|
71
71
|
});
|
|
@@ -75,7 +75,7 @@ pageConfigGlobal) {
|
|
|
75
75
|
if (pageConfig) {
|
|
76
76
|
const res = resolveVikeConfigPublic_base({
|
|
77
77
|
pageConfigGlobalValues: pageConfigGlobal.configValues,
|
|
78
|
-
pageConfigValues: pageConfig.configValues
|
|
78
|
+
pageConfigValues: pageConfig.configValues,
|
|
79
79
|
});
|
|
80
80
|
source = res.source;
|
|
81
81
|
sources = res.sources;
|
|
@@ -90,7 +90,7 @@ pageConfigGlobal) {
|
|
|
90
90
|
from = {
|
|
91
91
|
configsStandard: {},
|
|
92
92
|
configsCumulative: {},
|
|
93
|
-
configsComputed: {}
|
|
93
|
+
configsComputed: {},
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
96
|
const pageExports = {};
|
|
@@ -116,7 +116,7 @@ pageConfigGlobal) {
|
|
|
116
116
|
// TODO/now-flat-pageContext: deprecate every prop below
|
|
117
117
|
configEntries,
|
|
118
118
|
exports,
|
|
119
|
-
exportsAll
|
|
119
|
+
exportsAll,
|
|
120
120
|
};
|
|
121
121
|
// TODO/v1-release: remove
|
|
122
122
|
(0, utils_js_1.objectDefineProperty)(pageContextExports, 'pageExports', {
|
|
@@ -125,13 +125,13 @@ pageConfigGlobal) {
|
|
|
125
125
|
if (!(0, utils_js_1.isBrowser)()) {
|
|
126
126
|
(0, utils_js_1.assertWarning)(false, 'pageContext.pageExports is outdated, use pageContext.exports instead', {
|
|
127
127
|
onlyOnce: true,
|
|
128
|
-
showStackTrace: true
|
|
128
|
+
showStackTrace: true,
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
131
|
return pageExports;
|
|
132
132
|
},
|
|
133
133
|
enumerable: false,
|
|
134
|
-
configurable: true
|
|
134
|
+
configurable: true,
|
|
135
135
|
});
|
|
136
136
|
return pageContextExports;
|
|
137
137
|
}
|
|
@@ -145,7 +145,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
145
145
|
const from = {
|
|
146
146
|
configsStandard: {},
|
|
147
147
|
configsCumulative: {},
|
|
148
|
-
configsComputed: {}
|
|
148
|
+
configsComputed: {},
|
|
149
149
|
};
|
|
150
150
|
const addSrc = (src, configName) => {
|
|
151
151
|
source[configName] = src;
|
|
@@ -159,7 +159,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
159
159
|
configEntries[configName].push({
|
|
160
160
|
configValue: value,
|
|
161
161
|
configDefinedAt,
|
|
162
|
-
configDefinedByFile: configValueFilePathToShowToUser
|
|
162
|
+
configDefinedByFile: configValueFilePathToShowToUser,
|
|
163
163
|
});
|
|
164
164
|
// TODO/v1-release: remove
|
|
165
165
|
const exportName = configName;
|
|
@@ -170,7 +170,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
170
170
|
filePath: configValueFilePathToShowToUser,
|
|
171
171
|
_filePath: configValueFilePathToShowToUser,
|
|
172
172
|
_fileType: null,
|
|
173
|
-
_isFromDefaultExport: null
|
|
173
|
+
_isFromDefaultExport: null,
|
|
174
174
|
});
|
|
175
175
|
};
|
|
176
176
|
Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
|
|
@@ -180,7 +180,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
180
180
|
const src = {
|
|
181
181
|
type: 'configsStandard',
|
|
182
182
|
value: configValue.value,
|
|
183
|
-
definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName)
|
|
183
|
+
definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName),
|
|
184
184
|
};
|
|
185
185
|
addSrc(src, configName);
|
|
186
186
|
from.configsStandard[configName] = src;
|
|
@@ -197,9 +197,9 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
197
197
|
addLegacy(configName, value, definedAtFile);
|
|
198
198
|
return {
|
|
199
199
|
value,
|
|
200
|
-
definedAt
|
|
200
|
+
definedAt,
|
|
201
201
|
};
|
|
202
|
-
})
|
|
202
|
+
}),
|
|
203
203
|
};
|
|
204
204
|
addSrc(src, configName);
|
|
205
205
|
from.configsCumulative[configName] = src;
|
|
@@ -208,7 +208,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
208
208
|
const src = {
|
|
209
209
|
type: 'configsComputed',
|
|
210
210
|
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.
|
|
211
|
-
value: configValue.value
|
|
211
|
+
value: configValue.value,
|
|
212
212
|
};
|
|
213
213
|
addSrc(src, configName);
|
|
214
214
|
from.configsComputed[configName] = src;
|
|
@@ -221,7 +221,7 @@ function resolveVikeConfigPublic_V1Design(pageConfig) {
|
|
|
221
221
|
exportsAll,
|
|
222
222
|
source,
|
|
223
223
|
sources,
|
|
224
|
-
from
|
|
224
|
+
from,
|
|
225
225
|
};
|
|
226
226
|
}
|
|
227
227
|
function getExportValues(pageFile) {
|
|
@@ -244,7 +244,7 @@ function getExportValues(pageFile) {
|
|
|
244
244
|
exportValues.push({
|
|
245
245
|
exportName: defaultExportName,
|
|
246
246
|
exportValue: defaultExportValue,
|
|
247
|
-
isFromDefaultExport
|
|
247
|
+
isFromDefaultExport,
|
|
248
248
|
});
|
|
249
249
|
});
|
|
250
250
|
return;
|
|
@@ -253,7 +253,7 @@ function getExportValues(pageFile) {
|
|
|
253
253
|
exportValues.push({
|
|
254
254
|
exportName,
|
|
255
255
|
exportValue,
|
|
256
|
-
isFromDefaultExport
|
|
256
|
+
isFromDefaultExport,
|
|
257
257
|
});
|
|
258
258
|
});
|
|
259
259
|
exportValues.forEach(({ exportName, isFromDefaultExport }) => {
|
|
@@ -119,9 +119,9 @@ function parseValueSerialized(valueSerialized, configName, getDefinedAtFile) {
|
|
|
119
119
|
value: exportValue,
|
|
120
120
|
definedAtData: {
|
|
121
121
|
filePathToShowToUser: definedAtFile.filePathToShowToUser,
|
|
122
|
-
fileExportPathToShowToUser: [exportName]
|
|
123
|
-
}
|
|
124
|
-
}
|
|
122
|
+
fileExportPathToShowToUser: [exportName],
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
125
|
});
|
|
126
126
|
}
|
|
127
127
|
});
|
|
@@ -111,14 +111,14 @@ function getValueSerializedWithImport(configValueSource, importStatements, files
|
|
|
111
111
|
const { importName } = addImportStatement(importStatements, filePathAbsoluteVite, fileExportName || '*', filesEnv, configEnv, configName);
|
|
112
112
|
return {
|
|
113
113
|
type: valueIsDefinedByPlusValueFile ? 'plus-file' : 'pointer-import',
|
|
114
|
-
valueAsJsCode: importName
|
|
114
|
+
valueAsJsCode: importName,
|
|
115
115
|
};
|
|
116
116
|
}
|
|
117
117
|
function getValueSerializedWithJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
|
|
118
118
|
const valueAsJsCode = valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv);
|
|
119
119
|
return {
|
|
120
120
|
type: 'js-serialized',
|
|
121
|
-
valueAsJsCode
|
|
121
|
+
valueAsJsCode,
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
function valueToJson(value, configName, definedAtData, importStatements, filesEnv, configEnv) {
|
|
@@ -141,7 +141,7 @@ function valueToJson(value, configName, definedAtData, importStatements, filesEn
|
|
|
141
141
|
return { replacement };
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
|
-
}
|
|
144
|
+
},
|
|
145
145
|
});
|
|
146
146
|
}
|
|
147
147
|
catch (err) {
|
|
@@ -190,7 +190,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
190
190
|
return 'SKIP';
|
|
191
191
|
const configValueBase = {
|
|
192
192
|
type: 'computed',
|
|
193
|
-
definedAtData: null
|
|
193
|
+
definedAtData: null,
|
|
194
194
|
};
|
|
195
195
|
return { configValueBase, value, configName, configEnv };
|
|
196
196
|
});
|
|
@@ -207,13 +207,13 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
207
207
|
const definedAtFile = getDefinedAtFileSource(source);
|
|
208
208
|
const configValueBase = {
|
|
209
209
|
type: 'standard',
|
|
210
|
-
definedAtData: definedAtFile
|
|
210
|
+
definedAtData: definedAtFile,
|
|
211
211
|
};
|
|
212
212
|
return { configValueBase, sourceRelevant: source, configName };
|
|
213
213
|
}
|
|
214
214
|
else {
|
|
215
215
|
const sourcesRelevant = sources
|
|
216
|
-
.filter((source) => !(0, resolveVikeConfigInternal_js_1.
|
|
216
|
+
.filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverridden)(source, configName, pageConfig))
|
|
217
217
|
.filter((source) => isEnvMatch(source.configEnv));
|
|
218
218
|
if (sourcesRelevant.length === 0)
|
|
219
219
|
return 'SKIP';
|
|
@@ -224,7 +224,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
|
|
|
224
224
|
});
|
|
225
225
|
const configValueBase = {
|
|
226
226
|
type: 'cumulative',
|
|
227
|
-
definedAtData
|
|
227
|
+
definedAtData,
|
|
228
228
|
};
|
|
229
229
|
return { configValueBase, sourcesRelevant, configName };
|
|
230
230
|
}
|
|
@@ -237,7 +237,7 @@ function getDefinedAtFileSource(source) {
|
|
|
237
237
|
return definedAt;
|
|
238
238
|
const definedAtFile = {
|
|
239
239
|
filePathToShowToUser: definedAt.filePathToShowToUser,
|
|
240
|
-
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser
|
|
240
|
+
fileExportPathToShowToUser: definedAt.fileExportPathToShowToUser,
|
|
241
241
|
};
|
|
242
242
|
return definedAtFile;
|
|
243
243
|
}
|
|
@@ -284,7 +284,7 @@ function assertFileEnv(importPath, configEnv, configName, filesEnv) {
|
|
|
284
284
|
(0, utils_js_1.assertUsage)(false, [
|
|
285
285
|
`${importPath} defines the value of configs living in different environments:`,
|
|
286
286
|
...[fileEnvDiff, fileEnvNew].map((c) => ` - config ${picocolors_1.default.code(c.configName)} which value lives in environment ${picocolors_1.default.code(JSON.stringify(c.configEnv))}`),
|
|
287
|
-
'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports'
|
|
287
|
+
'Defining config values in the same file is allowed only if they live in the same environment, see https://vike.dev/config#pointer-imports',
|
|
288
288
|
].join('\n'));
|
|
289
289
|
}
|
|
290
290
|
}
|
|
@@ -17,11 +17,11 @@ function preparePageContextForPublicUsage(pageContext) {
|
|
|
17
17
|
get() {
|
|
18
18
|
(0, utils_js_1.assertWarning)(false, 'pageContext._pageId has been renamed to pageContext.pageId', {
|
|
19
19
|
showStackTrace: true,
|
|
20
|
-
onlyOnce: true
|
|
20
|
+
onlyOnce: true,
|
|
21
21
|
});
|
|
22
22
|
return pageContext.pageId;
|
|
23
23
|
},
|
|
24
|
-
enumerable: false
|
|
24
|
+
enumerable: false,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
// For a more readable `console.log(pageContext)` output
|
|
@@ -72,7 +72,7 @@ function assertPropertyGetters(pageContext) {
|
|
|
72
72
|
// TODO/v1-release: remove
|
|
73
73
|
'url',
|
|
74
74
|
// TODO/v1-release: remove
|
|
75
|
-
'pageExports'
|
|
75
|
+
'pageExports',
|
|
76
76
|
].forEach((prop) => {
|
|
77
77
|
if (pageContext.prop)
|
|
78
78
|
(0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, prop));
|
|
@@ -40,8 +40,8 @@ function redirect(url, statusCode) {
|
|
|
40
40
|
_abortCall: `redirect(${args.join(', ')})`,
|
|
41
41
|
_urlRedirect: {
|
|
42
42
|
url,
|
|
43
|
-
statusCode
|
|
44
|
-
}
|
|
43
|
+
statusCode,
|
|
44
|
+
},
|
|
45
45
|
});
|
|
46
46
|
return AbortRender(pageContextAbort);
|
|
47
47
|
}
|
|
@@ -57,7 +57,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
57
57
|
const pageContextAbort = {
|
|
58
58
|
abortReason,
|
|
59
59
|
_abortCaller: abortCaller,
|
|
60
|
-
_abortCall: abortCall
|
|
60
|
+
_abortCall: abortCall,
|
|
61
61
|
};
|
|
62
62
|
if (pageContextAddendum) {
|
|
63
63
|
(0, utils_js_1.assert)(pageContextAddendum._isLegacyRenderErrorPage === true);
|
|
@@ -67,7 +67,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
67
67
|
const url = urlOrStatusCode;
|
|
68
68
|
(0, utils_js_1.assertUsageUrlPathnameAbsolute)(url, getErrPrefix(abortCaller));
|
|
69
69
|
(0, utils_js_1.objectAssign)(pageContextAbort, {
|
|
70
|
-
_urlRewrite: url
|
|
70
|
+
_urlRewrite: url,
|
|
71
71
|
});
|
|
72
72
|
return AbortRender(pageContextAbort);
|
|
73
73
|
}
|
|
@@ -76,7 +76,7 @@ function render_(urlOrStatusCode, abortReason, abortCall, abortCaller, pageConte
|
|
|
76
76
|
assertStatusCode(urlOrStatusCode, [401, 403, 404, 410, 429, 500, 503], 'render');
|
|
77
77
|
(0, utils_js_1.objectAssign)(pageContextAbort, {
|
|
78
78
|
abortStatusCode,
|
|
79
|
-
is404: abortStatusCode === 404
|
|
79
|
+
is404: abortStatusCode === 404,
|
|
80
80
|
});
|
|
81
81
|
return AbortRender(pageContextAbort);
|
|
82
82
|
}
|
|
@@ -133,7 +133,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
|
|
|
133
133
|
// hookLoc is missing when serializing abort errors from server to client
|
|
134
134
|
}
|
|
135
135
|
(0, utils_js_1.assertInfo)(false, `${picocolors_1.default.cyan(abortCall)} thrown${thrownBy} while rendering ${picocolors_1.default.cyan(urlCurrent)}`, {
|
|
136
|
-
onlyOnce: false
|
|
136
|
+
onlyOnce: false,
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
function assertStatusCode(statusCode, expected, caller) {
|
|
@@ -167,7 +167,7 @@ function assertNoInfiniteAbortLoop(rewriteCount, redirectCount) {
|
|
|
167
167
|
// prettier-ignore
|
|
168
168
|
// biome-ignore format:
|
|
169
169
|
rewriteCount > 0 && picocolors_1.default.cyan("throw render('/some-url')"),
|
|
170
|
-
redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')")
|
|
170
|
+
redirectCount > 0 && picocolors_1.default.cyan("throw redirect('/some-url')"),
|
|
171
171
|
]
|
|
172
172
|
.filter(Boolean)
|
|
173
173
|
.join(' and ');
|
|
@@ -4,7 +4,7 @@ exports.debug = debug;
|
|
|
4
4
|
exports.setCreateDebugger = setCreateDebugger;
|
|
5
5
|
// Using createDebugger() for isomorphic code without bloating the client-side.
|
|
6
6
|
// On the server-side, this is just a transparent proxy.
|
|
7
|
-
// On the client-side, this is an
|
|
7
|
+
// On the client-side, this is an empty shell.
|
|
8
8
|
const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
|
|
9
9
|
const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('route/debug.ts', {});
|
|
10
10
|
function debug(...args) {
|
|
@@ -37,7 +37,7 @@ function deduceRouteStringFromFilesystemPath(pageId, filesystemRoots) {
|
|
|
37
37
|
.split('/')
|
|
38
38
|
.filter((dir) => dir !== 'pages' && dir !== 'src' && dir !== 'index')
|
|
39
39
|
.join('/');
|
|
40
|
-
//
|
|
40
|
+
// Handle `/index.page.*` suffix
|
|
41
41
|
(0, utils_js_1.assert)(!filesystemRoute.includes('.page.'));
|
|
42
42
|
(0, utils_js_1.assert)(!filesystemRoute.endsWith('.'));
|
|
43
43
|
if (filesystemRoute.endsWith('/index')) {
|
|
@@ -28,13 +28,13 @@ async function executeOnBeforeRouteHook(pageContext) {
|
|
|
28
28
|
}
|
|
29
29
|
(0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
|
|
30
30
|
_routingProvidedByOnBeforeRouteHook: true,
|
|
31
|
-
_debugRouteMatches: 'CUSTOM_ROUTING'
|
|
31
|
+
_debugRouteMatches: 'CUSTOM_ROUTING',
|
|
32
32
|
});
|
|
33
33
|
return pageContextFromOnBeforeRouteHook;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
(0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, {
|
|
37
|
-
_routingProvidedByOnBeforeRouteHook: false
|
|
37
|
+
_routingProvidedByOnBeforeRouteHook: false,
|
|
38
38
|
});
|
|
39
39
|
return pageContextFromOnBeforeRouteHook;
|
|
40
40
|
}
|
|
@@ -77,7 +77,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
|
|
|
77
77
|
}
|
|
78
78
|
(0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {
|
|
79
79
|
hookFilePath: onBeforeRouteHook.hookFilePath,
|
|
80
|
-
hookName: 'onBeforeRoute'
|
|
80
|
+
hookName: 'onBeforeRoute',
|
|
81
81
|
});
|
|
82
82
|
const pageContextAddendumHook = {};
|
|
83
83
|
(0, utils_js_1.objectAssign)(pageContextAddendumHook, hookReturn.pageContext);
|
|
@@ -44,7 +44,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
44
44
|
const routeMatches = [];
|
|
45
45
|
await Promise.all(pageContext._globalContext._pageRoutes.map(async (pageRoute) => {
|
|
46
46
|
const { pageId, routeType } = pageRoute;
|
|
47
|
-
//
|
|
47
|
+
// Filesystem Routing
|
|
48
48
|
if (pageRoute.routeType === 'FILESYSTEM') {
|
|
49
49
|
const { routeString } = pageRoute;
|
|
50
50
|
const match = (0, resolveRouteString_js_1.resolveRouteString)(routeString, urlPathname);
|
|
@@ -65,7 +65,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
65
65
|
pageId,
|
|
66
66
|
routeString,
|
|
67
67
|
routeParams,
|
|
68
|
-
routeType
|
|
68
|
+
routeType,
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
return;
|
|
@@ -82,7 +82,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
82
82
|
}
|
|
83
83
|
(0, utils_js_1.assert)(false);
|
|
84
84
|
}));
|
|
85
|
-
(0, resolvePrecedence_js_1.
|
|
85
|
+
(0, resolvePrecedence_js_1.resolvePrecedence)(routeMatches);
|
|
86
86
|
const winner = routeMatches[0] ?? null;
|
|
87
87
|
(0, debug_js_1.debug)(`Route matches for URL ${picocolors_1.default.cyan(urlPathname)} (in precedence order):`, routeMatches);
|
|
88
88
|
(0, utils_js_1.objectAssign)(pageContextFromRoute, { _debugRouteMatches: routeMatches });
|
|
@@ -91,7 +91,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
91
91
|
if (!winner) {
|
|
92
92
|
(0, utils_js_1.objectAssign)(pageContextFromRoute, {
|
|
93
93
|
pageId: null,
|
|
94
|
-
routeParams: {}
|
|
94
|
+
routeParams: {},
|
|
95
95
|
});
|
|
96
96
|
return pageContextFromRoute;
|
|
97
97
|
}
|
|
@@ -100,7 +100,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
100
100
|
(0, utils_js_1.assert)((0, utils_js_1.isPlainObject)(routeParams));
|
|
101
101
|
(0, utils_js_1.objectAssign)(pageContextFromRoute, {
|
|
102
102
|
pageId: winner.pageId,
|
|
103
|
-
routeParams: winner.routeParams
|
|
103
|
+
routeParams: winner.routeParams,
|
|
104
104
|
});
|
|
105
105
|
}
|
|
106
106
|
return pageContextFromRoute;
|
|
@@ -42,7 +42,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
42
42
|
comesFromV1PageConfig,
|
|
43
43
|
routeString: route,
|
|
44
44
|
routeDefinedAtString: definedAtString,
|
|
45
|
-
routeType: 'STRING'
|
|
45
|
+
routeType: 'STRING',
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
@@ -60,7 +60,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
60
60
|
routeFunction: route,
|
|
61
61
|
routeFunctionFilePath: filePathToShowToUser,
|
|
62
62
|
routeDefinedAtString: definedAtString,
|
|
63
|
-
routeType: 'FUNCTION'
|
|
63
|
+
routeType: 'FUNCTION',
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -76,7 +76,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
76
76
|
comesFromV1PageConfig,
|
|
77
77
|
routeString,
|
|
78
78
|
routeDefinedAtString: null,
|
|
79
|
-
routeType: 'FILESYSTEM'
|
|
79
|
+
routeType: 'FILESYSTEM',
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
82
|
(0, utils_js_1.assert)(pageRoute);
|
|
@@ -102,7 +102,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
102
102
|
routeString,
|
|
103
103
|
routeDefinedAtString: null,
|
|
104
104
|
routeFilesystemDefinedBy: `${pageId}.page.*`,
|
|
105
|
-
routeType: 'FILESYSTEM'
|
|
105
|
+
routeType: 'FILESYSTEM',
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
else {
|
|
@@ -116,7 +116,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
116
116
|
comesFromV1PageConfig,
|
|
117
117
|
routeString,
|
|
118
118
|
routeDefinedAtString: filePath,
|
|
119
|
-
routeType: 'STRING'
|
|
119
|
+
routeType: 'STRING',
|
|
120
120
|
});
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
@@ -134,7 +134,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
134
134
|
routeFunction,
|
|
135
135
|
routeFunctionFilePath: filePath,
|
|
136
136
|
routeDefinedAtString: filePath,
|
|
137
|
-
routeType: 'FUNCTION'
|
|
137
|
+
routeType: 'FUNCTION',
|
|
138
138
|
});
|
|
139
139
|
return;
|
|
140
140
|
}
|
|
@@ -166,7 +166,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
|
|
|
166
166
|
hookFilePath: filePath,
|
|
167
167
|
hookFn: onBeforeRoute,
|
|
168
168
|
hookName,
|
|
169
|
-
hookTimeout: (0, getHook_js_1.getHookTimeoutDefault)(hookName)
|
|
169
|
+
hookTimeout: (0, getHook_js_1.getHookTimeoutDefault)(hookName),
|
|
170
170
|
};
|
|
171
171
|
}
|
|
172
172
|
if ('filesystemRoutingRoot' in fileExports) {
|
|
@@ -174,7 +174,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
|
|
|
174
174
|
(0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(fileExports, 'filesystemRoutingRoot', 'string'), `\`export { filesystemRoutingRoot }\` of ${filePath} is \`'${fileExports.filesystemRoutingRoot}'\` but it should start with a leading slash \`/\`.`);
|
|
175
175
|
filesystemRoots.push({
|
|
176
176
|
filesystemRoot: dirname(filePath),
|
|
177
|
-
urlRoot: fileExports.filesystemRoutingRoot
|
|
177
|
+
urlRoot: fileExports.filesystemRoutingRoot,
|
|
178
178
|
});
|
|
179
179
|
}
|
|
180
180
|
});
|