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

package/src/config.ts

@@ -4,13 +4,8 @@ export {
   resolveEffectTsgoCompiler,
 } from './build-config/public';
 export { createRemoteManifestUrl } from './build-config/remote-address';
-
-export type DeployTarget =
-  | 'node'
-  | 'vercel'
-  | 'netlify'
-  | 'ghPages'
-  | 'cloudflare';
+export type { DeployTarget } from './deploy-output/target';
+export { resolveDeployTarget } from './deploy-output/target';
 
 export type CloudflareWorkerSecurityCspMode = 'enforce' | 'report-only' | 'off';
 

package/src/deploy-output/plugin.ts

@@ -7,35 +7,28 @@ import {
   normalizeDeclaredPublicAssets,
   stageDeclaredPublicAssets,
 } from './public-assets';
-import {
-  type DeployOutputConfig,
-  resolveDeployTarget as defaultResolveDeployTarget,
-} from './target';
+import { getDeployingTarget, type ResolvedDeployTarget } from './target';
+
+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 const createDeployOutputAliasesPlugin = ({
-  resolveDeployTarget = defaultResolveDeployTarget,
-}: {
-  resolveDeployTarget?: (config: DeployOutputConfig) => string;
-} = {}) => ({
+export const createDeployOutputAliasesPlugin = () => ({
   name: '@modern-js/deploy-output-aliases',
   setup(api: DeployOutputPluginApi) {
     api.onAfterDeploy(async () => {
-      const { appDirectory, metaName } = api.getAppContext();
-      const config = api.getNormalizedConfig();
-      if (
-        (metaName !== 'modern-js' &&
-          !config.deploy?.target &&
-          !process.env.MODERNJS_DEPLOY) ||
-        resolveDeployTarget(config) !== 'node'
-      ) {
+      const appContext = api.getAppContext();
+      if (getDeployingTarget(appContext) !== 'node') {
         return;
       }
+      const { appDirectory } = appContext;
 
       const entry = createRequire(__filename).resolve('@modern-js/prod-server');
       const identity = await readPackageIdentity(entry);
@@ -54,14 +47,12 @@ export const createDeployOutputAliasesPlugin = ({
   },
 });
 
-export interface DeployOutputPublicAssetsConfig extends DeployOutputConfig {
-  deploy?: DeployOutputConfig['deploy'] & {
-    node?: { publicAssets?: NodePublicAssetConfig[] };
-  };
+export interface DeployOutputPublicAssetsConfig {
+  deploy?: { node?: { publicAssets?: NodePublicAssetConfig[] } };
 }
 
 export interface DeployOutputPublicAssetsPluginApi {
-  getAppContext(): { appDirectory: string; metaName: string };
+  getAppContext(): DeployOutputAppContext;
   getNormalizedConfig(): DeployOutputPublicAssetsConfig;
   onAfterDeploy(handler: () => Promise<void>): void;
 }
@@ -70,24 +61,16 @@ export interface DeployOutputPublicAssetsPluginApi {
  * Stage `deploy.node.publicAssets` into the Node deploy output. Cloudflare
  * stages `deploy.worker.publicAssets` inside its deploy preset.
  */
-export const createDeployOutputPublicAssetsPlugin = ({
-  resolveDeployTarget = defaultResolveDeployTarget,
-}: {
-  resolveDeployTarget?: (config: DeployOutputConfig) => string;
-} = {}) => ({
+export const createDeployOutputPublicAssetsPlugin = () => ({
   name: '@modern-js/deploy-output-public-assets',
   setup(api: DeployOutputPublicAssetsPluginApi) {
     api.onAfterDeploy(async () => {
-      const { appDirectory, metaName } = api.getAppContext();
-      const config = api.getNormalizedConfig();
-      if (
-        (metaName !== 'modern-js' &&
-          !config.deploy?.target &&
-          !process.env.MODERNJS_DEPLOY) ||
-        resolveDeployTarget(config) !== 'node'
-      ) {
+      const appContext = api.getAppContext();
+      if (getDeployingTarget(appContext) !== 'node') {
         return;
       }
+      const { appDirectory } = appContext;
+      const config = api.getNormalizedConfig();
 
       await stageDeclaredPublicAssets({
         appDirectory,

package/src/deploy-output/target.ts

@@ -1,10 +1,19 @@
-import { provider } from 'std-env';
+import { getArgv } from '@modern-js/utils';
+import { provider as detectedProvider } from 'std-env';
 
-export interface DeployOutputConfig {
-  deploy?: { target?: string };
-}
+export const DEPLOY_TARGETS = [
+  'node',
+  'vercel',
+  'netlify',
+  'ghPages',
+  'cloudflare',
+] as const;
+
+export type DeployTarget = (typeof DEPLOY_TARGETS)[number];
 
-const providerDeployTargets: Partial<Record<string, string>> = {
+export const DEPLOY_TARGET_FLAG = '--deploy-target';
+
+const providerDeployTargets: Partial<Record<string, DeployTarget>> = {
   vercel: 'vercel',
   netlify: 'netlify',
   cloudflare: 'cloudflare',
@@ -12,12 +21,86 @@ const providerDeployTargets: Partial<Record<string, string>> = {
   cloudflare_workers: 'cloudflare',
 };
 
-export const resolveDeployTarget = (
-  config: DeployOutputConfig,
-  envDeployTarget = process.env.MODERNJS_DEPLOY,
-  detectedProvider = provider,
-): string =>
-  config.deploy?.target ||
-  envDeployTarget ||
-  (detectedProvider ? providerDeployTargets[detectedProvider] : undefined) ||
-  'node';
+export interface ResolvedDeployTarget {
+  target: DeployTarget;
+  /** The flag, `deploy.target` or `MODERNJS_DEPLOY` chose the target. */
+  explicit: boolean;
+}
+
+export interface ResolveDeployTargetOptions {
+  argv?: readonly string[];
+  configTarget?: string;
+  env?: string;
+  provider?: string;
+}
+
+const readDeployTargetFlag = (argv: readonly string[]) => {
+  for (const [index, arg] of argv.entries()) {
+    if (arg === DEPLOY_TARGET_FLAG) {
+      const value = argv[index + 1];
+      if (value === undefined || 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);
+    }
+  }
+  return undefined;
+};
+
+const assertDeployTarget = (target: string, source: string): DeployTarget => {
+  if (!(DEPLOY_TARGETS as readonly string[]).includes(target)) {
+    throw new Error(
+      `Unknown deploy target '${target}' from ${source}. Use one of: ${DEPLOY_TARGETS.join(', ')}.`,
+    );
+  }
+  return target as DeployTarget;
+};
+
+/**
+ * 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 const resolveDeployTarget = ({
+  argv = getArgv(),
+  configTarget,
+  env = process.env.MODERNJS_DEPLOY,
+  provider = detectedProvider,
+}: ResolveDeployTargetOptions = {}): ResolvedDeployTarget => {
+  const explicit = (
+    [
+      [readDeployTargetFlag(argv), DEPLOY_TARGET_FLAG],
+      [configTarget, 'deploy.target'],
+      [env, 'MODERNJS_DEPLOY'],
+    ] as const
+  ).find(([target]) => target);
+  if (explicit?.[0]) {
+    return {
+      target: assertDeployTarget(explicit[0], explicit[1]),
+      explicit: true,
+    };
+  }
+  return {
+    target: (provider && providerDeployTargets[provider]) || 'node',
+    explicit: false,
+  };
+};
+
+/**
+ * The target `modern deploy` stages. Apps under another CLI meta name deploy
+ * only when a flag, config or env chose the target explicitly.
+ */
+export const getDeployingTarget = ({
+  deployTarget,
+  metaName,
+}: {
+  deployTarget?: ResolvedDeployTarget;
+  metaName: string;
+}): DeployTarget | undefined =>
+  deployTarget && (metaName === 'modern-js' || deployTarget.explicit)
+    ? deployTarget.target
+    : undefined;

package/src/release-envelope/plugin.ts

@@ -5,6 +5,10 @@ import {
   normalizeDeclaredPublicAssets,
   resolveAddedDeclaredPublicAssetPaths,
 } from '../deploy-output/public-assets';
+import {
+  getDeployingTarget,
+  type ResolvedDeployTarget,
+} from '../deploy-output/target';
 import {
   emitFrameworkMicroVerticalReleaseEnvelope,
   emitNodeStagedReleaseEnvelope,
@@ -12,13 +16,8 @@ import {
   verifyNodeReleaseEnvelopeStaging,
 } from './framework-output';
 
-type ReleaseEnvelopeTarget = 'cloudflare' | 'node' | string;
-
 export interface ReleaseEnvelopeConfig {
-  deploy?: {
-    target?: string;
-    node?: { publicAssets?: NodePublicAssetConfig[] };
-  };
+  deploy?: { node?: { publicAssets?: NodePublicAssetConfig[] } };
 }
 
 export interface ReleaseEnvelopeAppContext {
@@ -26,6 +25,7 @@ export interface ReleaseEnvelopeAppContext {
   appDirectory: string;
   distDirectory: string;
   metaName: string;
+  deployTarget?: ResolvedDeployTarget;
 }
 
 export interface ReleaseEnvelopePluginApi<
@@ -47,33 +47,9 @@ export interface ReleaseEnvelopePlugin<
   setup(api: ReleaseEnvelopePluginApi<Config>): void;
 }
 
-export type ResolveDeployTarget<
-  Config extends ReleaseEnvelopeConfig = ReleaseEnvelopeConfig,
-> = (config: Config) => ReleaseEnvelopeTarget;
-
-const resolveActiveDeployTarget = <Config extends ReleaseEnvelopeConfig>(
-  api: ReleaseEnvelopePluginApi<Config>,
-  resolveDeployTarget: ResolveDeployTarget<Config>,
-) => {
-  const { metaName } = api.getAppContext();
-  const config = api.getNormalizedConfig();
-  if (
-    metaName !== 'modern-js' &&
-    !config.deploy?.target &&
-    !process.env.MODERNJS_DEPLOY
-  ) {
-    return undefined;
-  }
-  return resolveDeployTarget(config);
-};
-
 export const createUltramodernReleaseEnvelopePlugin = <
   Config extends ReleaseEnvelopeConfig,
->({
-  resolveDeployTarget,
-}: {
-  resolveDeployTarget: ResolveDeployTarget<Config>;
-}): ReleaseEnvelopePlugin<Config> => {
+>(): ReleaseEnvelopePlugin<Config> => {
   return {
     name: '@modern-js/ultramodern-release-envelope',
     pre: [
@@ -98,7 +74,7 @@ export const createUltramodernReleaseEnvelopePlugin = <
       };
 
       api.onAfterBuild(async () => {
-        const configuredTarget = resolveDeployTarget(api.getNormalizedConfig());
+        const configuredTarget = api.getAppContext().deployTarget?.target;
         if (configuredTarget !== 'node' && configuredTarget !== 'cloudflare') {
           return;
         }
@@ -110,10 +86,7 @@ export const createUltramodernReleaseEnvelopePlugin = <
       });
 
       api.onBeforeDeploy(async () => {
-        const configuredTarget = resolveActiveDeployTarget(
-          api,
-          resolveDeployTarget,
-        );
+        const configuredTarget = getDeployingTarget(api.getAppContext());
         if (configuredTarget !== 'node') {
           return;
         }
@@ -123,10 +96,7 @@ export const createUltramodernReleaseEnvelopePlugin = <
       });
 
       api.onAfterDeploy(async () => {
-        const configuredTarget = resolveActiveDeployTarget(
-          api,
-          resolveDeployTarget,
-        );
+        const configuredTarget = getDeployingTarget(api.getAppContext());
         if (configuredTarget !== 'node') {
           return;
         }

package/dist/cjs/templates/cloudflare-worker-mf-ssr-runtime-plugin.mjs

@@ -1,14 +0,0 @@
-/**
- * Workerd cannot initialize Module Federation's Node-oriented SSR data-fetch
- * runtime. Cloudflare workers do not load native MF remotes, so retain the
- * runtime-plugin contract without installing its server data-fetch hooks.
- */
-export const injectDataFetchFunctionPlugin = () => ({
-  name: '@module-federation/inject-data-fetch-function-plugin',
-  setup() {},
-});
-
-export const mfSSRDevPlugin = () => ({
-  name: '@module-federation/modern-js-v3',
-  setup() {},
-});

package/dist/esm/templates/cloudflare-worker-mf-ssr-runtime-plugin.mjs

@@ -1,14 +0,0 @@
-/**
- * Workerd cannot initialize Module Federation's Node-oriented SSR data-fetch
- * runtime. Cloudflare workers do not load native MF remotes, so retain the
- * runtime-plugin contract without installing its server data-fetch hooks.
- */
-export const injectDataFetchFunctionPlugin = () => ({
-  name: '@module-federation/inject-data-fetch-function-plugin',
-  setup() {},
-});
-
-export const mfSSRDevPlugin = () => ({
-  name: '@module-federation/modern-js-v3',
-  setup() {},
-});

package/dist/esm-node/templates/cloudflare-worker-mf-ssr-runtime-plugin.mjs

@@ -1,14 +0,0 @@
-/**
- * Workerd cannot initialize Module Federation's Node-oriented SSR data-fetch
- * runtime. Cloudflare workers do not load native MF remotes, so retain the
- * runtime-plugin contract without installing its server data-fetch hooks.
- */
-export const injectDataFetchFunctionPlugin = () => ({
-  name: '@module-federation/inject-data-fetch-function-plugin',
-  setup() {},
-});
-
-export const mfSSRDevPlugin = () => ({
-  name: '@module-federation/modern-js-v3',
-  setup() {},
-});

package/dist/types/templates/cloudflare-worker-mf-ssr-runtime-plugin.d.mts

@@ -1,13 +0,0 @@
-/**
- * Workerd cannot initialize Module Federation's Node-oriented SSR data-fetch
- * runtime. Cloudflare workers do not load native MF remotes, so retain the
- * runtime-plugin contract without installing its server data-fetch hooks.
- */
-export declare const injectDataFetchFunctionPlugin: () => {
-    name: string;
-    setup(): void;
-};
-export declare const mfSSRDevPlugin: () => {
-    name: string;
-    setup(): void;
-};

package/src/templates/cloudflare-worker-mf-ssr-runtime-plugin.mjs

@@ -1,14 +0,0 @@
-/**
- * Workerd cannot initialize Module Federation's Node-oriented SSR data-fetch
- * runtime. Cloudflare workers do not load native MF remotes, so retain the
- * runtime-plugin contract without installing its server data-fetch hooks.
- */
-export const injectDataFetchFunctionPlugin = () => ({
-  name: '@module-federation/inject-data-fetch-function-plugin',
-  setup() {},
-});
-
-export const mfSSRDevPlugin = () => ({
-  name: '@module-federation/modern-js-v3',
-  setup() {},
-});