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
|
@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.renderPage = renderPage;
|
|
7
7
|
exports.renderPage_addAsyncHookwrapper = renderPage_addAsyncHookwrapper;
|
|
8
|
-
exports.renderPage_vikeConfigHasError = renderPage_vikeConfigHasError;
|
|
9
|
-
exports.vikeConfigHasError = vikeConfigHasError;
|
|
10
8
|
const renderPageAlreadyRouted_js_1 = require("./renderPage/renderPageAlreadyRouted.js");
|
|
11
9
|
const createPageContextServerSide_js_1 = require("./renderPage/createPageContextServerSide.js");
|
|
12
10
|
const index_js_1 = require("../../shared/route/index.js");
|
|
@@ -25,11 +23,8 @@ const error_page_js_1 = require("../../shared/error-page.js");
|
|
|
25
23
|
const handleErrorWithoutErrorPage_js_1 = require("./renderPage/handleErrorWithoutErrorPage.js");
|
|
26
24
|
const loadPageConfigsLazyServerSide_js_1 = require("./renderPage/loadPageConfigsLazyServerSide.js");
|
|
27
25
|
const resolveRedirects_js_1 = require("./renderPage/resolveRedirects.js");
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
vikeConfigHasRuntimeError: false,
|
|
31
|
-
vikeConfigHasBuildError: false
|
|
32
|
-
});
|
|
26
|
+
const getVikeConfigError_js_1 = require("../shared/getVikeConfigError.js");
|
|
27
|
+
const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', { httpRequestsCount: 0 });
|
|
33
28
|
// `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.)
|
|
34
29
|
async function renderPage(pageContextInit) {
|
|
35
30
|
(0, assertArguments_js_1.assertArguments)(...arguments);
|
|
@@ -50,7 +45,7 @@ async function renderPage(pageContextInit) {
|
|
|
50
45
|
}
|
|
51
46
|
// Fallback wrapper if node:async_hooks isn't available
|
|
52
47
|
let asyncHookWrapper = async (_httpRequestId, ret) => ({
|
|
53
|
-
pageContextReturn: await ret()
|
|
48
|
+
pageContextReturn: await ret(),
|
|
54
49
|
});
|
|
55
50
|
// Add node:async_hooks wrapper
|
|
56
51
|
function renderPage_addAsyncHookwrapper(wrapper) {
|
|
@@ -59,7 +54,7 @@ function renderPage_addAsyncHookwrapper(wrapper) {
|
|
|
59
54
|
async function renderPagePrepare(pageContextInit, httpRequestId) {
|
|
60
55
|
// Invalid config
|
|
61
56
|
{
|
|
62
|
-
const vikeConfigError = getVikeConfigError();
|
|
57
|
+
const vikeConfigError = (0, getVikeConfigError_js_1.getVikeConfigError)();
|
|
63
58
|
if (vikeConfigError) {
|
|
64
59
|
return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
|
|
65
60
|
}
|
|
@@ -73,14 +68,14 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
|
|
|
73
68
|
// ```bash
|
|
74
69
|
// Re-build your app (you're using 1.2.3 but your app was built with 1.2.2)
|
|
75
70
|
// ```
|
|
76
|
-
// initGlobalContext_renderPage()
|
|
71
|
+
// initGlobalContext_renderPage() doesn't call any user hook => err isn't thrown from user code.
|
|
77
72
|
(0, utils_js_1.assert)(!(0, abort_js_1.isAbortError)(err));
|
|
78
73
|
(0, loggerRuntime_js_1.logRuntimeError)(err, httpRequestId);
|
|
79
74
|
const pageContextWithError = getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextInit);
|
|
80
75
|
return pageContextWithError;
|
|
81
76
|
}
|
|
82
77
|
{
|
|
83
|
-
const vikeConfigError = getVikeConfigError();
|
|
78
|
+
const vikeConfigError = (0, getVikeConfigError_js_1.getVikeConfigError)();
|
|
84
79
|
if (vikeConfigError) {
|
|
85
80
|
return getPageContextInvalidVikeConfig(vikeConfigError.err, pageContextInit, httpRequestId);
|
|
86
81
|
}
|
|
@@ -223,7 +218,7 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
|
|
|
223
218
|
// - Maybe we can/should make the error available at pageContext.errorWhileRendering
|
|
224
219
|
(0, utils_js_1.assert)(errorWhileRendering === null || errorWhileRendering === undefined);
|
|
225
220
|
msg = `HTTP response ${prettyUrl(urlOriginalPretty)} ${picocolors_1.default.dim('null')}`;
|
|
226
|
-
// Erroneous value (it
|
|
221
|
+
// Erroneous value (it should sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
|
|
227
222
|
isNominal = true;
|
|
228
223
|
}
|
|
229
224
|
else {
|
|
@@ -261,7 +256,7 @@ function getPageContextHttpResponseError(err, pageContextBegin) {
|
|
|
261
256
|
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContextBegin);
|
|
262
257
|
(0, utils_js_1.objectAssign)(pageContextWithError, {
|
|
263
258
|
httpResponse,
|
|
264
|
-
errorWhileRendering: err
|
|
259
|
+
errorWhileRendering: err,
|
|
265
260
|
});
|
|
266
261
|
return pageContextWithError;
|
|
267
262
|
}
|
|
@@ -270,7 +265,7 @@ function getPageContextHttpResponseErrorWithoutGlobalContext(err, pageContextIni
|
|
|
270
265
|
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseErrorWithoutGlobalContext)();
|
|
271
266
|
(0, utils_js_1.objectAssign)(pageContextWithError, {
|
|
272
267
|
httpResponse,
|
|
273
|
-
errorWhileRendering: err
|
|
268
|
+
errorWhileRendering: err,
|
|
274
269
|
});
|
|
275
270
|
return pageContextWithError;
|
|
276
271
|
}
|
|
@@ -303,10 +298,10 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
|
|
|
303
298
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
304
299
|
is404: false,
|
|
305
300
|
errorWhileRendering: errNominalPage,
|
|
306
|
-
routeParams: {}
|
|
301
|
+
routeParams: {},
|
|
307
302
|
});
|
|
308
303
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
309
|
-
_debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
|
|
304
|
+
_debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR',
|
|
310
305
|
});
|
|
311
306
|
(0, utils_js_1.assert)(pageContext.errorWhileRendering);
|
|
312
307
|
return pageContext;
|
|
@@ -317,8 +312,8 @@ async function getPageContextBegin(pageContextInit, globalContext, httpRequestId
|
|
|
317
312
|
isPrerendering: false,
|
|
318
313
|
ssr: {
|
|
319
314
|
urlHandler: _urlHandler,
|
|
320
|
-
isClientSideNavigation
|
|
321
|
-
}
|
|
315
|
+
isClientSideNavigation,
|
|
316
|
+
},
|
|
322
317
|
});
|
|
323
318
|
(0, utils_js_1.objectAssign)(pageContextBegin, { _httpRequestId: httpRequestId });
|
|
324
319
|
return pageContextBegin;
|
|
@@ -327,7 +322,7 @@ function handlePageContextUrl(urlOriginal) {
|
|
|
327
322
|
const { isPageContextRequest } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
|
|
328
323
|
return {
|
|
329
324
|
isClientSideNavigation: isPageContextRequest,
|
|
330
|
-
_urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix
|
|
325
|
+
_urlHandler: (url) => (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(url).urlWithoutPageContextRequestSuffix,
|
|
331
326
|
};
|
|
332
327
|
}
|
|
333
328
|
function getRequestId() {
|
|
@@ -436,7 +431,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
|
|
|
436
431
|
if (pageContextAbort._urlRewrite) {
|
|
437
432
|
const pageContextReturn = await renderPageAlreadyPrepared(pageContextBegin, globalContext, httpRequestId, [
|
|
438
433
|
...pageContextsFromRewrite,
|
|
439
|
-
pageContextAbort
|
|
434
|
+
pageContextAbort,
|
|
440
435
|
]);
|
|
441
436
|
Object.assign(pageContextReturn, pageContextAbort);
|
|
442
437
|
return { pageContextReturn };
|
|
@@ -461,7 +456,7 @@ async function checkBaseUrl(pageContextBegin, globalContext) {
|
|
|
461
456
|
const httpResponse = (0, createHttpResponse_js_1.createHttpResponseBaseIsMissing)(urlOriginal, baseServer);
|
|
462
457
|
(0, utils_js_1.objectAssign)(pageContext, {
|
|
463
458
|
httpResponse,
|
|
464
|
-
isBaseMissing: true
|
|
459
|
+
isBaseMissing: true,
|
|
465
460
|
});
|
|
466
461
|
(0, utils_js_1.checkType)(pageContext);
|
|
467
462
|
return pageContext;
|
|
@@ -476,7 +471,7 @@ function getPageContextSkipRequest(pageContextInit) {
|
|
|
476
471
|
if (urlPathnameWithBase.endsWith('.well-known/appspecific/com.chrome.devtools.json')) {
|
|
477
472
|
// https://chromium.googlesource.com/devtools/devtools-frontend/+/main/docs/ecosystem/automatic_workspace_folders.md
|
|
478
473
|
// https://www.reddit.com/r/node/comments/1kcr0wh/odd_request_coming_into_my_localhost_server_from/
|
|
479
|
-
errMsg404 = 'Not
|
|
474
|
+
errMsg404 = 'Not supported';
|
|
480
475
|
}
|
|
481
476
|
if (!errMsg404)
|
|
482
477
|
return;
|
|
@@ -497,15 +492,3 @@ function forkPageContext(pageContextBegin) {
|
|
|
497
492
|
(0, utils_js_1.objectAssign)(pageContext, pageContextBegin, true);
|
|
498
493
|
return pageContext;
|
|
499
494
|
}
|
|
500
|
-
function renderPage_vikeConfigHasError(val) {
|
|
501
|
-
if ('hasRuntimeError' in val)
|
|
502
|
-
globalObject.vikeConfigHasRuntimeError = val.hasRuntimeError;
|
|
503
|
-
if ('hasBuildError' in val)
|
|
504
|
-
globalObject.vikeConfigHasBuildError = val.hasBuildError;
|
|
505
|
-
}
|
|
506
|
-
function getVikeConfigError() {
|
|
507
|
-
return globalObject.vikeConfigHasBuildError || globalObject.vikeConfigHasRuntimeError;
|
|
508
|
-
}
|
|
509
|
-
function vikeConfigHasError() {
|
|
510
|
-
return !!getVikeConfigError();
|
|
511
|
-
}
|
|
@@ -8,13 +8,13 @@ async function universalVikeHandler(request, context, runtime) {
|
|
|
8
8
|
...runtime,
|
|
9
9
|
runtime,
|
|
10
10
|
urlOriginal: request.url,
|
|
11
|
-
headersOriginal: request.headers
|
|
11
|
+
headersOriginal: request.headers,
|
|
12
12
|
};
|
|
13
13
|
const pageContext = await (0, index_js_1.renderPage)(pageContextInit);
|
|
14
14
|
const response = pageContext.httpResponse;
|
|
15
15
|
const readable = response.getReadableWebStream();
|
|
16
16
|
return new Response(readable, {
|
|
17
17
|
status: response.statusCode,
|
|
18
|
-
headers: response.headers
|
|
18
|
+
headers: response.headers,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
@@ -53,7 +53,7 @@ __exportStar(require("../../utils/freezePartial.js"), exports);
|
|
|
53
53
|
__exportStar(require("../../utils/parseNpmPackage.js"), exports);
|
|
54
54
|
__exportStar(require("../../utils/isNullish.js"), exports);
|
|
55
55
|
__exportStar(require("../../utils/isScriptFile.js"), exports);
|
|
56
|
-
__exportStar(require("../../utils/
|
|
56
|
+
__exportStar(require("../../utils/removeFileExtension.js"), exports);
|
|
57
57
|
__exportStar(require("../../utils/objectKeys.js"), exports);
|
|
58
58
|
__exportStar(require("../../utils/objectEntries.js"), exports);
|
|
59
59
|
__exportStar(require("../../utils/objectFromEntries.js"), exports);
|
|
@@ -18,9 +18,9 @@ async function createDevMiddleware(options = {}) {
|
|
|
18
18
|
root: options.root ?? options.viteConfig?.root,
|
|
19
19
|
server: {
|
|
20
20
|
...options.viteConfig?.server,
|
|
21
|
-
middlewareMode: options.viteConfig?.server?.middlewareMode ?? true
|
|
22
|
-
}
|
|
23
|
-
}
|
|
21
|
+
middlewareMode: options.viteConfig?.server?.middlewareMode ?? true,
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
24
|
};
|
|
25
25
|
const { viteConfigFromUserEnhanced } = await (0, prepareViteApiCall_js_1.prepareViteApiCall)(optionsMod, 'dev');
|
|
26
26
|
const server = await (0, vite_1.createServer)(viteConfigFromUserEnhanced);
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractAssetsAddQuery = extractAssetsAddQuery;
|
|
4
4
|
exports.extractAssetsRemoveQuery = extractAssetsRemoveQuery;
|
|
5
|
-
// We import from node/utils.ts
|
|
5
|
+
// We import from node/utils.ts instead of node/vite/utils.ts because this file is loaded by the server runtime
|
|
6
6
|
const utils_js_1 = require("./utils.js");
|
|
7
7
|
const query = 'extractAssets';
|
|
8
8
|
function extractAssetsAddQuery(id) {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getVikeConfigError = getVikeConfigError;
|
|
4
|
+
exports.getVikeConfigErrorBuild = getVikeConfigErrorBuild;
|
|
5
|
+
exports.setVikeConfigError = setVikeConfigError;
|
|
6
|
+
const utils_js_1 = require("./utils.js");
|
|
7
|
+
const globalObject = (0, utils_js_1.getGlobalObject)('node/shared/getVikeConfigError.ts', {
|
|
8
|
+
errorRuntime: false,
|
|
9
|
+
errorBuild: false,
|
|
10
|
+
});
|
|
11
|
+
function setVikeConfigError(val) {
|
|
12
|
+
if ('errorRuntime' in val)
|
|
13
|
+
globalObject.errorRuntime = val.errorRuntime;
|
|
14
|
+
if ('errorBuild' in val)
|
|
15
|
+
globalObject.errorBuild = val.errorBuild;
|
|
16
|
+
}
|
|
17
|
+
function getVikeConfigError() {
|
|
18
|
+
return globalObject.errorBuild || globalObject.errorRuntime;
|
|
19
|
+
}
|
|
20
|
+
function getVikeConfigErrorBuild() {
|
|
21
|
+
return globalObject.errorBuild;
|
|
22
|
+
}
|
|
@@ -18,6 +18,7 @@ const assertIsNotBrowser_js_1 = require("../../utils/assertIsNotBrowser.js");
|
|
|
18
18
|
(0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
|
|
19
19
|
__exportStar(require("../../utils/assert.js"), exports);
|
|
20
20
|
__exportStar(require("../../utils/getFileExtension.js"), exports);
|
|
21
|
+
__exportStar(require("../../utils/getGlobalObject.js"), exports);
|
|
21
22
|
__exportStar(require("../../utils/isPlainObject.js"), exports);
|
|
22
23
|
__exportStar(require("../../utils/checkType.js"), exports);
|
|
23
24
|
__exportStar(require("../../utils/hasProp.js"), exports);
|
|
@@ -25,14 +25,14 @@ function isVirtualFileIdPageConfigLazy(id) {
|
|
|
25
25
|
return {
|
|
26
26
|
pageId: id.slice(idBaseClient.length),
|
|
27
27
|
isForClientSide: true,
|
|
28
|
-
isExtractAssets
|
|
28
|
+
isExtractAssets,
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
if (id.startsWith(idBaseServer)) {
|
|
32
32
|
return {
|
|
33
33
|
pageId: id.slice(idBaseServer.length),
|
|
34
34
|
isForClientSide: false,
|
|
35
|
-
isExtractAssets
|
|
35
|
+
isExtractAssets,
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
(0, utils_js_1.assert)(false);
|
|
@@ -47,7 +47,7 @@ function plugin(vikeVitePluginOptions = {}) {
|
|
|
47
47
|
(0, pluginFileEnv_js_1.pluginFileEnv)(),
|
|
48
48
|
(0, pluginWorkaroundCssModuleHmr_js_1.pluginWorkaroundCssModuleHmr)(),
|
|
49
49
|
(0, pluginWorkaroundVite6HmrRegression_js_1.pluginWorkaroundVite6HmrRegression)(),
|
|
50
|
-
(0, pluginReplaceConstants_js_1.pluginReplaceConstants)()
|
|
50
|
+
(0, pluginReplaceConstants_js_1.pluginReplaceConstants)(),
|
|
51
51
|
];
|
|
52
52
|
Object.assign(plugins, { _vikeVitePluginOptions: vikeVitePluginOptions });
|
|
53
53
|
return plugins;
|
|
@@ -57,7 +57,7 @@ Object.defineProperty(plugin, 'apply', {
|
|
|
57
57
|
enumerable: true,
|
|
58
58
|
get: () => {
|
|
59
59
|
(0, utils_js_2.assertUsage)(false, `Add ${picocolors_1.default.cyan('vike()')} instead of ${picocolors_1.default.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 });
|
|
60
|
-
}
|
|
60
|
+
},
|
|
61
61
|
});
|
|
62
62
|
// CJS default export `const vike = require('vike/plugin')`
|
|
63
63
|
// - It needs to live at the end of this file, in order to ensure we do it after all assignments to `exports`.
|
|
@@ -22,10 +22,10 @@ function pluginBaseUrls() {
|
|
|
22
22
|
envPrefix: [
|
|
23
23
|
'VITE_', // Vite doesn't seem to merge in its default, see https://github.com/vikejs/vike/issues/554
|
|
24
24
|
'BASE_SERVER',
|
|
25
|
-
'BASE_ASSETS'
|
|
25
|
+
'BASE_ASSETS',
|
|
26
26
|
],
|
|
27
27
|
base: basesResolved.baseAssets, // Make Vite inject baseAssets to imports e.g. `import logoUrl from './logo.svg.js'`
|
|
28
|
-
_baseViteOriginal: baseViteOriginal
|
|
28
|
+
_baseViteOriginal: baseViteOriginal,
|
|
29
29
|
};
|
|
30
30
|
},
|
|
31
31
|
async configResolved(config) {
|
|
@@ -38,7 +38,7 @@ function pluginBaseUrls() {
|
|
|
38
38
|
* - Instead of having an internal Vike assertion fail, we let the user discover Vite's buggy behavior.
|
|
39
39
|
assert(config.base === baseAssets)
|
|
40
40
|
*/
|
|
41
|
-
}
|
|
41
|
+
},
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
function resolveBaseFromResolvedConfig(baseServer, baseAssets, config) {
|
|
@@ -8,10 +8,10 @@ exports.handleAssetsManifest_getBuildConfig = handleAssetsManifest_getBuildConfi
|
|
|
8
8
|
exports.handleAssetsManifest_isFixEnabled = handleAssetsManifest_isFixEnabled;
|
|
9
9
|
exports.handleAssetsManifest_assertUsageCssCodeSplit = handleAssetsManifest_assertUsageCssCodeSplit;
|
|
10
10
|
exports.handleAssetsManifest_assertUsageCssTarget = handleAssetsManifest_assertUsageCssTarget;
|
|
11
|
-
const promises_1 = __importDefault(require("fs/promises"));
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
11
|
+
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
12
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
13
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
14
|
+
const node_fs_2 = require("node:fs");
|
|
15
15
|
const utils_js_1 = require("../../utils.js");
|
|
16
16
|
const virtualFilePageConfigLazy_js_1 = require("../../../shared/virtualFiles/virtualFilePageConfigLazy.js");
|
|
17
17
|
const pluginBuildConfig_js_1 = require("./pluginBuildConfig.js");
|
|
@@ -41,22 +41,22 @@ async function fixServerAssets(config) {
|
|
|
41
41
|
async function copyAssets(filesToMove, filesToRemove, config) {
|
|
42
42
|
const { outDirClient, outDirServer } = (0, getOutDirs_js_1.getOutDirs)(config);
|
|
43
43
|
const assetsDir = (0, getAssetsDir_js_1.getAssetsDir)(config);
|
|
44
|
-
const assetsDirServer =
|
|
45
|
-
if (!filesToMove.length && !filesToRemove.length && !(0,
|
|
44
|
+
const assetsDirServer = node_path_1.default.posix.join(outDirServer, assetsDir);
|
|
45
|
+
if (!filesToMove.length && !filesToRemove.length && !(0, node_fs_2.existsSync)(assetsDirServer))
|
|
46
46
|
return;
|
|
47
|
-
(0, utils_js_1.assert)((0,
|
|
47
|
+
(0, utils_js_1.assert)((0, node_fs_2.existsSync)(assetsDirServer));
|
|
48
48
|
const concurrencyLimit = (0, utils_js_1.pLimit)(10);
|
|
49
49
|
await Promise.all(filesToMove.map((file) => concurrencyLimit(async () => {
|
|
50
|
-
const source =
|
|
51
|
-
const target =
|
|
52
|
-
await promises_1.default.mkdir(
|
|
50
|
+
const source = node_path_1.default.posix.join(outDirServer, file);
|
|
51
|
+
const target = node_path_1.default.posix.join(outDirClient, file);
|
|
52
|
+
await promises_1.default.mkdir(node_path_1.default.posix.dirname(target), { recursive: true });
|
|
53
53
|
await promises_1.default.rename(source, target);
|
|
54
54
|
})));
|
|
55
55
|
filesToRemove.forEach((file) => {
|
|
56
|
-
const filePath =
|
|
57
|
-
|
|
56
|
+
const filePath = node_path_1.default.posix.join(outDirServer, file);
|
|
57
|
+
node_fs_1.default.unlinkSync(filePath);
|
|
58
58
|
});
|
|
59
|
-
/* We cannot do that because, with some edge case Rollup settings (
|
|
59
|
+
/* 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
|
|
60
60
|
await fs.rm(assetsDirServer, { recursive: true })
|
|
61
61
|
*/
|
|
62
62
|
removeEmptyDirectories(assetsDirServer);
|
|
@@ -158,7 +158,7 @@ function addServerAssets(clientManifest, serverManifest) {
|
|
|
158
158
|
css,
|
|
159
159
|
assets,
|
|
160
160
|
dynamicImports: undefined,
|
|
161
|
-
imports: undefined
|
|
161
|
+
imports: undefined,
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
}
|
|
@@ -210,7 +210,7 @@ function collectResources(entryRoot, manifest) {
|
|
|
210
210
|
// </head>
|
|
211
211
|
// ```
|
|
212
212
|
function getHash(src) {
|
|
213
|
-
// src is
|
|
213
|
+
// src is guaranteed to end with `.[hash][extname]`, see pluginDistFileNames.ts
|
|
214
214
|
const hash = src.split('.').at(-2);
|
|
215
215
|
(0, utils_js_1.assert)(hash);
|
|
216
216
|
return hash;
|
|
@@ -239,10 +239,10 @@ function handleAssetsManifest_assertUsageCssTarget(config) {
|
|
|
239
239
|
'The CSS browser target should be the same for both client and server, but we got:',
|
|
240
240
|
`Client: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedClient))}`,
|
|
241
241
|
`Server: ${picocolors_1.default.cyan(JSON.stringify(targetCssResolvedServer))}`,
|
|
242
|
-
`Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information
|
|
242
|
+
`Different targets lead to CSS duplication, see ${picocolors_1.default.underline('https://github.com/vikejs/vike/issues/1815#issuecomment-2507002979')} for more information.`,
|
|
243
243
|
].join('\n'), {
|
|
244
244
|
showStackTrace: true,
|
|
245
|
-
onlyOnce: 'different-css-target'
|
|
245
|
+
onlyOnce: 'different-css-target',
|
|
246
246
|
});
|
|
247
247
|
});
|
|
248
248
|
});
|
|
@@ -255,23 +255,23 @@ function resolveCssTarget(target) {
|
|
|
255
255
|
*/
|
|
256
256
|
function removeEmptyDirectories(dirPath) {
|
|
257
257
|
// Read the directory contents
|
|
258
|
-
const files =
|
|
258
|
+
const files = node_fs_1.default.readdirSync(dirPath);
|
|
259
259
|
// Iterate through the files and subdirectories
|
|
260
260
|
for (const file of files) {
|
|
261
|
-
const fullPath =
|
|
261
|
+
const fullPath = node_path_1.default.join(dirPath, file);
|
|
262
262
|
// Check if it's a directory
|
|
263
|
-
if (
|
|
263
|
+
if (node_fs_1.default.statSync(fullPath).isDirectory()) {
|
|
264
264
|
// Recursively clean up the subdirectory
|
|
265
265
|
removeEmptyDirectories(fullPath);
|
|
266
266
|
}
|
|
267
267
|
}
|
|
268
268
|
// Re-check the directory; remove it if it's now empty
|
|
269
|
-
if (
|
|
270
|
-
|
|
269
|
+
if (node_fs_1.default.readdirSync(dirPath).length === 0) {
|
|
270
|
+
node_fs_1.default.rmdirSync(dirPath);
|
|
271
271
|
}
|
|
272
272
|
}
|
|
273
273
|
async function readManifestFile(outDir) {
|
|
274
|
-
const manifestFilePath =
|
|
274
|
+
const manifestFilePath = node_path_1.default.posix.join(outDir, pluginBuildConfig_js_1.manifestTempFile);
|
|
275
275
|
const manifestFileContent = await promises_1.default.readFile(manifestFilePath, 'utf-8');
|
|
276
276
|
(0, utils_js_1.assert)(manifestFileContent);
|
|
277
277
|
const manifest = JSON.parse(manifestFileContent);
|
|
@@ -296,7 +296,7 @@ async function handleAssetsManifest_getBuildConfig(config) {
|
|
|
296
296
|
copyPublicDir: vikeConfig.config.vite6BuilderApp
|
|
297
297
|
? // Already set by vike:build:pluginBuildApp
|
|
298
298
|
undefined
|
|
299
|
-
: !(0, isViteServerBuild_js_1.isViteServerBuild)(config)
|
|
299
|
+
: !(0, isViteServerBuild_js_1.isViteServerBuild)(config),
|
|
300
300
|
};
|
|
301
301
|
}
|
|
302
302
|
async function handleAssetsManifest(config, viteEnv, options, bundle) {
|
|
@@ -304,23 +304,25 @@ async function handleAssetsManifest(config, viteEnv, options, bundle) {
|
|
|
304
304
|
if (isSsREnv) {
|
|
305
305
|
(0, utils_js_1.assert)(!assetsJsonFilePath);
|
|
306
306
|
const outDirs = (0, getOutDirs_js_1.getOutDirs)(config, viteEnv);
|
|
307
|
-
assetsJsonFilePath =
|
|
307
|
+
assetsJsonFilePath = node_path_1.default.posix.join(outDirs.outDirRoot, 'assets.json');
|
|
308
308
|
await writeAssetsManifestFile(outDirs, assetsJsonFilePath, config);
|
|
309
309
|
}
|
|
310
310
|
if ((0, isViteServerBuild_js_1.isViteServerBuild)(config, viteEnv)) {
|
|
311
|
+
const outDir = options.dir;
|
|
312
|
+
(0, utils_js_1.assert)(outDir);
|
|
311
313
|
// Replace __VITE_ASSETS_MANIFEST__ in server builds
|
|
312
314
|
// - Always replace it in dist/server/
|
|
313
315
|
// - Also in some other server builds such as dist/vercel/ from vike-vercel
|
|
314
316
|
// - Don't replace it in dist/rsc/ from vike-react-rsc since __VITE_ASSETS_MANIFEST__ doesn't exist there
|
|
315
|
-
const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(
|
|
317
|
+
const noop = await (0, pluginBuildEntry_js_1.set_macro_ASSETS_MANIFEST)(assetsJsonFilePath, bundle, outDir);
|
|
316
318
|
if (isSsREnv)
|
|
317
319
|
(0, utils_js_1.assert)(!noop); // dist/server should always contain __VITE_ASSETS_MANIFEST__
|
|
318
320
|
}
|
|
319
321
|
}
|
|
320
322
|
async function writeAssetsManifestFile(outDirs, assetsJsonFilePath, config) {
|
|
321
323
|
const isFixEnabled = handleAssetsManifest_isFixEnabled(config);
|
|
322
|
-
const clientManifestFilePath =
|
|
323
|
-
const serverManifestFilePath =
|
|
324
|
+
const clientManifestFilePath = node_path_1.default.posix.join(outDirs.outDirClient, pluginBuildConfig_js_1.manifestTempFile);
|
|
325
|
+
const serverManifestFilePath = node_path_1.default.posix.join(outDirs.outDirServer, pluginBuildConfig_js_1.manifestTempFile);
|
|
324
326
|
if (!isFixEnabled) {
|
|
325
327
|
await promises_1.default.copyFile(clientManifestFilePath, assetsJsonFilePath);
|
|
326
328
|
}
|
|
@@ -48,8 +48,8 @@ function pluginAutoFullBuild() {
|
|
|
48
48
|
(0, logErrorHint_js_1.logErrorHint)(err);
|
|
49
49
|
process.exit(1);
|
|
50
50
|
}
|
|
51
|
-
}
|
|
52
|
-
}
|
|
51
|
+
},
|
|
52
|
+
},
|
|
53
53
|
},
|
|
54
54
|
{
|
|
55
55
|
name: 'vike:build:pluginAutoFullBuild:post',
|
|
@@ -68,9 +68,9 @@ function pluginAutoFullBuild() {
|
|
|
68
68
|
(0, runPrerenderEntry_js_1.runPrerender_forceExit)();
|
|
69
69
|
(0, utils_js_1.assert)(false);
|
|
70
70
|
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}
|
|
71
|
+
},
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
74
|
];
|
|
75
75
|
}
|
|
76
76
|
async function triggerFullBuild(config, viteEnv, bundle) {
|
|
@@ -94,7 +94,7 @@ async function triggerFullBuild(config, viteEnv, bundle) {
|
|
|
94
94
|
await (0, vite_1.build)(setSSR(configInline));
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
|
-
// The server
|
|
97
|
+
// The server build is already called by builder.buildApp()
|
|
98
98
|
}
|
|
99
99
|
if ((0, context_js_1.isPrerenderAutoRunEnabled)(vikeConfig)) {
|
|
100
100
|
const res = await (0, runPrerenderEntry_js_1.runPrerenderFromAutoRun)(configInline);
|
|
@@ -107,8 +107,8 @@ function setSSR(configInline) {
|
|
|
107
107
|
...configInline,
|
|
108
108
|
build: {
|
|
109
109
|
...configInline.build,
|
|
110
|
-
ssr: true
|
|
111
|
-
}
|
|
110
|
+
ssr: true,
|
|
111
|
+
},
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
async function abortViteBuildSsr() {
|
|
@@ -142,8 +142,8 @@ function getFullBuildInlineConfig(config) {
|
|
|
142
142
|
configFile: configFromCli?.configFile || config.configFile,
|
|
143
143
|
root: config.root,
|
|
144
144
|
build: {
|
|
145
|
-
...configFromCli?.build
|
|
146
|
-
}
|
|
145
|
+
...configFromCli?.build,
|
|
146
|
+
},
|
|
147
147
|
};
|
|
148
148
|
}
|
|
149
149
|
}
|
|
@@ -17,7 +17,7 @@ function pluginBuildApp() {
|
|
|
17
17
|
return;
|
|
18
18
|
return {
|
|
19
19
|
builder: {
|
|
20
|
-
// Can be
|
|
20
|
+
// Can be overridden by another plugin e.g vike-vercel https://github.com/vikejs/vike/pull/2184#issuecomment-2659425195
|
|
21
21
|
async buildApp(builder) {
|
|
22
22
|
(0, utils_js_1.assert)(builder.environments.client);
|
|
23
23
|
(0, utils_js_1.assert)(builder.environments.ssr);
|
|
@@ -27,26 +27,26 @@ function pluginBuildApp() {
|
|
|
27
27
|
(0, runPrerenderEntry_js_1.runPrerender_forceExit)();
|
|
28
28
|
(0, utils_js_1.assert)(false);
|
|
29
29
|
}
|
|
30
|
-
}
|
|
30
|
+
},
|
|
31
31
|
},
|
|
32
32
|
environments: {
|
|
33
33
|
ssr: {
|
|
34
34
|
consumer: 'server',
|
|
35
35
|
build: {
|
|
36
36
|
outDir: (0, getOutDirs_js_1.resolveOutDir)(config, true),
|
|
37
|
-
ssr: true
|
|
38
|
-
}
|
|
37
|
+
ssr: true,
|
|
38
|
+
},
|
|
39
39
|
},
|
|
40
40
|
client: {
|
|
41
41
|
consumer: 'client',
|
|
42
42
|
build: {
|
|
43
43
|
copyPublicDir: true,
|
|
44
|
-
ssr: false
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
44
|
+
ssr: false,
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
},
|
|
48
48
|
};
|
|
49
|
-
}
|
|
50
|
-
}
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
51
|
];
|
|
52
52
|
}
|
|
@@ -36,7 +36,7 @@ function pluginBuildConfig() {
|
|
|
36
36
|
config.build.rollupOptions.input = (0, utils_js_1.injectRollupInputs)(entries, config);
|
|
37
37
|
addLogHook();
|
|
38
38
|
(0, handleAssetsManifest_js_1.handleAssetsManifest_assertUsageCssCodeSplit)(config);
|
|
39
|
-
}
|
|
39
|
+
},
|
|
40
40
|
},
|
|
41
41
|
config: {
|
|
42
42
|
order: 'post',
|
|
@@ -45,15 +45,15 @@ function pluginBuildConfig() {
|
|
|
45
45
|
return {
|
|
46
46
|
build: {
|
|
47
47
|
outDir: (0, getOutDirs_js_1.resolveOutDir)(config),
|
|
48
|
-
...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config))
|
|
49
|
-
}
|
|
48
|
+
...(await (0, handleAssetsManifest_js_1.handleAssetsManifest_getBuildConfig)(config)),
|
|
49
|
+
},
|
|
50
50
|
};
|
|
51
|
-
}
|
|
51
|
+
},
|
|
52
52
|
},
|
|
53
53
|
buildStart() {
|
|
54
54
|
(0, utils_js_1.onSetupBuild)();
|
|
55
|
-
}
|
|
56
|
-
}
|
|
55
|
+
},
|
|
56
|
+
},
|
|
57
57
|
];
|
|
58
58
|
}
|
|
59
59
|
async function getEntries(config) {
|
|
@@ -67,7 +67,7 @@ async function getEntries(config) {
|
|
|
67
67
|
const entries = {
|
|
68
68
|
...pageFileEntries,
|
|
69
69
|
// Ensure Rollup generates a bundle per page: https://github.com/vikejs/vike/issues/349#issuecomment-1166247275
|
|
70
|
-
...pageEntries
|
|
70
|
+
...pageEntries,
|
|
71
71
|
};
|
|
72
72
|
return entries;
|
|
73
73
|
}
|
|
@@ -79,7 +79,7 @@ async function getEntries(config) {
|
|
|
79
79
|
}
|
|
80
80
|
const entries = {
|
|
81
81
|
...clientEntries,
|
|
82
|
-
...pageFileEntries
|
|
82
|
+
...pageFileEntries,
|
|
83
83
|
};
|
|
84
84
|
const clientRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-client-routing/entry.js');
|
|
85
85
|
const serverRoutingEntry = (0, utils_js_1.requireResolveVikeDistFile)('dist/esm/client/runtime-server-routing/entry.js');
|
|
@@ -165,7 +165,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
|
|
|
165
165
|
(0, utils_js_1.assert)(filePathAbsoluteUserRootDir.startsWith('/'));
|
|
166
166
|
const filePath = (0, getFilePath_js_1.getFilePathResolved)({
|
|
167
167
|
filePathAbsoluteUserRootDir,
|
|
168
|
-
userRootDir: config.root
|
|
168
|
+
userRootDir: config.root,
|
|
169
169
|
});
|
|
170
170
|
let entryTarget = filePath.filePathAbsoluteFilesystem;
|
|
171
171
|
if (addExtractAssetsQuery)
|
|
@@ -173,7 +173,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
|
|
|
173
173
|
let entryName = filePathAbsoluteUserRootDir;
|
|
174
174
|
if (addExtractAssetsQuery)
|
|
175
175
|
entryName = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(entryName);
|
|
176
|
-
entryName = (0, utils_js_1.
|
|
176
|
+
entryName = (0, utils_js_1.removeFileExtension)(entryName);
|
|
177
177
|
entryName = (0, prependEntriesDir_js_1.prependEntriesDir)(entryName);
|
|
178
178
|
return { entryName, entryTarget };
|
|
179
179
|
}
|