@bleedingdev/modern-js-runtime-extensions 3.9.0-ultramodern.5 → 3.9.0-ultramodern.7

package/src/routerProvider.ts

@@ -97,209 +97,32 @@ export function createRouterProviderRealm(
   });
 }
 
-type RouterProviderRegistry = {
-  providers: Map<string, RouterProviderFactory>;
-  defaultProvider?: string;
-  /** Names that were registered by more than one module instance. */
-  duplicateProviders: Set<string>;
-  /** Duplicate names already reported when the compatibility fallback won. */
-  warnedDuplicates: Set<string>;
-};
-
-/**
- * Versioned compatibility-registry key. The unsuffixed key
- * ('@modern-js/runtime:router-providers') is owned by older published copies
- * of this module whose `registerRouterProvider` *throws* on a same-name
- * re-registration. `:v2` added keep-first registration but also enforced one
- * non-default provider across the whole JavaScript realm. `:v3` removes that
- * page-global app invariant: explicit runtime realms own provider selection,
- * while this registry remains only a mixed-version fallback. New copies read
- * but never mutate the v2 slot so older published copies remain compatible.
- */
-const REGISTRY_SLOT: unique symbol = Symbol.for(
-  '@modern-js/runtime:router-providers:v3',
-);
-const LEGACY_V2_REGISTRY_SLOT: unique symbol = Symbol.for(
-  '@modern-js/runtime:router-providers:v2',
-);
-
-function getRegistry(): RouterProviderRegistry {
-  const host = globalThis as { [REGISTRY_SLOT]?: RouterProviderRegistry };
-  host[REGISTRY_SLOT] ??= {
-    providers: new Map(),
-    duplicateProviders: new Set(),
-    warnedDuplicates: new Set(),
-  };
-  // Defense in depth within the v3 key: if a future v3-keyed copy of this
-  // module ever predates a later-added field (mixed v3 minors in a Module
-  // Federation setup), heal the shape instead of crashing on `undefined`.
-  host[REGISTRY_SLOT].duplicateProviders ??= new Set();
-  host[REGISTRY_SLOT].warnedDuplicates ??= new Set();
-  return host[REGISTRY_SLOT];
-}
-
-function getLegacyV2Registry():
-  | Pick<RouterProviderRegistry, 'providers' | 'defaultProvider'>
-  | undefined {
-  const host = globalThis as {
-    [LEGACY_V2_REGISTRY_SLOT]?: Pick<
-      RouterProviderRegistry,
-      'providers' | 'defaultProvider'
-    >;
-  };
-  return host[LEGACY_V2_REGISTRY_SLOT];
-}
-
-export function registerRouterProvider(
-  name: string,
-  factory: RouterProviderFactory,
-  options: { isDefault?: boolean } = {},
-): void {
-  const registry = getRegistry();
-  const existing = registry.providers.get(name);
-
-  if (existing !== undefined) {
-    // Keep-first semantics. A same-name re-registration with a *different*
-    // factory is almost always two bundled copies of the same provider
-    // module — e.g. a Module Federation remote that does not share
-    // '@modern-js/plugin-tanstack/runtime' evaluates its own copy, which
-    // creates a fresh factory function per evaluation. That must not crash
-    // the app; the first registration remains available for compatibility.
-    // Merely loading independent app-owned realms is valid, so defer the
-    // warning until a caller actually consumes this ambiguous fallback.
-    if (existing !== factory) {
-      registry.duplicateProviders.add(name);
-    }
-    return;
-  }
-
-  if (options.isDefault === true) {
-    registry.defaultProvider = name;
-  }
-
-  registry.providers.set(name, factory);
-}
-
 export function resolveRouterProvider(
-  framework?: string,
-  options: {
-    /**
-     * Provider factories owned by the resolving app/runtime wrapper. A realm
-     * is the exclusive provider source when supplied because its factories
-     * close over the correct app module graph.
-     */
-    realm?: RouterProviderRealm;
-    /**
-     * Legacy single-provider override retained for published wrappers. New
-     * integrations should pass an app-owned `realm`, which supports every
-     * provider rather than only the default.
-     */
-    localDefault?: { name: string; factory: RouterProviderFactory };
-  } = {},
+  framework: string | undefined,
+  options: { realm: RouterProviderRealm },
 ): RouterProviderFactory {
-  if (options.realm !== undefined) {
-    const name = framework || options.realm.defaultProvider;
-    const realmProviderNames = options.realm.names();
-
-    if (name === undefined) {
-      throw new Error(
-        `[@modern-js/runtime] The app-owned router provider realm does not declare a default provider. Available realm providers: ${
-          realmProviderNames.join(', ') || '(none)'
-        }.`,
-      );
-    }
-
-    const factory = options.realm.get(name);
-    if (factory === undefined) {
-      throw new Error(
-        `[@modern-js/runtime] Router provider "${name}" is not registered in the app-owned router provider realm. ` +
-          `Available realm providers: ${
-            realmProviderNames.join(', ') || '(none)'
-          }. Compatibility registry fallback is disabled for app-owned realms.`,
-      );
-    }
-
-    return factory;
-  }
-
-  const registry = getRegistry();
-  const legacyV2Registry = getLegacyV2Registry();
-  // `||` on purpose: a falsy framework value (empty string from env
-  // templating, `false`, `undefined`) falls back to the default provider
-  // instead of erroring on an unknown framework "". Prefer the older
-  // localDefault contract before compatibility slots.
-  const name =
-    framework ||
-    options.localDefault?.name ||
-    registry.defaultProvider ||
-    legacyV2Registry?.defaultProvider;
+  const name = framework || options.realm.defaultProvider;
+  const realmProviderNames = options.realm.names();
 
   if (name === undefined) {
     throw new Error(
-      '[@modern-js/runtime] No default router provider is registered. This is a bug in the runtime setup.',
+      `[@modern-js/runtime] The app-owned router provider realm does not declare a default provider. Available realm providers: ${
+        realmProviderNames.join(', ') || '(none)'
+      }.`,
     );
   }
 
-  if (
-    options.localDefault !== undefined &&
-    name === options.localDefault.name
-  ) {
-    return options.localDefault.factory;
-  }
-
-  const factory = registry.providers.get(name);
-  if (factory !== undefined) {
-    if (
-      registry.duplicateProviders.has(name) &&
-      !registry.warnedDuplicates.has(name)
-    ) {
-      registry.warnedDuplicates.add(name);
-      console.warn(
-        `[@modern-js/runtime] The router provider "${name}" was registered more than once with different module instances, and a router wrapper without an app-owned provider realm is resolving the mixed-version compatibility fallback. The fallback is keeping the first registration. ` +
-          'Modern router wrappers isolate app-owned realms automatically. ' +
-          'For an older wrapper, share the provider runtime between Module Federation host and remotes or upgrade every app to a realm-aware runtime.',
-      );
-    }
-    return factory;
-  }
-
-  const legacyV2Factory = legacyV2Registry?.providers.get(name);
-  if (legacyV2Factory !== undefined) {
-    return legacyV2Factory;
-  }
-
-  if (name === 'tanstack') {
+  const factory = options.realm.get(name);
+  if (factory === undefined) {
     throw new Error(
-      '[@modern-js/runtime] `runtime.router.framework` is set to "tanstack", but no TanStack router provider is registered. ' +
-        'Install @modern-js/plugin-tanstack, add `tanstackRouterPlugin()` to the `plugins` array in modern.config.ts, ' +
-        "and make sure '@modern-js/plugin-tanstack/runtime' is imported (e.g. in modern.runtime.ts).",
+      `[@modern-js/runtime] Router provider "${name}" is not registered in the app-owned router provider realm. ` +
+        `Available realm providers: ${
+          realmProviderNames.join(', ') || '(none)'
+        }.`,
     );
   }
 
-  throw new Error(
-    `[@modern-js/runtime] Unknown router framework "${name}". ` +
-      `Registered providers: ${
-        [
-          ...new Set([
-            ...registry.providers.keys(),
-            ...(legacyV2Registry?.providers.keys() ?? []),
-          ]),
-        ].join(', ') || '(none)'
-      }. Install and register the plugin that provides this router framework.`,
-  );
-}
-
-/**
- * Test-only escape hatch: compatibility registries live on `globalThis`, so
- * unit tests need a way to restore a pristine state between cases.
- */
-export function unsafe_resetRouterProvidersForTesting(): void {
-  const host = globalThis as {
-    [REGISTRY_SLOT]?: RouterProviderRegistry;
-    [LEGACY_V2_REGISTRY_SLOT]?: unknown;
-  };
-  delete host[REGISTRY_SLOT];
-  delete host[LEGACY_V2_REGISTRY_SLOT];
+  return factory;
 }
 
 /** Compose app-owned providers without importing the native runtime graph. */
@@ -312,9 +135,6 @@ export function createRouterPlugin<Hooks extends Record<string, unknown>>({
   registryHooks: Hooks;
   localProviders?: readonly Omit<RouterProviderRegistration, 'isDefault'>[];
 }) {
-  registerRouterProvider(defaultProvider.name, defaultProvider.factory, {
-    isDefault: true,
-  });
   const realm = createRouterProviderRealm([
     { ...defaultProvider, isDefault: true },
     ...localProviders,

package/src/server-config/bffRuntime.ts

@@ -123,10 +123,10 @@ export interface BffEffectUserConfig {
   /**
    * Enforce Effect-native API/runtime modules instead of raw request handlers.
    *
-   * When enabled, Effect API entries must export a `defineEffectBff(...)`
+   * Effect API entries must export a `defineEffectBff(...)`
    * definition or a `{ api, layer }` HttpApi module. Raw `handler` exports,
    * default request handlers, and unbranded custom `createHandler` factories
-   * are treated as legacy escape hatches.
+   * are rejected.
    *
    * @default true
    */

package/src/server-config/serverTelemetry.ts

@@ -31,18 +31,18 @@ export interface ServerTelemetrySloUserConfig {
   alertCooldownMs?: number;
 }
 
-export interface ServerTelemetryCanaryContractGateUserConfig {
+export interface ServerTelemetryHealthContractGateUserConfig {
   /**
    * Whether this contract gate currently passes.
    */
   passed: boolean;
   /**
-   * Optional failure reason used for rollback diagnostics.
+   * Optional failure reason used for health diagnostics.
    */
   reason?: string;
 }
 
-export interface ServerTelemetryCanaryAutopilotUserConfig {
+export interface ServerTelemetrySnapshotObservationUserConfig {
   /**
    * Enable automatic contract gate synchronization from a gate snapshot file.
    *
@@ -70,15 +70,15 @@ export interface ServerTelemetryCanaryAutopilotUserConfig {
   /**
    * Runtime MF fallback signal ingestion.
    */
-  runtimeFallbackSignal?: ServerTelemetryCanaryRuntimeFallbackSignalUserConfig;
+  runtimeFallbackSignal?: ServerTelemetryHealthRuntimeFallbackSignalUserConfig;
   /**
    * Optional pluggable state store backend for contract gate snapshots.
    * When omitted, snapshots are read/written from gateSnapshotPath on local disk.
    */
-  stateStore?: ServerTelemetryCanaryAutopilotStateStoreUserConfig;
+  stateStore?: ServerTelemetrySnapshotObservationStateStoreUserConfig;
 }
 
-export interface ServerTelemetryCanaryAutopilotStateStoreUserConfig {
+export interface ServerTelemetrySnapshotObservationStateStoreUserConfig {
   /**
    * Path or package name of a module that exports
    * `createContractGateSnapshotStore(context)`.
@@ -90,7 +90,7 @@ export interface ServerTelemetryCanaryAutopilotStateStoreUserConfig {
   options?: Record<string, unknown>;
 }
 
-export interface ServerTelemetryCanaryRuntimeFallbackSignalUserConfig {
+export interface ServerTelemetryHealthRuntimeFallbackSignalUserConfig {
   /**
    * Enable runtime MF fallback signal ingestion endpoint.
    *
@@ -126,16 +126,16 @@ export interface ServerTelemetryCanaryRuntimeFallbackSignalUserConfig {
   maxBodyBytes?: number;
   /**
    * Optional runtime trust policy for fallback signal ingestion.
-   * Use this to restrict who can mutate canary contract gates.
+   * Use this to restrict who can mutate health contract gates.
    */
-  trustPolicy?: ServerTelemetryCanaryRuntimeFallbackSignalTrustPolicyUserConfig;
+  trustPolicy?: ServerTelemetryHealthRuntimeFallbackSignalTrustPolicyUserConfig;
   /**
    * Optional request authentication for runtime fallback signal endpoint.
    */
-  auth?: ServerTelemetryCanaryRuntimeFallbackSignalAuthUserConfig;
+  auth?: ServerTelemetryHealthRuntimeFallbackSignalAuthUserConfig;
 }
 
-export interface ServerTelemetryCanaryRuntimeFallbackSignalAuthUserConfig {
+export interface ServerTelemetryHealthRuntimeFallbackSignalAuthUserConfig {
   /**
    * Enable auth guard for runtime fallback signal endpoint.
    *
@@ -158,7 +158,7 @@ export interface ServerTelemetryCanaryRuntimeFallbackSignalAuthUserConfig {
   expectedValueEnv?: string;
 }
 
-export interface ServerTelemetryCanaryRuntimeFallbackSignalTrustPolicyUserConfig {
+export interface ServerTelemetryHealthRuntimeFallbackSignalTrustPolicyUserConfig {
   /**
    * Allowlist of app names accepted by runtime fallback signal endpoint.
    * Empty means no app-name allowlist check.
@@ -200,61 +200,61 @@ export interface ServerTelemetryCanaryRuntimeFallbackSignalTrustPolicyUserConfig
   dedupeWindowMs?: number;
 }
 
-export interface ServerTelemetryCanaryUserConfig {
+export interface ServerTelemetryHealthUserConfig {
   /**
-   * Enable canary rollout/rollback orchestration.
+   * Enable telemetry health observation.
    *
    * @default false
    */
   enabled?: boolean;
   /**
-   * Periodic canary evaluation interval in milliseconds.
+   * Periodic health evaluation interval in milliseconds.
    *
    * @default 15000
    */
   evaluationIntervalMs?: number;
   /**
-   * Required consecutive healthy evaluations before promotion.
+   * Required consecutive healthy evaluations before reporting healthy.
    *
    * @default 3
    */
   minConsecutiveHealthyEvaluations?: number;
   /**
-   * Consecutive failing evaluations before automated rollback.
+   * Consecutive failing evaluations before reporting unhealthy.
    *
    * @default 2
    */
-  rollbackConsecutiveFailures?: number;
+  minConsecutiveFailedEvaluations?: number;
   /**
-   * Maximum queue utilization ratio allowed during canary.
+   * Maximum queue utilization ratio allowed for healthy telemetry.
    *
    * @default 0.8
    */
   maxQueueUtilization?: number;
   /**
-   * Maximum allowed total dropped envelopes during canary.
+   * Maximum allowed total dropped envelopes for healthy telemetry.
    *
    * @default 0
    */
   maxTotalDropped?: number;
   /**
-   * Maximum allowed unhealthy exporters during canary.
+   * Maximum allowed unhealthy exporters for healthy telemetry.
    *
    * @default 0
    */
   maxUnhealthyExporters?: number;
   /**
-   * Contract gate map used in rollout decisions.
+   * Contract gate map used in health evaluations.
    * `true` means passing, `false` means failing.
    */
   contractGates?: Record<
     string,
-    boolean | ServerTelemetryCanaryContractGateUserConfig
+    boolean | ServerTelemetryHealthContractGateUserConfig
   >;
   /**
-   * Contract-gate autopilot settings.
+   * Contract-gate snapshot observation settings.
    */
-  autopilot?: ServerTelemetryCanaryAutopilotUserConfig;
+  snapshotObservation?: ServerTelemetrySnapshotObservationUserConfig;
 }
 
 export interface ServerTelemetryConfigExtension {
@@ -321,9 +321,9 @@ export interface ServerTelemetryUserConfig {
    */
   slo?: ServerTelemetrySloUserConfig;
   /**
-   * Canary rollout and automated rollback orchestration policy.
+   * Telemetry health observation policy.
    */
-  canary?: ServerTelemetryCanaryUserConfig;
+  health?: ServerTelemetryHealthUserConfig;
   exporters?: {
     /**
      * OpenTelemetry HTTP exporter.

package/tests/buildIdentity.test.ts

@@ -28,25 +28,6 @@ const readers = {
   sourceRevision: () => 'compiled-revision',
 };
 
-it('applies injected identity to every surface without mutating the artifact', () => {
-  const resolved = resolveUltramodernBuildArtifact(artifact, readers);
-  for (const record of [
-    resolved.deliveryUnit,
-    resolved.surfaces.api,
-    resolved.surfaces.ui,
-  ]) {
-    expect(record).toMatchObject({
-      build: 'compiled-build',
-      buildMarker: 'compiled-build',
-      sourceRevision: 'compiled-revision',
-    });
-  }
-  expect(resolved.deliveryUnit.unitId).toBe('shop/catalog');
-  expect(resolved.surfaces.api.surface).toBe('api');
-  expect(resolved.surfaces.ui.surface).toBe('ui');
-  expect(artifact.deliveryUnit.buildMarker).toBe('original');
-});
-
 it('falls back only for missing compiler references and preserves each supplied value', () => {
   expect(resolveUltramodernBuildArtifact(artifact)).toEqual(artifact);
 

package/tests/contextExtensions.test.ts

@@ -1,50 +1,6 @@
 import { createRuntimeContextExtension } from '../src/contextExtensions';
 
 describe('runtime context extensions', () => {
-  it('stores and retrieves typed values per context object', () => {
-    const extension = createRuntimeContextExtension<{ value: number }>(
-      'test:isolation-a',
-    );
-    const contextA = {};
-    const contextB = {};
-
-    extension.set(contextA, { value: 1 });
-    extension.set(contextB, { value: 2 });
-
-    expect(extension.get(contextA)).toEqual({ value: 1 });
-    expect(extension.get(contextB)).toEqual({ value: 2 });
-
-    extension.remove(contextA);
-    expect(extension.get(contextA)).toBeUndefined();
-    expect(extension.get(contextB)).toEqual({ value: 2 });
-  });
-
-  it('isolates extensions with different ids on the same context', () => {
-    const first = createRuntimeContextExtension<string>('test:first');
-    const second = createRuntimeContextExtension<string>('test:second');
-    const context = {};
-
-    first.set(context, 'one');
-    second.set(context, 'two');
-
-    expect(first.get(context)).toBe('one');
-    expect(second.get(context)).toBe('two');
-  });
-
-  it('shares state between extensions created with the same id', () => {
-    const a = createRuntimeContextExtension<string>('test:shared');
-    const b = createRuntimeContextExtension<string>('test:shared');
-    const context = {};
-
-    a.set(context, 'value');
-    expect(b.get(context)).toBe('value');
-  });
-
-  it('returns undefined for contexts without any extensions', () => {
-    const extension = createRuntimeContextExtension<string>('test:empty');
-    expect(extension.get({})).toBeUndefined();
-  });
-
   it('does not leak into string-key enumeration of the context', () => {
     const extension = createRuntimeContextExtension<string>('test:hidden');
     const context = {};

package/tests/headRuntime.test.tsx

@@ -146,41 +146,6 @@ describe('server Helmet collection', () => {
     expect(meta).toContain('content="inner"');
     expect(meta).not.toContain('content="outer"');
     expect(meta).toContain('content="modernjs"');
-    // outer instance tags come first, like react-helmet-async
-    expect(meta.indexOf('keywords')).toBeLessThan(meta.indexOf('description'));
-  });
-
-  it('keeps duplicate metas within a single Helmet instance', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <Helmet>
-        <meta name="author" content="a" />
-        <meta name="author" content="b" />
-      </Helmet>,
-    );
-
-    const meta = getHelmetData(context)!.meta.toString();
-    expect(meta).toContain('content="a"');
-    expect(meta).toContain('content="b"');
-  });
-
-  it('normalizes charSet when deduping and drops meta without primary attribute', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <>
-        <Helmet>
-          <meta charSet="utf-8" />
-          <meta content="orphan" />
-        </Helmet>
-        <Helmet meta={[{ charSet: 'utf-8' } as any]} />
-      </>,
-    );
-
-    const meta = getHelmetData(context)!.meta.toString();
-    expect(meta.match(/charset/g)).toHaveLength(1);
-    expect(meta).not.toContain('orphan');
   });
 
   it('applies the innermost title and the innermost titleTemplate', () => {
@@ -202,71 +167,6 @@ describe('server Helmet collection', () => {
     );
   });
 
-  it('falls back to defaultTitle without applying the template', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <Helmet defaultTitle="Default" titleTemplate="%s | Site" />,
-    );
-
-    expect(getHelmetData(context)!.title.toString()).toBe(
-      '<title data-rh="true">Default</title>',
-    );
-  });
-
-  it('maps <html>/<body> children to html/body attributes', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <Helmet>
-        <html lang="en" />
-        <body className="dark" />
-      </Helmet>,
-    );
-
-    const helmet = getHelmetData(context)!;
-    expect(helmet.htmlAttributes.toString()).toBe('lang="en"');
-    expect(helmet.bodyAttributes.toString()).toBe('class="dark"');
-  });
-
-  it('keeps one canonical link but all distinct stylesheets', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <>
-        <Helmet>
-          <link rel="canonical" href="https://outer.example/" />
-          <link rel="stylesheet" href="/a.css" />
-          <link rel="stylesheet" href="/b.css" />
-        </Helmet>
-        <Helmet>
-          <link rel="canonical" href="https://inner.example/" />
-        </Helmet>
-      </>,
-    );
-
-    const link = getHelmetData(context)!.link.toString();
-    expect(link).toContain('https://inner.example/');
-    expect(link).not.toContain('https://outer.example/');
-    expect(link).toContain('/a.css');
-    expect(link).toContain('/b.css');
-  });
-
-  it('does not serialize script innerHTML as an attribute', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <Helmet>
-        <script type="application/ld+json">{'{"@context":"a"}'}</script>
-      </Helmet>,
-    );
-
-    const script = getHelmetData(context)!.script.toString();
-    expect(script).toBe(
-      '<script data-rh="true" type="application/ld+json">{"@context":"a"}</script>',
-    );
-  });
-
   it('publishes prioritized SEO tags separately with component parity', () => {
     const context = createServerContext();
     renderWithContext(
@@ -292,29 +192,6 @@ describe('server Helmet collection', () => {
     expect(helmet.link.toString()).not.toContain('https://example.com/page');
     expect(helmet.script.toString()).toContain('/ordinary.js');
     expect(helmet.script.toString()).not.toContain('application/ld+json');
-
-    const priority = helmet.priority.toComponent();
-    expect(priority.map(element => element.type)).toEqual([
-      'meta',
-      'link',
-      'script',
-    ]);
-    expect(priority[0].props).toMatchObject({
-      'data-rh': true,
-      content: 'priority description',
-      name: 'description',
-    });
-    expect(priority[2].props).toMatchObject({
-      'data-rh': true,
-      dangerouslySetInnerHTML: { __html: '{"name":"page"}' },
-      type: 'application/ld+json',
-    });
-    expect(helmet.meta.toComponent()[0].props).toMatchObject({
-      content: 'ordinary keywords',
-      name: 'keywords',
-    });
-    expect(helmet.title.toComponent()[0].props.children).toBe('Priority Page');
-    expect(helmet.htmlAttributes.toComponent()).toEqual({ className: 'app' });
   });
 
   it('is idempotent when React replays the tree (streaming SSR retry)', () => {
@@ -349,21 +226,4 @@ describe('server Helmet collection', () => {
     expect(second.htmlAttributes.toString()).toBe(firstSnapshot.htmlAttributes);
     expect(second.meta.toString().match(/description/g)).toHaveLength(1);
   });
-
-  it('keeps the innermost base tag only', () => {
-    const context = createServerContext();
-    renderWithContext(
-      context,
-      <>
-        <Helmet base={{ href: 'https://outer.example/' } as any} />
-        <Helmet>
-          <base href="https://inner.example/" />
-        </Helmet>
-      </>,
-    );
-
-    const base = getHelmetData(context)!.base.toString();
-    expect(base).toContain('https://inner.example/');
-    expect(base).not.toContain('https://outer.example/');
-  });
 });