vike 0.4.253 → 0.4.255-commit-05a7b95
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/dist/client/assertEnvClient.js +2 -2
- package/dist/client/index.js +1 -1
- package/dist/client/node.js +1 -1
- package/dist/client/runtime-client-routing/createPageContextClient.d.ts +3 -25
- package/dist/client/runtime-client-routing/createPageContextClient.js +1 -1
- package/dist/client/runtime-client-routing/entry.js +1 -1
- package/dist/client/runtime-client-routing/getBaseServer.d.ts +1 -1
- package/dist/client/runtime-client-routing/getBaseServer.js +1 -1
- package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts +3 -25
- package/dist/client/runtime-client-routing/getGlobalContextClientInternal.js +1 -1
- package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.d.ts +1 -1
- package/dist/client/runtime-client-routing/getPageContext/removeBuiltInOverrides.js +1 -1
- package/dist/client/runtime-client-routing/getPageContext.d.ts +1 -1
- package/dist/client/runtime-client-routing/getPageContext.js +1 -1
- package/dist/client/runtime-client-routing/getPageContextCurrent.d.ts +1 -1
- package/dist/client/runtime-client-routing/getPageContextCurrent.js +1 -1
- package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts +21 -101
- package/dist/client/runtime-client-routing/getPageContextFromHooks.js +1 -1
- package/dist/client/runtime-client-routing/getPageContextPublicClient.d.ts +1 -1
- package/dist/client/runtime-client-routing/getPageContextPublicClient.js +1 -1
- package/dist/client/runtime-client-routing/history.d.ts +1 -1
- package/dist/client/runtime-client-routing/history.js +1 -1
- package/dist/client/runtime-client-routing/index.d.ts +1 -1
- package/dist/client/runtime-client-routing/index.js +1 -1
- package/dist/client/runtime-client-routing/initClientRouter.d.ts +1 -1
- package/dist/client/runtime-client-routing/initClientRouter.js +1 -1
- package/dist/client/runtime-client-routing/initOnLinkClick.d.ts +1 -1
- package/dist/client/runtime-client-routing/initOnLinkClick.js +1 -1
- package/dist/client/runtime-client-routing/initOnPopState.d.ts +1 -1
- package/dist/client/runtime-client-routing/initOnPopState.js +1 -1
- package/dist/client/runtime-client-routing/isClientSideRoutable.d.ts +1 -1
- package/dist/client/runtime-client-routing/isClientSideRoutable.js +1 -1
- package/dist/client/runtime-client-routing/isLinkSkipped.d.ts +1 -1
- package/dist/client/runtime-client-routing/isLinkSkipped.js +1 -1
- package/dist/client/runtime-client-routing/logErrorClient.d.ts +1 -1
- package/dist/client/runtime-client-routing/logErrorClient.js +1 -1
- package/dist/client/runtime-client-routing/navigate.d.ts +1 -1
- package/dist/client/runtime-client-routing/navigate.js +1 -1
- package/dist/client/runtime-client-routing/normalizeUrlArgument.d.ts +1 -1
- package/dist/client/runtime-client-routing/normalizeUrlArgument.js +1 -1
- package/dist/client/runtime-client-routing/prefetch/getPrefetchSettings.d.ts +1 -1
- package/dist/client/runtime-client-routing/prefetch/getPrefetchSettings.js +1 -1
- package/dist/client/runtime-client-routing/prefetch.d.ts +1 -1
- package/dist/client/runtime-client-routing/prefetch.js +1 -1
- package/dist/client/runtime-client-routing/renderPageClient.d.ts +9 -97
- package/dist/client/runtime-client-routing/renderPageClient.js +1 -1
- package/dist/client/runtime-client-routing/scrollRestoration.d.ts +1 -1
- package/dist/client/runtime-client-routing/scrollRestoration.js +1 -1
- package/dist/client/runtime-client-routing/setScrollPosition.d.ts +1 -1
- package/dist/client/runtime-client-routing/setScrollPosition.js +1 -1
- package/dist/client/runtime-server-routing/createPageContextClient.d.ts +3 -25
- package/dist/client/runtime-server-routing/createPageContextClient.js +1 -1
- package/dist/client/runtime-server-routing/entry.js +1 -1
- package/dist/client/runtime-server-routing/getGlobalContextClientInternal.d.ts +3 -25
- package/dist/client/runtime-server-routing/getGlobalContextClientInternal.js +1 -1
- package/dist/client/runtime-server-routing/getPageContextPublicClient.d.ts +1 -1
- package/dist/client/runtime-server-routing/getPageContextPublicClient.js +1 -1
- package/dist/client/runtime-server-routing/index.d.ts +1 -1
- package/dist/client/runtime-server-routing/index.js +1 -0
- package/dist/client/shared/execHookOnRenderClient.d.ts +1 -1
- package/dist/client/shared/execHookOnRenderClient.js +1 -1
- package/dist/client/shared/getCurrentUrl.d.ts +1 -1
- package/dist/client/shared/getCurrentUrl.js +1 -1
- package/dist/client/shared/getGlobalContextClientInternalShared.d.ts +3 -25
- package/dist/client/shared/getGlobalContextClientInternalShared.js +1 -1
- package/dist/client/shared/getJsonSerializedInHtml.d.ts +1 -1
- package/dist/client/shared/getJsonSerializedInHtml.js +1 -1
- package/dist/client/shared/getPageContextPublicClientShared.d.ts +1 -1
- package/dist/client/shared/getPageContextPublicClientShared.js +1 -1
- package/dist/client/shared/loadPageConfigsLazyClientSide.d.ts +1 -1
- package/dist/client/shared/loadPageConfigsLazyClientSide.js +1 -1
- package/dist/client/shared/normalizeClientSideUrl.d.ts +1 -1
- package/dist/client/shared/normalizeClientSideUrl.js +1 -1
- package/dist/client/shared/removeFoucBuster.d.ts +1 -1
- package/dist/client/shared/removeFoucBuster.js +1 -1
- package/dist/node/api/{assertEnvApi.js → assertEnvApiDev.js} +2 -2
- package/dist/node/api/assertEnvApiDevAndProd.d.ts +1 -0
- package/dist/node/api/assertEnvApiDevAndProd.js +9 -0
- package/dist/node/api/build.d.ts +1 -1
- package/dist/node/api/build.js +1 -1
- package/dist/node/api/dev.d.ts +1 -1
- package/dist/node/api/dev.js +3 -3
- package/dist/node/api/index.d.ts +1 -1
- package/dist/node/api/index.js +1 -1
- package/dist/node/api/prepareViteApiCall.d.ts +1 -1
- package/dist/node/api/prepareViteApiCall.js +1 -1
- package/dist/node/api/prerender.d.ts +2 -2
- package/dist/node/api/prerender.js +1 -1
- package/dist/node/api/preview.d.ts +1 -1
- package/dist/node/api/preview.js +1 -1
- package/dist/node/api/resolveViteConfigFromUser.d.ts +1 -1
- package/dist/node/api/resolveViteConfigFromUser.js +1 -1
- package/dist/node/cli/assertEnvCli.js +2 -2
- package/dist/node/cli/context.d.ts +1 -1
- package/dist/node/cli/context.js +1 -1
- package/dist/node/cli/entry.js +1 -1
- package/dist/node/cli/index.d.ts +1 -1
- package/dist/node/cli/index.js +1 -1
- package/dist/node/cli/parseCli.d.ts +1 -1
- package/dist/node/cli/parseCli.js +1 -1
- package/dist/node/prerender/resolvePrerenderConfig.d.ts +3 -3
- package/dist/node/prerender/resolvePrerenderConfig.js +8 -4
- package/dist/node/prerender/runPrerender.d.ts +17 -43
- package/dist/node/prerender/runPrerender.js +22 -20
- package/dist/node/prerender/runPrerenderEntry.d.ts +1 -1
- package/dist/node/prerender/runPrerenderEntry.js +4 -1
- package/dist/node/vite/assertEnvVite.js +2 -2
- package/dist/node/vite/index.d.ts +1 -1
- package/dist/node/vite/index.js +31 -16
- package/dist/node/vite/plugins/build/handleAssetsManifest.d.ts +1 -1
- package/dist/node/vite/plugins/build/handleAssetsManifest.js +4 -4
- package/dist/node/vite/plugins/build/pluginBuildApp.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginBuildApp.js +1 -1
- package/dist/node/vite/plugins/build/pluginBuildConfig.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginBuildConfig.js +3 -3
- package/dist/node/vite/plugins/build/pluginDistFileNames.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginDistFileNames.js +1 -1
- package/dist/node/vite/plugins/build/pluginDistPackageJsonFile.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginDistPackageJsonFile.js +1 -1
- package/dist/node/vite/plugins/build/pluginModuleBanner.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginModuleBanner.js +1 -1
- package/dist/node/vite/plugins/build/pluginProdBuildEntry.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginProdBuildEntry.js +7 -3
- package/dist/node/vite/plugins/build/pluginSuppressRollupWarning.d.ts +1 -1
- package/dist/node/vite/plugins/build/pluginSuppressRollupWarning.js +1 -1
- package/dist/node/vite/plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.d.ts +1 -1
- package/dist/node/vite/plugins/non-runnable-dev/pluginReplaceConstantsNonRunnableDev.js +1 -1
- package/dist/node/vite/plugins/non-runnable-dev/pluginViteRPC.d.ts +1 -1
- package/dist/node/vite/plugins/non-runnable-dev/pluginViteRPC.js +1 -1
- package/dist/node/vite/plugins/pluginAssertFileEnv.d.ts +1 -1
- package/dist/node/vite/plugins/pluginAssertFileEnv.js +1 -1
- package/dist/node/vite/plugins/pluginBaseUrls.d.ts +1 -1
- package/dist/node/vite/plugins/pluginBaseUrls.js +1 -1
- package/dist/node/vite/plugins/pluginCommon/assertResolveAlias.d.ts +1 -1
- package/dist/node/vite/plugins/pluginCommon/assertResolveAlias.js +3 -3
- package/dist/node/vite/plugins/pluginCommon.d.ts +1 -1
- package/dist/node/vite/plugins/pluginCommon.js +2 -37
- package/dist/node/vite/plugins/pluginDev/determineFsAllowList.d.ts +1 -1
- package/dist/node/vite/plugins/pluginDev/determineFsAllowList.js +1 -1
- package/dist/node/vite/plugins/pluginDev/optimizeDeps.d.ts +1 -1
- package/dist/node/vite/plugins/pluginDev/optimizeDeps.js +30 -5
- package/dist/node/vite/plugins/pluginDev.d.ts +1 -1
- package/dist/node/vite/plugins/pluginDev.js +1 -1
- package/dist/node/vite/plugins/pluginExtractAssets.d.ts +1 -1
- package/dist/node/vite/plugins/pluginExtractAssets.js +1 -1
- package/dist/node/vite/plugins/pluginExtractExportNames.d.ts +1 -1
- package/dist/node/vite/plugins/pluginExtractExportNames.js +1 -1
- package/dist/node/vite/plugins/pluginPreview.d.ts +1 -1
- package/dist/node/vite/plugins/pluginPreview.js +1 -1
- package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.d.ts +1 -1
- package/dist/node/vite/plugins/pluginReplaceConstantsEnvVars.js +21 -4
- package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.d.ts +3 -1
- package/dist/node/vite/plugins/pluginReplaceConstantsGlobalThis.js +4 -1
- package/dist/node/vite/plugins/pluginReplaceConstantsPageContext.d.ts +1 -1
- package/dist/node/vite/plugins/pluginReplaceConstantsPageContext.js +1 -1
- package/dist/node/vite/plugins/pluginSetGlobalContext.d.ts +1 -1
- package/dist/node/vite/plugins/pluginSetGlobalContext.js +1 -1
- package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.d.ts +1 -1
- package/dist/node/vite/plugins/pluginStaticReplace/applyStaticReplace.js +1 -1
- package/dist/node/vite/plugins/pluginStaticReplace.d.ts +1 -1
- package/dist/node/vite/plugins/pluginStaticReplace.js +1 -1
- package/dist/node/vite/plugins/pluginStripPointerImportAttribute.d.ts +4 -0
- package/dist/node/vite/plugins/pluginStripPointerImportAttribute.js +31 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.d.ts +12 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy/getDeployConfigs.js +73 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy.d.ts +5 -0
- package/dist/node/vite/plugins/pluginUniversalDeploy.js +155 -0
- package/dist/node/vite/plugins/pluginVirtualFiles/debug.js +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.d.ts +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntry.js +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.d.ts +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFileGlobalEntryWithOldDesign.js +8 -18
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.d.ts +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/generateVirtualFilePageEntry.js +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.d.ts +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles/getConfigValueSourcesRelevant.js +1 -3
- package/dist/node/vite/plugins/pluginVirtualFiles.d.ts +1 -1
- package/dist/node/vite/plugins/pluginVirtualFiles.js +1 -1
- package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.d.ts +1 -1
- package/dist/node/vite/plugins/pluginViteConfigVikeExtensions.js +1 -1
- package/dist/node/vite/plugins/pluginWorkaroundCssModuleHmr.d.ts +1 -1
- package/dist/node/vite/plugins/pluginWorkaroundCssModuleHmr.js +1 -1
- package/dist/node/vite/plugins/pluginWorkaroundVite6HmrRegression.d.ts +1 -1
- package/dist/node/vite/plugins/pluginWorkaroundVite6HmrRegression.js +1 -1
- package/dist/node/vite/shared/addSsrMiddleware.d.ts +1 -1
- package/dist/node/vite/shared/addSsrMiddleware.js +3 -2
- package/dist/node/vite/shared/findPageFiles.d.ts +1 -1
- package/dist/node/vite/shared/findPageFiles.js +1 -1
- package/dist/node/vite/shared/getAssetsDir.d.ts +1 -1
- package/dist/node/vite/shared/getAssetsDir.js +1 -1
- package/dist/node/vite/shared/getClientEntrySrcDev.d.ts +1 -1
- package/dist/node/vite/shared/getClientEntrySrcDev.js +3 -3
- package/dist/node/vite/shared/getEnvVarObject.d.ts +1 -1
- package/dist/node/vite/shared/getEnvVarObject.js +1 -1
- package/dist/node/vite/shared/getFilePath.d.ts +1 -1
- package/dist/node/vite/shared/getFilePath.js +4 -4
- package/dist/node/vite/shared/getMagicString.d.ts +1 -1
- package/dist/node/vite/shared/getMagicString.js +1 -1
- package/dist/node/vite/shared/getManifestFilePathRelative.d.ts +1 -1
- package/dist/node/vite/shared/getManifestFilePathRelative.js +1 -1
- package/dist/node/vite/shared/getOutDirs.d.ts +3 -1
- package/dist/node/vite/shared/getOutDirs.js +8 -4
- package/dist/node/vite/shared/getViteConfigRuntime.d.ts +1 -1
- package/dist/node/vite/shared/getViteConfigRuntime.js +1 -1
- package/dist/node/vite/shared/importString.d.ts +1 -1
- package/dist/node/vite/shared/importString.js +1 -1
- package/dist/node/vite/shared/isAsset.d.ts +1 -1
- package/dist/node/vite/shared/isAsset.js +1 -1
- package/dist/node/vite/shared/isViteCli.d.ts +1 -1
- package/dist/node/vite/shared/isViteCli.js +3 -12
- package/dist/node/vite/shared/isViteServerSide.d.ts +1 -1
- package/dist/node/vite/shared/isViteServerSide.js +1 -1
- package/dist/node/vite/shared/loggerDev/errorWithCodeSnippet.d.ts +1 -1
- package/dist/node/vite/shared/loggerDev/errorWithCodeSnippet.js +1 -1
- package/dist/node/vite/shared/loggerDev.d.ts +1 -1
- package/dist/node/vite/shared/loggerDev.js +1 -1
- package/dist/node/vite/shared/loggerVite.d.ts +1 -1
- package/dist/node/vite/shared/loggerVite.js +1 -1
- package/dist/node/vite/shared/normalizeId.d.ts +1 -1
- package/dist/node/vite/shared/normalizeId.js +1 -1
- package/dist/node/vite/shared/parseEsModule.d.ts +1 -1
- package/dist/node/vite/shared/parseEsModule.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/assertExtensions.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js +19 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths/ignorePatternsBuiltIn.js +3 -0
- package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/crawlPlusFilePaths.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/filesystemRouting.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/getConfigFileExport.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/getConfigFileExport.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.d.ts +3 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/getPlusFilesByLocationId.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/loadFileAtConfigTime.js +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.d.ts +1 -3
- package/dist/node/vite/shared/resolveVikeConfigInternal/pointerImports.js +17 -7
- package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/resolvePointerImport.js +3 -3
- package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.d.ts +1 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal/transpileAndExecuteFile.js +36 -36
- package/dist/node/vite/shared/resolveVikeConfigInternal.d.ts +2 -1
- package/dist/node/vite/shared/resolveVikeConfigInternal.js +19 -7
- package/dist/node/vite/shared/rollupIsEsm.d.ts +1 -1
- package/dist/node/vite/shared/rollupIsEsm.js +1 -1
- package/dist/server/__internal/index.d.ts +1 -1
- package/dist/server/__internal/index.js +1 -1
- package/dist/server/__internal/vite.d.ts +1 -1
- package/dist/server/__internal/vite.js +1 -1
- package/dist/server/assertEnvServer.js +3 -5
- package/dist/server/client/router.d.ts +1 -1
- package/dist/server/client/router.js +1 -1
- package/dist/server/createPageRenderer.d.ts +2 -2
- package/dist/server/createPageRenderer.js +2 -2
- package/dist/server/importBuild.js +1 -1
- package/dist/server/runtime/asyncHook.d.ts +1 -1
- package/dist/server/runtime/asyncHook.js +1 -3
- package/dist/server/runtime/createDevMiddleware.d.ts +1 -1
- package/dist/server/runtime/createDevMiddleware.js +1 -1
- package/dist/server/runtime/fetch.d.ts +10 -0
- package/dist/server/runtime/fetch.js +5 -0
- package/dist/server/runtime/getPageContext.d.ts +1 -1
- package/dist/server/runtime/getPageContext.js +1 -1
- package/dist/server/runtime/globalContext.d.ts +11 -121
- package/dist/server/runtime/globalContext.js +1 -3
- package/dist/server/runtime/index-deprecated.d.ts +1 -1
- package/dist/server/runtime/index-deprecated.js +1 -1
- package/dist/server/runtime/index.d.ts +1 -1
- package/dist/server/runtime/index.js +1 -1
- package/dist/server/runtime/logErrorServer.d.ts +1 -1
- package/dist/server/runtime/logErrorServer.js +1 -3
- package/dist/server/runtime/loggerRuntime.d.ts +1 -1
- package/dist/server/runtime/loggerRuntime.js +1 -1
- package/dist/server/runtime/renderPageServer/addErrorHint/errors.js +1 -1
- package/dist/server/runtime/renderPageServer/addErrorHint.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/addErrorHint.js +3 -2
- package/dist/server/runtime/renderPageServer/analyzePage.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/analyzePage.js +1 -1
- package/dist/server/runtime/renderPageServer/assertArguments.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/assertArguments.js +1 -1
- package/dist/server/runtime/renderPageServer/createHttpResponse/assertNoInfiniteHttpRedirect.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/createHttpResponse/assertNoInfiniteHttpRedirect.js +1 -1
- package/dist/server/runtime/renderPageServer/createHttpResponse.d.ts +6 -4
- package/dist/server/runtime/renderPageServer/createHttpResponse.js +14 -2
- package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts +21 -41
- package/dist/server/runtime/renderPageServer/createPageContextServer.js +1 -1
- package/dist/server/runtime/renderPageServer/csp.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/csp.js +1 -1
- package/dist/server/runtime/renderPageServer/execHookDataAndOnBeforeRender.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/execHookDataAndOnBeforeRender.js +1 -1
- package/dist/server/runtime/renderPageServer/execHookOnError.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/execHookOnError.js +1 -1
- package/dist/server/runtime/renderPageServer/execHookOnRenderHtml.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/execHookOnRenderHtml.js +1 -1
- package/dist/server/runtime/renderPageServer/execHookServer.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/execHookServer.js +1 -1
- package/dist/server/runtime/renderPageServer/getCacheControl.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getCacheControl.js +1 -1
- package/dist/server/runtime/renderPageServer/getEarlyHints.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getEarlyHints.js +1 -1
- package/dist/server/runtime/renderPageServer/getHttpResponseBody.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getHttpResponseBody.js +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/getManifestEntry.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/getManifestEntry.js +3 -3
- package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsDev.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsDev.js +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js +3 -3
- package/dist/server/runtime/renderPageServer/getPageAssets/sortPageAssetsForEarlyHintsHeader.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets/sortPageAssetsForEarlyHintsHeader.js +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageAssets.js +1 -1
- package/dist/server/runtime/renderPageServer/getPageContextPublicServer.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/getPageContextPublicServer.js +1 -1
- package/dist/server/runtime/renderPageServer/handleErrorWithoutErrorPage.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/handleErrorWithoutErrorPage.js +1 -1
- package/dist/server/runtime/renderPageServer/handlePageContextRequestUrl.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/handlePageContextRequestUrl.js +1 -1
- package/dist/server/runtime/renderPageServer/headersResponse.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/headersResponse.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/getHtmlTags.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/getHtmlTags.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/getViteDevScript.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/getViteDevScript.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/inferHtmlTags.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/inferHtmlTags.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/injectAssets__public.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/injectAssets__public.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/injectHtmlTags.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/injectHtmlTags.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/mergeScriptTags.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/mergeScriptTags.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets/sanitizeJson.js +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/injectAssets.js +1 -1
- package/dist/server/runtime/renderPageServer/html/propKeys.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/propKeys.js +1 -1
- package/dist/server/runtime/renderPageServer/html/renderHtml.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/renderHtml.js +1 -1
- package/dist/server/runtime/renderPageServer/html/serializeContext.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/serializeContext.js +1 -1
- package/dist/server/runtime/renderPageServer/html/stream/react-streaming.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/stream/react-streaming.js +1 -1
- package/dist/server/runtime/renderPageServer/html/stream.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/html/stream.js +10 -2
- package/dist/server/runtime/renderPageServer/inferMediaType.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/inferMediaType.js +1 -1
- package/dist/server/runtime/renderPageServer/isFontFallback.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/isFontFallback.js +1 -1
- package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts +13 -38
- package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.js +1 -1
- package/dist/server/runtime/renderPageServer/log404/index.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/log404/index.js +1 -1
- package/dist/server/runtime/renderPageServer/loggerProd.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/loggerProd.js +1 -1
- package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts +49 -149
- package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.js +1 -1
- package/dist/server/runtime/renderPageServer/resolveRedirects.d.ts +1 -1
- package/dist/server/runtime/renderPageServer/resolveRedirects.js +1 -3
- package/dist/server/runtime/renderPageServer.d.ts +17 -41
- package/dist/server/runtime/renderPageServer.js +52 -4
- package/dist/server/runtime/universal-middleware.d.ts +9 -2
- package/dist/server/runtime/universal-middleware.js +10 -2
- package/dist/shared-server-client/createGlobalContextShared.d.ts +4 -48
- package/dist/shared-server-client/getPageContextPublicShared.js +7 -2
- package/dist/shared-server-client/getPageFiles/fileTypes.js +1 -1
- package/dist/shared-server-client/page-configs/loadAndParseVirtualFilePageEntry.js +12 -1
- package/dist/shared-server-client/page-configs/resolveVikeConfigPublic.d.ts +1 -0
- package/dist/shared-server-client/page-configs/serialize/serializeConfigValues.js +1 -1
- package/dist/shared-server-client/route/abort.js +1 -4
- package/dist/shared-server-client/route/deduceRouteStringFromFilesystemPath.js +1 -1
- package/dist/types/Config.d.ts +28 -1
- package/dist/types/PageConfig.d.ts +1 -1
- package/dist/types/PageContext.d.ts +8 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/utils/PROJECT_VERSION.d.ts +1 -1
- package/dist/utils/PROJECT_VERSION.js +1 -1
- package/dist/utils/assertSingleInstance.js +1 -1
- package/dist/utils/asyncFlatten.d.ts +4 -0
- package/dist/utils/asyncFlatten.js +7 -0
- package/dist/utils/debug.d.ts +1 -1
- package/dist/utils/debug.js +1 -0
- package/dist/utils/isImportPath.js +2 -2
- package/dist/utils/isObjectWithKeys.js +1 -1
- package/dist/utils/isSameErrorMessage.js +1 -1
- package/dist/utils/isScriptFile.d.ts +2 -0
- package/dist/utils/isScriptFile.js +5 -1
- package/dist/utils/isStorybook.d.ts +2 -0
- package/dist/utils/isStorybook.js +8 -0
- package/dist/utils/isToolCli.d.ts +2 -0
- package/dist/utils/isToolCli.js +7 -0
- package/dist/utils/parseNpmPackage.d.ts +8 -8
- package/dist/utils/parseNpmPackage.js +13 -13
- package/dist/utils/path.js +1 -1
- package/dist/utils/preventConstantFolding.d.ts +2 -0
- package/dist/utils/preventConstantFolding.js +7 -0
- package/dist/utils/requireResolve.js +3 -3
- package/dist/utils/slice.js +1 -1
- package/dist/utils/sorter.js +1 -1
- package/fetch.js +3 -0
- package/package.json +23 -7
- /package/dist/node/api/{assertEnvApi.d.ts → assertEnvApiDev.d.ts} +0 -0
|
@@ -1,22 +1,18 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginCommon };
|
|
3
2
|
import { isDevCheck } from '../../../utils/isDev.js';
|
|
4
3
|
import { isDocker } from '../../../utils/isDocker.js';
|
|
5
4
|
import { isExactlyOneTruthy } from '../../../utils/isExactlyOneTruthy.js';
|
|
6
|
-
import {
|
|
7
|
-
import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
|
|
5
|
+
import { assert, assertUsage } from '../../../utils/assert.js';
|
|
8
6
|
import { hasProp } from '../../../utils/hasProp.js';
|
|
9
7
|
import { isObject } from '../../../utils/isObject.js';
|
|
10
8
|
import { assertRollupInput } from './build/pluginBuildConfig.js';
|
|
11
|
-
import { installRequireShim_setUserRootDir } from '@brillout/require-shim';
|
|
12
9
|
import pc from '@brillout/picocolors';
|
|
13
10
|
import { assertResolveAlias } from './pluginCommon/assertResolveAlias.js';
|
|
14
|
-
import { isViteCli } from '../shared/isViteCli.js';
|
|
15
|
-
import { isVikeCliOrApi } from '../../../shared-server-node/api-context.js';
|
|
16
11
|
import { getVikeConfigInternal, setVikeConfigContext } from '../shared/resolveVikeConfigInternal.js';
|
|
17
12
|
import { assertViteRoot, getViteRoot, normalizeViteRoot } from '../../api/resolveViteConfigFromUser.js';
|
|
18
13
|
import { temp_disablePrerenderAutoRun } from '../../prerender/context.js';
|
|
19
14
|
import { version as viteVersionVike } from 'vite';
|
|
15
|
+
import '../assertEnvVite.js';
|
|
20
16
|
const pluginName = 'vike:pluginCommon';
|
|
21
17
|
globalThis.__VIKE__IS_PROCESS_SHARED_WITH_VITE = true;
|
|
22
18
|
function pluginCommon(vikeVitePluginOptions) {
|
|
@@ -57,7 +53,6 @@ function pluginCommon(vikeVitePluginOptions) {
|
|
|
57
53
|
handler(config) {
|
|
58
54
|
assertViteRoot(config._rootResolvedEarly, config);
|
|
59
55
|
assertSingleInstance(config);
|
|
60
|
-
installRequireShim_setUserRootDir(config.root);
|
|
61
56
|
},
|
|
62
57
|
},
|
|
63
58
|
},
|
|
@@ -77,7 +72,6 @@ function pluginCommon(vikeVitePluginOptions) {
|
|
|
77
72
|
workaroundCI(config);
|
|
78
73
|
assertRollupInput(config);
|
|
79
74
|
assertResolveAlias(config);
|
|
80
|
-
assertVikeCliOrApi(config);
|
|
81
75
|
temp_supportOldInterface(config);
|
|
82
76
|
await emitServerEntryOnlyIfNeeded(config);
|
|
83
77
|
},
|
|
@@ -85,7 +79,6 @@ function pluginCommon(vikeVitePluginOptions) {
|
|
|
85
79
|
config: {
|
|
86
80
|
order: 'post',
|
|
87
81
|
async handler(configFromUser) {
|
|
88
|
-
assertViteBuildSsr(configFromUser);
|
|
89
82
|
let configFromVike = { server: {}, preview: {} };
|
|
90
83
|
const vikeConfig = await getVikeConfigInternal();
|
|
91
84
|
if (vikeConfig.config.port !== undefined) {
|
|
@@ -142,30 +135,6 @@ function assertSingleInstance(config) {
|
|
|
142
135
|
const numberOfInstances = config.plugins.filter((o) => o.name === pluginName).length;
|
|
143
136
|
assertUsage(numberOfInstances === 1, `Vike's Vite plugin (${pc.cyan("import vike from 'vike/plugin'")}) is being added ${numberOfInstances} times to the list of Vite plugins. Make sure to add it only once instead.`);
|
|
144
137
|
}
|
|
145
|
-
function assertVikeCliOrApi(config) {
|
|
146
|
-
if (isVikeCliOrApi())
|
|
147
|
-
return;
|
|
148
|
-
if (isViteCli()) {
|
|
149
|
-
assert(!isVitest());
|
|
150
|
-
return;
|
|
151
|
-
}
|
|
152
|
-
/* This warning is always shown: Vitest loads Vite *before* any Vike JavaScript API can be invoked.
|
|
153
|
-
if (isVitest()) {
|
|
154
|
-
assertWarning(
|
|
155
|
-
false,
|
|
156
|
-
`Unexpected Vitest setup: you seem to be using Vitest together with Vike's Vite plugin but without using Vike's JavaScript API which is unexpected, see ${pc.underline('https://vike.dev/vitest')}`,
|
|
157
|
-
{ onlyOnce: true },
|
|
158
|
-
)
|
|
159
|
-
return
|
|
160
|
-
}
|
|
161
|
-
*/
|
|
162
|
-
if (config.server.middlewareMode) {
|
|
163
|
-
assertWarning(false, `${pc.cyan('vite.createServer()')} is deprecated ${pc.underline('https://vike.dev/migration/cli#api')}`, {
|
|
164
|
-
onlyOnce: true,
|
|
165
|
-
});
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
138
|
// TO-DO/next-major-release: remove https://github.com/vikejs/vike/issues/2122
|
|
170
139
|
function temp_supportOldInterface(config) {
|
|
171
140
|
if (!('vitePluginSsr' in config))
|
|
@@ -194,7 +163,3 @@ async function emitServerEntryOnlyIfNeeded(config) {
|
|
|
194
163
|
config.vitePluginServerEntry.disableServerEntryEmit = true;
|
|
195
164
|
}
|
|
196
165
|
}
|
|
197
|
-
function assertViteBuildSsr(configFromUser) {
|
|
198
|
-
// https://github.com/vikejs/vike/issues/3010
|
|
199
|
-
assertUsage(configFromUser.build?.ssr === undefined, "Don't set vite.build.ssr");
|
|
200
|
-
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../../assertEnvVite.js';
|
|
2
1
|
export { determineFsAllowList };
|
|
3
2
|
import { searchForWorkspaceRoot } from 'vite';
|
|
4
3
|
import path from 'node:path';
|
|
@@ -6,6 +5,7 @@ import { assert } from '../../../../utils/assert.js';
|
|
|
6
5
|
import { assertPosixPath } from '../../../../utils/path.js';
|
|
7
6
|
import { getPackageNodeModulesDirectory } from '../../../../utils/requireResolve.js';
|
|
8
7
|
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import '../../assertEnvVite.js';
|
|
9
9
|
const importMetaUrl = import.meta.url;
|
|
10
10
|
assertPosixPath(importMetaUrl);
|
|
11
11
|
const __dirname_ = path.posix.dirname(fileURLToPath(importMetaUrl));
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import '../../assertEnvVite.js';
|
|
2
1
|
export { optimizeDeps };
|
|
3
2
|
export { resolveOptimizeDeps };
|
|
4
3
|
import type { ResolvedConfig } from 'vite';
|
|
4
|
+
import '../../assertEnvVite.js';
|
|
5
5
|
declare const optimizeDeps: {
|
|
6
6
|
readonly optimizeDeps: {
|
|
7
7
|
readonly exclude: ["vike/client", "vike/client/router"];
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../../assertEnvVite.js';
|
|
2
1
|
export { optimizeDeps };
|
|
3
2
|
export { resolveOptimizeDeps };
|
|
4
3
|
import { findPageFiles } from '../../shared/findPageFiles.js';
|
|
@@ -6,7 +5,7 @@ import { assert } from '../../../../utils/assert.js';
|
|
|
6
5
|
import { createDebug } from '../../../../utils/debug.js';
|
|
7
6
|
import { isArray } from '../../../../utils/isArray.js';
|
|
8
7
|
import { isFilePathAbsoluteFilesystem } from '../../../../utils/isFilePathAbsoluteFilesystem.js';
|
|
9
|
-
import {
|
|
8
|
+
import { assertImportIsNpmPackage, getNpmPackageName } from '../../../../utils/parseNpmPackage.js';
|
|
10
9
|
import { requireResolveOptional } from '../../../../utils/requireResolve.js';
|
|
11
10
|
import { isVirtualFileId } from '../../../../utils/virtualFileId.js';
|
|
12
11
|
import { getVikeConfigInternal } from '../../shared/resolveVikeConfigInternal.js';
|
|
@@ -14,6 +13,7 @@ import { analyzeClientEntries } from '../build/pluginBuildConfig.js';
|
|
|
14
13
|
import { virtualFileIdGlobalEntryClientCR, virtualFileIdGlobalEntryClientSR, } from '../../../../shared-server-node/virtualFileId.js';
|
|
15
14
|
import { getFilePathResolved } from '../../shared/getFilePath.js';
|
|
16
15
|
import { getConfigValueSourcesRelevant } from '../pluginVirtualFiles/getConfigValueSourcesRelevant.js';
|
|
16
|
+
import '../../assertEnvVite.js';
|
|
17
17
|
const debug = createDebug('vike:optimizeDeps');
|
|
18
18
|
// Add dependencies that cannot be discovered by Vite during the scanning phase
|
|
19
19
|
const LATE_DISCOVERED = [
|
|
@@ -24,6 +24,14 @@ const LATE_DISCOVERED = [
|
|
|
24
24
|
// Workaround for https://github.com/vikejs/vike/issues/2823#issuecomment-3514325487
|
|
25
25
|
'@compiled/react/runtime',
|
|
26
26
|
];
|
|
27
|
+
// TO-DO/eventually: remove this.
|
|
28
|
+
// Avoid following warning for older vike-photon versions:
|
|
29
|
+
// ```
|
|
30
|
+
// [11:32:49.768][/test/photon-vercel/.test-dev.test.ts][pnpm run dev][stderr] Failed to resolve dependency: vike > @brillout/require-shim, present in ssr 'optimizeDeps.include'
|
|
31
|
+
// ```
|
|
32
|
+
// https://github.com/vikejs/vike-photon/issues/56
|
|
33
|
+
// https://github.com/vikejs/vike/pull/3091
|
|
34
|
+
const ALWAYS_REMOVE = ['@brillout/require-shim', 'vike > @brillout/require-shim'];
|
|
27
35
|
const optimizeDeps = {
|
|
28
36
|
optimizeDeps: {
|
|
29
37
|
exclude: [
|
|
@@ -95,6 +103,14 @@ async function resolveOptimizeDeps(config) {
|
|
|
95
103
|
env.optimizeDeps.entries = add(env.optimizeDeps.entries, entriesServer);
|
|
96
104
|
}
|
|
97
105
|
}
|
|
106
|
+
// Remove @brillout/require-shim
|
|
107
|
+
config.optimizeDeps.include = remove(config.optimizeDeps.include);
|
|
108
|
+
config.optimizeDeps.entries = remove(config.optimizeDeps.entries);
|
|
109
|
+
for (const envName in config.environments) {
|
|
110
|
+
const env = config.environments[envName];
|
|
111
|
+
env.optimizeDeps.include = remove(env.optimizeDeps.include ?? []);
|
|
112
|
+
env.optimizeDeps.entries = remove(env.optimizeDeps.entries ?? []);
|
|
113
|
+
}
|
|
98
114
|
// Debug
|
|
99
115
|
if (debug.isActivated)
|
|
100
116
|
debug('optimizeDeps', {
|
|
@@ -130,7 +146,7 @@ async function getPageDeps(config, pageConfigs) {
|
|
|
130
146
|
// optimizeDeps.include expects npm packages
|
|
131
147
|
assert(!e.startsWith('/'));
|
|
132
148
|
// Shouldn't be a path alias, as path aliases would need to be added to optimizeDeps.entries instead of optimizeDeps.include
|
|
133
|
-
|
|
149
|
+
assertImportIsNpmPackage(e);
|
|
134
150
|
if (isExcluded(e, isForClientSide, definedAt))
|
|
135
151
|
return;
|
|
136
152
|
if (isForClientSide) {
|
|
@@ -165,7 +181,7 @@ async function getPageDeps(config, pageConfigs) {
|
|
|
165
181
|
};
|
|
166
182
|
const sourcesRelevant = getConfigValueSourcesRelevant(configName, runtimeEnv, pageConfig);
|
|
167
183
|
sourcesRelevant.forEach((configValueSource) => {
|
|
168
|
-
if (!configValueSource.
|
|
184
|
+
if (!configValueSource.valueLoadedViaImport && !configValueSource.valueIsFilePath)
|
|
169
185
|
return;
|
|
170
186
|
const { definedAt } = configValueSource;
|
|
171
187
|
if (definedAt.definedBy)
|
|
@@ -220,14 +236,23 @@ async function getPageDeps(config, pageConfigs) {
|
|
|
220
236
|
};
|
|
221
237
|
}
|
|
222
238
|
function add(input, listAddendum) {
|
|
223
|
-
const list =
|
|
239
|
+
const list = normalizeInput(input);
|
|
224
240
|
listAddendum.forEach((e) => {
|
|
225
241
|
if (!list.includes(e))
|
|
226
242
|
list.push(e);
|
|
227
243
|
});
|
|
228
244
|
return list;
|
|
229
245
|
}
|
|
246
|
+
function normalizeInput(input) {
|
|
247
|
+
const list = !input ? [] : isArray(input) ? unique(input) : [input];
|
|
248
|
+
return list;
|
|
249
|
+
}
|
|
230
250
|
function unique(arr) {
|
|
231
251
|
const arrUnique = Array.from(new Set(arr));
|
|
232
252
|
return arr.length !== arrUnique.length ? arrUnique : arr;
|
|
233
253
|
}
|
|
254
|
+
function remove(input) {
|
|
255
|
+
let list = normalizeInput(input);
|
|
256
|
+
list = list.filter((e) => !ALWAYS_REMOVE.includes(e));
|
|
257
|
+
return list;
|
|
258
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginDev };
|
|
3
2
|
export { logDockerHint };
|
|
4
3
|
import { type Plugin, type ResolvedConfig } from 'vite';
|
|
4
|
+
import '../assertEnvVite.js';
|
|
5
5
|
declare function pluginDev(): Plugin[];
|
|
6
6
|
declare function logDockerHint(configHost: ResolvedConfig['server']['host']): void;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginDev };
|
|
3
2
|
export { logDockerHint };
|
|
4
3
|
import { optimizeDeps, resolveOptimizeDeps } from './pluginDev/optimizeDeps.js';
|
|
@@ -11,6 +10,7 @@ import { assertWarning } from '../../../utils/assert.js';
|
|
|
11
10
|
import { interceptViteLogs } from '../shared/loggerVite.js';
|
|
12
11
|
import pc from '@brillout/picocolors';
|
|
13
12
|
import { swallowViteLogConnected, swallowViteLogConnected_clean } from '../shared/loggerVite.js';
|
|
13
|
+
import '../assertEnvVite.js';
|
|
14
14
|
function pluginDev() {
|
|
15
15
|
let config;
|
|
16
16
|
return [
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
// TO-DO/next-major-release: remove
|
|
3
2
|
// Remove this workaround if the other workaround config.build.ssrEmitAssets turns out to be reliable.
|
|
4
3
|
// - Remove this file then revert this commit: https://github.com/vikejs/vike/commit/805a18974f13420a78fcc30fdd676696e405c3ca
|
|
@@ -25,6 +24,7 @@ import { assertV1Design } from '../../../shared-server-node/assertV1Design.js';
|
|
|
25
24
|
import { normalizeId } from '../shared/normalizeId.js';
|
|
26
25
|
import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
|
|
27
26
|
import { resolveIncludeAssetsImportedByServer } from '../../../server/runtime/renderPageServer/getPageAssets/retrievePageAssetsProd.js';
|
|
27
|
+
import '../assertEnvVite.js';
|
|
28
28
|
const extractAssetsRE = /(\?|&)extractAssets(?:&|$)/;
|
|
29
29
|
const rawRE = /(\?|&)raw(?:&|$)/;
|
|
30
30
|
const urlRE = /(\?|&)url(?:&|$)/;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginExtractExportNames };
|
|
3
2
|
export { isUsingClientRouter };
|
|
4
3
|
export { extractExportNamesRE };
|
|
5
4
|
import type { Plugin } from 'vite';
|
|
5
|
+
import '../assertEnvVite.js';
|
|
6
6
|
declare const extractExportNamesRE: RegExp;
|
|
7
7
|
declare function pluginExtractExportNames(): Plugin[];
|
|
8
8
|
declare function isUsingClientRouter(): boolean;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginExtractExportNames };
|
|
3
2
|
export { isUsingClientRouter };
|
|
4
3
|
export { extractExportNamesRE };
|
|
@@ -10,6 +9,7 @@ import { getGlobalObject } from '../../../utils/getGlobalObject.js';
|
|
|
10
9
|
import { getExportNames } from '../shared/parseEsModule.js';
|
|
11
10
|
import { normalizeId } from '../shared/normalizeId.js';
|
|
12
11
|
import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
|
|
12
|
+
import '../assertEnvVite.js';
|
|
13
13
|
const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
|
|
14
14
|
const debug = createDebug('vike:pluginExtractExportNames');
|
|
15
15
|
const globalObject = getGlobalObject('plugins/pluginExtractExportNames.ts', {});
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginPreview };
|
|
3
2
|
import { applyPreview } from '../../../utils/isDev.js';
|
|
4
3
|
import { assertUsage } from '../../../utils/assert.js';
|
|
@@ -10,6 +9,7 @@ import { logDockerHint } from './pluginDev.js';
|
|
|
10
9
|
import { getOutDirs } from '../shared/getOutDirs.js';
|
|
11
10
|
import sirv from 'sirv';
|
|
12
11
|
import { getVikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
|
|
12
|
+
import '../assertEnvVite.js';
|
|
13
13
|
function pluginPreview() {
|
|
14
14
|
let config;
|
|
15
15
|
let vikeConfig;
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginReplaceConstantsEnvVars };
|
|
3
2
|
import { loadEnv } from 'vite';
|
|
4
3
|
import { escapeRegex } from '../../../utils/escapeRegex.js';
|
|
5
4
|
import { isNotNullish } from '../../../utils/isNullish.js';
|
|
6
5
|
import { assert, assertUsage, assertWarning } from '../../../utils/assert.js';
|
|
7
6
|
import { isArray } from '../../../utils/isArray.js';
|
|
8
|
-
import {
|
|
7
|
+
import { makeLast } from '../../../utils/sorter.js';
|
|
9
8
|
import { assertPosixPath } from '../../../utils/path.js';
|
|
10
9
|
import { getFilePathToShowToUserModule } from '../shared/getFilePath.js';
|
|
11
10
|
import { normalizeId } from '../shared/normalizeId.js';
|
|
12
11
|
import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
|
|
13
12
|
import { getMagicString } from '../shared/getMagicString.js';
|
|
13
|
+
import pc from '@brillout/picocolors';
|
|
14
|
+
import '../assertEnvVite.js';
|
|
14
15
|
const PUBLIC_ENV_PREFIX = 'PUBLIC_ENV__';
|
|
15
16
|
const PUBLIC_ENV_ALLOWLIST = [
|
|
16
17
|
// https://github.com/vikejs/vike/issues/1724
|
|
@@ -23,7 +24,7 @@ const PUBLIC_ENV_ALLOWLIST = [
|
|
|
23
24
|
// - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
|
|
24
25
|
// - Or stop using Vite's `mode` implementation and have Vike implement its own `mode` feature? (So that the only dependencies are `$ vike build --mode staging` and `$ MODE=staging vike build`.)
|
|
25
26
|
// === Rolldown filter
|
|
26
|
-
const skipIrrelevant = 'import.meta.env
|
|
27
|
+
const skipIrrelevant = 'import.meta.env';
|
|
27
28
|
const filterRolldown = {
|
|
28
29
|
/* We don't do that, because vike-react-sentry uses import.meta.env.PUBLIC_ENV__SENTRY_DSN
|
|
29
30
|
id: {
|
|
@@ -47,6 +48,11 @@ function pluginReplaceConstantsEnvVars() {
|
|
|
47
48
|
return [
|
|
48
49
|
{
|
|
49
50
|
name: 'vike:pluginReplaceConstantsEnvVars',
|
|
51
|
+
// Correct order:
|
|
52
|
+
// 1. @vitejs/plugin-vue
|
|
53
|
+
// 2. vike:pluginExtractAssets and vike:pluginExtractExportNames [needs to be applied after @vitejs/plugin-vue]
|
|
54
|
+
// 3. vike:pluginReplaceConstantsEnvVars [needs to be applied after vike:pluginExtractAssets and vike:pluginExtractExportNames]
|
|
55
|
+
// 4. vite:define (Vite built-in plugin) [needs to be applied after vike:pluginReplaceConstantsEnvVars]
|
|
50
56
|
enforce: 'post',
|
|
51
57
|
configResolved: {
|
|
52
58
|
handler(config_) {
|
|
@@ -55,7 +61,7 @@ function pluginReplaceConstantsEnvVars() {
|
|
|
55
61
|
// Add process.env values defined by .env files
|
|
56
62
|
Object.entries(envVarsAll).forEach(([key, val]) => { var _a; return ((_a = process.env)[key] ?? (_a[key] = val)); });
|
|
57
63
|
envPrefix = getEnvPrefix(config);
|
|
58
|
-
config.plugins.sort(
|
|
64
|
+
config.plugins.sort(makeLast((plugin) => plugin.name === 'vite:define'));
|
|
59
65
|
},
|
|
60
66
|
},
|
|
61
67
|
transform: {
|
|
@@ -97,6 +103,17 @@ function pluginReplaceConstantsEnvVars() {
|
|
|
97
103
|
replacements.forEach(({ regExpStr, replacement }) => {
|
|
98
104
|
magicString.replaceAll(new RegExp(regExpStr, 'g'), JSON.stringify(replacement));
|
|
99
105
|
});
|
|
106
|
+
// Replace bare `import.meta.env` expression with `null` in the user-land.
|
|
107
|
+
// - Otherwise Vite replaces it with an object missing PUBLIC_ENV__ variables which is confusing for users.
|
|
108
|
+
// - We purposely don't support replacing `import.meta.env` with an object to incentivize users to write tree-shaking friendly code.
|
|
109
|
+
// - `define: { 'import.meta.env': JSON.stringify(null) }` doesn't work because it also replaces `import.meta.env` inside `import.meta.env.SONE_ENV`
|
|
110
|
+
const bareImportMetaEnvRegex = /\bimport\.meta\.env(?!\.)/g;
|
|
111
|
+
const isUserLand = !id.includes('node_modules') && id.startsWith(config.root); // skip node_modules/ as well as linked dependencies
|
|
112
|
+
if (isUserLand && bareImportMetaEnvRegex.test(code)) {
|
|
113
|
+
assertWarning(false, `The bare ${pc.cyan('import.meta.env')} expression in ${getFilePathToShowToUserModule(id, config)} is replaced with ${pc.cyan('null')} — use ${pc.cyan('import.meta.env.SONE_ENV')} instead ${pc.underline('https://vike.dev/env')}`, { onlyOnce: true });
|
|
114
|
+
bareImportMetaEnvRegex.lastIndex = 0; // Reset state after .test() since the /g flag makes the RegExp stateful
|
|
115
|
+
magicString.replaceAll(bareImportMetaEnvRegex, JSON.stringify(null));
|
|
116
|
+
}
|
|
100
117
|
return getMagicStringResult();
|
|
101
118
|
},
|
|
102
119
|
},
|
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginReplaceConstantsGlobalThis };
|
|
3
2
|
export { VIRTUAL_FILE_ID_constantsGlobalThis };
|
|
4
3
|
export type _LoadDeclareGlobal__VIKE__IS = never;
|
|
5
4
|
import type { Plugin } from 'vite';
|
|
5
|
+
import '../assertEnvVite.js';
|
|
6
6
|
declare global {
|
|
7
7
|
/** Like `import.meta.env.DEV` but works for `node_modules/` packages with `ssr.external` */
|
|
8
8
|
var __VIKE__IS_DEV: boolean;
|
|
9
9
|
/** Like `import.meta.env.SSR` but works for `node_modules/` packages with `ssr.external` */
|
|
10
10
|
var __VIKE__IS_CLIENT: boolean;
|
|
11
11
|
var __VIKE__IS_DEBUG: boolean;
|
|
12
|
+
/** Whether the code is processed by Vite, e.g. `true` when server code is `ssr.noExternal` */
|
|
13
|
+
var __VIKE__NO_EXTERNAL: true | undefined;
|
|
12
14
|
}
|
|
13
15
|
declare const VIRTUAL_FILE_ID_constantsGlobalThis = "virtual:vike:server:constantsGlobalThis";
|
|
14
16
|
declare function pluginReplaceConstantsGlobalThis(): Plugin[];
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginReplaceConstantsGlobalThis };
|
|
3
2
|
export { VIRTUAL_FILE_ID_constantsGlobalThis };
|
|
4
3
|
import { isDebug } from '../../../utils/debug.js';
|
|
@@ -6,6 +5,7 @@ import { escapeRegex } from '../../../utils/escapeRegex.js';
|
|
|
6
5
|
import { addVirtualFileIdPrefix } from '../../../utils/virtualFileId.js';
|
|
7
6
|
import { assert } from '../../../utils/assert.js';
|
|
8
7
|
import { isViteServerSide_applyToEnvironment, isViteServerSide_configEnvironment, isViteServerSide_extraSafe, } from '../shared/isViteServerSide.js';
|
|
8
|
+
import '../assertEnvVite.js';
|
|
9
9
|
const VIRTUAL_FILE_ID_constantsGlobalThis = 'virtual:vike:server:constantsGlobalThis';
|
|
10
10
|
const isDebugVal = isDebug();
|
|
11
11
|
globalThis.__VIKE__IS_CLIENT = false;
|
|
@@ -33,14 +33,17 @@ function pluginReplaceConstantsGlobalThis() {
|
|
|
33
33
|
define: {
|
|
34
34
|
'globalThis.__VIKE__IS_DEV': JSON.stringify(isDev),
|
|
35
35
|
'globalThis.__VIKE__IS_DEBUG': JSON.stringify(isDebugVal),
|
|
36
|
+
'globalThis.__VIKE__NO_EXTERNAL': 'true',
|
|
36
37
|
},
|
|
37
38
|
};
|
|
38
39
|
},
|
|
39
40
|
},
|
|
40
41
|
configEnvironment: {
|
|
42
|
+
order: 'pre',
|
|
41
43
|
handler(name, config) {
|
|
42
44
|
const isClientSide = !isViteServerSide_configEnvironment(name, config);
|
|
43
45
|
return {
|
|
46
|
+
consumer: isClientSide ? 'client' : 'server',
|
|
44
47
|
define: {
|
|
45
48
|
'globalThis.__VIKE__IS_CLIENT': JSON.stringify(isClientSide),
|
|
46
49
|
},
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginReplaceConstantsPageContext };
|
|
3
2
|
import { assert } from '../../../utils/assert.js';
|
|
4
3
|
import { assertPosixPath } from '../../../utils/path.js';
|
|
5
4
|
import { normalizeId } from '../shared/normalizeId.js';
|
|
6
5
|
import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
|
|
7
6
|
import { getMagicString } from '../shared/getMagicString.js';
|
|
7
|
+
import '../assertEnvVite.js';
|
|
8
8
|
const constantsIsClientSide = [
|
|
9
9
|
//
|
|
10
10
|
'pageContext.isClientSide',
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginSetGlobalContext };
|
|
3
2
|
import { setGlobalContext_viteDevServer, setGlobalContext_viteConfig, setGlobalContext_isProductionAccordingToVite, } from '../../../server/runtime/globalContext.js';
|
|
4
3
|
import { markSetup_isViteDev, markSetup_viteDevServer, markSetup_vitePreviewServer, } from '../../../utils/assertSetup.js';
|
|
5
4
|
import { isDevCheck } from '../../../utils/isDev.js';
|
|
6
5
|
import { reloadVikeConfig } from '../shared/resolveVikeConfigInternal.js';
|
|
7
6
|
import { getViteConfigRuntime } from '../shared/getViteConfigRuntime.js';
|
|
7
|
+
import '../assertEnvVite.js';
|
|
8
8
|
function pluginSetGlobalContext() {
|
|
9
9
|
let isServerReload = false;
|
|
10
10
|
return [
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import '../../assertEnvVite.js';
|
|
2
1
|
export { applyStaticReplace };
|
|
3
2
|
import { transformAsync } from '@babel/core';
|
|
4
3
|
import * as t from '@babel/types';
|
|
5
4
|
import { parseImportString } from '../../shared/importString.js';
|
|
6
5
|
import { assert } from '../../../../utils/assert.js';
|
|
6
|
+
import '../../assertEnvVite.js';
|
|
7
7
|
// ============================================================================
|
|
8
8
|
// Main transformer
|
|
9
9
|
// ============================================================================
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginStaticReplace };
|
|
3
2
|
import type { Plugin } from 'vite';
|
|
4
3
|
import { VikeConfigInternal } from '../shared/resolveVikeConfigInternal.js';
|
|
4
|
+
import '../assertEnvVite.js';
|
|
5
5
|
declare function pluginStaticReplace(vikeConfig: VikeConfigInternal): Plugin[];
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import '../assertEnvVite.js';
|
|
2
1
|
export { pluginStaticReplace };
|
|
3
2
|
import { createDebug } from '../../../utils/debug.js';
|
|
4
3
|
import { assert, assertUsage } from '../../../utils/assert.js';
|
|
5
4
|
import { isViteServerSide_extraSafe } from '../shared/isViteServerSide.js';
|
|
6
5
|
import { applyStaticReplace } from './pluginStaticReplace/applyStaticReplace.js';
|
|
6
|
+
import '../assertEnvVite.js';
|
|
7
7
|
const debug = createDebug('vike:staticReplace');
|
|
8
8
|
function pluginStaticReplace(vikeConfig) {
|
|
9
9
|
let config;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export { pluginStripPointerImportAttribute };
|
|
2
|
+
import { getMagicString } from '../shared/getMagicString.js';
|
|
3
|
+
import '../assertEnvVite.js';
|
|
4
|
+
// Match `with { type: 'vike:pointer' }` (with optional whitespace variations)
|
|
5
|
+
const runtimeAttrRE = /\bwith\s*\{\s*type\s*:\s*['"]vike:pointer['"]\s*\}/g;
|
|
6
|
+
function pluginStripPointerImportAttribute() {
|
|
7
|
+
return [
|
|
8
|
+
{
|
|
9
|
+
name: 'vike:pluginStripPointerImportAttribute',
|
|
10
|
+
transform: {
|
|
11
|
+
filter: {
|
|
12
|
+
code: {
|
|
13
|
+
include: 'vike:pointer',
|
|
14
|
+
},
|
|
15
|
+
},
|
|
16
|
+
handler(code, id) {
|
|
17
|
+
runtimeAttrRE.lastIndex = 0;
|
|
18
|
+
if (!runtimeAttrRE.test(code))
|
|
19
|
+
return;
|
|
20
|
+
const { magicString, getMagicStringResult } = getMagicString(code, id);
|
|
21
|
+
runtimeAttrRE.lastIndex = 0;
|
|
22
|
+
let match;
|
|
23
|
+
while ((match = runtimeAttrRE.exec(code)) !== null) {
|
|
24
|
+
magicString.remove(match.index, match.index + match[0].length);
|
|
25
|
+
}
|
|
26
|
+
return getMagicStringResult();
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
];
|
|
31
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export { getDeployConfigs };
|
|
2
|
+
import type { PageConfigPublicWithRoute } from '../../../../shared-server-client/page-configs/resolveVikeConfigPublic.js';
|
|
3
|
+
import '../../assertEnvVite.js';
|
|
4
|
+
declare function getDeployConfigs(pageId: string, page: PageConfigPublicWithRoute): {
|
|
5
|
+
route: string[];
|
|
6
|
+
vercel: {
|
|
7
|
+
isr: {
|
|
8
|
+
expiration: number;
|
|
9
|
+
} | undefined;
|
|
10
|
+
edge: boolean;
|
|
11
|
+
};
|
|
12
|
+
} | null;
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import pc from '@brillout/picocolors';
|
|
2
|
+
export { getDeployConfigs };
|
|
3
|
+
import { fromVike, toRou3 } from 'convert-route';
|
|
4
|
+
import { assert, assertUsage, assertWarning } from '../../../../utils/assert.js';
|
|
5
|
+
import '../../assertEnvVite.js';
|
|
6
|
+
function getDeployConfigs(pageId, page) {
|
|
7
|
+
// Convert Vike's routes to rou3 format
|
|
8
|
+
const routeIr = typeof page.route === 'string' ? fromVike(page.route) : null;
|
|
9
|
+
// Vercel specific configs
|
|
10
|
+
const rawIsr = extractIsr(page.config);
|
|
11
|
+
let isr = assertIsr(rawIsr);
|
|
12
|
+
const edge = extractEdge(page.config);
|
|
13
|
+
const isrOrEdge = isr ? 'isr' : edge ? 'edge' : null;
|
|
14
|
+
if (typeof page.route === 'function' && isrOrEdge) {
|
|
15
|
+
assertWarning(false, `Page ${pageId}: ${pc.cyan(isrOrEdge)} is not supported when using route function. Remove ${pc.cyan(isrOrEdge)} config or use a route string if possible.`, { onlyOnce: true });
|
|
16
|
+
isr = null;
|
|
17
|
+
}
|
|
18
|
+
if (edge && rawIsr !== null && typeof rawIsr === 'object') {
|
|
19
|
+
assertUsage(false, `Page ${pageId}: ISR cannot be enabled for edge functions. Remove ${pc.cyan('isr')} config or set \`{ edge: false }\`.`);
|
|
20
|
+
}
|
|
21
|
+
if (isrOrEdge && routeIr) {
|
|
22
|
+
return {
|
|
23
|
+
route: [...new Set([...toRou3(routeIr), ...getPageContextRoute(routeIr)])],
|
|
24
|
+
vercel: {
|
|
25
|
+
isr: isr ? { expiration: isr } : undefined,
|
|
26
|
+
edge: Boolean(edge),
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
return null;
|
|
31
|
+
}
|
|
32
|
+
function extractIsr(exports) {
|
|
33
|
+
if (exports === null || typeof exports !== 'object')
|
|
34
|
+
return null;
|
|
35
|
+
if (!('isr' in exports))
|
|
36
|
+
return null;
|
|
37
|
+
const isr = exports.isr;
|
|
38
|
+
assertUsage(typeof isr === 'object' &&
|
|
39
|
+
typeof isr.expiration === 'number' &&
|
|
40
|
+
isr.expiration > 0, ' `{ expiration }` must be a positive number');
|
|
41
|
+
return isr;
|
|
42
|
+
}
|
|
43
|
+
function assertIsr(isr) {
|
|
44
|
+
if (isr === null || isr === undefined)
|
|
45
|
+
return null;
|
|
46
|
+
return isr.expiration;
|
|
47
|
+
}
|
|
48
|
+
function extractEdge(exports) {
|
|
49
|
+
if (exports === null || typeof exports !== 'object')
|
|
50
|
+
return null;
|
|
51
|
+
if (!('edge' in exports))
|
|
52
|
+
return null;
|
|
53
|
+
const edge = exports.edge;
|
|
54
|
+
assertUsage(typeof edge === 'boolean', ' `{ edge }` must be a boolean');
|
|
55
|
+
return edge;
|
|
56
|
+
}
|
|
57
|
+
function getPageContextRoute(routeIr) {
|
|
58
|
+
const lastSegment = routeIr.pathname.at(-1);
|
|
59
|
+
assert(lastSegment);
|
|
60
|
+
if (!lastSegment.catchAll) {
|
|
61
|
+
const pageContextIr = {
|
|
62
|
+
pathname: [
|
|
63
|
+
...routeIr.pathname.slice(0, -1),
|
|
64
|
+
{
|
|
65
|
+
...lastSegment,
|
|
66
|
+
value: `${lastSegment.value}.pageContext.json`,
|
|
67
|
+
},
|
|
68
|
+
],
|
|
69
|
+
};
|
|
70
|
+
return toRou3(pageContextIr);
|
|
71
|
+
}
|
|
72
|
+
return [];
|
|
73
|
+
}
|