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

package/dist/cjs/build-config/remote-address.js

@@ -31,18 +31,20 @@ __webpack_require__.d(__webpack_exports__, {
     createRemoteManifestUrl: ()=>createRemoteManifestUrl
 });
 const surface_resolution_namespaceObject = require("@modern-js/surface-resolution");
+const target_js_namespaceObject = require("../deploy-output/target.js");
 const external_build_environment_js_namespaceObject = require("./build-environment.js");
 function createRemoteManifestUrl(options) {
-    const env = Object.fromEntries([
-        options.manifestEnv,
-        options.publicUrlEnv,
-        'MODERNJS_DEPLOY',
-        'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN',
-        'ULTRAMODERN_CLOUDFLARE_REQUIRE_PUBLIC_URLS'
-    ].map((name)=>[
-            name,
-            (0, external_build_environment_js_namespaceObject.getBuildConfigEnvironment)(name)
-        ]));
+    const env = {
+        ...Object.fromEntries([
+            options.manifestEnv,
+            options.publicUrlEnv,
+            'ULTRAMODERN_CLOUDFLARE_WORKERS_DEV_SUBDOMAIN'
+        ].map((name)=>[
+                name,
+                (0, external_build_environment_js_namespaceObject.getBuildConfigEnvironment)(name)
+            ])),
+        MODERNJS_DEPLOY: (0, target_js_namespaceObject.resolveDeployTarget)().target
+    };
     const address = (0, surface_resolution_namespaceObject.resolveBrowserManifestAddress)(env, options, (0, external_build_environment_js_namespaceObject.getBuildConfigEnvironment)('NODE_ENV') ?? 'production');
     if (!address.ok) throw new Error(`Remote ${options.mfName}: ${address.reason}`);
     return env[options.manifestEnv]?.trim() || `${options.mfName}@${address.manifestUrl}`;

package/dist/cjs/cloudflare-builder.js

@@ -41,7 +41,6 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     applyCloudflareBuilderEnvironments: ()=>applyCloudflareBuilderEnvironments,
-    applyCloudflareWorkerMfRuntimeBoundary: ()=>applyCloudflareWorkerMfRuntimeBoundary,
     applyCloudflareWorkerRspackConfig: ()=>applyCloudflareWorkerRspackConfig,
     claimsByFunctionExternal: ()=>claimsByFunctionExternal,
     createAbsentOptionalDependencyFilter: ()=>createAbsentOptionalDependencyFilter,
@@ -57,7 +56,6 @@ const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const builder_namespaceObject = require("@modern-js/builder");
 const utils_namespaceObject = require("@modern-js/utils");
-const external_std_env_namespaceObject = require("std-env");
 const external_cloudflare_output_contract_js_namespaceObject = require("./cloudflare-output-contract.js");
 const external_read_template_js_namespaceObject = require("./read-template.js");
 const moduleRequire = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
@@ -68,8 +66,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',
@@ -363,12 +359,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 = (0, external_read_template_js_namespaceObject.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;
@@ -378,18 +368,6 @@ const getEffectBffEntry = (normalizedConfig, appContext)=>{
     }
     return resolveJsOrTsEntry(external_node_path_default().resolve(appContext.apiDirectory, 'index'));
 };
-const CLOUDFLARE_DEPLOY_PROVIDERS = new Set([
-    'cloudflare',
-    'cloudflare_pages',
-    'cloudflare_workers'
-]);
-const resolveStdEnvDeployProvider = ()=>external_std_env_namespaceObject.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;
@@ -512,7 +490,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);
@@ -521,8 +499,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[builder_namespaceObject.SERVICE_WORKER_ENVIRONMENT_NAME] ?? (appContext.apiOnly ? {
         output: {
             target: 'web-worker'
@@ -559,19 +537,17 @@ 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()
                 }));
         }
     });
 exports.applyCloudflareBuilderEnvironments = __webpack_exports__.applyCloudflareBuilderEnvironments;
-exports.applyCloudflareWorkerMfRuntimeBoundary = __webpack_exports__.applyCloudflareWorkerMfRuntimeBoundary;
 exports.applyCloudflareWorkerRspackConfig = __webpack_exports__.applyCloudflareWorkerRspackConfig;
 exports.claimsByFunctionExternal = __webpack_exports__.claimsByFunctionExternal;
 exports.createAbsentOptionalDependencyFilter = __webpack_exports__.createAbsentOptionalDependencyFilter;
@@ -581,7 +557,6 @@ exports.getCloudflareBuilderEnvironments = __webpack_exports__.getCloudflareBuil
 exports.getCloudflareWorkerRspackConfig = __webpack_exports__.getCloudflareWorkerRspackConfig;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "applyCloudflareBuilderEnvironments",
-    "applyCloudflareWorkerMfRuntimeBoundary",
     "applyCloudflareWorkerRspackConfig",
     "claimsByFunctionExternal",
     "createAbsentOptionalDependencyFilter",

package/dist/cjs/config.js

@@ -30,16 +30,20 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRemoteManifestUrl: ()=>remote_address_js_namespaceObject.createRemoteManifestUrl,
     getBuildConfigEnvironment: ()=>public_js_namespaceObject.getBuildConfigEnvironment,
+    resolveDeployTarget: ()=>target_js_namespaceObject.resolveDeployTarget,
     resolveEffectTsgoCompiler: ()=>public_js_namespaceObject.resolveEffectTsgoCompiler
 });
 const public_js_namespaceObject = require("./build-config/public.js");
 const remote_address_js_namespaceObject = require("./build-config/remote-address.js");
+const target_js_namespaceObject = require("./deploy-output/target.js");
 exports.createRemoteManifestUrl = __webpack_exports__.createRemoteManifestUrl;
 exports.getBuildConfigEnvironment = __webpack_exports__.getBuildConfigEnvironment;
+exports.resolveDeployTarget = __webpack_exports__.resolveDeployTarget;
 exports.resolveEffectTsgoCompiler = __webpack_exports__.resolveEffectTsgoCompiler;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRemoteManifestUrl",
     "getBuildConfigEnvironment",
+    "resolveDeployTarget",
     "resolveEffectTsgoCompiler"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/deploy-output/plugin.js

@@ -46,13 +46,13 @@ var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_no
 const external_npmAliases_js_namespaceObject = require("./npmAliases.js");
 const external_public_assets_js_namespaceObject = require("./public-assets.js");
 const external_target_js_namespaceObject = require("./target.js");
-const createDeployOutputAliasesPlugin = ({ resolveDeployTarget = external_target_js_namespaceObject.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' !== (0, external_target_js_namespaceObject.getDeployingTarget)(appContext)) return;
+                const { appDirectory } = appContext;
                 const entry = (0, external_node_module_namespaceObject.createRequire)(__filename).resolve('@modern-js/prod-server');
                 const identity = await (0, external_npmAliases_js_namespaceObject.readPackageIdentity)(entry);
                 await (0, external_npmAliases_js_namespaceObject.preserveNpmAliases)({
@@ -69,13 +69,14 @@ const createDeployOutputAliasesPlugin = ({ resolveDeployTarget = external_target
             });
         }
     });
-const createDeployOutputPublicAssetsPlugin = ({ resolveDeployTarget = external_target_js_namespaceObject.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' !== (0, external_target_js_namespaceObject.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 (0, external_public_assets_js_namespaceObject.stageDeclaredPublicAssets)({
                     appDirectory,
                     outputDirectory: external_node_path_default().join(appDirectory, '.output'),

package/dist/cjs/deploy-output/target.js

@@ -28,9 +28,21 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    DEPLOY_TARGETS: ()=>DEPLOY_TARGETS,
+    DEPLOY_TARGET_FLAG: ()=>DEPLOY_TARGET_FLAG,
+    getDeployingTarget: ()=>getDeployingTarget,
     resolveDeployTarget: ()=>resolveDeployTarget
 });
+const utils_namespaceObject = require("@modern-js/utils");
 const external_std_env_namespaceObject = require("std-env");
+const DEPLOY_TARGETS = [
+    'node',
+    'vercel',
+    'netlify',
+    'ghPages',
+    'cloudflare'
+];
+const DEPLOY_TARGET_FLAG = '--deploy-target';
 const providerDeployTargets = {
     vercel: 'vercel',
     netlify: 'netlify',
@@ -38,9 +50,53 @@ const providerDeployTargets = {
     cloudflare_pages: 'cloudflare',
     cloudflare_workers: 'cloudflare'
 };
-const resolveDeployTarget = (config, envDeployTarget = process.env.MODERNJS_DEPLOY, detectedProvider = external_std_env_namespaceObject.provider)=>config.deploy?.target || envDeployTarget || (detectedProvider ? providerDeployTargets[detectedProvider] : void 0) || 'node';
+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 = (0, utils_namespaceObject.getArgv)(), configTarget, env = process.env.MODERNJS_DEPLOY, provider = external_std_env_namespaceObject.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;
+exports.DEPLOY_TARGETS = __webpack_exports__.DEPLOY_TARGETS;
+exports.DEPLOY_TARGET_FLAG = __webpack_exports__.DEPLOY_TARGET_FLAG;
+exports.getDeployingTarget = __webpack_exports__.getDeployingTarget;
 exports.resolveDeployTarget = __webpack_exports__.resolveDeployTarget;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "DEPLOY_TARGETS",
+    "DEPLOY_TARGET_FLAG",
+    "getDeployingTarget",
     "resolveDeployTarget"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/release-envelope/plugin.js

@@ -42,14 +42,9 @@ __webpack_require__.d(__webpack_exports__, {
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const public_assets_js_namespaceObject = require("../deploy-output/public-assets.js");
+const target_js_namespaceObject = require("../deploy-output/target.js");
 const external_framework_output_js_namespaceObject = require("./framework-output.js");
-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',
@@ -71,19 +66,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 = (0, target_js_namespaceObject.getDeployingTarget)(api.getAppContext());
                 if ('node' !== configuredTarget) return;
                 await emitBuildEnvelope(configuredTarget);
                 const { distDirectory } = api.getAppContext();
                 await (0, external_framework_output_js_namespaceObject.verifyBuildOutputReleaseEnvelope)(distDirectory, configuredTarget);
             });
             api.onAfterDeploy(async ()=>{
-                const configuredTarget = resolveActiveDeployTarget(api, resolveDeployTarget);
+                const configuredTarget = (0, target_js_namespaceObject.getDeployingTarget)(api.getAppContext());
                 if ('node' !== configuredTarget) return;
                 const { appDirectory, distDirectory } = api.getAppContext();
                 const outputDirectory = external_node_path_default().join(appDirectory, '.output');

package/dist/esm/build-config/remote-address.mjs

@@ -1,16 +1,18 @@
 import { resolveBrowserManifestAddress } from "@modern-js/surface-resolution";
+import { resolveDeployTarget } from "../deploy-output/target.mjs";
 import { getBuildConfigEnvironment } from "./build-environment.mjs";
 function createRemoteManifestUrl(options) {
-    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 = {
+        ...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, getBuildConfigEnvironment('NODE_ENV') ?? 'production');
     if (!address.ok) throw new Error(`Remote ${options.mfName}: ${address.reason}`);
     return env[options.manifestEnv]?.trim() || `${options.mfName}@${address.manifestUrl}`;

package/dist/esm/cloudflare-builder.mjs

@@ -3,7 +3,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);
@@ -14,8 +13,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',
@@ -309,12 +306,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;
@@ -324,18 +315,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;
@@ -458,7 +437,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);
@@ -467,8 +446,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'
@@ -505,15 +484,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/config.mjs

@@ -1,2 +1,3 @@
 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/deploy-output/plugin.mjs

@@ -2,14 +2,14 @@ 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";
-const createDeployOutputAliasesPlugin = ({ resolveDeployTarget = external_target_mjs_resolveDeployTarget } = {})=>({
+import { getDeployingTarget } from "./target.mjs";
+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(__filename).resolve('@modern-js/prod-server');
                 const identity = await readPackageIdentity(entry);
                 await preserveNpmAliases({
@@ -26,13 +26,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/deploy-output/target.mjs

@@ -1,4 +1,13 @@
-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',
@@ -6,5 +15,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/release-envelope/plugin.mjs

@@ -1,13 +1,8 @@
 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',
@@ -29,19 +24,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/esm-node/build-config/remote-address.mjs

@@ -1,17 +1,19 @@
 import "node:module";
 import { resolveBrowserManifestAddress } from "@modern-js/surface-resolution";
+import { resolveDeployTarget } from "../deploy-output/target.mjs";
 import { getBuildConfigEnvironment } from "./build-environment.mjs";
 function createRemoteManifestUrl(options) {
-    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 = {
+        ...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, getBuildConfigEnvironment('NODE_ENV') ?? 'production');
     if (!address.ok) throw new Error(`Remote ${options.mfName}: ${address.reason}`);
     return env[options.manifestEnv]?.trim() || `${options.mfName}@${address.manifestUrl}`;