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
|
@@ -35,7 +35,7 @@ function deduceRouteStringFromFilesystemPath(pageId, filesystemRoots) {
|
|
|
35
35
|
.split('/')
|
|
36
36
|
.filter((dir) => dir !== 'pages' && dir !== 'src' && dir !== 'index')
|
|
37
37
|
.join('/');
|
|
38
|
-
//
|
|
38
|
+
// Handle `/index.page.*` suffix
|
|
39
39
|
assert(!filesystemRoute.includes('.page.'));
|
|
40
40
|
assert(!filesystemRoute.endsWith('.'));
|
|
41
41
|
if (filesystemRoute.endsWith('/index')) {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { executeOnBeforeRouteHook };
|
|
2
2
|
import { assertPageContextProvidedByUser } from '../assertPageContextProvidedByUser.js';
|
|
3
|
-
import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrlPathnameAbsolute, joinEnglish, assert } from './utils.js';
|
|
3
|
+
import { assertUsage, hasProp, isObjectWithKeys, objectAssign, assertWarning, assertUsageUrlPathnameAbsolute, joinEnglish, assert, } from './utils.js';
|
|
4
4
|
import { assertRouteParams, assertSyncRouting } from './resolveRouteFunction.js';
|
|
5
5
|
import pc from '@brillout/picocolors';
|
|
6
6
|
import { execHookSync } from '../hooks/execHook.js';
|
|
7
|
-
import { preparePageContextForPublicUsage } from '../preparePageContextForPublicUsage.js';
|
|
7
|
+
import { preparePageContextForPublicUsage, } from '../preparePageContextForPublicUsage.js';
|
|
8
8
|
async function executeOnBeforeRouteHook(pageContext) {
|
|
9
9
|
const pageContextFromOnBeforeRouteHook = {};
|
|
10
10
|
if (!pageContext._globalContext._onBeforeRouteHook)
|
|
@@ -23,13 +23,13 @@ async function executeOnBeforeRouteHook(pageContext) {
|
|
|
23
23
|
}
|
|
24
24
|
objectAssign(pageContextFromOnBeforeRouteHook, {
|
|
25
25
|
_routingProvidedByOnBeforeRouteHook: true,
|
|
26
|
-
_debugRouteMatches: 'CUSTOM_ROUTING'
|
|
26
|
+
_debugRouteMatches: 'CUSTOM_ROUTING',
|
|
27
27
|
});
|
|
28
28
|
return pageContextFromOnBeforeRouteHook;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
objectAssign(pageContextFromOnBeforeRouteHook, {
|
|
32
|
-
_routingProvidedByOnBeforeRouteHook: false
|
|
32
|
+
_routingProvidedByOnBeforeRouteHook: false,
|
|
33
33
|
});
|
|
34
34
|
return pageContextFromOnBeforeRouteHook;
|
|
35
35
|
}
|
|
@@ -72,7 +72,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
|
|
|
72
72
|
}
|
|
73
73
|
assertPageContextProvidedByUser(hookReturn.pageContext, {
|
|
74
74
|
hookFilePath: onBeforeRouteHook.hookFilePath,
|
|
75
|
-
hookName: 'onBeforeRoute'
|
|
75
|
+
hookName: 'onBeforeRoute',
|
|
76
76
|
});
|
|
77
77
|
const pageContextAddendumHook = {};
|
|
78
78
|
objectAssign(pageContextAddendumHook, hookReturn.pageContext);
|
|
@@ -6,7 +6,7 @@ if (isBrowser()) {
|
|
|
6
6
|
assertClientRouting();
|
|
7
7
|
}
|
|
8
8
|
import { assert, assertUsage, isPlainObject, objectAssign } from './utils.js';
|
|
9
|
-
import {
|
|
9
|
+
import { resolvePrecedence } from './resolvePrecedence.js';
|
|
10
10
|
import { resolveRouteString } from './resolveRouteString.js';
|
|
11
11
|
import { resolveRouteFunction } from './resolveRouteFunction.js';
|
|
12
12
|
import { executeOnBeforeRouteHook } from './executeOnBeforeRouteHook.js';
|
|
@@ -39,7 +39,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
39
39
|
const routeMatches = [];
|
|
40
40
|
await Promise.all(pageContext._globalContext._pageRoutes.map(async (pageRoute) => {
|
|
41
41
|
const { pageId, routeType } = pageRoute;
|
|
42
|
-
//
|
|
42
|
+
// Filesystem Routing
|
|
43
43
|
if (pageRoute.routeType === 'FILESYSTEM') {
|
|
44
44
|
const { routeString } = pageRoute;
|
|
45
45
|
const match = resolveRouteString(routeString, urlPathname);
|
|
@@ -60,7 +60,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
60
60
|
pageId,
|
|
61
61
|
routeString,
|
|
62
62
|
routeParams,
|
|
63
|
-
routeType
|
|
63
|
+
routeType,
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
return;
|
|
@@ -77,7 +77,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
77
77
|
}
|
|
78
78
|
assert(false);
|
|
79
79
|
}));
|
|
80
|
-
|
|
80
|
+
resolvePrecedence(routeMatches);
|
|
81
81
|
const winner = routeMatches[0] ?? null;
|
|
82
82
|
debug(`Route matches for URL ${pc.cyan(urlPathname)} (in precedence order):`, routeMatches);
|
|
83
83
|
objectAssign(pageContextFromRoute, { _debugRouteMatches: routeMatches });
|
|
@@ -86,7 +86,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
86
86
|
if (!winner) {
|
|
87
87
|
objectAssign(pageContextFromRoute, {
|
|
88
88
|
pageId: null,
|
|
89
|
-
routeParams: {}
|
|
89
|
+
routeParams: {},
|
|
90
90
|
});
|
|
91
91
|
return pageContextFromRoute;
|
|
92
92
|
}
|
|
@@ -95,7 +95,7 @@ async function route(pageContext, skipOnBeforeRouteHook) {
|
|
|
95
95
|
assert(isPlainObject(routeParams));
|
|
96
96
|
objectAssign(pageContextFromRoute, {
|
|
97
97
|
pageId: winner.pageId,
|
|
98
|
-
routeParams: winner.routeParams
|
|
98
|
+
routeParams: winner.routeParams,
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
return pageContextFromRoute;
|
|
@@ -40,7 +40,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
40
40
|
comesFromV1PageConfig,
|
|
41
41
|
routeString: route,
|
|
42
42
|
routeDefinedAtString: definedAtString,
|
|
43
|
-
routeType: 'STRING'
|
|
43
|
+
routeType: 'STRING',
|
|
44
44
|
};
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
@@ -58,7 +58,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
58
58
|
routeFunction: route,
|
|
59
59
|
routeFunctionFilePath: filePathToShowToUser,
|
|
60
60
|
routeDefinedAtString: definedAtString,
|
|
61
|
-
routeType: 'FUNCTION'
|
|
61
|
+
routeType: 'FUNCTION',
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -74,7 +74,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
74
74
|
comesFromV1PageConfig,
|
|
75
75
|
routeString,
|
|
76
76
|
routeDefinedAtString: null,
|
|
77
|
-
routeType: 'FILESYSTEM'
|
|
77
|
+
routeType: 'FILESYSTEM',
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
assert(pageRoute);
|
|
@@ -100,7 +100,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
100
100
|
routeString,
|
|
101
101
|
routeDefinedAtString: null,
|
|
102
102
|
routeFilesystemDefinedBy: `${pageId}.page.*`,
|
|
103
|
-
routeType: 'FILESYSTEM'
|
|
103
|
+
routeType: 'FILESYSTEM',
|
|
104
104
|
});
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
@@ -114,7 +114,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
114
114
|
comesFromV1PageConfig,
|
|
115
115
|
routeString,
|
|
116
116
|
routeDefinedAtString: filePath,
|
|
117
|
-
routeType: 'STRING'
|
|
117
|
+
routeType: 'STRING',
|
|
118
118
|
});
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
@@ -132,7 +132,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
|
|
|
132
132
|
routeFunction,
|
|
133
133
|
routeFunctionFilePath: filePath,
|
|
134
134
|
routeDefinedAtString: filePath,
|
|
135
|
-
routeType: 'FUNCTION'
|
|
135
|
+
routeType: 'FUNCTION',
|
|
136
136
|
});
|
|
137
137
|
return;
|
|
138
138
|
}
|
|
@@ -164,7 +164,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
|
|
|
164
164
|
hookFilePath: filePath,
|
|
165
165
|
hookFn: onBeforeRoute,
|
|
166
166
|
hookName,
|
|
167
|
-
hookTimeout: getHookTimeoutDefault(hookName)
|
|
167
|
+
hookTimeout: getHookTimeoutDefault(hookName),
|
|
168
168
|
};
|
|
169
169
|
}
|
|
170
170
|
if ('filesystemRoutingRoot' in fileExports) {
|
|
@@ -172,7 +172,7 @@ function getGlobalHooks(pageFilesAll, pageConfigs, pageConfigGlobal) {
|
|
|
172
172
|
assertUsage(hasProp(fileExports, 'filesystemRoutingRoot', 'string'), `\`export { filesystemRoutingRoot }\` of ${filePath} is \`'${fileExports.filesystemRoutingRoot}'\` but it should start with a leading slash \`/\`.`);
|
|
173
173
|
filesystemRoots.push({
|
|
174
174
|
filesystemRoot: dirname(filePath),
|
|
175
|
-
urlRoot: fileExports.filesystemRoutingRoot
|
|
175
|
+
urlRoot: fileExports.filesystemRoutingRoot,
|
|
176
176
|
});
|
|
177
177
|
}
|
|
178
178
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export { resolvePrecedence };
|
|
2
2
|
import type { RouteType } from './loadPageRoutes.js';
|
|
3
3
|
type RouteMatch = {
|
|
4
4
|
precedence?: number | null;
|
|
5
5
|
routeString?: string;
|
|
6
6
|
routeType: RouteType;
|
|
7
7
|
};
|
|
8
|
-
declare function
|
|
8
|
+
declare function resolvePrecedence<T extends RouteMatch>(routeMatches: T[]): void;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export { resolvePrecedence };
|
|
2
2
|
// export type { RouteMatch }
|
|
3
3
|
import { analyzeRouteString } from './resolveRouteString.js';
|
|
4
4
|
import { higherFirst, lowerFirst } from './utils.js';
|
|
5
5
|
import { makeFirst } from './utils.js';
|
|
6
6
|
import { isStaticRouteString } from './resolveRouteString.js';
|
|
7
7
|
// See https://vike.dev/route-function#precedence
|
|
8
|
-
function
|
|
8
|
+
function resolvePrecedence(routeMatches) {
|
|
9
9
|
// prettier-ignore
|
|
10
10
|
// biome-ignore format:
|
|
11
11
|
routeMatches
|
|
@@ -10,7 +10,7 @@ async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFil
|
|
|
10
10
|
let { hookReturn: result } = execHookSync({
|
|
11
11
|
hookFn: routeFunction,
|
|
12
12
|
hookFilePath: routeFunctionFilePath,
|
|
13
|
-
hookName: 'route'
|
|
13
|
+
hookName: 'route',
|
|
14
14
|
}, pageContext, preparePageContextForPublicUsage);
|
|
15
15
|
assertSyncRouting(result, `The Route Function ${routeFunctionFilePath}`);
|
|
16
16
|
// TODO/v1-release: make resolveRouteFunction() and route() sync
|
|
@@ -46,7 +46,7 @@ async function resolveRouteFunction(routeFunction, pageContext, routeFunctionFil
|
|
|
46
46
|
});
|
|
47
47
|
return {
|
|
48
48
|
precedence,
|
|
49
|
-
routeParams
|
|
49
|
+
routeParams,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
// TODO/v1-release: remove, and make routing synchronous (enabling Vike to synchronously check whether a link is a Vike link before even calling ev.preventDefault())
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from '../utils/assert.js';
|
|
2
2
|
export * from '../utils/parseUrl.js';
|
|
3
3
|
export * from '../utils/objectAssign.js';
|
|
4
|
+
export * from '../utils/objectReplace.js';
|
|
4
5
|
export * from '../utils/isCallable.js';
|
|
5
6
|
export * from '../utils/isObject.js';
|
|
6
7
|
export * from '../utils/unique.js';
|
package/dist/esm/shared/utils.js
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
export * from '../utils/assert.js';
|
|
6
6
|
export * from '../utils/parseUrl.js';
|
|
7
7
|
export * from '../utils/objectAssign.js';
|
|
8
|
+
export * from '../utils/objectReplace.js';
|
|
8
9
|
export * from '../utils/isCallable.js';
|
|
9
10
|
export * from '../utils/isObject.js';
|
|
10
11
|
export * from '../utils/unique.js';
|
|
@@ -268,6 +268,12 @@ type ConfigBuiltIn = {
|
|
|
268
268
|
* @default false
|
|
269
269
|
*/
|
|
270
270
|
partial?: boolean;
|
|
271
|
+
/**
|
|
272
|
+
* Whether +redirects should be pre-rendered to HTML documents that redirect the user.
|
|
273
|
+
*
|
|
274
|
+
* https://vike.dev/prerender#redirects
|
|
275
|
+
*/
|
|
276
|
+
redirects?: boolean;
|
|
271
277
|
/**
|
|
272
278
|
* Don't create a new directory for each HTML file.
|
|
273
279
|
*
|
|
@@ -17,7 +17,7 @@ type FilePathResolved = FilePathCommon & {
|
|
|
17
17
|
/**
|
|
18
18
|
* The file's path, shown to the user in logs.
|
|
19
19
|
*
|
|
20
|
-
* Resolved: it always shows a file path. (It
|
|
20
|
+
* Resolved: it always shows a file path. (It never shows an import path such as `vike-react/config`.)
|
|
21
21
|
*
|
|
22
22
|
* Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.filePathAbsoluteFilesystem`.
|
|
23
23
|
*/
|
|
@@ -95,7 +95,7 @@ type ConfigValueSource = {
|
|
|
95
95
|
definedAt: DefinedAtFilePath | DefinedBy;
|
|
96
96
|
plusFile: PlusFile | null;
|
|
97
97
|
locationId: LocationId;
|
|
98
|
-
/**
|
|
98
|
+
/** Whether the config value is loaded at runtime, for example config.Page or config.onBeforeRender */
|
|
99
99
|
valueIsLoadedWithImport: boolean;
|
|
100
100
|
/** Whether the config value is a file path, this is currently only true for +client */
|
|
101
101
|
valueIsFilePath?: true;
|
|
@@ -59,7 +59,7 @@ type PageContextBuiltInCommon<Data> = {
|
|
|
59
59
|
* https://vike.dev/pageContext#config
|
|
60
60
|
*/
|
|
61
61
|
config: PageContextConfig;
|
|
62
|
-
/** The page's configuration, including the configs origin and
|
|
62
|
+
/** The page's configuration, including the configs origin and overridden configs.
|
|
63
63
|
*
|
|
64
64
|
* https://vike.dev/config
|
|
65
65
|
*/
|
|
@@ -124,7 +124,7 @@ type PageContextBuiltInCommon<Data> = {
|
|
|
124
124
|
*/
|
|
125
125
|
abortStatusCode?: AbortStatusCode;
|
|
126
126
|
/**
|
|
127
|
-
* Error that
|
|
127
|
+
* Error that occurred while rendering.
|
|
128
128
|
*
|
|
129
129
|
* https://vike.dev/error-tracking
|
|
130
130
|
* https://vike.dev/pageContext#errorWhileRendering
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type { PageContextBuiltIn, PageContextBuiltInClientWithClientRouting, PageContextBuiltInClientWithServerRouting, InjectFilterEntry, Config, Env, ConfigEntries };
|
|
1
|
+
export type { PageContextBuiltIn, PageContextBuiltInClientWithClientRouting, PageContextBuiltInClientWithServerRouting, InjectFilterEntry, Config, Env, ConfigEntries, };
|
|
2
2
|
import type { PageContextBuiltInServer, PageContextBuiltInClientWithClientRouting as PageContextBuiltInClientWithClientRouting_, PageContextBuiltInClientWithServerRouting as PageContextBuiltInClientWithServerRouting_, InjectFilterEntry as InjectFilterEntry_, Config as Config_, Env as Env_, ConfigEntries as ConfigEntries_ } from './index.js';
|
|
3
3
|
/** @deprecated All types have been moved to `vike/types`.
|
|
4
4
|
* Replace:
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export type { PageContext, PageContextServer, PageContextClient, GlobalContext, GlobalContextServer, GlobalContextClient, PageContextWithServerRouting, PageContextClientWithServerRouting, GlobalContextClientWithServerRouting } from './PageContext.js';
|
|
1
|
+
export type { PageContext, PageContextServer, PageContextClient, GlobalContext, GlobalContextServer, GlobalContextClient, PageContextWithServerRouting, PageContextClientWithServerRouting, GlobalContextClientWithServerRouting, } from './PageContext.js';
|
|
2
2
|
export type { PageContextBuiltInServer } from './PageContext.js';
|
|
3
3
|
export type { PageContextBuiltInClientWithClientRouting } from './PageContext.js';
|
|
4
4
|
export type { PageContextBuiltInClientWithServerRouting } from './PageContext.js';
|
|
5
|
-
export type { Config, ConfigMeta as Meta, ImportString, DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, KeepScrollPosition } from './Config.js';
|
|
5
|
+
export type { Config, ConfigMeta as Meta, ImportString, DataAsync, DataSync, GuardAsync, GuardSync, OnBeforePrerenderStartAsync, OnBeforePrerenderStartSync, OnBeforeRenderAsync, OnBeforeRenderSync, OnBeforeRouteAsync, OnBeforeRouteSync, OnHydrationEndAsync, OnHydrationEndSync, OnPageTransitionEndAsync, OnPageTransitionEndSync, OnPageTransitionStartAsync, OnPageTransitionStartSync, OnPrerenderStartAsync, OnPrerenderStartSync, OnRenderClientAsync, OnRenderClientSync, OnRenderHtmlAsync, OnRenderHtmlSync, RouteAsync, RouteSync, KeepScrollPosition, } from './Config.js';
|
|
6
6
|
export type { ConfigResolved } from './Config/PageContextConfig.js';
|
|
7
7
|
export type { ConfigEnv } from './PageConfig.js';
|
|
8
|
-
export type { ConfigDefinition, ConfigEffect } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
|
|
8
|
+
export type { ConfigDefinition, ConfigEffect, } from '../node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js';
|
|
9
9
|
export type { ConfigEntries } from '../shared/page-configs/resolveVikeConfigPublic.js';
|
|
10
10
|
export type { VikeConfig } from '../node/vite/shared/resolveVikeConfigInternal.js';
|
|
11
11
|
export type { UrlPublic as Url } from '../utils/parseUrl.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const PROJECT_VERSION: "0.4.
|
|
1
|
+
export declare const PROJECT_VERSION: "0.4.232-commit-134207d";
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Automatically updated by @brillout/release-me
|
|
2
|
-
export const PROJECT_VERSION = '0.4.
|
|
2
|
+
export const PROJECT_VERSION = '0.4.232-commit-134207d';
|
package/dist/esm/utils/assert.js
CHANGED
|
@@ -25,7 +25,7 @@ const globalObject = getGlobalObject('utils/assert.ts', {
|
|
|
25
25
|
console.warn(msg);
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
|
-
showStackTraceList: new WeakSet()
|
|
28
|
+
showStackTraceList: new WeakSet(),
|
|
29
29
|
});
|
|
30
30
|
assertSingleInstance_onAssertModuleLoad();
|
|
31
31
|
const projectTag = `[vike]`;
|
|
@@ -40,18 +40,18 @@ function assert(condition, debugInfo) {
|
|
|
40
40
|
return null;
|
|
41
41
|
}
|
|
42
42
|
const debugInfoSerialized = typeof debugInfo === 'string' ? debugInfo : JSON.stringify(debugInfo);
|
|
43
|
-
return pc.dim(`Debug info
|
|
43
|
+
return pc.dim(`Debug info for Vike maintainers (you can ignore this): ${debugInfoSerialized}`);
|
|
44
44
|
})();
|
|
45
45
|
const link = pc.underline('https://github.com/vikejs/vike/issues/new?template=bug.yml');
|
|
46
46
|
let errMsg = [
|
|
47
47
|
`You stumbled upon a Vike bug. Go to ${link} and copy-paste this error. A maintainer will fix the bug (usually within 24 hours).`,
|
|
48
|
-
debugStr
|
|
48
|
+
debugStr,
|
|
49
49
|
]
|
|
50
50
|
.filter(Boolean)
|
|
51
51
|
.join(' ');
|
|
52
52
|
errMsg = addWhitespace(errMsg);
|
|
53
53
|
errMsg = addPrefixAssertType(errMsg, bugTag);
|
|
54
|
-
errMsg =
|
|
54
|
+
errMsg = addPrefixProjectName(errMsg, true);
|
|
55
55
|
const internalError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
|
|
56
56
|
globalObject.onBeforeLog?.();
|
|
57
57
|
throw internalError;
|
|
@@ -62,7 +62,7 @@ function assertUsage(condition, errMsg, { showStackTrace, exitOnError } = {}) {
|
|
|
62
62
|
showStackTrace = showStackTrace || globalObject.alwaysShowStackTrace;
|
|
63
63
|
errMsg = addWhitespace(errMsg);
|
|
64
64
|
errMsg = addPrefixAssertType(errMsg, 'Wrong Usage');
|
|
65
|
-
errMsg =
|
|
65
|
+
errMsg = addPrefixProjectName(errMsg);
|
|
66
66
|
const usageError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
|
|
67
67
|
if (showStackTrace) {
|
|
68
68
|
globalObject.showStackTraceList.add(usageError);
|
|
@@ -79,7 +79,7 @@ function assertUsage(condition, errMsg, { showStackTrace, exitOnError } = {}) {
|
|
|
79
79
|
function getProjectError(errMsg) {
|
|
80
80
|
errMsg = addWhitespace(errMsg);
|
|
81
81
|
errMsg = addPrefixAssertType(errMsg, 'Error');
|
|
82
|
-
errMsg =
|
|
82
|
+
errMsg = addPrefixProjectName(errMsg);
|
|
83
83
|
const projectError = createErrorWithCleanStackTrace(errMsg, numberOfStackTraceLinesToRemove);
|
|
84
84
|
return projectError;
|
|
85
85
|
}
|
|
@@ -89,7 +89,7 @@ function assertWarning(condition, msg, { onlyOnce, showStackTrace }) {
|
|
|
89
89
|
showStackTrace = showStackTrace || globalObject.alwaysShowStackTrace;
|
|
90
90
|
msg = addWhitespace(msg);
|
|
91
91
|
msg = addPrefixAssertType(msg, 'Warning');
|
|
92
|
-
msg =
|
|
92
|
+
msg = addPrefixProjectName(msg);
|
|
93
93
|
if (onlyOnce) {
|
|
94
94
|
const { alreadyLogged } = globalObject;
|
|
95
95
|
const key = onlyOnce === true ? msg : onlyOnce;
|
|
@@ -112,7 +112,7 @@ function assertInfo(condition, msg, { onlyOnce }) {
|
|
|
112
112
|
return;
|
|
113
113
|
}
|
|
114
114
|
msg = addWhitespace(msg);
|
|
115
|
-
msg =
|
|
115
|
+
msg = addPrefixProjectName(msg);
|
|
116
116
|
if (onlyOnce) {
|
|
117
117
|
const { alreadyLogged } = globalObject;
|
|
118
118
|
const key = msg;
|
|
@@ -143,7 +143,7 @@ function addWhitespace(msg) {
|
|
|
143
143
|
return ` ${msg}`;
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
|
-
function
|
|
146
|
+
function addPrefixProjectName(msg, showProjectVersion = false) {
|
|
147
147
|
const prefix = showProjectVersion ? projectTagWithVersion : projectTag;
|
|
148
148
|
return `${prefix}${msg}`;
|
|
149
149
|
}
|
|
@@ -16,7 +16,7 @@ function assertKeys(obj, keysExpected, errPrefix) {
|
|
|
16
16
|
`unknown key${keysUnknown.length === 1 ? '' : 's'}`,
|
|
17
17
|
joinEnglish(keysUnknown, 'and', pc.cyan) + '.',
|
|
18
18
|
'Only following keys are allowed:',
|
|
19
|
-
joinEnglish(keysExpected, 'and', pc.cyan) + '.'
|
|
19
|
+
joinEnglish(keysExpected, 'and', pc.cyan) + '.',
|
|
20
20
|
].join(' '));
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -143,7 +143,7 @@ function getNodeEnv() {
|
|
|
143
143
|
/*
|
|
144
144
|
// Should we show the following warning? So far I don't think so because of the following. Maybe we can show it once we enable users to disable warnings.
|
|
145
145
|
// - The warning isn't always actionable, e.g. if it's a tool that dynamically sets `process.env.NODE_ENV`.
|
|
146
|
-
// - We assume that tools use `process.env.NODE_ENV` and not
|
|
146
|
+
// - We assume that tools use `process.env.NODE_ENV` and not something like `const { env } = process; env.NODE_ENV`. Thus, in practice, `val` overrides `val2` so having `val!==val2` isn't an issue.
|
|
147
147
|
{
|
|
148
148
|
const val2 = process.env['NODE' + '_ENV']
|
|
149
149
|
if (val2)
|
|
@@ -17,7 +17,7 @@ globalObject ?? (globalObject = genGlobalConfig());
|
|
|
17
17
|
function genGlobalConfig() {
|
|
18
18
|
return getGlobalObject('utils/assertSingleInstance.ts', {
|
|
19
19
|
instances: [],
|
|
20
|
-
alreadyLogged: new Set()
|
|
20
|
+
alreadyLogged: new Set(),
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
// We need getGlobalObjectSafe() because globalObject is `undefined` when exported functions are called before globalObject is initialized
|
|
@@ -48,11 +48,11 @@ function assertSingleInstance_onClientEntryServerRouting(isProduction) {
|
|
|
48
48
|
const globalObject = getGlobalObjectSafe();
|
|
49
49
|
assertWarning(globalObject.isClientRouting !== true, clientRuntimesClonflict, {
|
|
50
50
|
onlyOnce: true,
|
|
51
|
-
showStackTrace: true
|
|
51
|
+
showStackTrace: true,
|
|
52
52
|
});
|
|
53
53
|
assertWarning(globalObject.isClientRouting === undefined, clientNotSingleInstance, {
|
|
54
54
|
onlyOnce: true,
|
|
55
|
-
showStackTrace: true
|
|
55
|
+
showStackTrace: true,
|
|
56
56
|
});
|
|
57
57
|
globalObject.isClientRouting = false;
|
|
58
58
|
if (isProduction)
|
|
@@ -63,11 +63,11 @@ function assertSingleInstance_onClientEntryClientRouting(isProduction) {
|
|
|
63
63
|
const globalObject = getGlobalObjectSafe();
|
|
64
64
|
assertWarning(globalObject.isClientRouting !== false, clientRuntimesClonflict, {
|
|
65
65
|
onlyOnce: true,
|
|
66
|
-
showStackTrace: true
|
|
66
|
+
showStackTrace: true,
|
|
67
67
|
});
|
|
68
68
|
assertWarning(globalObject.isClientRouting === undefined, clientNotSingleInstance, {
|
|
69
69
|
onlyOnce: true,
|
|
70
|
-
showStackTrace: true
|
|
70
|
+
showStackTrace: true,
|
|
71
71
|
});
|
|
72
72
|
globalObject.isClientRouting = true;
|
|
73
73
|
if (isProduction)
|
package/dist/esm/utils/debug.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { findFile };
|
|
2
|
-
import path from 'path';
|
|
3
|
-
import fs from 'fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
4
|
import { isArray } from './isArray.js';
|
|
5
5
|
import { assertPosixPath } from './path.js';
|
|
6
6
|
// We need to be able to crawl the filesystem, regardless of Vike's `$ git ls-files` command call, because we need to fallback if the user didn't setup Git (e.g. we cannot remove the tinyglobby fallback).
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { findPackageJson };
|
|
2
2
|
import { findFile } from './findFile.js';
|
|
3
|
-
import { createRequire } from 'module';
|
|
3
|
+
import { createRequire } from 'node:module';
|
|
4
4
|
// @ts-ignore import.meta.url is shimmed at dist/cjs by dist-cjs-fixup.js.
|
|
5
5
|
const importMetaUrl = import.meta.url;
|
|
6
6
|
const require_ = createRequire(importMetaUrl);
|
|
@@ -11,6 +11,6 @@ function findPackageJson(cwd) {
|
|
|
11
11
|
const packageJson = require_(packageJsonPath);
|
|
12
12
|
return {
|
|
13
13
|
packageJson,
|
|
14
|
-
packageJsonPath
|
|
14
|
+
packageJsonPath,
|
|
15
15
|
};
|
|
16
16
|
}
|
|
@@ -2,7 +2,7 @@ export { genPromise };
|
|
|
2
2
|
// Simple implementation without timeout: https://github.com/vikejs/vike/blob/2e59b922e7e0f227d26018dc2b74877c9b0f581b/vike/utils/genPromise.ts
|
|
3
3
|
import { assert, assertWarning } from './assert.js';
|
|
4
4
|
const timeoutSecondsDefault = 25;
|
|
5
|
-
function genPromise({ timeout: timeoutSeconds = timeoutSecondsDefault } = {}) {
|
|
5
|
+
function genPromise({ timeout: timeoutSeconds = timeoutSecondsDefault, } = {}) {
|
|
6
6
|
let resolve;
|
|
7
7
|
let reject;
|
|
8
8
|
let finished = false;
|
|
@@ -36,7 +36,7 @@ function genPromise({ timeout: timeoutSeconds = timeoutSecondsDefault } = {}) {
|
|
|
36
36
|
}
|
|
37
37
|
const value = Reflect.get(target, prop);
|
|
38
38
|
return typeof value === 'function' ? value.bind(target) : value;
|
|
39
|
-
}
|
|
39
|
+
},
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
42
|
return { promise, resolve, reject };
|
|
@@ -15,7 +15,7 @@ function getMostSimilar(word, words) {
|
|
|
15
15
|
const mostSimilar = words
|
|
16
16
|
.map((w) => ({
|
|
17
17
|
word: w,
|
|
18
|
-
similarity: getSimilarity(w, word)
|
|
18
|
+
similarity: getSimilarity(w, word),
|
|
19
19
|
}))
|
|
20
20
|
.sort(higherFirst(({ similarity }) => similarity))[0];
|
|
21
21
|
assert(mostSimilar);
|
|
@@ -7,7 +7,7 @@ function injectRollupInputs(inputsNew, config) {
|
|
|
7
7
|
const inputsCurrent = normalizeRollupInput(config.build.rollupOptions.input);
|
|
8
8
|
const input = {
|
|
9
9
|
...inputsNew,
|
|
10
|
-
...inputsCurrent
|
|
10
|
+
...inputsCurrent,
|
|
11
11
|
};
|
|
12
12
|
return input;
|
|
13
13
|
}
|
|
@@ -15,7 +15,7 @@ function normalizeRollupInput(input) {
|
|
|
15
15
|
if (!input) {
|
|
16
16
|
return {};
|
|
17
17
|
}
|
|
18
|
-
// Usually `input` is an
|
|
18
|
+
// Usually `input` is an object, but the user can set it as a `string` or `string[]`
|
|
19
19
|
if (typeof input === 'string') {
|
|
20
20
|
input = [input];
|
|
21
21
|
}
|
|
@@ -34,7 +34,7 @@ function isFilePathAbsoluteFilesystem(filePath) {
|
|
|
34
34
|
// - File path absolute starting from filesystem root, e.g. /home/rom/code/my-app/pages/about/+Page.js
|
|
35
35
|
// - File path absolute starting from user root dir (Vite's `config.root`), e.g. /pages/about/+Page.js
|
|
36
36
|
// - Checking whether `p` starts with the first directory of process.cwd() (or `userRootDir`) can be erroneous, most notably when using docker: https://github.com/vikejs/vike/issues/703
|
|
37
|
-
// - Using require.resolve() or node:fs to check
|
|
37
|
+
// - Using require.resolve() or node:fs to check whether the file/dir exists would be a solution, but maybe too slow?
|
|
38
38
|
return filePath.startsWith('/');
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Same as `Object.assign(obj, objNewVals)` but ensure that `objNewVals` properties
|
|
1
|
+
// Same as `Object.assign(obj, objNewVals)` but ensure that `objNewVals` properties already exist on `obj`
|
|
2
2
|
export function objectAssignSafe(obj, objNewVals) {
|
|
3
3
|
Object.assign(obj, objNewVals);
|
|
4
4
|
}
|
package/dist/esm/utils/pLimit.js
CHANGED
|
@@ -55,16 +55,16 @@ function pLimit(concurrency) {
|
|
|
55
55
|
});
|
|
56
56
|
Object.defineProperties(generator, {
|
|
57
57
|
activeCount: {
|
|
58
|
-
get: () => activeCount
|
|
58
|
+
get: () => activeCount,
|
|
59
59
|
},
|
|
60
60
|
pendingCount: {
|
|
61
|
-
get: () => queue.size
|
|
61
|
+
get: () => queue.size,
|
|
62
62
|
},
|
|
63
63
|
clearQueue: {
|
|
64
64
|
value: () => {
|
|
65
65
|
queue.clear();
|
|
66
|
-
}
|
|
67
|
-
}
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
68
|
});
|
|
69
69
|
// @ts-ignore
|
|
70
70
|
return generator;
|