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
|
@@ -12,7 +12,7 @@ exports.isV1Design = isV1Design;
|
|
|
12
12
|
exports.getConfVal = getConfVal;
|
|
13
13
|
exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
|
|
14
14
|
exports.getVikeConfigFromCliOrEnv = getVikeConfigFromCliOrEnv;
|
|
15
|
-
exports.
|
|
15
|
+
exports.isOverridden = isOverridden;
|
|
16
16
|
exports.getVikeConfig = getVikeConfig;
|
|
17
17
|
const utils_js_1 = require("../utils.js");
|
|
18
18
|
const configDefinitionsBuiltIn_js_1 = require("./resolveVikeConfigInternal/configDefinitionsBuiltIn.js");
|
|
@@ -34,10 +34,10 @@ const context_js_1 = require("../../api/context.js");
|
|
|
34
34
|
const context_js_2 = require("../../cli/context.js");
|
|
35
35
|
const resolvePrerenderConfig_js_1 = require("../../prerender/resolvePrerenderConfig.js");
|
|
36
36
|
const getProxyForPublicUsage_js_1 = require("../../../shared/getProxyForPublicUsage.js");
|
|
37
|
-
const
|
|
37
|
+
const getVikeConfigError_js_1 = require("../../shared/getVikeConfigError.js");
|
|
38
38
|
(0, utils_js_1.assertIsNotProductionRuntime)();
|
|
39
39
|
// We can simply use global variables since Vike's config is:
|
|
40
|
-
// -
|
|
40
|
+
// - global
|
|
41
41
|
// - independent of Vite (therefore we don't need to tie Vike's config with Vite's `config` object)
|
|
42
42
|
(0, utils_js_1.assertIsSingleModuleInstance)('v1-design/getVikeConfig.ts');
|
|
43
43
|
let restartVite = false;
|
|
@@ -112,7 +112,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
|
|
|
112
112
|
vikeConfigPromise = promise;
|
|
113
113
|
const esbuildCache = {
|
|
114
114
|
transpileCache: {},
|
|
115
|
-
vikeConfigDependencies: new Set()
|
|
115
|
+
vikeConfigDependencies: new Set(),
|
|
116
116
|
};
|
|
117
117
|
let hasError = false;
|
|
118
118
|
let ret;
|
|
@@ -141,7 +141,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
|
|
|
141
141
|
(0, utils_js_1.assert)(err === undefined);
|
|
142
142
|
const hadError = vikeConfigHasBuildError;
|
|
143
143
|
vikeConfigHasBuildError = false;
|
|
144
|
-
(0,
|
|
144
|
+
(0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: false });
|
|
145
145
|
if (hadError) {
|
|
146
146
|
(0, loggerNotProd_js_1.logConfigErrorRecover)();
|
|
147
147
|
if (restartVite) {
|
|
@@ -155,7 +155,7 @@ async function resolveVikeConfigInternal_withErrorHandling(userRootDir, isDev, v
|
|
|
155
155
|
(0, utils_js_1.assert)(ret === undefined);
|
|
156
156
|
(0, utils_js_1.assert)(err);
|
|
157
157
|
vikeConfigHasBuildError = true;
|
|
158
|
-
(0,
|
|
158
|
+
(0, getVikeConfigError_js_1.setVikeConfigError)({ errorBuild: { err } });
|
|
159
159
|
if (!doNotRestartViteOnError)
|
|
160
160
|
restartVite = true;
|
|
161
161
|
if (!isDev) {
|
|
@@ -187,7 +187,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
|
|
|
187
187
|
const prerenderContext = resolvePrerenderContext({
|
|
188
188
|
config: vikeConfigPublicGlobal.config,
|
|
189
189
|
_from: vikeConfigPublicGlobal._from,
|
|
190
|
-
_pageConfigs: pageConfigs
|
|
190
|
+
_pageConfigs: pageConfigs,
|
|
191
191
|
});
|
|
192
192
|
const vikeConfig = {
|
|
193
193
|
_pageConfigs: pageConfigs,
|
|
@@ -196,7 +196,7 @@ async function resolveVikeConfigInternal(userRootDir, vikeVitePluginOptions, esb
|
|
|
196
196
|
_from: vikeConfigPublicGlobal._from,
|
|
197
197
|
pages: vikeConfigPublicPagesEager,
|
|
198
198
|
prerenderContext,
|
|
199
|
-
_vikeConfigDependencies: esbuildCache.vikeConfigDependencies
|
|
199
|
+
_vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
|
|
200
200
|
};
|
|
201
201
|
vikeConfigSync = vikeConfig;
|
|
202
202
|
return vikeConfig;
|
|
@@ -228,7 +228,7 @@ async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache)
|
|
|
228
228
|
configDefinitions,
|
|
229
229
|
plusFiles,
|
|
230
230
|
plusFilesRelevant,
|
|
231
|
-
configNamesKnownLocal
|
|
231
|
+
configNamesKnownLocal,
|
|
232
232
|
};
|
|
233
233
|
}));
|
|
234
234
|
const configDefinitionsResolved = {
|
|
@@ -236,7 +236,7 @@ async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache)
|
|
|
236
236
|
configDefinitionsLocal,
|
|
237
237
|
configDefinitionsAll,
|
|
238
238
|
configNamesKnownAll,
|
|
239
|
-
configNamesKnownGlobal
|
|
239
|
+
configNamesKnownGlobal,
|
|
240
240
|
};
|
|
241
241
|
assertKnownConfigs(configDefinitionsResolved);
|
|
242
242
|
return configDefinitionsResolved;
|
|
@@ -259,7 +259,7 @@ async function loadCustomConfigBuildTimeFiles(plusFiles, configDefinitions, user
|
|
|
259
259
|
function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRootDir) {
|
|
260
260
|
const pageConfigGlobal = {
|
|
261
261
|
configDefinitions: configDefinitionsResolved.configDefinitionsGlobal,
|
|
262
|
-
configValueSources: {}
|
|
262
|
+
configValueSources: {},
|
|
263
263
|
};
|
|
264
264
|
(0, utils_js_1.objectEntries)(configDefinitionsResolved.configDefinitionsGlobal).forEach(([configName, configDef]) => {
|
|
265
265
|
const sources = resolveConfigValueSources(configName, configDef,
|
|
@@ -297,7 +297,7 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
|
|
|
297
297
|
configDefinitions: configDefinitionsLocal,
|
|
298
298
|
plusFiles: plusFilesRelevant,
|
|
299
299
|
configValueSources,
|
|
300
|
-
configValuesComputed
|
|
300
|
+
configValuesComputed,
|
|
301
301
|
};
|
|
302
302
|
return pageConfig;
|
|
303
303
|
});
|
|
@@ -327,7 +327,7 @@ function assertGlobalConfigLocation(configName, sources, plusFilesAll, configDef
|
|
|
327
327
|
// It's `null` when the config is defined by `vike(options)` in vite.config.js
|
|
328
328
|
(0, utils_js_1.assert)(plusFile);
|
|
329
329
|
const { filePathAbsoluteUserRootDir } = plusFile.filePath;
|
|
330
|
-
// Allow local Vike extensions to set
|
|
330
|
+
// Allow local Vike extensions to set global configs (`filePathAbsoluteUserRootDir===null` for Vike extension)
|
|
331
331
|
if (!filePathAbsoluteUserRootDir)
|
|
332
332
|
return;
|
|
333
333
|
(0, utils_js_1.assert)(!plusFile.isExtensionConfig);
|
|
@@ -413,9 +413,9 @@ function temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, use
|
|
|
413
413
|
sources.push(getSourceNonConfigFile(configName, value, {
|
|
414
414
|
...(0, getFilePath_js_1.getFilePathResolved)({
|
|
415
415
|
userRootDir,
|
|
416
|
-
filePathAbsoluteUserRootDir: '/vite.config.js'
|
|
416
|
+
filePathAbsoluteUserRootDir: '/vite.config.js',
|
|
417
417
|
}),
|
|
418
|
-
fileExportPathToShowToUser: null
|
|
418
|
+
fileExportPathToShowToUser: null,
|
|
419
419
|
}));
|
|
420
420
|
});
|
|
421
421
|
}
|
|
@@ -450,12 +450,12 @@ function getVikeConfigFromCliOrEnv() {
|
|
|
450
450
|
const configFromEnvVar = (0, getEnvVarObject_js_1.getEnvVarObject)('VIKE_CONFIG');
|
|
451
451
|
const vikeConfigFromCliOrEnv = {
|
|
452
452
|
...configFromCliOptions, // Lower precedence
|
|
453
|
-
...configFromEnvVar // Higher precedence
|
|
453
|
+
...configFromEnvVar, // Higher precedence
|
|
454
454
|
};
|
|
455
455
|
return {
|
|
456
456
|
vikeConfigFromCliOrEnv,
|
|
457
457
|
configFromCliOptions,
|
|
458
|
-
configFromEnvVar
|
|
458
|
+
configFromEnvVar,
|
|
459
459
|
};
|
|
460
460
|
}
|
|
461
461
|
function getSourceNonConfigFile(configName, value, definedAt) {
|
|
@@ -469,7 +469,7 @@ function getSourceNonConfigFile(configName, value, definedAt) {
|
|
|
469
469
|
locationId: '/',
|
|
470
470
|
plusFile: null,
|
|
471
471
|
valueIsLoadedWithImport: false,
|
|
472
|
-
valueIsDefinedByPlusValueFile: false
|
|
472
|
+
valueIsDefinedByPlusValueFile: false,
|
|
473
473
|
};
|
|
474
474
|
return source;
|
|
475
475
|
}
|
|
@@ -556,7 +556,7 @@ function sortPlusFilesSameLocationId(plusFile1, plusFile2, configName) {
|
|
|
556
556
|
return ret;
|
|
557
557
|
}
|
|
558
558
|
// Config set by +{configName}.js (highest precedence)
|
|
559
|
-
// No need to make it deterministic: the overall order is
|
|
559
|
+
// No need to make it deterministic: the overall order is already deterministic, see sortMakeDeterministic() at getPlusFilesAll()
|
|
560
560
|
return 0;
|
|
561
561
|
}
|
|
562
562
|
function resolveConfigValueSources(configName, configDef, plusFilesRelevant, userRootDir, isGlobal, plusFilesAll) {
|
|
@@ -588,11 +588,11 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
588
588
|
(0, utils_js_1.assert)(confVal);
|
|
589
589
|
const configValueSourceCommon = {
|
|
590
590
|
locationId: plusFile.locationId,
|
|
591
|
-
plusFile
|
|
591
|
+
plusFile,
|
|
592
592
|
};
|
|
593
593
|
const definedAtFilePath_ = {
|
|
594
594
|
...plusFile.filePath,
|
|
595
|
-
fileExportPathToShowToUser: ['default', configName]
|
|
595
|
+
fileExportPathToShowToUser: ['default', configName],
|
|
596
596
|
};
|
|
597
597
|
// +client.js
|
|
598
598
|
if (configDef._valueIsFilePath) {
|
|
@@ -613,7 +613,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
613
613
|
valueFilePath = plusFile.filePath.filePathAbsoluteVite;
|
|
614
614
|
definedAtFilePath = {
|
|
615
615
|
...plusFile.filePath,
|
|
616
|
-
fileExportPathToShowToUser: []
|
|
616
|
+
fileExportPathToShowToUser: [],
|
|
617
617
|
};
|
|
618
618
|
}
|
|
619
619
|
const configValueSource = {
|
|
@@ -624,7 +624,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
624
624
|
configEnv: configDef.env,
|
|
625
625
|
valueIsLoadedWithImport: false,
|
|
626
626
|
valueIsDefinedByPlusValueFile: false,
|
|
627
|
-
definedAt: definedAtFilePath
|
|
627
|
+
definedAt: definedAtFilePath,
|
|
628
628
|
};
|
|
629
629
|
return configValueSource;
|
|
630
630
|
}
|
|
@@ -637,10 +637,10 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
637
637
|
const value = pointerImport.fileExportValueLoaded
|
|
638
638
|
? {
|
|
639
639
|
valueIsLoaded: true,
|
|
640
|
-
value: pointerImport.fileExportValue
|
|
640
|
+
value: pointerImport.fileExportValue,
|
|
641
641
|
}
|
|
642
642
|
: {
|
|
643
|
-
valueIsLoaded: false
|
|
643
|
+
valueIsLoaded: false,
|
|
644
644
|
};
|
|
645
645
|
const configValueSource = {
|
|
646
646
|
...configValueSourceCommon,
|
|
@@ -648,7 +648,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
648
648
|
configEnv: resolveConfigEnv(configDef.env, pointerImport.fileExportPath),
|
|
649
649
|
valueIsLoadedWithImport: true,
|
|
650
650
|
valueIsDefinedByPlusValueFile: false,
|
|
651
|
-
definedAt: pointerImport.fileExportPath
|
|
651
|
+
definedAt: pointerImport.fileExportPath,
|
|
652
652
|
};
|
|
653
653
|
return configValueSource;
|
|
654
654
|
}
|
|
@@ -660,7 +660,7 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
660
660
|
configEnv: configDef.env,
|
|
661
661
|
valueIsLoadedWithImport: false,
|
|
662
662
|
valueIsDefinedByPlusValueFile: false,
|
|
663
|
-
definedAt: definedAtFilePath_
|
|
663
|
+
definedAt: definedAtFilePath_,
|
|
664
664
|
};
|
|
665
665
|
return configValueSource;
|
|
666
666
|
}
|
|
@@ -679,8 +679,8 @@ function getConfigValueSource(configName, plusFile, configDef, userRootDir) {
|
|
|
679
679
|
fileExportPathToShowToUser: configName === plusFile.configName
|
|
680
680
|
? []
|
|
681
681
|
: // Side-effect config (e.g. `export { frontmatter }` of .md files)
|
|
682
|
-
[configName]
|
|
683
|
-
}
|
|
682
|
+
[configName],
|
|
683
|
+
},
|
|
684
684
|
};
|
|
685
685
|
return configValueSource;
|
|
686
686
|
}
|
|
@@ -703,7 +703,7 @@ function resolveIsGlobalValue(configDefGlobal, source, plusFilesAll) {
|
|
|
703
703
|
let isGlobal;
|
|
704
704
|
if ((0, utils_js_1.isCallable)(configDefGlobal))
|
|
705
705
|
isGlobal = configDefGlobal(source.value, {
|
|
706
|
-
isGlobalLocation: isGlobalLocation(source.locationId, plusFilesAll)
|
|
706
|
+
isGlobalLocation: isGlobalLocation(source.locationId, plusFilesAll),
|
|
707
707
|
});
|
|
708
708
|
else
|
|
709
709
|
isGlobal = configDefGlobal ?? false;
|
|
@@ -740,20 +740,20 @@ function getConfigDefinitions(plusFilesRelevant, filter) {
|
|
|
740
740
|
(0, utils_js_1.assert)(plusFile.isConfigFile);
|
|
741
741
|
configDef._userEffectDefinedAtFilePath = {
|
|
742
742
|
...plusFile.filePath,
|
|
743
|
-
fileExportPathToShowToUser: ['default', 'meta', configName, 'effect']
|
|
743
|
+
fileExportPathToShowToUser: ['default', 'meta', configName, 'effect'],
|
|
744
744
|
};
|
|
745
745
|
});
|
|
746
746
|
(0, utils_js_1.objectEntries)(meta).forEach(([configName, configDefinitionUserLand]) => {
|
|
747
747
|
if ('isDefinedByPeerDependency' in configDefinitionUserLand) {
|
|
748
748
|
configDefinitionUserLand = {
|
|
749
749
|
env: { client: false, server: false, config: false },
|
|
750
|
-
...configDefinitionUserLand
|
|
750
|
+
...configDefinitionUserLand,
|
|
751
751
|
};
|
|
752
752
|
}
|
|
753
753
|
// User can override an existing config definition
|
|
754
754
|
configDefinitions[configName] = {
|
|
755
755
|
...configDefinitions[configName],
|
|
756
|
-
...configDefinitionUserLand
|
|
756
|
+
...configDefinitionUserLand,
|
|
757
757
|
};
|
|
758
758
|
});
|
|
759
759
|
});
|
|
@@ -831,13 +831,13 @@ function runEffect(configName, configDef, source) {
|
|
|
831
831
|
return null;
|
|
832
832
|
// The value needs to be loaded at config time, that's why we only support effect for configs that are config-only for now.
|
|
833
833
|
(0, utils_js_1.assertUsage)(configDef.env.config, [
|
|
834
|
-
`Cannot add meta.effect to ${picocolors_1.default.cyan(configName)} because its meta.env is ${picocolors_1.default.cyan(JSON.stringify(configDef.env))} but an effect can only be added to a config that has a meta.env with ${picocolors_1.default.cyan('{ config: true }')}
|
|
834
|
+
`Cannot add meta.effect to ${picocolors_1.default.cyan(configName)} because its meta.env is ${picocolors_1.default.cyan(JSON.stringify(configDef.env))} but an effect can only be added to a config that has a meta.env with ${picocolors_1.default.cyan('{ config: true }')}.`,
|
|
835
835
|
].join(' '));
|
|
836
836
|
(0, utils_js_1.assert)(source.valueIsLoaded);
|
|
837
837
|
// Call effect
|
|
838
838
|
const configModFromEffect = configDef.effect({
|
|
839
839
|
configValue: source.value,
|
|
840
|
-
configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAt)
|
|
840
|
+
configDefinedAt: (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, source.definedAt),
|
|
841
841
|
});
|
|
842
842
|
if (!configModFromEffect)
|
|
843
843
|
return null;
|
|
@@ -858,7 +858,7 @@ function applyEffectConfVal(configModFromEffect, sourceEffect, configValueSource
|
|
|
858
858
|
valueIsLoadedWithImport: false,
|
|
859
859
|
valueIsDefinedByPlusValueFile: false,
|
|
860
860
|
valueIsLoaded: true,
|
|
861
|
-
value: configValue
|
|
861
|
+
value: configValue,
|
|
862
862
|
};
|
|
863
863
|
(0, utils_js_1.assert)(sourceEffect.valueIsLoaded);
|
|
864
864
|
const isValueGlobalSource = resolveIsGlobalValue(configDefEffect.global, sourceEffect, plusFilesAll);
|
|
@@ -890,11 +890,11 @@ function applyEffectMetaEnv(configModFromEffect, configValueSources, configDefEf
|
|
|
890
890
|
(0, utils_js_1.assertUsage)(keys.includes('env'), notSupported);
|
|
891
891
|
(0, utils_js_1.assertUsage)(keys.length === 1, notSupported);
|
|
892
892
|
}
|
|
893
|
-
const
|
|
893
|
+
const envOverridden = configTargetDef.env;
|
|
894
894
|
const sources = configValueSources[configTargetName];
|
|
895
895
|
sources?.forEach((configValueSource) => {
|
|
896
896
|
// Apply effect
|
|
897
|
-
configValueSource.configEnv =
|
|
897
|
+
configValueSource.configEnv = envOverridden;
|
|
898
898
|
});
|
|
899
899
|
});
|
|
900
900
|
});
|
|
@@ -909,7 +909,7 @@ function getComputed(configValueSources, configDefinitions) {
|
|
|
909
909
|
return;
|
|
910
910
|
configValuesComputed[configName] = {
|
|
911
911
|
value,
|
|
912
|
-
configEnv: configDef.env
|
|
912
|
+
configEnv: configDef.env,
|
|
913
913
|
};
|
|
914
914
|
});
|
|
915
915
|
return configValuesComputed;
|
|
@@ -954,7 +954,7 @@ function assertKnownConfig(configName, configNamesKnownRelevant, configDefinitio
|
|
|
954
954
|
title: ui,
|
|
955
955
|
ssr: ui,
|
|
956
956
|
stream: ui,
|
|
957
|
-
Wrapper: ui
|
|
957
|
+
Wrapper: ui,
|
|
958
958
|
};
|
|
959
959
|
if (configName in knownVikeExntensionConfigs) {
|
|
960
960
|
const requiredVikeExtension = (0, utils_js_1.joinEnglish)(knownVikeExntensionConfigs[configName].map((e) => picocolors_1.default.bold(e)), 'or');
|
|
@@ -1001,7 +1001,7 @@ function determineRouteFilesystem(locationId, configValueSources) {
|
|
|
1001
1001
|
(0, utils_js_1.assert)(filesystemRouteString.startsWith('/'));
|
|
1002
1002
|
const routeFilesystem = {
|
|
1003
1003
|
routeString: filesystemRouteString,
|
|
1004
|
-
definedAtLocation: filesystemRouteDefinedBy
|
|
1004
|
+
definedAtLocation: filesystemRouteDefinedBy,
|
|
1005
1005
|
};
|
|
1006
1006
|
return { routeFilesystem, isErrorPage: undefined };
|
|
1007
1007
|
}
|
|
@@ -1100,7 +1100,7 @@ function isGlobalLocation(locationId, plusFilesAll) {
|
|
|
1100
1100
|
.map(([locationId]) => locationId);
|
|
1101
1101
|
return locationIdsPage.every((locId) => (0, filesystemRouting_js_1.isInherited)(locationId, locId));
|
|
1102
1102
|
}
|
|
1103
|
-
function
|
|
1103
|
+
function isOverridden(source, configName, pageConfig) {
|
|
1104
1104
|
const configDef = pageConfig.configDefinitions[configName];
|
|
1105
1105
|
(0, utils_js_1.assert)(configDef);
|
|
1106
1106
|
if (configDef.cumulative)
|
|
@@ -1119,7 +1119,7 @@ function resolvePrerenderContext(vikeConfig) {
|
|
|
1119
1119
|
// Set at runPrerender()
|
|
1120
1120
|
output: null,
|
|
1121
1121
|
// Set at runPrerender()
|
|
1122
|
-
pageContexts: null
|
|
1122
|
+
pageContexts: null,
|
|
1123
1123
|
});
|
|
1124
1124
|
prerenderContext.isPrerenderingEnabled = isPrerenderingEnabled;
|
|
1125
1125
|
prerenderContext.isPrerenderingEnabledForAllPages = isPrerenderingEnabledForAllPages;
|
|
@@ -1146,19 +1146,19 @@ function getVikeConfigDummy(esbuildCache) {
|
|
|
1146
1146
|
const prerenderContextDummy = resolvePrerenderContext({
|
|
1147
1147
|
config: globalDummy.config,
|
|
1148
1148
|
_from: globalDummy._from,
|
|
1149
|
-
_pageConfigs: pageConfigsDummy
|
|
1149
|
+
_pageConfigs: pageConfigsDummy,
|
|
1150
1150
|
});
|
|
1151
1151
|
const vikeConfigDummy = {
|
|
1152
1152
|
_pageConfigs: pageConfigsDummy,
|
|
1153
1153
|
_pageConfigGlobal: {
|
|
1154
1154
|
configDefinitions: {},
|
|
1155
|
-
configValueSources: {}
|
|
1155
|
+
configValueSources: {},
|
|
1156
1156
|
},
|
|
1157
1157
|
config: globalDummy.config,
|
|
1158
1158
|
_from: globalDummy._from,
|
|
1159
1159
|
pages: {},
|
|
1160
1160
|
prerenderContext: prerenderContextDummy,
|
|
1161
|
-
_vikeConfigDependencies: esbuildCache.vikeConfigDependencies
|
|
1161
|
+
_vikeConfigDependencies: esbuildCache.vikeConfigDependencies,
|
|
1162
1162
|
};
|
|
1163
1163
|
vikeConfigSync = vikeConfigDummy;
|
|
1164
1164
|
isV1Design_ = true;
|
|
@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
// We call onLoad() here so that it's called even when only a subset of the plugin is loaded. (Making the assert() calls inside onLoad() a lot stronger.)
|
|
19
19
|
const onLoad_js_1 = require("./onLoad.js");
|
|
20
20
|
(0, onLoad_js_1.onLoad)();
|
|
21
|
-
//
|
|
21
|
+
// - Server-side bloat is negligible
|
|
22
|
+
// - The Vite plugin imports the server runtime anyways
|
|
22
23
|
__exportStar(require("../runtime/utils.js"), exports);
|
|
23
24
|
// Utils only needed by `plugin/*`
|
|
24
25
|
__exportStar(require("../../utils/requireResolve.js"), exports);
|
|
@@ -26,22 +27,16 @@ __exportStar(require("../../utils/includes.js"), exports);
|
|
|
26
27
|
__exportStar(require("../../utils/isDev.js"), exports);
|
|
27
28
|
__exportStar(require("../../utils/getMostSimilar.js"), exports);
|
|
28
29
|
__exportStar(require("../../utils/getRandomId.js"), exports);
|
|
29
|
-
__exportStar(require("../../utils/joinEnglish.js"), exports);
|
|
30
30
|
__exportStar(require("../../utils/escapeRegex.js"), exports);
|
|
31
|
-
__exportStar(require("../../utils/stripAnsi.js"), exports);
|
|
32
31
|
__exportStar(require("../../utils/trimWithAnsi.js"), exports);
|
|
33
32
|
__exportStar(require("../../utils/removeEmptyLines.js"), exports);
|
|
34
33
|
__exportStar(require("../../utils/findPackageJson.js"), exports);
|
|
35
|
-
__exportStar(require("../../utils/getPropAccessNotation.js"), exports);
|
|
36
34
|
__exportStar(require("../../utils/deepEqual.js"), exports);
|
|
37
35
|
__exportStar(require("../../utils/assertKeys.js"), exports);
|
|
38
36
|
__exportStar(require("../../utils/injectRollupInputs.js"), exports);
|
|
39
|
-
__exportStar(require("../../utils/humanizeTime.js"), exports);
|
|
40
37
|
__exportStar(require("../../utils/pLimit.js"), exports);
|
|
41
38
|
__exportStar(require("../../utils/assertVersion.js"), exports);
|
|
42
39
|
__exportStar(require("../../utils/isFilePathAbsoluteFilesystem.js"), exports);
|
|
43
|
-
__exportStar(require("../../utils/isArray.js"), exports);
|
|
44
|
-
__exportStar(require("../../utils/PROJECT_VERSION.js"), exports);
|
|
45
40
|
__exportStar(require("../../utils/isEqualStringList.js"), exports);
|
|
46
41
|
__exportStar(require("../../utils/isDocker.js"), exports);
|
|
47
42
|
__exportStar(require("../../utils/isVitest.js"), exports);
|
|
@@ -16,6 +16,6 @@ function assertHookReturnedObject(obj, keysExpected, errPrefix) {
|
|
|
16
16
|
'returned an object with following unknown keys:',
|
|
17
17
|
(0, utils_js_1.stringifyStringArray)(keysUnknown) + '.',
|
|
18
18
|
'Only following keys are allowed:',
|
|
19
|
-
(0, utils_js_1.stringifyStringArray)(keysExpected) + '.'
|
|
19
|
+
(0, utils_js_1.stringifyStringArray)(keysExpected) + '.',
|
|
20
20
|
].join(' '));
|
|
21
21
|
}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.assertPageContextProvidedByUser = assertPageContextProvidedByUser;
|
|
7
7
|
const utils_js_1 = require("./utils.js");
|
|
8
8
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
9
|
-
function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName, hookFilePath }) {
|
|
9
|
+
function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName, hookFilePath, }) {
|
|
10
10
|
if (pageContextProvidedByUser === undefined || pageContextProvidedByUser === null)
|
|
11
11
|
return;
|
|
12
12
|
(0, utils_js_1.assert)(!hookName.endsWith(')'));
|
|
@@ -15,6 +15,6 @@ function assertPageContextProvidedByUser(pageContextProvidedByUser, { hookName,
|
|
|
15
15
|
(0, utils_js_1.assertUsage)(!('isPageContext' in pageContextProvidedByUser), `${errPrefix} shouldn't be the whole ${picocolors_1.default.cyan('pageContext')} object, see https://vike.dev/pageContext-manipulation#do-not-return-entire-pagecontext`);
|
|
16
16
|
// In principle, it's possible to use onBeforeRoute()` to override and define the whole routing.
|
|
17
17
|
// Is that a good idea to allow users to do this? Beyond deep integration with Vue Router or React Router, is there a use case for this?
|
|
18
|
-
(0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is
|
|
18
|
+
(0, utils_js_1.assertWarning)(!('pageId' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.pageId')} which means that Vike's routing is overridden. This is an experimental feature: make sure to contact a vike maintainer before using this.`, { onlyOnce: true });
|
|
19
19
|
(0, utils_js_1.assertUsage)(!('is404' in pageContextProvidedByUser), `${errPrefix} sets ${picocolors_1.default.cyan('pageContext.is404')} which is forbidden, use ${picocolors_1.default.cyan('throw render()')} instead, see https://vike.dev/render`);
|
|
20
20
|
}
|
|
@@ -7,36 +7,37 @@ const parseVirtualFileExports_js_1 = require("./getPageFiles/parseVirtualFileExp
|
|
|
7
7
|
const resolveVikeConfigPublic_js_1 = require("./page-configs/resolveVikeConfigPublic.js");
|
|
8
8
|
const execHook_js_1 = require("./hooks/execHook.js");
|
|
9
9
|
const prepareGlobalContextForPublicUsage_js_1 = require("./prepareGlobalContextForPublicUsage.js");
|
|
10
|
+
const getHook_js_1 = require("./hooks/getHook.js");
|
|
10
11
|
const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
|
|
11
12
|
exports.getGlobalContextSyncErrMsg = getGlobalContextSyncErrMsg;
|
|
12
13
|
async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
|
|
13
14
|
const globalContext = createGlobalContextBase(virtualFileExports);
|
|
14
15
|
const globalContextAddendum = await addGlobalContext?.(globalContext);
|
|
15
16
|
(0, utils_js_1.objectAssign)(globalContext, globalContextAddendum);
|
|
17
|
+
const onCreateGlobalContextHooks = (0, getHook_js_1.getHookFromPageConfigGlobalCumulative)(globalContext._pageConfigGlobal, 'onCreateGlobalContext');
|
|
18
|
+
let hooksCalled = false;
|
|
19
|
+
if (!hooksAreEqual(globalObject.onCreateGlobalContextHooks ?? [], onCreateGlobalContextHooks)) {
|
|
20
|
+
globalObject.onCreateGlobalContextHooks = onCreateGlobalContextHooks;
|
|
21
|
+
await (0, execHook_js_1.execHookGlobal)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage);
|
|
22
|
+
hooksCalled = true;
|
|
23
|
+
}
|
|
16
24
|
if (!globalObject.globalContext) {
|
|
17
25
|
globalObject.globalContext = globalContext;
|
|
18
|
-
// - We deliberately call onCreateGlobalContext() only at the beginning and only once per process.
|
|
19
|
-
// - TO-DO/eventually: HMR
|
|
20
|
-
// - Once Photon supports it: `server.hot.send({ type: 'full-server-reload' })`
|
|
21
|
-
// - Either use:
|
|
22
|
-
// - import.meta.hot
|
|
23
|
-
// - https://vite.dev/guide/api-hmr.html
|
|
24
|
-
// - Use a Vite transformer to inject import.meta.hot code into each user-land `+onCreateGlobalContext.js` file
|
|
25
|
-
// - Seems more idiomatic
|
|
26
|
-
// - globalContext._viteDevServer.hot.send()
|
|
27
|
-
// - Send 'full-server-reload' signal whenever a onCreateGlobalContext() function is modified => we need a globalObject to track all hooks and see if one of them is new/modified.
|
|
28
|
-
// - Seems less idiomatic
|
|
29
|
-
await (0, execHook_js_1.execHookGlobal)('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage);
|
|
30
26
|
}
|
|
31
27
|
else {
|
|
32
28
|
// Singleton: ensure all `globalContext` user-land references are preserved & updated.
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
if (hooksCalled) {
|
|
30
|
+
(0, utils_js_1.objectReplace)(globalObject.globalContext, globalContext);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
// We don't use objectReplace() in order to keep user-land properties.
|
|
34
|
+
(0, utils_js_1.objectAssign)(globalObject.globalContext, globalContext, true);
|
|
35
|
+
}
|
|
35
36
|
}
|
|
36
37
|
return globalObject.globalContext;
|
|
37
38
|
}
|
|
38
39
|
function createGlobalContextBase(virtualFileExports) {
|
|
39
|
-
const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager } = getConfigsAll(virtualFileExports);
|
|
40
|
+
const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, vikeConfigPublicGlobal, vikeConfigPublicPagesEager, } = getConfigsAll(virtualFileExports);
|
|
40
41
|
const globalContext = {
|
|
41
42
|
/**
|
|
42
43
|
* Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
|
|
@@ -52,7 +53,7 @@ function createGlobalContextBase(virtualFileExports) {
|
|
|
52
53
|
_allPageIds: allPageIds,
|
|
53
54
|
_vikeConfigPublicGlobal: vikeConfigPublicGlobal,
|
|
54
55
|
config: vikeConfigPublicGlobal.config,
|
|
55
|
-
pages: vikeConfigPublicPagesEager
|
|
56
|
+
pages: vikeConfigPublicPagesEager,
|
|
56
57
|
};
|
|
57
58
|
(0, utils_js_1.changeEnumerable)(globalContext, '_isOriginalObject', false);
|
|
58
59
|
return globalContext;
|
|
@@ -61,7 +62,7 @@ function getConfigsAll(virtualFileExports) {
|
|
|
61
62
|
const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseVirtualFileExports_js_1.parseVirtualFileExports)(virtualFileExports);
|
|
62
63
|
const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
|
|
63
64
|
const vikeConfigPublicGlobal = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicGlobal)({
|
|
64
|
-
pageConfigGlobalValues: pageConfigGlobal.configValues
|
|
65
|
+
pageConfigGlobalValues: pageConfigGlobal.configValues,
|
|
65
66
|
});
|
|
66
67
|
const vikeConfigPublicPagesEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
|
|
67
68
|
return (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageEager)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
|
|
@@ -72,7 +73,7 @@ function getConfigsAll(virtualFileExports) {
|
|
|
72
73
|
pageConfigs,
|
|
73
74
|
pageConfigGlobal,
|
|
74
75
|
vikeConfigPublicGlobal,
|
|
75
|
-
vikeConfigPublicPagesEager
|
|
76
|
+
vikeConfigPublicPagesEager,
|
|
76
77
|
};
|
|
77
78
|
}
|
|
78
79
|
function getAllPageIds(pageFilesAll, pageConfigs) {
|
|
@@ -81,3 +82,10 @@ function getAllPageIds(pageFilesAll, pageConfigs) {
|
|
|
81
82
|
const allPageIds2 = pageConfigs.map((p) => p.pageId);
|
|
82
83
|
return [...allPageIds, ...allPageIds2];
|
|
83
84
|
}
|
|
85
|
+
function hooksAreEqual(hooks1, hooks2) {
|
|
86
|
+
const hooksFn1 = hooks1.map((hook) => hook.hookFn);
|
|
87
|
+
const hooksFn2 = hooks2.map((hook) => hook.hookFn);
|
|
88
|
+
return (hooksFn1.every((hook) => hooksFn2.includes(hook)) &&
|
|
89
|
+
//
|
|
90
|
+
hooksFn2.every((hook) => hooksFn1.includes(hook)));
|
|
91
|
+
}
|
|
@@ -13,7 +13,7 @@ async function createPageContextShared(pageContextCreated, pageConfigGlobal, vik
|
|
|
13
13
|
function createPageContextObject() {
|
|
14
14
|
const pageContext = {
|
|
15
15
|
_isOriginalObject: true,
|
|
16
|
-
isPageContext: true
|
|
16
|
+
isPageContext: true,
|
|
17
17
|
};
|
|
18
18
|
(0, utils_js_1.changeEnumerable)(pageContext, '_isOriginalObject', false);
|
|
19
19
|
return pageContext;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.doNotCreateExtraDirectory = exports.pageContextJsonFileExtension = void 0;
|
|
4
4
|
exports.getPageContextRequestUrl = getPageContextRequestUrl;
|
|
5
|
-
// This module isn't loaded by the client-side of Server Routing => we don't
|
|
5
|
+
// This module isn't loaded by the client-side of Server Routing => we don't include `urlToFile` to `./utils.ts`
|
|
6
6
|
const urlToFile_js_1 = require("../utils/urlToFile.js");
|
|
7
7
|
const pageContextJsonFileExtension = '.pageContext.json';
|
|
8
8
|
exports.pageContextJsonFileExtension = pageContextJsonFileExtension;
|
|
@@ -15,17 +15,17 @@ function getPageContextUrlComputed(pageContext) {
|
|
|
15
15
|
(0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'urlPathname', {
|
|
16
16
|
get: urlPathnameGetter,
|
|
17
17
|
enumerable: true,
|
|
18
|
-
configurable: true
|
|
18
|
+
configurable: true,
|
|
19
19
|
});
|
|
20
20
|
(0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'url', {
|
|
21
21
|
get: urlGetter,
|
|
22
22
|
enumerable: false,
|
|
23
|
-
configurable: true
|
|
23
|
+
configurable: true,
|
|
24
24
|
});
|
|
25
25
|
(0, objectDefineProperty_js_1.objectDefineProperty)(pageContextUrlComputed, 'urlParsed', {
|
|
26
26
|
get: urlParsedGetter,
|
|
27
27
|
enumerable: true,
|
|
28
|
-
configurable: true
|
|
28
|
+
configurable: true,
|
|
29
29
|
});
|
|
30
30
|
return pageContextUrlComputed;
|
|
31
31
|
}
|
|
@@ -111,7 +111,7 @@ function urlParsedGetter() {
|
|
|
111
111
|
get hashString() {
|
|
112
112
|
(0, utils_js_1.assertWarning)(false, 'pageContext.urlParsed.hashString has been renamed to pageContext.urlParsed.hashOriginal', {
|
|
113
113
|
onlyOnce: true,
|
|
114
|
-
showStackTrace: true
|
|
114
|
+
showStackTrace: true,
|
|
115
115
|
});
|
|
116
116
|
warnHashNotAvailable('hashString');
|
|
117
117
|
return urlParsed.hashOriginal;
|
|
@@ -120,7 +120,7 @@ function urlParsedGetter() {
|
|
|
120
120
|
get searchString() {
|
|
121
121
|
(0, utils_js_1.assertWarning)(false, 'pageContext.urlParsed.searchString has been renamed to pageContext.urlParsed.searchOriginal', { onlyOnce: true, showStackTrace: true });
|
|
122
122
|
return urlParsed.searchOriginal;
|
|
123
|
-
}
|
|
123
|
+
},
|
|
124
124
|
};
|
|
125
125
|
(0, utils_js_1.changeEnumerable)(urlParsedEnhanced, 'hashString', false);
|
|
126
126
|
(0, utils_js_1.changeEnumerable)(urlParsedEnhanced, 'searchString', false);
|
|
@@ -4,7 +4,7 @@ exports.analyzeExports = analyzeExports;
|
|
|
4
4
|
const getExportNames_js_1 = require("./getExportNames.js");
|
|
5
5
|
const utils_js_1 = require("../../utils.js");
|
|
6
6
|
// TODO/v1-release: remove
|
|
7
|
-
function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
|
|
7
|
+
function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId, }) {
|
|
8
8
|
return { isHtmlOnly: isHtmlOnly(), isClientRouting: isClientRouting() };
|
|
9
9
|
function isHtmlOnly() {
|
|
10
10
|
{
|
|
@@ -37,8 +37,8 @@ function analyzeExports({ pageFilesClientSide, pageFilesServerSide, pageId }) {
|
|
|
37
37
|
'See https://vike.dev/render-modes for more information.',
|
|
38
38
|
[
|
|
39
39
|
'Loaded client-side page files (none of them `export { render }`):',
|
|
40
|
-
...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`)
|
|
41
|
-
].join('\n')
|
|
40
|
+
...pageFilesClientSide.map((p, i) => ` (${i + 1}): ${p.filePath}`),
|
|
41
|
+
].join('\n'),
|
|
42
42
|
].join(' '));
|
|
43
43
|
}
|
|
44
44
|
function isClientRouting() {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.determineClientEntry = determineClientEntry;
|
|
5
5
|
exports.getVikeClientEntry = getVikeClientEntry;
|
|
6
|
-
function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting }) {
|
|
6
|
+
function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtmlOnly, isClientRouting, }) {
|
|
7
7
|
let clientEntries = [];
|
|
8
8
|
const pageFilesServerSideOnly = pageFilesServerSide.filter((p) => !pageFilesClientSide.includes(p));
|
|
9
9
|
const clientDependencies = [];
|
|
@@ -16,13 +16,13 @@ function analyzePageClientSide(pageFilesAll, pageId) {
|
|
|
16
16
|
if (isHtmlOnly) {
|
|
17
17
|
// 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.
|
|
18
18
|
pageFilesClientSide = pageFilesClientSide.filter((p) => p.isEnv('CLIENT_ONLY') && !(0, getExportNames_js_1.getExportNames)(p).includes('render'));
|
|
19
|
-
pageFilesClientSide =
|
|
19
|
+
pageFilesClientSide = removeOverriddenPageFiles(pageFilesClientSide);
|
|
20
20
|
}
|
|
21
21
|
const { clientEntries, clientDependencies } = (0, determineClientEntry_js_1.determineClientEntry)({
|
|
22
22
|
pageFilesClientSide,
|
|
23
23
|
pageFilesServerSide,
|
|
24
24
|
isHtmlOnly,
|
|
25
|
-
isClientRouting
|
|
25
|
+
isClientRouting,
|
|
26
26
|
});
|
|
27
27
|
return { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide };
|
|
28
28
|
}
|
|
@@ -47,7 +47,7 @@ async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFiles
|
|
|
47
47
|
}
|
|
48
48
|
// [WIP] Just an experiment needed by https://vike.dev/banner
|
|
49
49
|
// - Not sure I want to make something like a public API: the CSS of `_default.page.server.js` are still loaded -> weird DX.
|
|
50
|
-
function
|
|
50
|
+
function removeOverriddenPageFiles(pageFilesClientSide) {
|
|
51
51
|
const pageFilesClientSide_ = [];
|
|
52
52
|
for (const p of pageFilesClientSide) {
|
|
53
53
|
pageFilesClientSide_.push(p);
|
|
@@ -14,7 +14,7 @@ const fileTypes = [
|
|
|
14
14
|
// New type `.page.css`/`.page.server.css`/`.page.client.css` for `extensions[number].pageFileDist`.
|
|
15
15
|
// - 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`.
|
|
16
16
|
// - Since these `.page.css` files Bundlers We can therefore expect that there isn't any `.page.server.sass`/...
|
|
17
|
-
'.css'
|
|
17
|
+
'.css',
|
|
18
18
|
];
|
|
19
19
|
exports.fileTypes = fileTypes;
|
|
20
20
|
function isValidFileType(filePath) {
|