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
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Logger used for the production server.
|
|
2
|
-
// Any other
|
|
2
|
+
// Any other environment (dev, preview, build, and pre-rendering) uses loggerNotProd.ts instead.
|
|
3
3
|
export { logErrorProd };
|
|
4
4
|
export { onRuntimeError };
|
|
5
5
|
import { isAbortError } from '../../../shared/route/abort.js';
|
|
@@ -7,7 +7,7 @@ import { setAlreadyLogged } from './isNewError.js';
|
|
|
7
7
|
import { isObject, warnIfErrorIsNotObject } from '../utils.js';
|
|
8
8
|
import pc from '@brillout/picocolors';
|
|
9
9
|
import { logErrorHint } from './logErrorHint.js';
|
|
10
|
-
function logErrorProd(err,
|
|
10
|
+
function logErrorProd(err, _httpRequestId) {
|
|
11
11
|
warnIfErrorIsNotObject(err);
|
|
12
12
|
setAlreadyLogged(err);
|
|
13
13
|
if (isAbortError(err)) {
|
|
@@ -22,7 +22,7 @@ function logErrorProd(err, _httpRquestId) {
|
|
|
22
22
|
// Every server-side runtime error is expected to go through `onRuntimeError()`.
|
|
23
23
|
// - onRuntimeError(err) should always be called after `console.error(err)`.
|
|
24
24
|
// - Because the error hint of logErrorHint(err) should be shown *after* the error.
|
|
25
|
-
// - In principle, any runtime error is (or at least should) be
|
|
25
|
+
// - In principle, any runtime error is (or at least should) be caught by Vike, otherwise Vike couldn't render the error page.
|
|
26
26
|
function onRuntimeError(err) {
|
|
27
27
|
// The more runtime errors we pass to logErrorHint() the better.
|
|
28
28
|
logErrorHint(err);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { preparePageContextForPublicUsageServer };
|
|
2
|
-
import { assertPropertyGetters, preparePageContextForPublicUsage } from '../../../shared/preparePageContextForPublicUsage.js';
|
|
2
|
+
import { assertPropertyGetters, preparePageContextForPublicUsage, } from '../../../shared/preparePageContextForPublicUsage.js';
|
|
3
3
|
function preparePageContextForPublicUsageServer(pageContext) {
|
|
4
4
|
// TODO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
|
|
5
5
|
assertPropertyGetters(pageContext);
|
|
@@ -5,7 +5,7 @@ import { getHtmlString } from '../html/renderHtml.js';
|
|
|
5
5
|
import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
|
|
6
6
|
import { getPageContextClientSerialized } from '../html/serializeContext.js';
|
|
7
7
|
import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
|
|
8
|
-
import { loadPageConfigsLazyServerSide } from './loadPageConfigsLazyServerSide.js';
|
|
8
|
+
import { loadPageConfigsLazyServerSide, } from './loadPageConfigsLazyServerSide.js';
|
|
9
9
|
import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
|
|
10
10
|
import { executeOnBeforeRenderAndDataHooks } from './executeOnBeforeRenderAndDataHooks.js';
|
|
11
11
|
import { logRuntimeError } from '../loggerRuntime.js';
|
|
@@ -58,7 +58,7 @@ async function renderPageAlreadyRouted(pageContext) {
|
|
|
58
58
|
async function prerenderPage(pageContext) {
|
|
59
59
|
objectAssign(pageContext, {
|
|
60
60
|
isClientSideNavigation: false,
|
|
61
|
-
_urlHandler: null
|
|
61
|
+
_urlHandler: null,
|
|
62
62
|
});
|
|
63
63
|
/* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
|
|
64
64
|
* - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { resolveRedirects };
|
|
2
|
+
export { getStaticRedirectsForPrerender };
|
|
2
3
|
export { resolveRouteStringRedirect };
|
|
3
4
|
declare function resolveRedirects(redirectsAll: Record<string, string>[], urlPathname: string): null | string;
|
|
5
|
+
declare function getStaticRedirectsForPrerender(redirectsAll: Record<string, string>[], showWarningUponDynamicRedirects: boolean): Record<string, string>;
|
|
4
6
|
declare function resolveRouteStringRedirect(urlSource: string, urlTarget: string, urlPathname: string): null | string;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
export { resolveRedirects };
|
|
2
|
+
export { getStaticRedirectsForPrerender };
|
|
2
3
|
// For ./resolveRedirects.spec.ts
|
|
3
4
|
export { resolveRouteStringRedirect };
|
|
4
5
|
import { assertIsNotBrowser } from '../../../utils/assertIsNotBrowser.js';
|
|
5
|
-
import { assert, assertUsage, assertUsageUrlRedirectTarget, isUrlRedirectTarget } from '../../../shared/utils.js';
|
|
6
|
+
import { assert, assertUsage, assertUsageUrlRedirectTarget, assertWarning, isUrlRedirectTarget, } from '../../../shared/utils.js';
|
|
6
7
|
import { resolveUrlPathname } from '../../../shared/route/resolveUrlPathname.js';
|
|
7
|
-
import { assertRouteString, resolveRouteString } from '../../../shared/route/resolveRouteString.js';
|
|
8
|
+
import { assertRouteString, isStaticRouteString, resolveRouteString } from '../../../shared/route/resolveRouteString.js';
|
|
8
9
|
import pc from '@brillout/picocolors';
|
|
9
10
|
assertIsNotBrowser(); // Don't bloat the client
|
|
10
11
|
const redirectsErrPrefix = '[+redirects]';
|
|
@@ -17,11 +18,22 @@ function resolveRedirects(redirectsAll, urlPathname) {
|
|
|
17
18
|
}
|
|
18
19
|
return null;
|
|
19
20
|
}
|
|
21
|
+
function getStaticRedirectsForPrerender(redirectsAll, showWarningUponDynamicRedirects) {
|
|
22
|
+
const redirects = merge(redirectsAll);
|
|
23
|
+
const redirectsStatic = {};
|
|
24
|
+
for (const [urlSource, urlTarget] of Object.entries(redirects)) {
|
|
25
|
+
assertRedirect(urlSource, urlTarget);
|
|
26
|
+
if (isStaticRouteString(urlSource)) {
|
|
27
|
+
redirectsStatic[urlSource] = urlTarget;
|
|
28
|
+
}
|
|
29
|
+
else if (showWarningUponDynamicRedirects) {
|
|
30
|
+
assertWarning(false, `Dynamic redirect ${pc.cyan(urlSource)} -> ${pc.cyan(urlTarget)} cannot be pre-rendered. You can remove this warning by setting +prerender.partial to true (https://vike.dev/prerender#partial).`, { onlyOnce: true });
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return redirectsStatic;
|
|
34
|
+
}
|
|
20
35
|
function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
|
|
21
|
-
|
|
22
|
-
// Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
|
|
23
|
-
assertUsageUrlRedirectTarget(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
|
|
24
|
-
assertParams(urlSource, urlTarget);
|
|
36
|
+
assertRedirect(urlSource, urlTarget);
|
|
25
37
|
const match = resolveRouteString(urlSource, urlPathname);
|
|
26
38
|
if (!match)
|
|
27
39
|
return null;
|
|
@@ -31,6 +43,12 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
|
|
|
31
43
|
assert(isUrlRedirectTarget(urlResolved));
|
|
32
44
|
return urlResolved;
|
|
33
45
|
}
|
|
46
|
+
function assertRedirect(urlSource, urlTarget) {
|
|
47
|
+
assertRouteString(urlSource, `${redirectsErrPrefix} Invalid`);
|
|
48
|
+
// Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
|
|
49
|
+
assertUsageUrlRedirectTarget(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
|
|
50
|
+
assertParams(urlSource, urlTarget);
|
|
51
|
+
}
|
|
34
52
|
function assertParams(urlSource, urlTarget) {
|
|
35
53
|
const routeSegments = urlTarget.split('/');
|
|
36
54
|
routeSegments.forEach((routeSegment) => {
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
export { renderPage };
|
|
2
2
|
export { renderPage_addAsyncHookwrapper };
|
|
3
|
-
export { renderPage_vikeConfigHasError };
|
|
4
|
-
export { vikeConfigHasError };
|
|
5
3
|
export type { PageContextInit };
|
|
6
4
|
export type { PageContextBegin };
|
|
7
5
|
import { type GlobalContextServerInternal } from './globalContext.js';
|
|
@@ -135,12 +133,3 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
|
|
|
135
133
|
} & {
|
|
136
134
|
_httpRequestId: number;
|
|
137
135
|
}>;
|
|
138
|
-
type VikeConfigHasError = false | {
|
|
139
|
-
err: unknown;
|
|
140
|
-
};
|
|
141
|
-
declare function renderPage_vikeConfigHasError(val: {
|
|
142
|
-
hasRuntimeError: VikeConfigHasError;
|
|
143
|
-
} | {
|
|
144
|
-
hasBuildError: VikeConfigHasError;
|
|
145
|
-
}): void;
|
|
146
|
-
declare function vikeConfigHasError(): boolean;
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
export { renderPage };
|
|
2
2
|
export { renderPage_addAsyncHookwrapper };
|
|
3
|
-
export { renderPage_vikeConfigHasError };
|
|
4
|
-
export { vikeConfigHasError };
|
|
5
3
|
import { renderPageAlreadyRouted } from './renderPage/renderPageAlreadyRouted.js';
|
|
6
|
-
import { createPageContextServerSide, createPageContextServerSideWithoutGlobalContext } from './renderPage/createPageContextServerSide.js';
|
|
4
|
+
import { createPageContextServerSide, createPageContextServerSideWithoutGlobalContext, } from './renderPage/createPageContextServerSide.js';
|
|
7
5
|
import { route } from '../../shared/route/index.js';
|
|
8
|
-
import { assert, hasProp, objectAssign, isUrl, parseUrl, onSetupRuntime, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, isUri, getUrlPretty } from './utils.js';
|
|
9
|
-
import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled } from '../../shared/route/abort.js';
|
|
10
|
-
import { getGlobalContextServerInternal, initGlobalContext_renderPage } from './globalContext.js';
|
|
6
|
+
import { assert, hasProp, objectAssign, isUrl, parseUrl, onSetupRuntime, assertWarning, getGlobalObject, checkType, assertUsage, normalizeUrlPathname, removeBaseServer, modifyUrlPathname, prependBase, removeUrlOrigin, setUrlOrigin, isUri, getUrlPretty, } from './utils.js';
|
|
7
|
+
import { assertNoInfiniteAbortLoop, getPageContextFromAllRewrites, isAbortError, logAbortErrorHandled, } from '../../shared/route/abort.js';
|
|
8
|
+
import { getGlobalContextServerInternal, initGlobalContext_renderPage, } from './globalContext.js';
|
|
11
9
|
import { handlePageContextRequestUrl } from './renderPage/handlePageContextRequestUrl.js';
|
|
12
|
-
import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageContextJson, createHttpResponseError, createHttpResponseErrorWithoutGlobalContext, createHttpResponseBaseIsMissing } from './renderPage/createHttpResponse.js';
|
|
10
|
+
import { createHttpResponse404, createHttpResponseRedirect, createHttpResponsePageContextJson, createHttpResponseError, createHttpResponseErrorWithoutGlobalContext, createHttpResponseBaseIsMissing, } from './renderPage/createHttpResponse.js';
|
|
13
11
|
import { logRuntimeError, logRuntimeInfo } from './loggerRuntime.js';
|
|
14
12
|
import { isNewError } from './renderPage/isNewError.js';
|
|
15
13
|
import { assertArguments } from './renderPage/assertArguments.js';
|
|
@@ -20,11 +18,8 @@ import { getErrorPageId } from '../../shared/error-page.js';
|
|
|
20
18
|
import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
|
|
21
19
|
import { loadPageConfigsLazyServerSide } from './renderPage/loadPageConfigsLazyServerSide.js';
|
|
22
20
|
import { resolveRedirects } from './renderPage/resolveRedirects.js';
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
vikeConfigHasRuntimeError: false,
|
|
26
|
-
vikeConfigHasBuildError: false
|
|
27
|
-
});
|
|
21
|
+
import { getVikeConfigError } from '../shared/getVikeConfigError.js';
|
|
22
|
+
const globalObject = getGlobalObject('runtime/renderPage.ts', { httpRequestsCount: 0 });
|
|
28
23
|
// `renderPage()` calls `renderPageNominal()` while ensuring that errors are `console.error(err)` instead of `throw err`, so that Vike never triggers a server shut down. (Throwing an error in an Express.js middleware shuts down the whole Express.js server.)
|
|
29
24
|
async function renderPage(pageContextInit) {
|
|
30
25
|
assertArguments(...arguments);
|
|
@@ -45,7 +40,7 @@ async function renderPage(pageContextInit) {
|
|
|
45
40
|
}
|
|
46
41
|
// Fallback wrapper if node:async_hooks isn't available
|
|
47
42
|
let asyncHookWrapper = async (_httpRequestId, ret) => ({
|
|
48
|
-
pageContextReturn: await ret()
|
|
43
|
+
pageContextReturn: await ret(),
|
|
49
44
|
});
|
|
50
45
|
// Add node:async_hooks wrapper
|
|
51
46
|
function renderPage_addAsyncHookwrapper(wrapper) {
|
|
@@ -68,7 +63,7 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
|
|
|
68
63
|
// ```bash
|
|
69
64
|
// Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
|
|
70
65
|
// ```
|
|
71
|
-
// initGlobalContext_renderPage()
|
|
66
|
+
// initGlobalContext_renderPage() doesn't call any user hook => err isn't thrown from user code.
|
|
72
67
|
assert(!isAbortError(err));
|
|
73
68
|
logRuntimeError(err, httpRequestId);
|
|
74
69
|
const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
|
|
@@ -218,7 +213,7 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
|
|
|
218
213
|
// - Maybe we can/should make the error available at pageContext.errorWhileRendering
|
|
219
214
|
assert(errorWhileRendering === null || errorWhileRendering === undefined);
|
|
220
215
|
msg = `HTTP response ${prettyUrl(urlOriginalPretty)} ${pc.dim('null')}`;
|
|
221
|
-
// Erroneous value (it
|
|
216
|
+
// Erroneous value (it should sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
|
|
222
217
|
isNominal = true;
|
|
223
218
|
}
|
|
224
219
|
else {
|
|
@@ -256,7 +251,7 @@ function getPageContextHttpResponseError(err, pageContextBegin) {
|
|
|
256
251
|
const httpResponse = createHttpResponseError(pageContextBegin);
|
|
257
252
|
objectAssign(pageContextWithError, {
|
|
258
253
|
httpResponse,
|
|
259
|
-
errorWhileRendering: err
|
|
254
|
+
errorWhileRendering: err,
|
|
260
255
|
});
|
|
261
256
|
return pageContextWithError;
|
|
262
257
|
}
|
|
@@ -265,7 +260,7 @@ function getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextIni
|
|
|
265
260
|
const httpResponse = createHttpResponseErrorWithoutGlobalContext();
|
|
266
261
|
objectAssign(pageContextWithError, {
|
|
267
262
|
httpResponse,
|
|
268
|
-
errorWhileRendering: err
|
|
263
|
+
errorWhileRendering: err,
|
|
269
264
|
});
|
|
270
265
|
return pageContextWithError;
|
|
271
266
|
}
|
|
@@ -298,10 +293,10 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
|
|
|
298
293
|
objectAssign(pageContext, {
|
|
299
294
|
is404: false,
|
|
300
295
|
errorWhileRendering: errNominalPage,
|
|
301
|
-
routeParams: {}
|
|
296
|
+
routeParams: {},
|
|
302
297
|
});
|
|
303
298
|
objectAssign(pageContext, {
|
|
304
|
-
_debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
|
|
299
|
+
_debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR',
|
|
305
300
|
});
|
|
306
301
|
assert(pageContext.errorWhileRendering);
|
|
307
302
|
return pageContext;
|
|
@@ -312,8 +307,8 @@ async function getPageContextBegin(pageContextInit, globalContext, httpRequestId
|
|
|
312
307
|
isPrerendering: false,
|
|
313
308
|
ssr: {
|
|
314
309
|
urlHandler: _urlHandler,
|
|
315
|
-
isClientSideNavigation
|
|
316
|
-
}
|
|
310
|
+
isClientSideNavigation,
|
|
311
|
+
},
|
|
317
312
|
});
|
|
318
313
|
objectAssign(pageContextBegin, { _httpRequestId: httpRequestId });
|
|
319
314
|
return pageContextBegin;
|
|
@@ -322,7 +317,7 @@ function handlePageContextUrl(urlOriginal) {
|
|
|
322
317
|
const { isPageContextRequest } = handlePageContextRequestUrl(urlOriginal);
|
|
323
318
|
return {
|
|
324
319
|
isClientSideNavigation: isPageContextRequest,
|
|
325
|
-
_urlHandler: (url) => handlePageContextRequestUrl(url).urlWithoutPageContextRequestSuffix
|
|
320
|
+
_urlHandler: (url) => handlePageContextRequestUrl(url).urlWithoutPageContextRequestSuffix,
|
|
326
321
|
};
|
|
327
322
|
}
|
|
328
323
|
function getRequestId() {
|
|
@@ -431,7 +426,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
|
|
|
431
426
|
if (pageContextAbort._urlRewrite) {
|
|
432
427
|
const pageContextReturn = await renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, [
|
|
433
428
|
...pageContextsFromRewrite,
|
|
434
|
-
pageContextAbort
|
|
429
|
+
pageContextAbort,
|
|
435
430
|
]);
|
|
436
431
|
Object.assign(pageContextReturn, pageContextAbort);
|
|
437
432
|
return { pageContextReturn };
|
|
@@ -456,7 +451,7 @@ async function checkBaseUrl(pageContextBegin, globalContext) {
|
|
|
456
451
|
const httpResponse = createHttpResponseBaseIsMissing(urlOriginal, baseServer);
|
|
457
452
|
objectAssign(pageContext, {
|
|
458
453
|
httpResponse,
|
|
459
|
-
isBaseMissing: true
|
|
454
|
+
isBaseMissing: true,
|
|
460
455
|
});
|
|
461
456
|
checkType(pageContext);
|
|
462
457
|
return pageContext;
|
|
@@ -471,7 +466,7 @@ function getPageContextSkipRequest(pageContextInit) {
|
|
|
471
466
|
if (urlPathnameWithBase.endsWith('.well-known/appspecific/com.chrome.devtools.json')) {
|
|
472
467
|
// https://chromium.googlesource.com/devtools/devtools-frontend/+/main/docs/ecosystem/automatic_workspace_folders.md
|
|
473
468
|
// https://www.reddit.com/r/node/comments/1kcr0wh/odd_request_coming_into_my_localhost_server_from/
|
|
474
|
-
errMsg404 = 'Not
|
|
469
|
+
errMsg404 = 'Not supported';
|
|
475
470
|
}
|
|
476
471
|
if (!errMsg404)
|
|
477
472
|
return;
|
|
@@ -492,15 +487,3 @@ function forkPageContext(pageContextBegin) {
|
|
|
492
487
|
objectAssign(pageContext, pageContextBegin, true);
|
|
493
488
|
return pageContext;
|
|
494
489
|
}
|
|
495
|
-
function renderPage_vikeConfigHasError(val) {
|
|
496
|
-
if ('hasRuntimeError' in val)
|
|
497
|
-
globalObject.vikeConfigHasRuntimeError = val.hasRuntimeError;
|
|
498
|
-
if ('hasBuildError' in val)
|
|
499
|
-
globalObject.vikeConfigHasBuildError = val.hasBuildError;
|
|
500
|
-
}
|
|
501
|
-
function getVikeConfigError() {
|
|
502
|
-
return globalObject.vikeConfigHasBuildError || globalObject.vikeConfigHasRuntimeError;
|
|
503
|
-
}
|
|
504
|
-
function vikeConfigHasError() {
|
|
505
|
-
return !!getVikeConfigError();
|
|
506
|
-
}
|
|
@@ -5,13 +5,13 @@ export default async function universalVikeHandler(request, context, runtime) {
|
|
|
5
5
|
...runtime,
|
|
6
6
|
runtime,
|
|
7
7
|
urlOriginal: request.url,
|
|
8
|
-
headersOriginal: request.headers
|
|
8
|
+
headersOriginal: request.headers,
|
|
9
9
|
};
|
|
10
10
|
const pageContext = await renderPage(pageContextInit);
|
|
11
11
|
const response = pageContext.httpResponse;
|
|
12
12
|
const readable = response.getReadableWebStream();
|
|
13
13
|
return new Response(readable, {
|
|
14
14
|
status: response.statusCode,
|
|
15
|
-
headers: response.headers
|
|
15
|
+
headers: response.headers,
|
|
16
16
|
});
|
|
17
17
|
}
|
|
@@ -33,7 +33,7 @@ export * from '../../utils/freezePartial.js';
|
|
|
33
33
|
export * from '../../utils/parseNpmPackage.js';
|
|
34
34
|
export * from '../../utils/isNullish.js';
|
|
35
35
|
export * from '../../utils/isScriptFile.js';
|
|
36
|
-
export * from '../../utils/
|
|
36
|
+
export * from '../../utils/removeFileExtension.js';
|
|
37
37
|
export * from '../../utils/objectKeys.js';
|
|
38
38
|
export * from '../../utils/objectEntries.js';
|
|
39
39
|
export * from '../../utils/objectFromEntries.js';
|
|
@@ -37,7 +37,7 @@ export * from '../../utils/freezePartial.js';
|
|
|
37
37
|
export * from '../../utils/parseNpmPackage.js';
|
|
38
38
|
export * from '../../utils/isNullish.js';
|
|
39
39
|
export * from '../../utils/isScriptFile.js';
|
|
40
|
-
export * from '../../utils/
|
|
40
|
+
export * from '../../utils/removeFileExtension.js';
|
|
41
41
|
export * from '../../utils/objectKeys.js';
|
|
42
42
|
export * from '../../utils/objectEntries.js';
|
|
43
43
|
export * from '../../utils/objectFromEntries.js';
|
|
@@ -16,9 +16,9 @@ async function createDevMiddleware(options = {}) {
|
|
|
16
16
|
root: options.root ?? options.viteConfig?.root,
|
|
17
17
|
server: {
|
|
18
18
|
...options.viteConfig?.server,
|
|
19
|
-
middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
|
|
20
|
-
}
|
|
21
|
-
}
|
|
19
|
+
middlewareMode: options.viteConfig?.server?.middlewareMode ?? true,
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
22
|
};
|
|
23
23
|
const { viteConfigFromUserEnhanced } = await prepareViteApiCall(optionsMod, 'dev');
|
|
24
24
|
const server = await createServer(viteConfigFromUserEnhanced);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { extractAssetsAddQuery };
|
|
2
2
|
export { extractAssetsRemoveQuery };
|
|
3
|
-
// We import from node/utils.ts
|
|
3
|
+
// We import from node/utils.ts instead of node/vite/utils.ts because this file is loaded by the server runtime
|
|
4
4
|
import { assert, getFileExtension } from './utils.js';
|
|
5
5
|
const query = 'extractAssets';
|
|
6
6
|
function extractAssetsAddQuery(id) {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export { getVikeConfigError };
|
|
2
|
+
export { getVikeConfigErrorBuild };
|
|
3
|
+
export { setVikeConfigError };
|
|
4
|
+
type VikeConfigHasError = false | {
|
|
5
|
+
err: unknown;
|
|
6
|
+
};
|
|
7
|
+
declare function setVikeConfigError(val: {
|
|
8
|
+
errorRuntime: VikeConfigHasError;
|
|
9
|
+
} | {
|
|
10
|
+
errorBuild: VikeConfigHasError;
|
|
11
|
+
}): void;
|
|
12
|
+
declare function getVikeConfigError(): VikeConfigHasError;
|
|
13
|
+
declare function getVikeConfigErrorBuild(): VikeConfigHasError;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
export { getVikeConfigError };
|
|
2
|
+
export { getVikeConfigErrorBuild };
|
|
3
|
+
export { setVikeConfigError };
|
|
4
|
+
import { getGlobalObject } from './utils.js';
|
|
5
|
+
const globalObject = getGlobalObject('node/shared/getVikeConfigError.ts', {
|
|
6
|
+
errorRuntime: false,
|
|
7
|
+
errorBuild: false,
|
|
8
|
+
});
|
|
9
|
+
function setVikeConfigError(val) {
|
|
10
|
+
if ('errorRuntime' in val)
|
|
11
|
+
globalObject.errorRuntime = val.errorRuntime;
|
|
12
|
+
if ('errorBuild' in val)
|
|
13
|
+
globalObject.errorBuild = val.errorBuild;
|
|
14
|
+
}
|
|
15
|
+
function getVikeConfigError() {
|
|
16
|
+
return globalObject.errorBuild || globalObject.errorRuntime;
|
|
17
|
+
}
|
|
18
|
+
function getVikeConfigErrorBuild() {
|
|
19
|
+
return globalObject.errorBuild;
|
|
20
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from '../../utils/assert.js';
|
|
2
2
|
export * from '../../utils/getFileExtension.js';
|
|
3
|
+
export * from '../../utils/getGlobalObject.js';
|
|
3
4
|
export * from '../../utils/isPlainObject.js';
|
|
4
5
|
export * from '../../utils/checkType.js';
|
|
5
6
|
export * from '../../utils/hasProp.js';
|
|
@@ -2,6 +2,7 @@ import { assertIsNotBrowser } from '../../utils/assertIsNotBrowser.js';
|
|
|
2
2
|
assertIsNotBrowser();
|
|
3
3
|
export * from '../../utils/assert.js';
|
|
4
4
|
export * from '../../utils/getFileExtension.js';
|
|
5
|
+
export * from '../../utils/getGlobalObject.js';
|
|
5
6
|
export * from '../../utils/isPlainObject.js';
|
|
6
7
|
export * from '../../utils/checkType.js';
|
|
7
8
|
export * from '../../utils/hasProp.js';
|
|
@@ -23,14 +23,14 @@ function isVirtualFileIdPageConfigLazy(id) {
|
|
|
23
23
|
return {
|
|
24
24
|
pageId: id.slice(idBaseClient.length),
|
|
25
25
|
isForClientSide: true,
|
|
26
|
-
isExtractAssets
|
|
26
|
+
isExtractAssets,
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
if (id.startsWith(idBaseServer)) {
|
|
30
30
|
return {
|
|
31
31
|
pageId: id.slice(idBaseServer.length),
|
|
32
32
|
isForClientSide: false,
|
|
33
|
-
isExtractAssets
|
|
33
|
+
isExtractAssets,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
assert(false);
|
|
@@ -40,7 +40,7 @@ function plugin(vikeVitePluginOptions = {}) {
|
|
|
40
40
|
pluginFileEnv(),
|
|
41
41
|
pluginWorkaroundCssModuleHmr(),
|
|
42
42
|
pluginWorkaroundVite6HmrRegression(),
|
|
43
|
-
pluginReplaceConstants()
|
|
43
|
+
pluginReplaceConstants(),
|
|
44
44
|
];
|
|
45
45
|
Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
|
|
46
46
|
return plugins;
|
|
@@ -50,7 +50,7 @@ Object.defineProperty(plugin, 'apply', {
|
|
|
50
50
|
enumerable: true,
|
|
51
51
|
get: () => {
|
|
52
52
|
assertUsage(false, `Add ${pc.cyan('vike()')} instead of ${pc.cyan('vike')} to vite.config.js#plugins (i.e. call the function and add the return value instead of adding the function itself)`, { showStackTrace: true });
|
|
53
|
-
}
|
|
53
|
+
},
|
|
54
54
|
});
|
|
55
55
|
// CJS default export `const vike = require('vike/plugin')`
|
|
56
56
|
// - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
|
|
@@ -20,10 +20,10 @@ function pluginBaseUrls() {
|
|
|
20
20
|
envPrefix: [
|
|
21
21
|
'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
|
|
22
22
|
'BASE_SERVER',
|
|
23
|
-
'BASE_ASSETS'
|
|
23
|
+
'BASE_ASSETS',
|
|
24
24
|
],
|
|
25
25
|
base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
|
|
26
|
-
_baseViteOriginal: baseViteOriginal
|
|
26
|
+
_baseViteOriginal: baseViteOriginal,
|
|
27
27
|
};
|
|
28
28
|
},
|
|
29
29
|
async configResolved(config) {
|
|
@@ -36,7 +36,7 @@ function pluginBaseUrls() {
|
|
|
36
36
|
* - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
|
|
37
37
|
assert(config.base === baseAssets)
|
|
38
38
|
*/
|
|
39
|
-
}
|
|
39
|
+
},
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
|
|
@@ -5,7 +5,6 @@ export { handleAssetsManifest_assertUsageCssCodeSplit };
|
|
|
5
5
|
export { handleAssetsManifest_assertUsageCssTarget };
|
|
6
6
|
import type { Environment, ResolvedConfig, Rollup, UserConfig } from 'vite';
|
|
7
7
|
type Bundle = Rollup.OutputBundle;
|
|
8
|
-
type Options = Rollup.NormalizedOutputOptions;
|
|
9
8
|
declare function handleAssetsManifest_isFixEnabled(config: ResolvedConfig | UserConfig): boolean;
|
|
10
9
|
declare function handleAssetsManifest_assertUsageCssCodeSplit(config: ResolvedConfig): void;
|
|
11
10
|
declare function handleAssetsManifest_assertUsageCssTarget(config: ResolvedConfig): void;
|
|
@@ -15,4 +14,6 @@ declare function handleAssetsManifest_getBuildConfig(config: UserConfig): Promis
|
|
|
15
14
|
readonly manifest: "_temp_manifest.json";
|
|
16
15
|
readonly copyPublicDir: boolean | undefined;
|
|
17
16
|
}>;
|
|
18
|
-
declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options:
|
|
17
|
+
declare function handleAssetsManifest(config: ResolvedConfig, viteEnv: Environment | undefined, options: {
|
|
18
|
+
dir: string | undefined;
|
|
19
|
+
}, bundle: Bundle): Promise<void>;
|
|
@@ -3,11 +3,11 @@ export { handleAssetsManifest_getBuildConfig };
|
|
|
3
3
|
export { handleAssetsManifest_isFixEnabled };
|
|
4
4
|
export { handleAssetsManifest_assertUsageCssCodeSplit };
|
|
5
5
|
export { handleAssetsManifest_assertUsageCssTarget };
|
|
6
|
-
import fs from 'fs/promises';
|
|
7
|
-
import fs_sync from 'fs';
|
|
8
|
-
import path from 'path';
|
|
9
|
-
import { existsSync } from 'fs';
|
|
10
|
-
import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique } from '../../utils.js';
|
|
6
|
+
import fs from 'node:fs/promises';
|
|
7
|
+
import fs_sync from 'node:fs';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { existsSync } from 'node:fs';
|
|
10
|
+
import { assert, assertIsSingleModuleInstance, assertWarning, isEqualStringList, isObject, pLimit, unique, } from '../../utils.js';
|
|
11
11
|
import { isVirtualFileIdPageConfigLazy } from '../../../shared/virtualFiles/virtualFilePageConfigLazy.js';
|
|
12
12
|
import { manifestTempFile } from './pluginBuildConfig.js';
|
|
13
13
|
import { getAssetsDir } from '../../shared/getAssetsDir.js';
|
|
@@ -51,7 +51,7 @@ async function copyAssets(filesToMove, filesToRemove, config) {
|
|
|
51
51
|
const filePath = path.posix.join(outDirServer, file);
|
|
52
52
|
fs_sync.unlinkSync(filePath);
|
|
53
53
|
});
|
|
54
|
-
/* We cannot do that because, with some edge case Rollup settings (
|
|
54
|
+
/* We cannot do that because, with some edge case Rollup settings (outputting JavaScript chunks and static assets to the same directory), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
|
|
55
55
|
await fs.rm(assetsDirServer, { recursive: true })
|
|
56
56
|
*/
|
|
57
57
|
removeEmptyDirectories(assetsDirServer);
|
|
@@ -153,7 +153,7 @@ function addServerAssets(clientManifest, serverManifest) {
|
|
|
153
153
|
css,
|
|
154
154
|
assets,
|
|
155
155
|
dynamicImports: undefined,
|
|
156
|
-
imports: undefined
|
|
156
|
+
imports: undefined,
|
|
157
157
|
};
|
|
158
158
|
}
|
|
159
159
|
}
|
|
@@ -205,7 +205,7 @@ function collectResources(entryRoot, manifest) {
|
|
|
205
205
|
// </head>
|
|
206
206
|
// ```
|
|
207
207
|
function getHash(src) {
|
|
208
|
-
// src is
|
|
208
|
+
// src is guaranteed to end with `.[hash][extname]`, see pluginDistFileNames.ts
|
|
209
209
|
const hash = src.split('.').at(-2);
|
|
210
210
|
assert(hash);
|
|
211
211
|
return hash;
|
|
@@ -234,10 +234,10 @@ function handleAssetsManifest_assertUsageCssTarget(config) {
|
|
|
234
234
|
'The CSS browser target should be the same for both client and server, but we got:',
|
|
235
235
|
`Client: ${pc.cyan(JSON.stringify(targetCssResolvedClient))}`,
|
|
236
236
|
`Server: ${pc.cyan(JSON.stringify(targetCssResolvedServer))}`,
|
|
237
|
-
`Different targets lead to CSS duplication, see ${pc.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information
|
|
237
|
+
`Different targets lead to CSS duplication, see ${pc.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`,
|
|
238
238
|
].join('\n'), {
|
|
239
239
|
showStackTrace: true,
|
|
240
|
-
onlyOnce: 'different-css-target'
|
|
240
|
+
onlyOnce: 'different-css-target',
|
|
241
241
|
});
|
|
242
242
|
});
|
|
243
243
|
});
|
|
@@ -291,7 +291,7 @@ async function handleAssetsManifest_getBuildConfig(config) {
|
|
|
291
291
|
copyPublicDir: vikeConfig.config.vite6BuilderApp
|
|
292
292
|
? // Already set by vike:build:pluginBuildApp
|
|
293
293
|
undefined
|
|
294
|
-
: !isViteServerBuild(config)
|
|
294
|
+
: !isViteServerBuild(config),
|
|
295
295
|
};
|
|
296
296
|
}
|
|
297
297
|
async function handleAssetsManifest(config, viteEnv, options, bundle) {
|
|
@@ -303,11 +303,13 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
|
|
|
303
303
|
await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
|
|
304
304
|
}
|
|
305
305
|
if (isViteServerBuild(config, viteEnv)) {
|
|
306
|
+
const outDir = options.dir;
|
|
307
|
+
assert(outDir);
|
|
306
308
|
// Replace __VITE_ASSETS_MANIFEST__ in server builds
|
|
307
309
|
// - Always replace it in dist/server/
|
|
308
310
|
// - Also in some other server builds such as dist/vercel/ from vike-vercel
|
|
309
311
|
// - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
|
|
310
|
-
const noop = await set_macro_ASSETS_MANIFEST(
|
|
312
|
+
const noop = await set_macro_ASSETS_MANIFEST(assetsJsonFilePath, bundle, outDir);
|
|
311
313
|
if (isSsREnv)
|
|
312
314
|
assert(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
|
|
313
315
|
}
|
|
@@ -43,8 +43,8 @@ function pluginAutoFullBuild() {
|
|
|
43
43
|
logErrorHint(err);
|
|
44
44
|
process.exit(1);
|
|
45
45
|
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
48
|
},
|
|
49
49
|
{
|
|
50
50
|
name: 'vike:build:pluginAutoFullBuild:post',
|
|
@@ -63,9 +63,9 @@ function pluginAutoFullBuild() {
|
|
|
63
63
|
runPrerender_forceExit();
|
|
64
64
|
assert(false);
|
|
65
65
|
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
}
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
69
|
];
|
|
70
70
|
}
|
|
71
71
|
async function triggerFullBuild(config, viteEnv, bundle) {
|
|
@@ -89,7 +89,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
|
|
|
89
89
|
await build(setSSR(configInline));
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
92
|
-
// The server
|
|
92
|
+
// The server build is already called by builder.buildApp()
|
|
93
93
|
}
|
|
94
94
|
if (isPrerenderAutoRunEnabled(vikeConfig)) {
|
|
95
95
|
const res = await runPrerenderFromAutoRun(configInline);
|
|
@@ -102,8 +102,8 @@ function setSSR(configInline) {
|
|
|
102
102
|
...configInline,
|
|
103
103
|
build: {
|
|
104
104
|
...configInline.build,
|
|
105
|
-
ssr: true
|
|
106
|
-
}
|
|
105
|
+
ssr: true,
|
|
106
|
+
},
|
|
107
107
|
};
|
|
108
108
|
}
|
|
109
109
|
async function abortViteBuildSsr() {
|
|
@@ -137,8 +137,8 @@ function getFullBuildInlineConfig(config) {
|
|
|
137
137
|
configFile: configFromCli?.configFile || config.configFile,
|
|
138
138
|
root: config.root,
|
|
139
139
|
build: {
|
|
140
|
-
...configFromCli?.build
|
|
141
|
-
}
|
|
140
|
+
...configFromCli?.build,
|
|
141
|
+
},
|
|
142
142
|
};
|
|
143
143
|
}
|
|
144
144
|
}
|