@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.19 → 3.9.0-ultramodern.20

package/dist/esm-node/cloudflare-builder.mjs

@@ -4,7 +4,6 @@ import { createRequire, isBuiltin } from "node:module";
 import node_path from "node:path";
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/builder";
 import { isProd } from "@modern-js/utils";
-import { provider } from "std-env";
 import { CLOUDFLARE_ROUTE_DATA_HANDLER_EXPORT, CLOUDFLARE_WORKER_NODE_BUILTINS, CLOUDFLARE_WORKER_PLATFORM_MODULES, getCloudflareWorkerRouteDataEntryName } from "./cloudflare-output-contract.mjs";
 import { getTemplatePath } from "./read-template.mjs";
 const moduleRequire = createRequire(import.meta.url);
@@ -15,8 +14,6 @@ const ROUTE_SERVER_LOADERS_FILE = 'route-server-loaders.js';
 const WORKER_ROUTE_DATA_FILE = 'cloudflare-worker-route-data.js';
 const WORKER_ROUTE_DATA_TEMPLATE = 'cloudflare-worker-route-data.mjs';
 const DATA_LOADER_CLIENT_TRANSFORM = /plugin-data-loader[\\/](?:.+[\\/])?loader\.[cm]?js$/u;
-const MF_SSR_DATA_FETCH_RUNTIME_PLUGIN = '@module-federation/modern-js-v3/ssr-inject-data-fetch-function-plugin';
-const MF_SSR_DEV_RUNTIME_PLUGIN = '@module-federation/modern-js-v3/ssr-dev-plugin';
 const WORKER_DEPENDENCY_CONDITIONS = [
     [
         'esm',
@@ -310,12 +307,6 @@ function applyCloudflareWorkerRspackConfig(chain, workerEntryNames) {
 function removeCloudflareWorkerDataLoaderClientTransform(chain) {
     for (const [name, rule] of Object.entries(chain.module.rules.entries() ?? {}))if (rule.uses.values().some((use)=>DATA_LOADER_CLIENT_TRANSFORM.test(String(use.get('loader'))))) chain.module.rules.delete(name);
 }
-function applyCloudflareWorkerMfRuntimeBoundary(chain) {
-    const runtimePlugin = getTemplatePath('cloudflare-worker-mf-ssr-runtime-plugin.mjs');
-    chain.plugins.delete('plugin-module-federation');
-    chain.resolve.alias.set(`${MF_SSR_DATA_FETCH_RUNTIME_PLUGIN}$`, runtimePlugin);
-    chain.resolve.alias.set(`${MF_SSR_DEV_RUNTIME_PLUGIN}$`, runtimePlugin);
-}
 const getEffectBffEntry = (normalizedConfig, appContext)=>{
     if (!normalizedConfig.bff || 'hono' === normalizedConfig.bff.runtimeFramework) return;
     const configuredEntry = normalizedConfig.bff.effect?.entry;
@@ -325,18 +316,6 @@ const getEffectBffEntry = (normalizedConfig, appContext)=>{
     }
     return resolveJsOrTsEntry(node_path.resolve(appContext.apiDirectory, 'index'));
 };
-const CLOUDFLARE_DEPLOY_PROVIDERS = new Set([
-    'cloudflare',
-    'cloudflare_pages',
-    'cloudflare_workers'
-]);
-const resolveStdEnvDeployProvider = ()=>provider;
-const isCloudflareWorkerDeploy = (normalizedConfig, resolveDeployProvider)=>{
-    const explicitTarget = normalizedConfig.deploy?.target || process.env.MODERNJS_DEPLOY;
-    if (explicitTarget) return 'cloudflare' === explicitTarget;
-    const detectedProvider = resolveDeployProvider();
-    return detectedProvider ? CLOUDFLARE_DEPLOY_PROVIDERS.has(detectedProvider) : false;
-};
 const rewriteWorkerEntryPath = (entry)=>entry.replace('index.jsx', 'index.server.jsx').replace('bootstrap.server.jsx', 'index.server.jsx').replace('bootstrap.jsx', 'index.server.jsx');
 const rewriteWorkerEntryDescription = (description)=>{
     const entryImport = description.import;
@@ -459,7 +438,7 @@ const createCloudflareBundlerChain = (appContext, workerEntryNames)=>{
             ]
         });
         chain.plugin('cloudflare-worker-absent-optional-dependencies').use(AbsentOptionalDependencyPlugin);
-        applyCloudflareWorkerMfRuntimeBoundary(chain);
+        chain.plugins.delete('plugin-module-federation');
         setAliasIfPresent(chain.resolve.alias, 'react$', reactFile);
         setAliasIfPresent(chain.resolve.alias, 'react/jsx-runtime$', reactJsxRuntimeFile);
         setAliasIfPresent(chain.resolve.alias, 'react/jsx-dev-runtime$', reactJsxDevRuntimeFile);
@@ -468,8 +447,8 @@ const createCloudflareBundlerChain = (appContext, workerEntryNames)=>{
         setAliasIfPresent(chain.resolve.alias, '@loadable/component$', loadableComponentFile);
     };
 };
-function getCloudflareBuilderEnvironments({ appContext, environments, normalizedConfig, resolveDeployProvider = resolveStdEnvDeployProvider }) {
-    if (!isCloudflareWorkerDeploy(normalizedConfig, resolveDeployProvider)) return environments;
+function getCloudflareBuilderEnvironments({ appContext, environments, normalizedConfig }) {
+    if (appContext.deployTarget?.target !== 'cloudflare') return environments;
     const workerEnvironment = environments[SERVICE_WORKER_ENVIRONMENT_NAME] ?? (appContext.apiOnly ? {
         output: {
             target: 'web-worker'
@@ -506,15 +485,14 @@ function applyCloudflareBuilderEnvironments(options) {
         environments: getCloudflareBuilderEnvironments(options)
     };
 }
-const createCloudflareBuilderPlugin = (resolveDeployProvider = resolveStdEnvDeployProvider)=>({
+const createCloudflareBuilderPlugin = ()=>({
         name: '@modern-js/cloudflare-builder',
         setup (api) {
             api.modifyBuilderEnvironments(({ environments })=>applyCloudflareBuilderEnvironments({
                     appContext: api.getAppContext(),
                     environments,
-                    normalizedConfig: api.getNormalizedConfig(),
-                    resolveDeployProvider
+                    normalizedConfig: api.getNormalizedConfig()
                 }));
         }
     });
-export { applyCloudflareBuilderEnvironments, applyCloudflareWorkerMfRuntimeBoundary, applyCloudflareWorkerRspackConfig, claimsByFunctionExternal, createAbsentOptionalDependencyFilter, createCloudflareBuilderPlugin, createRequestRedirectMatcher, getCloudflareBuilderEnvironments, getCloudflareWorkerRspackConfig };
+export { applyCloudflareBuilderEnvironments, applyCloudflareWorkerRspackConfig, claimsByFunctionExternal, createAbsentOptionalDependencyFilter, createCloudflareBuilderPlugin, createRequestRedirectMatcher, getCloudflareBuilderEnvironments, getCloudflareWorkerRspackConfig };

package/dist/esm-node/config.mjs

@@ -1,3 +1,4 @@
 import "node:module";
 export { getBuildConfigEnvironment, resolveEffectTsgoCompiler } from "./build-config/public.mjs";
 export { createRemoteManifestUrl } from "./build-config/remote-address.mjs";
+export { resolveDeployTarget } from "./deploy-output/target.mjs";

package/dist/esm-node/deploy-output/plugin.mjs

@@ -3,16 +3,16 @@ import { createRequire } from "node:module";
 import node_path from "node:path";
 import { preserveNpmAliases, readPackageIdentity } from "./npmAliases.mjs";
 import { NODE_PUBLIC_ASSET_SCOPE, normalizeDeclaredPublicAssets, stageDeclaredPublicAssets } from "./public-assets.mjs";
-import { resolveDeployTarget as external_target_mjs_resolveDeployTarget } from "./target.mjs";
+import { getDeployingTarget } from "./target.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 var __rspack_import_meta_filename__ = __rspack_fileURLToPath(import.meta.url);
-const createDeployOutputAliasesPlugin = ({ resolveDeployTarget = external_target_mjs_resolveDeployTarget } = {})=>({
+const createDeployOutputAliasesPlugin = ()=>({
         name: '@modern-js/deploy-output-aliases',
         setup (api) {
             api.onAfterDeploy(async ()=>{
-                const { appDirectory, metaName } = api.getAppContext();
-                const config = api.getNormalizedConfig();
-                if ('modern-js' !== metaName && !config.deploy?.target && !process.env.MODERNJS_DEPLOY || 'node' !== resolveDeployTarget(config)) return;
+                const appContext = api.getAppContext();
+                if ('node' !== getDeployingTarget(appContext)) return;
+                const { appDirectory } = appContext;
                 const entry = createRequire(__rspack_import_meta_filename__).resolve('@modern-js/prod-server');
                 const identity = await readPackageIdentity(entry);
                 await preserveNpmAliases({
@@ -29,13 +29,14 @@ const createDeployOutputAliasesPlugin = ({ resolveDeployTarget = external_target
             });
         }
     });
-const createDeployOutputPublicAssetsPlugin = ({ resolveDeployTarget = external_target_mjs_resolveDeployTarget } = {})=>({
+const createDeployOutputPublicAssetsPlugin = ()=>({
         name: '@modern-js/deploy-output-public-assets',
         setup (api) {
             api.onAfterDeploy(async ()=>{
-                const { appDirectory, metaName } = api.getAppContext();
+                const appContext = api.getAppContext();
+                if ('node' !== getDeployingTarget(appContext)) return;
+                const { appDirectory } = appContext;
                 const config = api.getNormalizedConfig();
-                if ('modern-js' !== metaName && !config.deploy?.target && !process.env.MODERNJS_DEPLOY || 'node' !== resolveDeployTarget(config)) return;
                 await stageDeclaredPublicAssets({
                     appDirectory,
                     outputDirectory: node_path.join(appDirectory, '.output'),

package/dist/esm-node/deploy-output/target.mjs

@@ -1,5 +1,14 @@
 import "node:module";
-import { provider } from "std-env";
+import { getArgv } from "@modern-js/utils";
+import { provider as external_std_env_provider } from "std-env";
+const DEPLOY_TARGETS = [
+    'node',
+    'vercel',
+    'netlify',
+    'ghPages',
+    'cloudflare'
+];
+const DEPLOY_TARGET_FLAG = '--deploy-target';
 const providerDeployTargets = {
     vercel: 'vercel',
     netlify: 'netlify',
@@ -7,5 +16,43 @@ const providerDeployTargets = {
     cloudflare_pages: 'cloudflare',
     cloudflare_workers: 'cloudflare'
 };
-const resolveDeployTarget = (config, envDeployTarget = process.env.MODERNJS_DEPLOY, detectedProvider = provider)=>config.deploy?.target || envDeployTarget || (detectedProvider ? providerDeployTargets[detectedProvider] : void 0) || 'node';
-export { resolveDeployTarget };
+const readDeployTargetFlag = (argv)=>{
+    for (const [index, arg] of argv.entries()){
+        if (arg === DEPLOY_TARGET_FLAG) {
+            const value = argv[index + 1];
+            if (void 0 === value || value.startsWith('-')) throw new Error(`${DEPLOY_TARGET_FLAG} needs a value.`);
+            return value;
+        }
+        if (arg.startsWith(`${DEPLOY_TARGET_FLAG}=`)) return arg.slice(DEPLOY_TARGET_FLAG.length + 1);
+    }
+};
+const assertDeployTarget = (target, source)=>{
+    if (!DEPLOY_TARGETS.includes(target)) throw new Error(`Unknown deploy target '${target}' from ${source}. Use one of: ${DEPLOY_TARGETS.join(', ')}.`);
+    return target;
+};
+const resolveDeployTarget = ({ argv = getArgv(), configTarget, env = process.env.MODERNJS_DEPLOY, provider = external_std_env_provider } = {})=>{
+    const explicit = [
+        [
+            readDeployTargetFlag(argv),
+            DEPLOY_TARGET_FLAG
+        ],
+        [
+            configTarget,
+            'deploy.target'
+        ],
+        [
+            env,
+            'MODERNJS_DEPLOY'
+        ]
+    ].find(([target])=>target);
+    if (explicit?.[0]) return {
+        target: assertDeployTarget(explicit[0], explicit[1]),
+        explicit: true
+    };
+    return {
+        target: provider && providerDeployTargets[provider] || 'node',
+        explicit: false
+    };
+};
+const getDeployingTarget = ({ deployTarget, metaName })=>deployTarget && ('modern-js' === metaName || deployTarget.explicit) ? deployTarget.target : void 0;
+export { DEPLOY_TARGETS, DEPLOY_TARGET_FLAG, getDeployingTarget, resolveDeployTarget };

package/dist/esm-node/release-envelope/plugin.mjs

@@ -1,14 +1,9 @@
 import "node:module";
 import node_path from "node:path";
 import { NODE_PUBLIC_ASSET_SCOPE, normalizeDeclaredPublicAssets, resolveAddedDeclaredPublicAssetPaths } from "../deploy-output/public-assets.mjs";
+import { getDeployingTarget } from "../deploy-output/target.mjs";
 import { emitFrameworkMicroVerticalReleaseEnvelope, emitNodeStagedReleaseEnvelope, verifyBuildOutputReleaseEnvelope, verifyNodeReleaseEnvelopeStaging } from "./framework-output.mjs";
-const resolveActiveDeployTarget = (api, resolveDeployTarget)=>{
-    const { metaName } = api.getAppContext();
-    const config = api.getNormalizedConfig();
-    if ('modern-js' !== metaName && !config.deploy?.target && !process.env.MODERNJS_DEPLOY) return;
-    return resolveDeployTarget(config);
-};
-const createUltramodernReleaseEnvelopePlugin = ({ resolveDeployTarget })=>({
+const createUltramodernReleaseEnvelopePlugin = ()=>({
         name: '@modern-js/ultramodern-release-envelope',
         pre: [
             '@modern-js/backend-federation-build',
@@ -30,19 +25,19 @@ const createUltramodernReleaseEnvelopePlugin = ({ resolveDeployTarget })=>({
                 });
             };
             api.onAfterBuild(async ()=>{
-                const configuredTarget = resolveDeployTarget(api.getNormalizedConfig());
+                const configuredTarget = api.getAppContext().deployTarget?.target;
                 if ('node' !== configuredTarget && 'cloudflare' !== configuredTarget) return;
                 await emitBuildEnvelope(configuredTarget, false);
             });
             api.onBeforeDeploy(async ()=>{
-                const configuredTarget = resolveActiveDeployTarget(api, resolveDeployTarget);
+                const configuredTarget = getDeployingTarget(api.getAppContext());
                 if ('node' !== configuredTarget) return;
                 await emitBuildEnvelope(configuredTarget);
                 const { distDirectory } = api.getAppContext();
                 await verifyBuildOutputReleaseEnvelope(distDirectory, configuredTarget);
             });
             api.onAfterDeploy(async ()=>{
-                const configuredTarget = resolveActiveDeployTarget(api, resolveDeployTarget);
+                const configuredTarget = getDeployingTarget(api.getAppContext());
                 if ('node' !== configuredTarget) return;
                 const { appDirectory, distDirectory } = api.getAppContext();
                 const outputDirectory = node_path.join(appDirectory, '.output');

package/dist/types/cloudflare-builder.d.ts

@@ -1,13 +1,12 @@
 import type { BffUserConfig } from '@modern-js/server-core';
 import type { EnvironmentConfig, ModifyBundlerChainFn, Rspack } from '@rsbuild/core';
+import type { ResolvedDeployTarget } from './deploy-output/target.js';
 export interface CloudflareBuilderNormalizedConfig {
     bff?: BffUserConfig;
-    deploy?: {
-        target?: string;
-    };
 }
 export interface CloudflareBuilderAppContext {
     apiOnly?: boolean;
+    deployTarget?: ResolvedDeployTarget;
     apiDirectory: string;
     appDirectory: string;
     entrypoints?: ReadonlyArray<{
@@ -19,9 +18,7 @@ export interface CloudflareBuilderEnvironmentsOptions {
     appContext: CloudflareBuilderAppContext;
     environments: Record<string, EnvironmentConfig>;
     normalizedConfig: CloudflareBuilderNormalizedConfig;
-    resolveDeployProvider?: ResolveCloudflareDeployProvider;
 }
-export type ResolveCloudflareDeployProvider = () => string | undefined;
 export interface CloudflareWorkerRspackConfig {
     externals: Record<string, string>;
     externalsType: 'module-import';
@@ -96,8 +93,7 @@ type FunctionExternal = (data: Rspack.ExternalItemFunctionData, callback: (error
 export declare const claimsByFunctionExternal: (externals: readonly FunctionExternal[], data: Rspack.ExternalItemFunctionData) => Promise<boolean>;
 export declare function getCloudflareWorkerRspackConfig(workerEntryNames: Iterable<string>): CloudflareWorkerRspackConfig;
 export declare function applyCloudflareWorkerRspackConfig(chain: Parameters<ModifyBundlerChainFn>[0], workerEntryNames: Iterable<string>): void;
-export declare function applyCloudflareWorkerMfRuntimeBoundary(chain: Parameters<ModifyBundlerChainFn>[0]): void;
-export declare function getCloudflareBuilderEnvironments({ appContext, environments, normalizedConfig, resolveDeployProvider, }: CloudflareBuilderEnvironmentsOptions): Record<string, EnvironmentConfig>;
+export declare function getCloudflareBuilderEnvironments({ appContext, environments, normalizedConfig, }: CloudflareBuilderEnvironmentsOptions): Record<string, EnvironmentConfig>;
 export declare function applyCloudflareBuilderEnvironments(options: CloudflareBuilderEnvironmentsOptions): CloudflareBuilderEnvironmentsResult;
-export declare const createCloudflareBuilderPlugin: (resolveDeployProvider?: ResolveCloudflareDeployProvider) => CloudflareBuilderPlugin;
+export declare const createCloudflareBuilderPlugin: () => CloudflareBuilderPlugin;
 export {};

package/dist/types/config.d.ts

@@ -1,7 +1,8 @@
 export type { ResolveEffectTsgoCompilerOptions } from './build-config/public.js';
 export { getBuildConfigEnvironment, resolveEffectTsgoCompiler, } from './build-config/public.js';
 export { createRemoteManifestUrl } from './build-config/remote-address.js';
-export type DeployTarget = 'node' | 'vercel' | 'netlify' | 'ghPages' | 'cloudflare';
+export type { DeployTarget } from './deploy-output/target.js';
+export { resolveDeployTarget } from './deploy-output/target.js';
 export type CloudflareWorkerSecurityCspMode = 'enforce' | 'report-only' | 'off';
 export type JsonValue = string | number | boolean | null | JsonValue[] | {
     [key: string]: JsonValue;

package/dist/types/deploy-output/plugin.d.ts

@@ -1,31 +1,27 @@
 import type { NodePublicAssetConfig } from '../config.js';
-import { type DeployOutputConfig } from './target.js';
+import { type ResolvedDeployTarget } from './target.js';
+export interface DeployOutputAppContext {
+    appDirectory: string;
+    metaName: string;
+    deployTarget?: ResolvedDeployTarget;
+}
 export interface DeployOutputPluginApi {
-    getAppContext(): {
-        appDirectory: string;
-        metaName: string;
-    };
-    getNormalizedConfig(): DeployOutputConfig;
+    getAppContext(): DeployOutputAppContext;
     onAfterDeploy(handler: () => Promise<void>): void;
 }
-export declare const createDeployOutputAliasesPlugin: ({ resolveDeployTarget, }?: {
-    resolveDeployTarget?: (config: DeployOutputConfig) => string;
-}) => {
+export declare const createDeployOutputAliasesPlugin: () => {
     name: string;
     setup(api: DeployOutputPluginApi): void;
 };
-export interface DeployOutputPublicAssetsConfig extends DeployOutputConfig {
-    deploy?: DeployOutputConfig['deploy'] & {
+export interface DeployOutputPublicAssetsConfig {
+    deploy?: {
         node?: {
             publicAssets?: NodePublicAssetConfig[];
         };
     };
 }
 export interface DeployOutputPublicAssetsPluginApi {
-    getAppContext(): {
-        appDirectory: string;
-        metaName: string;
-    };
+    getAppContext(): DeployOutputAppContext;
     getNormalizedConfig(): DeployOutputPublicAssetsConfig;
     onAfterDeploy(handler: () => Promise<void>): void;
 }
@@ -33,9 +29,7 @@ export interface DeployOutputPublicAssetsPluginApi {
  * Stage `deploy.node.publicAssets` into the Node deploy output. Cloudflare
  * stages `deploy.worker.publicAssets` inside its deploy preset.
  */
-export declare const createDeployOutputPublicAssetsPlugin: ({ resolveDeployTarget, }?: {
-    resolveDeployTarget?: (config: DeployOutputConfig) => string;
-}) => {
+export declare const createDeployOutputPublicAssetsPlugin: () => {
     name: string;
     setup(api: DeployOutputPublicAssetsPluginApi): void;
 };

package/dist/types/deploy-output/target.d.ts

@@ -1,6 +1,29 @@
-export interface DeployOutputConfig {
-    deploy?: {
-        target?: string;
-    };
+export declare const DEPLOY_TARGETS: readonly ['node', 'vercel', 'netlify', 'ghPages', 'cloudflare'];
+export type DeployTarget = (typeof DEPLOY_TARGETS)[number];
+export declare const DEPLOY_TARGET_FLAG = "--deploy-target";
+export interface ResolvedDeployTarget {
+    target: DeployTarget;
+    /** The flag, `deploy.target` or `MODERNJS_DEPLOY` chose the target. */
+    explicit: boolean;
 }
-export declare const resolveDeployTarget: (config: DeployOutputConfig, envDeployTarget?: string | undefined, detectedProvider?: import("std-env").ProviderName) => string;
+export interface ResolveDeployTargetOptions {
+    argv?: readonly string[];
+    configTarget?: string;
+    env?: string;
+    provider?: string;
+}
+/**
+ * The one deploy-target resolver: `--deploy-target` > `deploy.target` >
+ * `MODERNJS_DEPLOY` > detected CI provider > `node`. app-tools stores the
+ * result in the app context once; config files that branch on the target call
+ * it without `configTarget`.
+ */
+export declare const resolveDeployTarget: ({ argv, configTarget, env, provider, }?: ResolveDeployTargetOptions) => ResolvedDeployTarget;
+/**
+ * The target `modern deploy` stages. Apps under another CLI meta name deploy
+ * only when a flag, config or env chose the target explicitly.
+ */
+export declare const getDeployingTarget: ({ deployTarget, metaName, }: {
+    deployTarget?: ResolvedDeployTarget;
+    metaName: string;
+}) => DeployTarget | undefined;

package/dist/types/release-envelope/plugin.d.ts

@@ -1,8 +1,7 @@
 import type { NodePublicAssetConfig } from '../config.js';
-type ReleaseEnvelopeTarget = 'cloudflare' | 'node' | string;
+import { type ResolvedDeployTarget } from '../deploy-output/target.js';
 export interface ReleaseEnvelopeConfig {
     deploy?: {
-        target?: string;
         node?: {
             publicAssets?: NodePublicAssetConfig[];
         };
@@ -13,6 +12,7 @@ export interface ReleaseEnvelopeAppContext {
     appDirectory: string;
     distDirectory: string;
     metaName: string;
+    deployTarget?: ResolvedDeployTarget;
 }
 export interface ReleaseEnvelopePluginApi<Config extends ReleaseEnvelopeConfig = ReleaseEnvelopeConfig> {
     getAppContext(): ReleaseEnvelopeAppContext;
@@ -27,8 +27,4 @@ export interface ReleaseEnvelopePlugin<Config extends ReleaseEnvelopeConfig = Re
     post: string[];
     setup(api: ReleaseEnvelopePluginApi<Config>): void;
 }
-export type ResolveDeployTarget<Config extends ReleaseEnvelopeConfig = ReleaseEnvelopeConfig> = (config: Config) => ReleaseEnvelopeTarget;
-export declare const createUltramodernReleaseEnvelopePlugin: <Config extends ReleaseEnvelopeConfig>({ resolveDeployTarget, }: {
-    resolveDeployTarget: ResolveDeployTarget<Config>;
-}) => ReleaseEnvelopePlugin<Config>;
-export {};
+export declare const createUltramodernReleaseEnvelopePlugin: <Config extends ReleaseEnvelopeConfig>() => ReleaseEnvelopePlugin<Config>;

package/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/solutions/app-tools-extensions"
   },
   "license": "MIT",
-  "version": "3.9.0-ultramodern.19",
+  "version": "3.9.0-ultramodern.20",
   "files": [
     "dist",
     "src"
@@ -153,16 +153,16 @@
     "@babel/parser": "^8.0.6",
     "@babel/traverse": "^8.0.6",
     "@loadable/component": "5.16.7",
-    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.19",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.19",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.19",
-    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.19",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.19",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.19",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.19",
-    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.19",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.19",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.19",
+    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.20",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.20",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.20",
+    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.20",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.20",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.20",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.20",
+    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.20",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.20",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.20",
     "@swc/helpers": "^0.5.23",
     "@vercel/nft": "^1.11.0",
     "compression-webpack-plugin": "^12.0.0",
@@ -179,11 +179,12 @@
     }
   },
   "devDependencies": {
-    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.19",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.19",
-    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.19",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.19",
-    "@module-federation/runtime-tools": "npm:@bleedingdev/mf-runtime-tools@2.9.1",
+    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.20",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.20",
+    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.20",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.20",
+    "@module-federation/modern-js-v3": "2.9.2",
+    "@module-federation/runtime-tools": "2.9.2",
     "@rsbuild/core": "2.2.9",
     "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",

package/src/build-config/remote-address.ts

@@ -2,21 +2,23 @@ import {
   type BrowserManifestAddressOptions,
   resolveBrowserManifestAddress,
 } from '@modern-js/surface-resolution';
+import { resolveDeployTarget } from '../deploy-output/target';
 import { getBuildConfigEnvironment } from './build-environment';
 
 /** Adapt build environment leases and MF's name@URL syntax to discovery policy. */
 export function createRemoteManifestUrl(
   options: BrowserManifestAddressOptions,
 ): string {
-  const env = Object.fromEntries(
-    [
-      options.manifestEnv,
-      options.publicUrlEnv,
-      'MODERNJS_DEPLOY',
-      'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN',
-      'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS',
-    ].map(name => [name, getBuildConfigEnvironment(name)]),
-  );
+  const env: Record<string, string | undefined> = {
+    ...Object.fromEntries(
+      [
+        options.manifestEnv,
+        options.publicUrlEnv,
+        'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN',
+      ].map(name => [name, getBuildConfigEnvironment(name)]),
+    ),
+    MODERNJS_DEPLOY: resolveDeployTarget().target,
+  };
   const address = resolveBrowserManifestAddress(
     env,
     options,

package/src/cloudflare-builder.ts

@@ -12,13 +12,13 @@ import type {
   RsbuildEntryDescription,
   Rspack,
 } from '@rsbuild/core';
-import { provider } from 'std-env';
 import {
   CLOUDFLARE_ROUTE_DATA_HANDLER_EXPORT,
   CLOUDFLARE_WORKER_NODE_BUILTINS,
   CLOUDFLARE_WORKER_PLATFORM_MODULES,
   getCloudflareWorkerRouteDataEntryName,
 } from './cloudflare-output-contract';
+import type { ResolvedDeployTarget } from './deploy-output/target';
 import { getTemplatePath } from './read-template';
 
 const moduleRequire = createRequire(import.meta.url);
@@ -39,10 +39,6 @@ const WORKER_ROUTE_DATA_TEMPLATE = 'cloudflare-worker-route-data.mjs';
 // the workspace package and the published `@bleedingdev/modern-js-*` name.
 const DATA_LOADER_CLIENT_TRANSFORM =
   /plugin-data-loader[\\/](?:.+[\\/])?loader\.[cm]?js$/u;
-const MF_SSR_DATA_FETCH_RUNTIME_PLUGIN =
-  '@module-federation/modern-js-v3/ssr-inject-data-fetch-function-plugin';
-const MF_SSR_DEV_RUNTIME_PLUGIN =
-  '@module-federation/modern-js-v3/ssr-dev-plugin';
 // Rspack's default dependency-type conditions (`resolve.byDependency`).
 const WORKER_DEPENDENCY_CONDITIONS = [
   ['esm', 'import'],
@@ -67,11 +63,11 @@ const JS_OR_TS_EXTENSIONS = new Set([
 
 export interface CloudflareBuilderNormalizedConfig {
   bff?: BffUserConfig;
-  deploy?: { target?: string };
 }
 
 export interface CloudflareBuilderAppContext {
   apiOnly?: boolean;
+  deployTarget?: ResolvedDeployTarget;
   apiDirectory: string;
   appDirectory: string;
   entrypoints?: ReadonlyArray<{ entryName: string }>;
@@ -82,11 +78,8 @@ export interface CloudflareBuilderEnvironmentsOptions {
   appContext: CloudflareBuilderAppContext;
   environments: Record<string, EnvironmentConfig>;
   normalizedConfig: CloudflareBuilderNormalizedConfig;
-  resolveDeployProvider?: ResolveCloudflareDeployProvider;
 }
 
-export type ResolveCloudflareDeployProvider = () => string | undefined;
-
 export interface CloudflareWorkerRspackConfig {
   externals: Record<string, string>;
   externalsType: 'module-import';
@@ -654,20 +647,6 @@ function removeCloudflareWorkerDataLoaderClientTransform(
   }
 }
 
-export function applyCloudflareWorkerMfRuntimeBoundary(
-  chain: Parameters<ModifyBundlerChainFn>[0],
-) {
-  const runtimePlugin = getTemplatePath(
-    'cloudflare-worker-mf-ssr-runtime-plugin.mjs',
-  );
-  chain.plugins.delete('plugin-module-federation');
-  chain.resolve.alias.set(
-    `${MF_SSR_DATA_FETCH_RUNTIME_PLUGIN}$`,
-    runtimePlugin,
-  );
-  chain.resolve.alias.set(`${MF_SSR_DEV_RUNTIME_PLUGIN}$`, runtimePlugin);
-}
-
 const getEffectBffEntry = (
   normalizedConfig: CloudflareBuilderNormalizedConfig,
   appContext: CloudflareBuilderAppContext,
@@ -690,31 +669,6 @@ const getEffectBffEntry = (
   return resolveJsOrTsEntry(path.resolve(appContext.apiDirectory, 'index'));
 };
 
-const CLOUDFLARE_DEPLOY_PROVIDERS = new Set([
-  'cloudflare',
-  'cloudflare_pages',
-  'cloudflare_workers',
-]);
-
-const resolveStdEnvDeployProvider: ResolveCloudflareDeployProvider = () =>
-  provider;
-
-const isCloudflareWorkerDeploy = (
-  normalizedConfig: CloudflareBuilderNormalizedConfig,
-  resolveDeployProvider: ResolveCloudflareDeployProvider,
-) => {
-  const explicitTarget =
-    normalizedConfig.deploy?.target || process.env.MODERNJS_DEPLOY;
-  if (explicitTarget) {
-    return explicitTarget === 'cloudflare';
-  }
-
-  const detectedProvider = resolveDeployProvider();
-  return detectedProvider
-    ? CLOUDFLARE_DEPLOY_PROVIDERS.has(detectedProvider)
-    : false;
-};
-
 const rewriteWorkerEntryPath = (entry: string) =>
   entry
     .replace('index.jsx', 'index.server.jsx')
@@ -912,7 +866,13 @@ const createCloudflareBundlerChain = (
       .plugin('cloudflare-worker-absent-optional-dependencies')
       .use(AbsentOptionalDependencyPlugin);
 
-    applyCloudflareWorkerMfRuntimeBoundary(chain);
+    // The worker environment still uses the web target, so
+    // @module-federation/modern-js-v3 registers its browser federation plugin
+    // on it; Cloudflare workers load no native remotes. The `worker` export
+    // condition keeps MF's SSR runtime plugins out of the bundle
+    // (module-federation/core#5155). This deletion goes with the web-worker
+    // target, which needs @rsbuild/core 2.2.10 (web-infra-dev/rsbuild#8557).
+    chain.plugins.delete('plugin-module-federation');
     setAliasIfPresent(chain.resolve.alias, 'react$', reactFile);
     setAliasIfPresent(
       chain.resolve.alias,
@@ -942,9 +902,8 @@ export function getCloudflareBuilderEnvironments({
   appContext,
   environments,
   normalizedConfig,
-  resolveDeployProvider = resolveStdEnvDeployProvider,
 }: CloudflareBuilderEnvironmentsOptions): Record<string, EnvironmentConfig> {
-  if (!isCloudflareWorkerDeploy(normalizedConfig, resolveDeployProvider)) {
+  if (appContext.deployTarget?.target !== 'cloudflare') {
     return environments;
   }
 
@@ -1001,9 +960,7 @@ export function applyCloudflareBuilderEnvironments(
   return { environments: getCloudflareBuilderEnvironments(options) };
 }
 
-export const createCloudflareBuilderPlugin = (
-  resolveDeployProvider = resolveStdEnvDeployProvider,
-): CloudflareBuilderPlugin => ({
+export const createCloudflareBuilderPlugin = (): CloudflareBuilderPlugin => ({
   name: '@modern-js/cloudflare-builder',
   setup(api) {
     api.modifyBuilderEnvironments(({ environments }) =>
@@ -1011,7 +968,6 @@ export const createCloudflareBuilderPlugin = (
         appContext: api.getAppContext(),
         environments,
         normalizedConfig: api.getNormalizedConfig(),
-        resolveDeployProvider,
       }),
     );
   },