@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.16 → 3.9.0-ultramodern.18

package/src/backend-federation-build/codegen.ts

@@ -1,7 +1,6 @@
 import path from 'node:path';
 import {
   BACKEND_FEDERATION_EFFECT_EXPOSE as BACKEND_EXPOSE,
-  BACKEND_FEDERATION_MANIFEST_FILE as BACKEND_MANIFEST_FILE,
   BACKEND_FEDERATION_REMOTE_ENTRY_FILE as BACKEND_REMOTE_ENTRY_FILE,
   BACKEND_FEDERATION_CONTRACT_VERSION as CONTRACT_VERSION,
   formatBackendFederationValidationErrors,
@@ -65,28 +64,34 @@ export const createBackendRemoteEntrySource = async (
     ...(app.sourceRevision ? { sourceRevision: app.sourceRevision } : {}),
   };
   const source = `// Generated by Modern.js backend federation build.
-import * as exposedNamespace from ${JSON.stringify(effectApiSpecifier)};
+import { adoptEffectBffShareScope } from '@modern-js/bff-effect/effect-edge';
 
-const exposedModule = {
-  ...exposedNamespace,
-  backendFederationContract: {
-    ...(exposedNamespace.backendFederationContract ?? {}),
-    compatibility: {
-      ...(exposedNamespace.backendFederationContract?.compatibility ?? {}),
-      ...${JSON.stringify(compatibility)},
+// The expose evaluates lazily so defineEffectBff registers its handler
+// factories with the registry the host shares through init().
+let exposedModule;
+const loadExposedModule = () =>
+  (exposedModule ??= import(${JSON.stringify(effectApiSpecifier)}).then(exposedNamespace => ({
+    ...exposedNamespace,
+    backendFederationContract: {
+      ...(exposedNamespace.backendFederationContract ?? {}),
+      compatibility: {
+        ...(exposedNamespace.backendFederationContract?.compatibility ?? {}),
+        ...${JSON.stringify(compatibility)},
+      },
+      name: ${JSON.stringify(app.backendName)},
+      role: 'microvertical-server',
+      runtimeFramework: 'effect',
+      strictEffectApproach: true,
     },
-    name: ${JSON.stringify(app.backendName)},
-    role: 'microvertical-server',
-    runtimeFramework: 'effect',
-    strictEffectApproach: true,
-  },
-};
+  })));
 const exposedModules = {
-  ${JSON.stringify(BACKEND_EXPOSE)}: () => Promise.resolve(exposedModule),
+  ${JSON.stringify(BACKEND_EXPOSE)}: loadExposedModule,
 };
 const __modernjsBackendFederation = ${JSON.stringify(containerMetadata)};
 
-function init() {}
+function init(shareScope) {
+  return adoptEffectBffShareScope(shareScope);
+}
 
 function get(id) {
   const load = exposedModules[id];

package/src/build-config/build-environment.ts

@@ -16,230 +16,17 @@ import { createRequire } from 'node:module';
 import { tmpdir } from 'node:os';
 import { basename, dirname, join, resolve } from 'node:path';
 import type { URL } from 'node:url';
-import type { Rspack } from '@rsbuild/core';
 
 const EFFECT_TSGO_PACKAGE = '@effect/tsgo';
 const EFFECT_TSGO_BIN = 'effect-tsgo';
 const EFFECT_TSGO_RESOLUTION_ERROR =
   'Unable to resolve the Effect TS-Go compiler. Install "@effect/tsgo" and a native TypeScript backend for this build config, or set EFFECT_TSGO_BIN.';
 const executableEffectTsgoCompilers = new Map<string, string>();
-const BUILD_CONFIG_ENVIRONMENT_PLUGIN =
-  'ModernJsBuildConfigEnvironmentLeasePlugin';
-const ENVIRONMENT_LEASE_REGISTRY_KEY = Symbol.for(
-  '@modern-js/app-tools/build-config-environment-lease-registry/v1',
-);
-const ENVIRONMENT_LEASE_REGISTRY_BRAND = Symbol.for(
-  '@modern-js/app-tools/build-config-environment-lease-registry-brand/v1',
-);
-const LIFECYCLE_HOOK_NAMES = [
-  'run',
-  'watchRun',
-  'afterDone',
-  'failed',
-  'shutdown',
-  'watchClose',
-] as const;
 
 type PackageJson = {
   bin?: Record<string, string> | string;
 };
 
-type EnvironmentLease = {
-  originalValue: string | undefined;
-  owners: Set<symbol>;
-  value: string;
-};
-
-type EnvironmentLeaseRegistry = Readonly<{
-  acquire: (name: string, value: string) => () => void;
-  brand: symbol;
-}>;
-
-type LifecycleHookName = (typeof LIFECYCLE_HOOK_NAMES)[number];
-
-type LifecycleHook = {
-  tap: (options: { name: string; stage: number }, handler: () => void) => void;
-};
-
-function restoreEnvironment(name: string, value: string | undefined): void {
-  if (value === undefined) {
-    delete process.env[name];
-  } else {
-    process.env[name] = value;
-  }
-}
-
-function createEnvironmentLeaseRegistry(): EnvironmentLeaseRegistry {
-  const environmentLeases = new Map<string, EnvironmentLease>();
-
-  return Object.freeze({
-    acquire(name: string, value: string): () => void {
-      let lease = environmentLeases.get(name);
-
-      if (lease) {
-        if (lease.value !== value) {
-          throw new Error(
-            `Build config environment "${name}" already has an active lease for a different value.`,
-          );
-        }
-        if (process.env[name] !== lease.value) {
-          throw new Error(
-            `Build config environment lease for "${name}" lost ownership before another lease was acquired.`,
-          );
-        }
-      } else {
-        lease = {
-          originalValue: process.env[name],
-          owners: new Set(),
-          value,
-        };
-        process.env[name] = value;
-        environmentLeases.set(name, lease);
-      }
-
-      const owner = Symbol(name);
-      lease.owners.add(owner);
-      let released = false;
-
-      return () => {
-        if (released) {
-          return;
-        }
-
-        if (environmentLeases.get(name) !== lease || !lease.owners.has(owner)) {
-          throw new Error(
-            `Build config environment lease for "${name}" cannot be restored because its ownership record was lost.`,
-          );
-        }
-
-        released = true;
-        const lostOwnership = process.env[name] !== lease.value;
-        lease.owners.delete(owner);
-
-        if (lease.owners.size === 0) {
-          environmentLeases.delete(name);
-          restoreEnvironment(name, lease.originalValue);
-        } else if (lostOwnership) {
-          process.env[name] = lease.value;
-        }
-
-        if (lostOwnership) {
-          throw new Error(
-            `Build config environment lease for "${name}" lost ownership before restoration.`,
-          );
-        }
-      };
-    },
-    brand: ENVIRONMENT_LEASE_REGISTRY_BRAND,
-  });
-}
-
-function getEnvironmentLeaseRegistry(): EnvironmentLeaseRegistry {
-  const descriptor = Object.getOwnPropertyDescriptor(
-    process,
-    ENVIRONMENT_LEASE_REGISTRY_KEY,
-  );
-
-  if (descriptor) {
-    const registry = descriptor.value as
-      | Partial<EnvironmentLeaseRegistry>
-      | undefined;
-    if (
-      descriptor.configurable ||
-      descriptor.enumerable ||
-      descriptor.writable ||
-      registry?.brand !== ENVIRONMENT_LEASE_REGISTRY_BRAND ||
-      typeof registry.acquire !== 'function'
-    ) {
-      throw new Error(
-        'The process-global build config environment lease registry is occupied by an incompatible value.',
-      );
-    }
-    return registry as EnvironmentLeaseRegistry;
-  }
-
-  const registry = createEnvironmentLeaseRegistry();
-  Object.defineProperty(process, ENVIRONMENT_LEASE_REGISTRY_KEY, {
-    configurable: false,
-    enumerable: false,
-    value: registry,
-    writable: false,
-  });
-  return registry;
-}
-
-function acquireEnvironmentLease(name: string, value: string): () => void {
-  return getEnvironmentLeaseRegistry().acquire(name, value);
-}
-
-function releaseAfterFailure(
-  release: () => void,
-  originalError: unknown,
-): never {
-  try {
-    release();
-  } catch (restorationError) {
-    throw new AggregateError(
-      [originalError, restorationError],
-      'Build config environment setup and restoration both failed.',
-    );
-  }
-
-  throw originalError;
-}
-
-class BuildConfigEnvironmentLeasePlugin {
-  constructor(private readonly release: () => void) {}
-
-  apply(compiler: Rspack.Compiler): void {
-    const hooks = compiler.hooks as unknown as Record<
-      string,
-      LifecycleHook | undefined
-    >;
-
-    try {
-      const lifecycleHooks = {} as Record<LifecycleHookName, LifecycleHook>;
-      for (const hookName of LIFECYCLE_HOOK_NAMES) {
-        const hook = hooks[hookName];
-        if (!hook || typeof hook.tap !== 'function') {
-          throw new Error(
-            `Rspack does not expose the "${hookName}" lifecycle hook required to restore build config environment leases.`,
-          );
-        }
-        lifecycleHooks[hookName] = hook;
-      }
-
-      let mode: 'pending' | 'run' | 'watch' = 'pending';
-      const modeTap = {
-        name: BUILD_CONFIG_ENVIRONMENT_PLUGIN,
-        stage: Number.MIN_SAFE_INTEGER,
-      };
-      const releaseTap = {
-        name: BUILD_CONFIG_ENVIRONMENT_PLUGIN,
-        stage: Number.MAX_SAFE_INTEGER,
-      };
-      const releaseAfterOneShot = () => {
-        if (mode !== 'watch' && compiler.watchMode !== true) {
-          this.release();
-        }
-      };
-
-      lifecycleHooks.run.tap(modeTap, () => {
-        mode = 'run';
-      });
-      lifecycleHooks.watchRun.tap(modeTap, () => {
-        mode = 'watch';
-      });
-      lifecycleHooks.afterDone.tap(releaseTap, releaseAfterOneShot);
-      lifecycleHooks.failed.tap(releaseTap, releaseAfterOneShot);
-      lifecycleHooks.shutdown.tap(releaseTap, this.release);
-      lifecycleHooks.watchClose.tap(releaseTap, this.release);
-    } catch (error) {
-      releaseAfterFailure(this.release, error);
-    }
-  }
-}
-
 function resolveEffectTsgoCli(from: string | URL): string {
   const projectRequire = createRequire(from);
   const packageJsonPath = projectRequire.resolve(
@@ -333,37 +120,6 @@ export function getBuildConfigEnvironment(name: string): string | undefined {
   return process.env[name];
 }
 
-/**
- * Runs a Rspack config setup under a leased environment value. The lease is
- * restored when that compiler reaches any supported terminal hook.
- */
-export function withBuildConfigEnvironment<
-  Config extends { plugins?: Rspack.Plugin[] },
-  SetupArguments extends unknown[],
->(
-  name: string,
-  value: string,
-  setup: (
-    config: Config,
-    ...args: SetupArguments
-  ) => Config | void | Promise<Config | void>,
-): (config: Config, ...args: SetupArguments) => Promise<Config> {
-  return async (config, ...args) => {
-    const release = acquireEnvironmentLease(name, value);
-
-    try {
-      const configured = (await setup(config, ...args)) ?? config;
-      configured.plugins = [
-        ...(configured.plugins ?? []),
-        new BuildConfigEnvironmentLeasePlugin(release),
-      ];
-      return configured;
-    } catch (error) {
-      releaseAfterFailure(release, error);
-    }
-  };
-}
-
 export type ResolveEffectTsgoCompilerOptions = {
   /** Module URL or absolute filename used to resolve the consumer's compiler. */
   from: string | URL;

package/src/build-config/public.ts

@@ -2,5 +2,4 @@ export type { ResolveEffectTsgoCompilerOptions } from './build-environment';
 export {
   getBuildConfigEnvironment,
   resolveEffectTsgoCompiler,
-  withBuildConfigEnvironment,
 } from './build-environment';

package/src/cloudflare/index.ts

@@ -27,9 +27,6 @@ import {
   ROUTE_SPEC_FILE,
   ROUTE_SPEC_OUTPUT,
   WORKER_BUNDLE_DIRECTORY,
-  WORKER_ENTRY,
-  WORKER_MANIFEST,
-  WRANGLER_CONFIG_FILE,
 } from './constants';
 import {
   resolveTopologyDeliveryUnit,

package/src/cloudflare-builder.ts

@@ -850,21 +850,6 @@ const createCloudflareBundlerChain = (
   workerEntryNames: Iterable<string>,
 ): ModifyBundlerChainFn => {
   const resolvePaths = [appContext.appDirectory, process.cwd()];
-  const tanstackRouterSsrServerFile = resolvePackageFile(
-    '@tanstack/router-core',
-    'dist/esm/ssr/ssr-server.js',
-    resolvePaths,
-  );
-  const runtimeRscWorkerFile = resolvePackageFile(
-    '@modern-js/runtime',
-    'dist/esm/rsc/server.worker.mjs',
-    resolvePaths,
-  );
-  const renderRscWorkerFile = resolvePackageFile(
-    '@modern-js/render',
-    'dist/esm/rscWorker.mjs',
-    resolvePaths,
-  );
   const reactFile = resolvePackageFile('react', 'index.js', resolvePaths);
   const reactJsxRuntimeFile = resolvePackageFile(
     'react',
@@ -891,13 +876,6 @@ const createCloudflareBundlerChain = (
     'dist/esm/loadable.esm.mjs',
     [...resolvePaths, getTemplatePath('')],
   );
-  const loadableServerWorkerFile = getTemplatePath(
-    'cloudflare-worker-loadable-server.mjs',
-  );
-  const fsPromisesWorkerFile = getTemplatePath(
-    'cloudflare-worker-fs-promises.mjs',
-  );
-  const pathWorkerFile = getTemplatePath('cloudflare-worker-path.mjs');
   const entryNames = [...workerEntryNames];
 
   return chain => {
@@ -935,34 +913,6 @@ const createCloudflareBundlerChain = (
       .use(AbsentOptionalDependencyPlugin);
 
     applyCloudflareWorkerMfRuntimeBoundary(chain);
-    if (tanstackRouterSsrServerFile) {
-      chain.resolve.alias.set(
-        '@tanstack/router-core/ssr/server$',
-        tanstackRouterSsrServerFile,
-      );
-      chain.resolve.alias.set(
-        '@tanstack/router-core/ssr/server',
-        tanstackRouterSsrServerFile,
-      );
-    }
-    if (runtimeRscWorkerFile) {
-      chain.resolve.alias.set(
-        '@modern-js/runtime/rsc/server$',
-        runtimeRscWorkerFile,
-      );
-      chain.resolve.alias.set(
-        '@modern-js/runtime/rsc/server',
-        runtimeRscWorkerFile,
-      );
-    }
-    if (renderRscWorkerFile) {
-      chain.resolve.alias.set('@modern-js/render/rsc$', renderRscWorkerFile);
-      chain.resolve.alias.set('@modern-js/render/rsc', renderRscWorkerFile);
-      chain.resolve.alias.set(
-        '@modern-js/render/rsc-worker$',
-        renderRscWorkerFile,
-      );
-    }
     setAliasIfPresent(chain.resolve.alias, 'react$', reactFile);
     setAliasIfPresent(
       chain.resolve.alias,
@@ -985,41 +935,6 @@ const createCloudflareBundlerChain = (
       '@loadable/component$',
       loadableComponentFile,
     );
-    setAliasIfPresent(
-      chain.resolve.alias,
-      '@loadable/server$',
-      loadableServerWorkerFile,
-    );
-    setAliasIfPresent(
-      chain.resolve.alias,
-      'fs/promises$',
-      fsPromisesWorkerFile,
-    );
-    setAliasIfPresent(
-      chain.resolve.alias,
-      'node:fs/promises$',
-      fsPromisesWorkerFile,
-    );
-    setAliasIfPresent(chain.resolve.alias, 'path$', pathWorkerFile);
-    setAliasIfPresent(chain.resolve.alias, 'node:path$', pathWorkerFile);
-    chain.resolve.alias.set(
-      'react-server-dom-rspack/server.node$',
-      'react-server-dom-rspack/server.edge',
-    );
-    chain.resolve.alias.set(
-      'react-server-dom-rspack/server.node',
-      'react-server-dom-rspack/server.edge',
-    );
-    chain.resolve.alias.set(
-      'react-server-dom-rspack/client.node$',
-      'react-server-dom-rspack/client.edge',
-    );
-    chain.resolve.alias.set(
-      'react-server-dom-rspack/client.node',
-      'react-server-dom-rspack/client.edge',
-    );
-    chain.resolve.fallback.set('fs', false);
-    chain.resolve.fallback.set('node:fs', false);
   };
 };
 

package/src/config.ts

@@ -2,7 +2,6 @@ export type { ResolveEffectTsgoCompilerOptions } from './build-config/public';
 export {
   getBuildConfigEnvironment,
   resolveEffectTsgoCompiler,
-  withBuildConfigEnvironment,
 } from './build-config/public';
 export { createRemoteManifestUrl } from './build-config/remote-address';
 

package/src/deploy-output/trace-files.ts

@@ -0,0 +1,67 @@
+import os from 'node:os';
+import path from 'node:path';
+import { type NodeFileTraceResult, nodeFileTrace } from '@vercel/nft';
+
+// Directories owned by the build host rather than the app. nft statically
+// evaluates `os.homedir()`, `os.tmpdir()` and literal system paths, so code
+// like `fs.readFileSync(path.join(os.homedir(), name))` becomes a glob of the
+// whole home directory. With `base: '/'` that glob walks the machine.
+const SYSTEM_ROOTS =
+  process.platform === 'win32'
+    ? []
+    : ['/dev', '/etc', '/proc', '/run', '/sys', '/var/run'];
+
+const GLOB_SEGMENT = /[*?[{]/;
+
+const isInside = (parent: string, child: string) =>
+  child === parent || child.startsWith(`${parent}${path.sep}`);
+
+const globRoot = (absolutePattern: string) => {
+  const { root } = path.parse(absolutePattern);
+  const segments = absolutePattern.slice(root.length).split(path.sep);
+  const index = segments.findIndex(segment => GLOB_SEGMENT.test(segment));
+  return index === -1
+    ? undefined
+    : path.join(root, ...segments.slice(0, index));
+};
+
+/**
+ * Builds the nft `ignore` predicate for a trace rooted at `base`: skip every
+ * path under a system root, and skip globs that would enumerate the file
+ * system root, the home directory or the temp directory as a whole. Files
+ * inside home or temp are still traced, since package stores can live there.
+ */
+export const createBuildHostIgnore = (base: string) => {
+  const wholeDirectories = new Set([
+    path.parse(path.resolve(base)).root,
+    path.resolve(os.homedir()),
+    path.resolve(os.tmpdir()),
+  ]);
+  return (relativePath: string) => {
+    const absolutePath = path.resolve(base, relativePath);
+    if (SYSTEM_ROOTS.some(root => isInside(root, absolutePath))) {
+      return true;
+    }
+    const root = globRoot(absolutePath);
+    return root !== undefined && wholeDirectories.has(root);
+  };
+};
+
+/**
+ * `traceFiles` implementation for ndepe's `nodeDepEmit`, tracing with the
+ * `@vercel/nft` release app-tools-extensions depends on instead of the one ndepe pins.
+ */
+export const traceDeployFiles = ({
+  entryFiles,
+  sourceDir,
+  base = '/',
+}: {
+  entryFiles: string[];
+  sourceDir: string;
+  base?: string;
+}): Promise<NodeFileTraceResult> =>
+  nodeFileTrace(entryFiles, {
+    base,
+    processCwd: sourceDir,
+    ignore: createBuildHostIgnore(base),
+  });

package/src/release-identity.ts

@@ -10,6 +10,15 @@ export type UltramodernReleaseIdentity = {
   sourceRevision: string;
 };
 
+// Inherited GIT_* variables (git hooks export GIT_DIR and GIT_INDEX_FILE)
+// would make git describe some other repository than `workspaceRoot`.
+const workspaceGitEnv = (): NodeJS.ProcessEnv =>
+  Object.fromEntries(
+    Object.entries(process.env).filter(
+      ([name]) => !name.toUpperCase().startsWith('GIT_'),
+    ),
+  );
+
 const gitOutput = (
   workspaceRoot: string,
   args: string[],
@@ -18,6 +27,7 @@ const gitOutput = (
     return execFileSync('git', args, {
       cwd: workspaceRoot,
       encoding: 'utf8',
+      env: workspaceGitEnv(),
       stdio: ['ignore', 'pipe', 'ignore'],
     }).trim();
   } catch {

package/src/templates/cloudflare-entry.002-assets-routes.mjs

@@ -20,7 +20,7 @@ function withAssetHeaders(response, request) {
   });
 }
 
-async function createCorsPreflightResponse(request, env) {
+async function createCorsPreflightResponse(request, _env) {
   if (request.method !== 'OPTIONS') {
     return null;
   }

package/src/templates/cloudflare-entry.004-rendering-css.mjs

@@ -1138,7 +1138,7 @@ async function withRouteCssLinks(
     seenCssHrefs.add(entry.preloadHref);
     return true;
   });
-  for (const { href, preloadHref } of uniqueCssEntries) {
+  for (const { preloadHref } of uniqueCssEntries) {
     const preloadUrl = new URL(preloadHref);
     const preloadReference =
       preloadUrl.origin === requestOrigin

package/dist/cjs/templates/cloudflare-worker-fs-promises.mjs

@@ -1,11 +0,0 @@
-const unavailable = method => async () => {
-  throw new Error(
-    `node:fs/promises.${method} is unavailable in Cloudflare Worker SSR`,
-  );
-};
-
-export const readFile = unavailable('readFile');
-
-export default {
-  readFile,
-};