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
|
@@ -38,7 +38,7 @@ async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
|
|
|
38
38
|
return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
|
|
39
39
|
}
|
|
40
40
|
function createHttpResponse404(errMsg404) {
|
|
41
|
-
const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], `<p>${errMsg404}.</p><script>console.log('This
|
|
41
|
+
const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], `<p>${errMsg404}.</p><script>console.log('This HTML was generated by Vike.')</script>`);
|
|
42
42
|
return httpResponse;
|
|
43
43
|
}
|
|
44
44
|
function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
|
|
@@ -77,11 +77,10 @@ function createHttpResponseError(pageContext) {
|
|
|
77
77
|
return createHttpResponseError_(reason);
|
|
78
78
|
}
|
|
79
79
|
function createHttpResponseErrorWithoutGlobalContext() {
|
|
80
|
-
|
|
81
|
-
return createHttpResponseError_(reason);
|
|
80
|
+
return createHttpResponseError_('no error page (https://vike.dev/error-page) could be rendered');
|
|
82
81
|
}
|
|
83
82
|
function createHttpResponseError_(reason) {
|
|
84
|
-
const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This
|
|
83
|
+
const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTML was generated by Vike. Vike returned this HTML because ${reason}.`)})</script>`);
|
|
85
84
|
return httpResponse;
|
|
86
85
|
}
|
|
87
86
|
async function createHttpResponsePageContextJson(pageContextSerialized) {
|
|
@@ -97,7 +96,7 @@ function createHttpResponseRedirect({ url, statusCode }, pageContextInit) {
|
|
|
97
96
|
return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers,
|
|
98
97
|
// For bots / programmatic crawlig: show what's going on.
|
|
99
98
|
// For users: showing a blank page is probably better than a flickering text.
|
|
100
|
-
`<p style="display: none">Redirecting to ${(0, utils_js_1.escapeHtml)(url)}</p><script>console.log('This
|
|
99
|
+
`<p style="display: none">Redirecting to ${(0, utils_js_1.escapeHtml)(url)}</p><script>console.log('This HTML was generated by Vike.')</script>`);
|
|
101
100
|
}
|
|
102
101
|
function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
|
|
103
102
|
headers.push(['Content-Type', contentType]);
|
|
@@ -114,6 +113,6 @@ function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyH
|
|
|
114
113
|
get body() {
|
|
115
114
|
return (0, getHttpResponseBody_js_1.getHttpResponseBody)(htmlRender, renderHook);
|
|
116
115
|
},
|
|
117
|
-
...(0, getHttpResponseBody_js_1.getHttpResponseBodyStreamHandlers)(htmlRender, renderHook)
|
|
116
|
+
...(0, getHttpResponseBody_js_1.getHttpResponseBodyStreamHandlers)(htmlRender, renderHook),
|
|
118
117
|
};
|
|
119
118
|
}
|
|
@@ -7,8 +7,8 @@ const getPageContextUrlComputed_js_1 = require("../../../shared/getPageContextUr
|
|
|
7
7
|
const createPageContextShared_js_1 = require("../../../shared/createPageContextShared.js");
|
|
8
8
|
async function createPageContextServerSide(pageContextInit, globalContext, { isPrerendering, ssr: { urlHandler, isClientSideNavigation } = {
|
|
9
9
|
urlHandler: null,
|
|
10
|
-
isClientSideNavigation: false
|
|
11
|
-
} }) {
|
|
10
|
+
isClientSideNavigation: false,
|
|
11
|
+
}, }) {
|
|
12
12
|
(0, utils_js_1.assert)(pageContextInit.urlOriginal);
|
|
13
13
|
const pageContextCreated = createPageContext(pageContextInit, isPrerendering);
|
|
14
14
|
(0, utils_js_1.objectAssign)(pageContextCreated, {
|
|
@@ -20,7 +20,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, { isP
|
|
|
20
20
|
_pageContextInit: pageContextInit,
|
|
21
21
|
_urlRewrite: null,
|
|
22
22
|
_urlHandler: urlHandler,
|
|
23
|
-
isClientSideNavigation
|
|
23
|
+
isClientSideNavigation,
|
|
24
24
|
});
|
|
25
25
|
(0, utils_js_1.objectAssign)(pageContextCreated, globalContext._vikeConfigPublicGlobal);
|
|
26
26
|
// pageContext.urlParsed
|
|
@@ -55,7 +55,7 @@ function createPageContext(pageContextInit, isPrerendering) {
|
|
|
55
55
|
const pageContext = (0, createPageContextShared_js_1.createPageContextObject)();
|
|
56
56
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
57
57
|
isClientSide: false,
|
|
58
|
-
isPrerendering
|
|
58
|
+
isPrerendering,
|
|
59
59
|
});
|
|
60
60
|
(0, utils_js_1.objectAssign)(pageContext, pageContextInit);
|
|
61
61
|
return pageContext;
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.debugPageFiles = debugPageFiles;
|
|
7
7
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
8
8
|
const utils_js_1 = require("../utils.js");
|
|
9
|
-
function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies }) {
|
|
9
|
+
function debugPageFiles({ pageContext, isHtmlOnly, isClientRouting, pageFilesLoaded, pageFilesServerSide, pageFilesClientSide, clientEntries, clientDependencies, }) {
|
|
10
10
|
const debug = (0, utils_js_1.createDebugger)('vike:pageFiles', { serialization: { emptyArray: 'None' } });
|
|
11
11
|
const padding = ' - ';
|
|
12
12
|
debug('All page files:', printPageFiles(pageContext._globalContext._pageFilesAll, true));
|
|
@@ -4,8 +4,5 @@ exports.execHookServer = execHookServer;
|
|
|
4
4
|
const execHook_js_1 = require("../../../shared/hooks/execHook.js");
|
|
5
5
|
const preparePageContextForPublicUsageServer_js_1 = require("./preparePageContextForPublicUsageServer.js");
|
|
6
6
|
async function execHookServer(hookName, pageContext) {
|
|
7
|
-
return await (0, execHook_js_1.execHook)(hookName, pageContext,
|
|
8
|
-
(0, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer)(p);
|
|
9
|
-
return p;
|
|
10
|
-
});
|
|
7
|
+
return await (0, execHook_js_1.execHook)(hookName, pageContext, preparePageContextForPublicUsageServer_js_1.preparePageContextForPublicUsageServer);
|
|
11
8
|
}
|
|
@@ -12,7 +12,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
|
|
|
12
12
|
if (dataHook) {
|
|
13
13
|
// Note: hookReturn can be anything (e.g. an object) and is to be assigned to pageContext.data
|
|
14
14
|
const pageContextFromHook = {
|
|
15
|
-
data: dataHook.hookReturn
|
|
15
|
+
data: dataHook.hookReturn,
|
|
16
16
|
};
|
|
17
17
|
Object.assign(pageContext, pageContextFromHook);
|
|
18
18
|
// Execute +onData
|
|
@@ -59,7 +59,7 @@ function getRenderHook(pageContext) {
|
|
|
59
59
|
if (!hookFound) {
|
|
60
60
|
const hookName = pageContext._globalContext._pageConfigs.length > 0 ? 'onRenderHtml' : 'render';
|
|
61
61
|
(0, utils_js_1.assertUsage)(false, [
|
|
62
|
-
`No ${hookName}() hook found, see https://vike.dev/${hookName}
|
|
62
|
+
`No ${hookName}() hook found, see https://vike.dev/${hookName}`,
|
|
63
63
|
/*
|
|
64
64
|
'See https://vike.dev/render-modes for more information.',
|
|
65
65
|
[
|
|
@@ -87,7 +87,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
|
|
|
87
87
|
(0, utils_js_1.assertWarning)(false, [
|
|
88
88
|
errPrefix,
|
|
89
89
|
`returned a plain JavaScript string which is ${picocolors_1.default.red(picocolors_1.default.bold('dangerous'))}: it should instead return`,
|
|
90
|
-
errSuffix
|
|
90
|
+
errSuffix,
|
|
91
91
|
].join(' '), { onlyOnce: true });
|
|
92
92
|
hookReturnValue = (0, renderHtml_js_1.dangerouslySkipEscape)(hookReturnValue);
|
|
93
93
|
}
|
|
@@ -106,7 +106,7 @@ function processHookReturnValue(hookReturnValue, renderHook) {
|
|
|
106
106
|
(0, utils_js_1.assertWarning)(false, [
|
|
107
107
|
errBegin,
|
|
108
108
|
`is a plain JavaScript string which is ${picocolors_1.default.bold(picocolors_1.default.red('dangerous'))}: ${picocolors_1.default.cyan('documentHtml')} should be`,
|
|
109
|
-
errSuffix
|
|
109
|
+
errSuffix,
|
|
110
110
|
].join(' '), { onlyOnce: true });
|
|
111
111
|
val = (0, renderHtml_js_1.dangerouslySkipEscape)(val);
|
|
112
112
|
}
|
|
@@ -98,7 +98,7 @@ function getHttpResponseBodyStreamHandlers(htmlRender, renderHook) {
|
|
|
98
98
|
if (!success) {
|
|
99
99
|
(0, utils_js_1.assertUsage)(false, getErrMsg(htmlRender, renderHook, 'pipeToNodeWritable()'));
|
|
100
100
|
}
|
|
101
|
-
}
|
|
101
|
+
},
|
|
102
102
|
};
|
|
103
103
|
function getFixMsg(kind, type) {
|
|
104
104
|
const streamName = (0, stream_js_1.getStreamName)(kind, type);
|
|
@@ -27,7 +27,7 @@ function getManifestEntry(id, assetsManifest) {
|
|
|
27
27
|
// ../../virtual:vike:pageConfigLazy:client:/pages/index
|
|
28
28
|
// But it should be this instead:
|
|
29
29
|
// virtual:vike:pageConfigLazy:client:/pages/index
|
|
30
|
-
// - This workaround was implemented to support Vitest
|
|
30
|
+
// - This workaround was implemented to support Vitest running /tests/*
|
|
31
31
|
// - I don't know whether end users actually need this workaround? (I'm not sure what the bug actually is.)
|
|
32
32
|
const manifestKeyEnd = id;
|
|
33
33
|
const { manifestKey, manifestEntry } = getEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
|
|
@@ -18,7 +18,7 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
|
|
|
18
18
|
// We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
|
|
19
19
|
!(0, utils_js_1.isImportPathNpmPackage)(id, {
|
|
20
20
|
// I presume Vite already resolves path aliases when Vite sets the module's id
|
|
21
|
-
cannotBePathAlias: true
|
|
21
|
+
cannotBePathAlias: true,
|
|
22
22
|
})) {
|
|
23
23
|
id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
|
|
24
24
|
}
|
|
@@ -10,7 +10,7 @@ const inferMediaType_js_1 = require("./inferMediaType.js");
|
|
|
10
10
|
const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
|
|
11
11
|
const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
|
|
12
12
|
const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.ts', {
|
|
13
|
-
resolveClientEntriesDev: null
|
|
13
|
+
resolveClientEntriesDev: null,
|
|
14
14
|
});
|
|
15
15
|
async function getPageAssets(pageContext, clientDependencies, clientEntries) {
|
|
16
16
|
const globalContext = pageContext._globalContext;
|
|
@@ -47,7 +47,7 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
|
|
|
47
47
|
src,
|
|
48
48
|
assetType,
|
|
49
49
|
mediaType,
|
|
50
|
-
isEntry
|
|
50
|
+
isEntry,
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
53
|
pageAssets.forEach(({ src }) => {
|
|
@@ -34,7 +34,7 @@ async function warnMissingErrorPage(isV1, isProduction) {
|
|
|
34
34
|
const msg = [
|
|
35
35
|
`No ${isV1 ? 'error page' : picocolors_1.default.cyan('_error.page.js')} found,`,
|
|
36
36
|
'we recommend defining one',
|
|
37
|
-
'https://vike.dev/error-page'
|
|
37
|
+
'https://vike.dev/error-page',
|
|
38
38
|
].join(' ');
|
|
39
39
|
(0, utils_js_1.assertWarning)(false, msg, { onlyOnce: true });
|
|
40
40
|
}
|
|
@@ -13,7 +13,7 @@ function handlePageContextRequestUrl(url) {
|
|
|
13
13
|
function hasSuffix(url) {
|
|
14
14
|
const { pathnameOriginal, pathname } = (0, utils_js_1.parseUrl)(url, utils_js_1.baseServer);
|
|
15
15
|
(0, utils_js_1.assert)(pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension) === pathname.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension), {
|
|
16
|
-
url
|
|
16
|
+
url,
|
|
17
17
|
});
|
|
18
18
|
return pathnameOriginal.endsWith(getPageContextRequestUrl_js_1.pageContextJsonFileExtension);
|
|
19
19
|
}
|
|
@@ -6,12 +6,12 @@ function isFontFallback(asset, pageAssets) {
|
|
|
6
6
|
if (asset.assetType !== 'font') {
|
|
7
7
|
return false;
|
|
8
8
|
}
|
|
9
|
-
const fontUrlBase =
|
|
9
|
+
const fontUrlBase = removeFileExtensionAndHash(asset.src);
|
|
10
10
|
return pageAssets.some((assetOther) => {
|
|
11
|
-
return assetOther.assetType === 'font' &&
|
|
11
|
+
return assetOther.assetType === 'font' && removeFileExtensionAndHash(assetOther.src) === fontUrlBase;
|
|
12
12
|
});
|
|
13
13
|
}
|
|
14
|
-
function
|
|
14
|
+
function removeFileExtensionAndHash(assetUrl) {
|
|
15
15
|
(0, assert_js_1.assert)(!assetUrl.includes('\\'));
|
|
16
16
|
// The logic below doesn't work for '/assets/chunk-0e184ced.js'
|
|
17
17
|
(0, assert_js_1.assert)(!assetUrl.endsWith('.js'));
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isNewError = isNewError;
|
|
4
4
|
exports.setAlreadyLogged = setAlreadyLogged;
|
|
5
|
+
exports.hasAlreadyLogged = hasAlreadyLogged;
|
|
5
6
|
const utils_js_1 = require("../utils.js");
|
|
6
7
|
const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/isNewError.ts', {
|
|
7
|
-
wasAlreadyLogged: new WeakSet()
|
|
8
|
+
wasAlreadyLogged: new WeakSet(),
|
|
8
9
|
});
|
|
9
10
|
function isNewError(errErrorPage, errNominalPage) {
|
|
10
11
|
(0, utils_js_1.warnIfErrorIsNotObject)(errErrorPage);
|
|
@@ -16,8 +16,8 @@ async function loadPageConfigsLazyServerSide(pageContext) {
|
|
|
16
16
|
const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
|
|
17
17
|
loadPageUserFiles(pageContext._globalContext._pageFilesAll, pageConfig, globalContext._pageConfigGlobal, pageContext.pageId, !globalContext._isProduction),
|
|
18
18
|
(0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._globalContext._pageFilesAll, pageContext.pageId, {
|
|
19
|
-
sharedPageFilesAlreadyLoaded: true
|
|
20
|
-
})
|
|
19
|
+
sharedPageFilesAlreadyLoaded: true,
|
|
20
|
+
}),
|
|
21
21
|
]);
|
|
22
22
|
const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = await (0, analyzePage_js_1.analyzePage)(pageContext._globalContext._pageFilesAll, pageConfig, pageContext.pageId, globalContext);
|
|
23
23
|
const isV1Design = !!pageConfig;
|
|
@@ -45,7 +45,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
|
|
|
45
45
|
Page: pageContextExports.exports.Page,
|
|
46
46
|
_isHtmlOnly: isHtmlOnly,
|
|
47
47
|
_passToClient: passToClient,
|
|
48
|
-
_pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath)
|
|
48
|
+
_pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath),
|
|
49
49
|
});
|
|
50
50
|
(0, utils_js_1.objectAssign)(pageContextAddendum, {
|
|
51
51
|
__getPageAssets: async () => {
|
|
@@ -57,14 +57,14 @@ async function loadPageConfigsLazyServerSide(pageContext) {
|
|
|
57
57
|
(0, utils_js_1.objectAssign)(pageContext, { _pageAssets: pageAssets });
|
|
58
58
|
return pageContext._pageAssets;
|
|
59
59
|
}
|
|
60
|
-
}
|
|
60
|
+
},
|
|
61
61
|
});
|
|
62
62
|
// TODO/v1-release: remove
|
|
63
63
|
Object.assign(pageContextAddendum, {
|
|
64
64
|
_getPageAssets: async () => {
|
|
65
65
|
(0, utils_js_1.assertWarning)(false, 'pageContext._getPageAssets() deprecated, see https://vike.dev/preloading', {
|
|
66
66
|
onlyOnce: true,
|
|
67
|
-
showStackTrace: true
|
|
67
|
+
showStackTrace: true,
|
|
68
68
|
});
|
|
69
69
|
const pageAssetsOldFormat = [];
|
|
70
70
|
(await pageContextAddendum.__getPageAssets()).forEach((p) => {
|
|
@@ -73,18 +73,18 @@ async function loadPageConfigsLazyServerSide(pageContext) {
|
|
|
73
73
|
src: p.src,
|
|
74
74
|
preloadType: null,
|
|
75
75
|
assetType: 'script',
|
|
76
|
-
mediaType: p.mediaType
|
|
76
|
+
mediaType: p.mediaType,
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
pageAssetsOldFormat.push({
|
|
80
80
|
src: p.src,
|
|
81
81
|
preloadType: p.assetType,
|
|
82
82
|
assetType: p.assetType === 'style' ? 'style' : 'preload',
|
|
83
|
-
mediaType: p.mediaType
|
|
83
|
+
mediaType: p.mediaType,
|
|
84
84
|
});
|
|
85
85
|
});
|
|
86
86
|
return pageAssetsOldFormat;
|
|
87
|
-
}
|
|
87
|
+
},
|
|
88
88
|
});
|
|
89
89
|
{
|
|
90
90
|
(0, debugPageFiles_js_1.debugPageFiles)({
|
|
@@ -95,7 +95,7 @@ async function loadPageConfigsLazyServerSide(pageContext) {
|
|
|
95
95
|
pageFilesClientSide,
|
|
96
96
|
pageFilesServerSide,
|
|
97
97
|
clientEntries,
|
|
98
|
-
clientDependencies
|
|
98
|
+
clientDependencies,
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
return pageContextAddendum;
|
|
@@ -107,6 +107,6 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
|
|
|
107
107
|
const pageContextExports = (0, resolveVikeConfigPublic_js_1.resolveVikeConfigPublicPageLazy)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
|
|
108
108
|
return {
|
|
109
109
|
pageContextExports,
|
|
110
|
-
pageFilesLoaded: pageFilesServerSide
|
|
110
|
+
pageFilesLoaded: pageFilesServerSide,
|
|
111
111
|
};
|
|
112
112
|
}
|
|
@@ -11,11 +11,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
|
11
11
|
async function log404(pageContext) {
|
|
12
12
|
const { urlPathname } = pageContext;
|
|
13
13
|
const pageRoutes = pageContext._globalContext._pageRoutes;
|
|
14
|
-
(0, utils_js_1.assertUsage)(pageRoutes.length > 0, 'No page found.'
|
|
15
|
-
/* TODO/v1-release: use this
|
|
16
|
-
'No page found. Create at least one /pages/some-page/+Page.js file.'
|
|
17
|
-
*/
|
|
18
|
-
);
|
|
14
|
+
(0, utils_js_1.assertUsage)(pageRoutes.length > 0, 'No page found.');
|
|
19
15
|
const globalContext = pageContext._globalContext;
|
|
20
16
|
if (!globalContext._isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
|
|
21
17
|
const routesInfo = getRoutesInfo(pageRoutes);
|
|
@@ -72,9 +68,9 @@ function getRoutesInfo(pageRoutes) {
|
|
|
72
68
|
{
|
|
73
69
|
routeStr: 'ROUTE',
|
|
74
70
|
routeTypeSrc: 'TYPE',
|
|
75
|
-
routeDefinedBy: 'DEFINED BY'
|
|
71
|
+
routeDefinedBy: 'DEFINED BY',
|
|
76
72
|
},
|
|
77
|
-
...entries
|
|
73
|
+
...entries,
|
|
78
74
|
];
|
|
79
75
|
const terminalWidth = (0, utils_js_1.getTerminalWidth)() || 134;
|
|
80
76
|
let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => (0, utils_js_1.stripAnsi)(routeTypeSrc).length));
|
|
@@ -120,7 +116,7 @@ function getRoutesInfo(pageRoutes) {
|
|
|
120
116
|
lines[0],
|
|
121
117
|
picocolors_1.default.dim(`├${'─'.repeat(width1)}┼${'─'.repeat(width2)}┼${'─'.repeat(width3)}┤`),
|
|
122
118
|
...lines.slice(1),
|
|
123
|
-
picocolors_1.default.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`)
|
|
119
|
+
picocolors_1.default.dim(`└${'─'.repeat(width1)}┴${'─'.repeat(width2)}┴${'─'.repeat(width3)}┘`),
|
|
124
120
|
];
|
|
125
121
|
lines.forEach((line) => {
|
|
126
122
|
(0, utils_js_1.assert)((0, utils_js_1.stripAnsi)(line).length <= terminalWidth);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.error_cannot_use_import_outside_of_module = void 0;
|
|
4
4
|
// https://github.com/vikejs/vike/discussions/571#discussioncomment-6137618
|
|
5
|
-
exports.
|
|
5
|
+
exports.error_cannot_use_import_outside_of_module = `
|
|
6
6
|
import{useRunner as e}from"react-runner";export*from"react-runner";import t,{useState as r,useEffect as n,Fragment as a,useCallback as l,useRef as o,useMemo as c,createContext as s,useContext as i}from"react";import p from"react-simple-code-editor";import m,{Prism as u}from"prism-react-renderer";function g(){return g=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e},g.apply(this,arguments)}function y(e,t){if(null==e)return{};var r,n,a={},l=Object.keys(e);for(n=0;n<l.length;n++)t.indexOf(r=l[n])>=0||(a[r]=e[r]);return a}const d=["initialCode","transformCode"],h=t=>{let{initialCode:a="",transformCode:l}=t,o=y(t,d);const[c,s]=r(a),{element:i,error:p}=e(g({code:l?l(c):c},o));return n(()=>{s(a)},[a]),{element:i,error:p,code:c,onChange:s}},f={plain:{color:"#ffffff",backgroundColor:"#282c34"},styles:[{types:["comment","block-comment","prolog","doctype","cdata"],style:{color:"#b2b2b2"}},{types:["property","number","function-name","constant","symbol","deleted"],style:{color:"#5a9bcf"}},{types:["boolean"],style:{color:"#ff8b50"}},{types:["tag"],style:{color:"#fc929e"}},{types:["string","attr-value"],style:{color:"#8dc891"}},{types:["punctuation"],style:{color:"#88c6Be"}},{types:["selector","char","builtin","inserted"],style:{color:"#d8dee9"}},{types:["function"],style:{color:"#79b6f2"}},{types:["operator","entity","url","variable"],style:{color:"#d7deea"}},{types:["keyword"],style:{color:"#c5a5c5"}},{types:["atrule","class-name"],style:{color:"#fac863"}},{types:["important"],style:{fontWeight:"400"}},{types:["bold"],style:{fontWeight:"700"}},{types:["italic"],style:{fontStyle:"italic"}},{types:["entity"],style:{cursor:"help"}},{types:["namespace"],style:{opacity:.7}}]},b=["children","language","theme","Prism","padding","noWrapper","noWrap","className","style"],C=e=>{let{children:r,language:n="jsx",theme:l=f,Prism:o=u,padding:c=10,noWrapper:s,noWrap:i,className:p,style:d}=e,h=y(e,b);/*#__PURE__*/return t.createElement(m,{code:r||"",language:n,Prism:o,theme:l},({className:e,style:r,tokens:n,getLineProps:l,getTokenProps:o})=>{const m=n.map((e,r)=>/*#__PURE__*/t.createElement(a,{key:r},/*#__PURE__*/t.createElement("span",l({line:e}),e.map((e,r)=>/*#__PURE__*/t.createElement("span",o({token:e,key:r})))),"\\n"));return s?m:/*#__PURE__*/t.createElement("pre",g({className:p?:e,style:g({},r,{margin:0,padding:c,whiteSpace:i?"pre":"pre-wrap"},d)},h),m)})},v=["defaultValue","value","language","theme","Prism","highlight","padding","onChange"],E=e=>{let{defaultValue:n,value:a,language:s="jsx",theme:i=f,Prism:m,highlight:u,padding:d=10,onChange:h}=e,b=y(e,v);const[E,P]=r(n||""),k=void 0!==a,W=l(e=>/*#__PURE__*/t.createElement(C,{language:s,theme:i,Prism:m,noWrapper:!0},e),[s,i,m]),j=o(h);j.current=h;const x=l(e=>{k||P(e),null==j.current||j.current(e)},[k]),O=c(()=>g({},i.plain,b.style),[i.plain,b.style]);/*#__PURE__*/return t.createElement(p,g({},b,{highlight:u||W,padding:d,value:k?a:E,onValueChange:x,style:O}))},P=s({}),k=()=>i(P),W=["children","code","language","theme"],j=e=>{let{children:r,code:n="",language:a="jsx",theme:l=f}=e,o=y(e,W);const{element:c,error:s,code:i,onChange:p}=h(g({initialCode:n},o));/*#__PURE__*/return t.createElement(P.Provider,{value:{element:c,error:s,code:i,onChange:p,language:a,theme:l}},r)},x=e=>{const{code:r,language:n,theme:a,onChange:l}=k();/*#__PURE__*/return t.createElement(E,g({value:r,language:n,theme:a,onChange:l},e))},O=["Component"],w=e=>{let{Component:r="div"}=e,n=y(e,O);const{element:a}=k();/*#__PURE__*/return t.createElement(r,n,a)},N=e=>{const{error:r}=k();return r?/*#__PURE__*/t.createElement("pre",e,r):/*#__PURE__*/t.createElement(t.Fragment,null)};export{C as CodeBlock,E as CodeEditor,P as LiveContext,x as LiveEditor,N as LiveError,w as LivePreview,j as LiveProvider,f as defaultTheme,k as useLiveContext,h as useLiveRunner};
|
|
7
7
|
^^^^^^
|
|
8
8
|
|
|
@@ -13,12 +13,12 @@ const errorsMisc = [
|
|
|
13
13
|
{
|
|
14
14
|
errMsg: 'window is not defined',
|
|
15
15
|
link: 'https://vike.dev/hints#window-is-not-defined',
|
|
16
|
-
mustMentionNodeModules: false
|
|
16
|
+
mustMentionNodeModules: false,
|
|
17
17
|
},
|
|
18
18
|
{
|
|
19
19
|
errMsg: 'jsxDEV is not a function',
|
|
20
20
|
link: 'https://github.com/vikejs/vike/issues/1469#issuecomment-1919518096',
|
|
21
|
-
mustMentionNodeModules: false
|
|
21
|
+
mustMentionNodeModules: false,
|
|
22
22
|
},
|
|
23
23
|
{
|
|
24
24
|
// ```
|
|
@@ -26,12 +26,12 @@ const errorsMisc = [
|
|
|
26
26
|
// ```
|
|
27
27
|
errMsg: 'assets.json',
|
|
28
28
|
link: 'https://vike.dev/getGlobalContext',
|
|
29
|
-
mustMentionNodeModules: false
|
|
29
|
+
mustMentionNodeModules: false,
|
|
30
30
|
},
|
|
31
31
|
{
|
|
32
32
|
errMsg: 'ERR_UNKNOWN_FILE_EXTENSION',
|
|
33
|
-
link: 'https://vike.dev/broken-npm-package#err-unknown-file-extension'
|
|
34
|
-
}
|
|
33
|
+
link: 'https://vike.dev/broken-npm-package#err-unknown-file-extension',
|
|
34
|
+
},
|
|
35
35
|
];
|
|
36
36
|
const reactInvalidEelement = 'https://vike.dev/broken-npm-package#react-invalid-component';
|
|
37
37
|
const errorsReact = [
|
|
@@ -39,17 +39,17 @@ const errorsReact = [
|
|
|
39
39
|
errMsg: 'Element type is invalid: expected a string (for built-in components) or a class/function (for composite components)',
|
|
40
40
|
link: reactInvalidEelement,
|
|
41
41
|
// The stack trace can be user-land while the import is coming from node_modules
|
|
42
|
-
mustMentionNodeModules: false
|
|
42
|
+
mustMentionNodeModules: false,
|
|
43
43
|
},
|
|
44
44
|
{
|
|
45
45
|
errMsg: 'Objects are not valid as a React child',
|
|
46
46
|
link: reactInvalidEelement,
|
|
47
|
-
mustMentionNodeModules: false
|
|
47
|
+
mustMentionNodeModules: false,
|
|
48
48
|
},
|
|
49
49
|
{
|
|
50
50
|
// React's "Invalid hook call.", see https://github.com/vikejs/vike/discussions/1637#discussioncomment-9424712
|
|
51
|
-
errMsg: "Cannot read properties of null (reading 'useContext')"
|
|
52
|
-
}
|
|
51
|
+
errMsg: "Cannot read properties of null (reading 'useContext')",
|
|
52
|
+
},
|
|
53
53
|
];
|
|
54
54
|
const errorsCjsEsm_withPreciseLink = [
|
|
55
55
|
{
|
|
@@ -57,8 +57,8 @@ const errorsCjsEsm_withPreciseLink = [
|
|
|
57
57
|
errMsg: /Named export.*not found/i,
|
|
58
58
|
link: 'https://vike.dev/broken-npm-package#named-export-not-found',
|
|
59
59
|
// It seems that this always points to an npm package import.
|
|
60
|
-
mustMentionNodeModules: false
|
|
61
|
-
}
|
|
60
|
+
mustMentionNodeModules: false,
|
|
61
|
+
},
|
|
62
62
|
];
|
|
63
63
|
const errorsCjsEsm = [
|
|
64
64
|
{ errMsg: 'ERR_UNSUPPORTED_DIR_IMPORT' },
|
|
@@ -71,7 +71,7 @@ const errorsCjsEsm = [
|
|
|
71
71
|
{
|
|
72
72
|
errMsg: 'Cannot use import statement',
|
|
73
73
|
// Since user code is always ESM, this error must always originate from an npm package.
|
|
74
|
-
mustMentionNodeModules: false
|
|
74
|
+
mustMentionNodeModules: false,
|
|
75
75
|
},
|
|
76
76
|
{ errMsg: 'is not exported' },
|
|
77
77
|
{ errMsg: 'Cannot read properties of undefined' },
|
|
@@ -82,7 +82,7 @@ const errorsCjsEsm = [
|
|
|
82
82
|
{ errMsg: 'module is not defined' },
|
|
83
83
|
{ errMsg: 'not defined in ES' },
|
|
84
84
|
{ errMsg: "Unexpected token 'export'" },
|
|
85
|
-
{ errMsg: 'Failed to resolve entry for package' }
|
|
85
|
+
{ errMsg: 'Failed to resolve entry for package' },
|
|
86
86
|
];
|
|
87
87
|
function logErrorHint(error) {
|
|
88
88
|
/* Collect errors for ./logErrorHint.spec.ts
|
|
@@ -118,11 +118,11 @@ function isKnownError(error) {
|
|
|
118
118
|
...errorsMisc,
|
|
119
119
|
...errorsReact,
|
|
120
120
|
...errorsCjsEsm_withPreciseLink,
|
|
121
|
-
...errorsCjsEsm
|
|
122
|
-
].find((
|
|
123
|
-
if (!includesLowercase(anywhere,
|
|
121
|
+
...errorsCjsEsm,
|
|
122
|
+
].find((knownError) => {
|
|
123
|
+
if (!includesLowercase(anywhere, knownError.errMsg))
|
|
124
124
|
return false;
|
|
125
|
-
if (
|
|
125
|
+
if (knownError.mustMentionNodeModules !== false && !includesLowercase(anywhere, 'node_modules'))
|
|
126
126
|
return false;
|
|
127
127
|
return true;
|
|
128
128
|
});
|
|
@@ -183,7 +183,7 @@ function collectError(err) {
|
|
|
183
183
|
` message: ${JSON.stringify(err.message)},`,
|
|
184
184
|
` code: ${JSON.stringify(err.code)},`,
|
|
185
185
|
' stack: `\n' + err.stack + '\n`',
|
|
186
|
-
'}'
|
|
186
|
+
'}',
|
|
187
187
|
].join('\n'));
|
|
188
188
|
/* For reproductions using older vite-plugin-ssr versions, do one of the following.
|
|
189
189
|
- If upon pre-rendering:https: //github.com/brillout/repro_node-syntax-error#error-catched-by-vite-plugin-ssr
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Logger used for the production server.
|
|
3
|
-
// Any other
|
|
3
|
+
// Any other environment (dev, preview, build, and pre-rendering) uses loggerNotProd.ts instead.
|
|
4
4
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
6
|
};
|
|
@@ -12,7 +12,7 @@ const isNewError_js_1 = require("./isNewError.js");
|
|
|
12
12
|
const utils_js_1 = require("../utils.js");
|
|
13
13
|
const picocolors_1 = __importDefault(require("@brillout/picocolors"));
|
|
14
14
|
const logErrorHint_js_1 = require("./logErrorHint.js");
|
|
15
|
-
function logErrorProd(err,
|
|
15
|
+
function logErrorProd(err, _httpRequestId) {
|
|
16
16
|
(0, utils_js_1.warnIfErrorIsNotObject)(err);
|
|
17
17
|
(0, isNewError_js_1.setAlreadyLogged)(err);
|
|
18
18
|
if ((0, abort_js_1.isAbortError)(err)) {
|
|
@@ -27,7 +27,7 @@ function logErrorProd(err, _httpRquestId) {
|
|
|
27
27
|
// Every server-side runtime error is expected to go through `onRuntimeError()`.
|
|
28
28
|
// - onRuntimeError(err) should always be called after `console.error(err)`.
|
|
29
29
|
// - Because the error hint of logErrorHint(err) should be shown *after* the error.
|
|
30
|
-
// - In principle, any runtime error is (or at least should) be
|
|
30
|
+
// - In principle, any runtime error is (or at least should) be caught by Vike, otherwise Vike couldn't render the error page.
|
|
31
31
|
function onRuntimeError(err) {
|
|
32
32
|
// The more runtime errors we pass to logErrorHint() the better.
|
|
33
33
|
(0, logErrorHint_js_1.logErrorHint)(err);
|
|
@@ -63,7 +63,7 @@ async function renderPageAlreadyRouted(pageContext) {
|
|
|
63
63
|
async function prerenderPage(pageContext) {
|
|
64
64
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
65
65
|
isClientSideNavigation: false,
|
|
66
|
-
_urlHandler: null
|
|
66
|
+
_urlHandler: null,
|
|
67
67
|
});
|
|
68
68
|
/* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
|
|
69
69
|
* - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.resolveRedirects = resolveRedirects;
|
|
7
|
+
exports.getStaticRedirectsForPrerender = getStaticRedirectsForPrerender;
|
|
7
8
|
exports.resolveRouteStringRedirect = resolveRouteStringRedirect;
|
|
8
9
|
const assertIsNotBrowser_js_1 = require("../../../utils/assertIsNotBrowser.js");
|
|
9
10
|
const utils_js_1 = require("../../../shared/utils.js");
|
|
@@ -21,11 +22,22 @@ function resolveRedirects(redirectsAll, urlPathname) {
|
|
|
21
22
|
}
|
|
22
23
|
return null;
|
|
23
24
|
}
|
|
25
|
+
function getStaticRedirectsForPrerender(redirectsAll, showWarningUponDynamicRedirects) {
|
|
26
|
+
const redirects = merge(redirectsAll);
|
|
27
|
+
const redirectsStatic = {};
|
|
28
|
+
for (const [urlSource, urlTarget] of Object.entries(redirects)) {
|
|
29
|
+
assertRedirect(urlSource, urlTarget);
|
|
30
|
+
if ((0, resolveRouteString_js_1.isStaticRouteString)(urlSource)) {
|
|
31
|
+
redirectsStatic[urlSource] = urlTarget;
|
|
32
|
+
}
|
|
33
|
+
else if (showWarningUponDynamicRedirects) {
|
|
34
|
+
(0, utils_js_1.assertWarning)(false, `Dynamic redirect ${picocolors_1.default.cyan(urlSource)} -> ${picocolors_1.default.cyan(urlTarget)} cannot be pre-rendered. You can remove this warning by setting +prerender.partial to true (https://vike.dev/prerender#partial).`, { onlyOnce: true });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return redirectsStatic;
|
|
38
|
+
}
|
|
24
39
|
function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
|
|
25
|
-
(
|
|
26
|
-
// Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
|
|
27
|
-
(0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
|
|
28
|
-
assertParams(urlSource, urlTarget);
|
|
40
|
+
assertRedirect(urlSource, urlTarget);
|
|
29
41
|
const match = (0, resolveRouteString_js_1.resolveRouteString)(urlSource, urlPathname);
|
|
30
42
|
if (!match)
|
|
31
43
|
return null;
|
|
@@ -35,6 +47,12 @@ function resolveRouteStringRedirect(urlSource, urlTarget, urlPathname) {
|
|
|
35
47
|
(0, utils_js_1.assert)((0, utils_js_1.isUrlRedirectTarget)(urlResolved));
|
|
36
48
|
return urlResolved;
|
|
37
49
|
}
|
|
50
|
+
function assertRedirect(urlSource, urlTarget) {
|
|
51
|
+
(0, resolveRouteString_js_1.assertRouteString)(urlSource, `${redirectsErrPrefix} Invalid`);
|
|
52
|
+
// Is allowing any protocol a safety issue? https://github.com/vikejs/vike/pull/1292#issuecomment-1828043917
|
|
53
|
+
(0, utils_js_1.assertUsageUrlRedirectTarget)(urlTarget, `${redirectsErrPrefix} The URL redirection target`, true);
|
|
54
|
+
assertParams(urlSource, urlTarget);
|
|
55
|
+
}
|
|
38
56
|
function assertParams(urlSource, urlTarget) {
|
|
39
57
|
const routeSegments = urlTarget.split('/');
|
|
40
58
|
routeSegments.forEach((routeSegment) => {
|