@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.13 → 3.9.0-ultramodern.14

package/dist/types/cloudflare/wrangler-config.d.ts

@@ -34,6 +34,12 @@ export declare const createWranglerConfig: (appDirectory: string, modernConfig:
         binding: string;
         run_worker_first: boolean;
     };
+    env?: {
+        [k: string]: {
+            compatibility_date?: string | undefined;
+            compatibility_flags?: JsonValue[] | undefined;
+        };
+    } | undefined;
     d1_databases?: {
         binding: string;
         database_name: string;

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

@@ -1,5 +1,5 @@
 import type { BffUserConfig } from '@modern-js/server-core';
-import type { EnvironmentConfig, ModifyBundlerChainFn } from '@rsbuild/core';
+import type { EnvironmentConfig, ModifyBundlerChainFn, Rspack } from '@rsbuild/core';
 export interface CloudflareBuilderNormalizedConfig {
     bff?: BffUserConfig;
     deploy?: {
@@ -10,6 +10,10 @@ export interface CloudflareBuilderAppContext {
     apiOnly?: boolean;
     apiDirectory: string;
     appDirectory: string;
+    entrypoints?: ReadonlyArray<{
+        entryName: string;
+    }>;
+    internalDirectory?: string;
 }
 export interface CloudflareBuilderEnvironmentsOptions {
     appContext: CloudflareBuilderAppContext;
@@ -52,9 +56,48 @@ export interface CloudflareBuilderPlugin {
     name: string;
     setup(api: CloudflareBuilderPluginApi): void;
 }
+type AliasField = string | readonly string[];
+/**
+ * Leaves an absent optional dependency missing at runtime, exactly as Node
+ * does, instead of failing the worker build. It applies only when the
+ * importing package itself declares the request as an optional peer
+ * (`peerDependenciesMeta.<name>.optional`) or an `optionalDependencies`
+ * entry, the package is not found in any `resolve.modules` directory, and
+ * neither the app (`resolve.alias`, `resolve.fallback`, `externals`) nor the
+ * importing package (an enabled `resolve.aliasFields` entry such as
+ * `browser`) redirects the request. The import
+ * then rejects with "Cannot find module" so the library's own fallback
+ * handles it (for example `@redis/client` guards `import('@node-rs/xxhash')`).
+ */
+export declare const createAbsentOptionalDependencyFilter: (isRedirected?: (request: string) => boolean, moduleDirectories?: readonly string[], aliasFields?: readonly AliasField[]) => (request: string, context: string) => boolean;
+type AliasOption = Record<string, unknown> | {
+    name: string;
+    onlyModule?: boolean;
+}[] | false | undefined;
+/**
+ * Reads the final resolved `resolve.alias`, `resolve.fallback` and
+ * `externals` so an app's own
+ * replacement for an optional package still wins over the absent-module
+ * fallback (the fallback runs before resolution).
+ */
+export declare const createRequestRedirectMatcher: (options: {
+    externals?: unknown;
+    resolve?: {
+        alias?: AliasOption;
+        fallback?: AliasOption;
+    };
+}) => (request: string) => boolean;
+type FunctionExternal = (data: Rspack.ExternalItemFunctionData, callback: (error?: Error | null, result?: unknown) => void) => unknown;
+/**
+ * Reports whether any function external claims the request. A function that
+ * throws is treated as claiming it, so the request goes through ordinary
+ * external processing and surfaces that error instead of being ignored.
+ */
+export declare const claimsByFunctionExternal: (externals: readonly FunctionExternal[], data: Rspack.ExternalItemFunctionData) => Promise<boolean>;
 export declare function getCloudflareWorkerRspackConfig(workerEntryNames: Iterable<string>): CloudflareWorkerRspackConfig;
 export declare function applyCloudflareWorkerRspackConfig(chain: Parameters<ModifyBundlerChainFn>[0], workerEntryNames: Iterable<string>): void;
 export declare function applyCloudflareWorkerMfRuntimeBoundary(chain: Parameters<ModifyBundlerChainFn>[0]): void;
 export declare function getCloudflareBuilderEnvironments({ appContext, environments, normalizedConfig, resolveDeployProvider, }: CloudflareBuilderEnvironmentsOptions): Record<string, EnvironmentConfig>;
 export declare function applyCloudflareBuilderEnvironments(options: CloudflareBuilderEnvironmentsOptions): CloudflareBuilderEnvironmentsResult;
 export declare const createCloudflareBuilderPlugin: (resolveDeployProvider?: ResolveCloudflareDeployProvider) => CloudflareBuilderPlugin;
+export {};

package/dist/types/cloudflare-output-contract.d.ts

@@ -10,6 +10,8 @@ export declare const CLOUDFLARE_RUNTIME_TYPE = "cloudflare-module-worker";
 export declare const CLOUDFLARE_OUTPUT_PACKAGE_TYPE = "module";
 export declare const CLOUDFLARE_WORKER_PACKAGE_TYPE = "commonjs";
 export declare const CLOUDFLARE_WORKER_BUNDLE_FORMAT = "commonjs";
-export declare const CLOUDFLARE_WORKER_NODE_BUILTINS: readonly ['assert', 'assert/strict', 'async_hooks', 'buffer', 'child_process', 'crypto', 'dgram', 'dns', 'domain', 'events', 'fs', 'fs/promises', 'http', 'http2', 'https', 'inspector', 'module', 'net', 'os', 'path', 'process', 'readline', 'readline/promises', 'repl', 'sqlite', 'stream', 'stream/consumers', 'stream/promises', 'stream/web', 'string_decoder', 'timers', 'timers/promises', 'tls', 'trace_events', 'tty', 'url', 'util', 'util/types', 'v8', 'vm', 'wasi', 'worker_threads', 'zlib'];
+export declare const CLOUDFLARE_ROUTE_DATA_HANDLER_EXPORT = "handleRouteDataRequest";
+export declare const getCloudflareWorkerRouteDataEntryName: (entryName: string) => string;
+export declare const CLOUDFLARE_WORKER_NODE_BUILTINS: readonly ['_http_agent', '_http_client', '_http_common', '_http_incoming', '_http_outgoing', '_http_server', '_tls_common', '_tls_wrap', 'assert', 'assert/strict', 'async_hooks', 'buffer', 'child_process', 'cluster', 'console', 'constants', 'crypto', 'dgram', 'diagnostics_channel', 'dns', 'dns/promises', 'domain', 'events', 'fs', 'fs/promises', 'http', 'http2', 'https', 'inspector', 'inspector/promises', 'module', 'net', 'os', 'path', 'path/posix', 'path/win32', 'perf_hooks', 'process', 'punycode', 'querystring', 'readline', 'readline/promises', 'repl', 'sqlite', 'stream', 'stream/consumers', 'stream/promises', 'stream/web', 'string_decoder', 'sys', 'test', 'timers', 'timers/promises', 'tls', 'trace_events', 'tty', 'url', 'util', 'util/types', 'v8', 'vm', 'wasi', 'worker_threads', 'zlib'];
 export declare const CLOUDFLARE_WORKER_PLATFORM_MODULES: readonly ['cloudflare:sockets'];
 export declare const CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS: readonly ['nodejs_compat', 'global_fetch_strictly_public'];

package/dist/types/cloudflare-output-verifier/worker-bundles.d.ts

@@ -1,7 +1,7 @@
 import type { CloudflareOutputVerifierIssue, JsonObject } from './issues.js';
 interface WorkerBundleReference {
     dispatcherExport?: string;
-    kind: 'effect-bff' | 'route';
+    kind: 'effect-bff' | 'route' | 'route-data';
     reference: string;
 }
 interface ResolvedWorkerBundleReference extends WorkerBundleReference {
@@ -10,7 +10,7 @@ interface ResolvedWorkerBundleReference extends WorkerBundleReference {
 export declare const getEffectBffWorker: (manifest: JsonObject) => any;
 export declare const getWorkerBundleReferences: (manifest: JsonObject) => WorkerBundleReference[];
 export declare const resolveWorkerBundleReference: (issues: CloudflareOutputVerifierIssue[], outputDirectory: string, reference: WorkerBundleReference, manifestPath: string) => ResolvedWorkerBundleReference | null;
-export declare const missingWorkerBundleMessage: (reference: WorkerBundleReference) => "Cloudflare Effect BFF manifest points to a missing worker bundle." | "Cloudflare route worker manifest points to a missing worker bundle.";
+export declare const missingWorkerBundleMessage: (reference: WorkerBundleReference) => "Cloudflare Effect BFF manifest points to a missing worker bundle." | "Cloudflare route data worker manifest points to a missing worker bundle." | "Cloudflare route worker manifest points to a missing worker bundle.";
 interface WorkerBundleVerificationContract {
     providedPackages: ReadonlySet<string>;
     workerRoot: string;

package/dist/types/templates/cloudflare-worker-route-data.d.mts

@@ -0,0 +1,14 @@
+/**
+ * Create the worker route data request handler for an entry's route loaders
+ * (the `routes` export of its generated `route-server-loaders.js`).
+ *
+ * The handler takes the Node data handler's options and resolves to
+ * `undefined` for requests that are not route data requests of a known entry,
+ * so the caller renders the page instead.
+ */
+export declare function createRouteDataRequestHandler(routes: any): ({ request, serverRoutes, context, onTiming }: {
+    context?: {} | undefined;
+    onTiming: any;
+    request: any;
+    serverRoutes: any;
+}) => Promise<any>;

package/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/solutions/app-tools-extensions"
   },
   "license": "MIT",
-  "version": "3.9.0-ultramodern.13",
+  "version": "3.9.0-ultramodern.14",
   "files": [
     "dist",
     "src"
@@ -145,15 +145,16 @@
     "@babel/parser": "^8.0.6",
     "@babel/traverse": "^8.0.6",
     "@loadable/component": "5.16.7",
-    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.13",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.13",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.13",
-    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.13",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.13",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.13",
-    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.13",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.13",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.13",
+    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.14",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.14",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.14",
+    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.14",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.14",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.14",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.14",
+    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.14",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.14",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.14",
     "@swc/helpers": "^0.5.23",
     "compression-webpack-plugin": "^12.0.0",
     "esbuild": "^0.28.2",
@@ -163,8 +164,9 @@
     "@rsbuild/core": "2.2.9"
   },
   "devDependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.13",
-    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.13",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.14",
+    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.14",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.14",
     "@module-federation/runtime-tools": "npm:@bleedingdev/mf-runtime-tools@2.9.1",
     "@rsbuild/core": "2.2.9",
     "@rslib/core": "1.0.2",
@@ -174,7 +176,9 @@
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "core-js": "^3.50.0",
     "effect": "npm:@bleedingdev/effect@4.0.0-rc.117",
-    "ndepe": "^0.1.13"
+    "miniflare": "5.20260921.0-alpha",
+    "ndepe": "^0.1.13",
+    "pg": "8.23.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/cloudflare/worker-manifest.ts

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import type {} from '@modern-js/server-runtime-extensions/server-config';
 import { fs as fse } from '@modern-js/utils';
+import { getCloudflareWorkerRouteDataEntryName } from '../cloudflare-output-contract';
 import { readRouteSpec } from './artifacts';
 import {
   ASSETS_BINDING,
@@ -132,6 +133,15 @@ export const createWorkerManifest = async (
     routeSpec.routes.map(async (route: Record<string, any>) => {
       const worker =
         typeof route.worker === 'string' ? route.worker : undefined;
+      const routeDataWorker =
+        route.isSSR && typeof route.entryName === 'string'
+          ? `${WORKER_BUNDLE_DIRECTORY}/${getCloudflareWorkerRouteDataEntryName(
+              route.entryName,
+            )}.js`
+          : undefined;
+      const hasRouteDataWorker = routeDataWorker
+        ? await fse.pathExists(path.join(outputDirectory, routeDataWorker))
+        : false;
 
       return {
         urlPath: route.urlPath,
@@ -142,6 +152,7 @@ export const createWorkerManifest = async (
         workerExists: worker
           ? await fse.pathExists(path.join(outputDirectory, worker))
           : false,
+        ...(hasRouteDataWorker ? { routeDataWorker } : {}),
       };
     }),
   );
@@ -218,9 +229,14 @@ export const createWorkerModuleLoaders = (manifest: any) => {
   const imports = new Map<string, string>();
 
   for (const route of manifest.routeSpec.routes) {
-    if (route.worker && route.workerExists) {
-      const importPath = `../${String(route.worker).replace(/^\/+/u, '')}`;
-      imports.set(route.worker, `() => import(${JSON.stringify(importPath)})`);
+    for (const worker of [
+      route.workerExists ? route.worker : undefined,
+      route.routeDataWorker,
+    ]) {
+      if (worker) {
+        const importPath = `../${String(worker).replace(/^\/+/u, '')}`;
+        imports.set(worker, `() => import(${JSON.stringify(importPath)})`);
+      }
     }
   }
 

package/src/cloudflare/wrangler-config.ts

@@ -15,21 +15,51 @@ import {
 import type { CloudflareModernConfig } from './types';
 import { isJsonRecord, normalizeRelativePath } from './utils';
 
-const getCompatibilityDate = (modernConfig: CloudflareModernConfig) => {
-  const configuredDate = modernConfig.deploy?.worker?.compatibilityDate?.trim();
-  const compatibilityDate = configuredDate || DEFAULT_COMPATIBILITY_DATE;
-
+// Workers only add Node.js built-ins at later dates, and the bundler
+// externalizes the set probed at DEFAULT_COMPATIBILITY_DATE; an earlier date
+// could leave an externalized built-in unresolvable at deploy time.
+const assertSupportedCompatibilityDate = (
+  compatibilityDate: JsonValue | undefined,
+  label: string,
+) => {
+  if (typeof compatibilityDate !== 'string') {
+    throw new Error(`${label} must be a YYYY-MM-DD string.`);
+  }
   if (!COMPATIBILITY_DATE_PATTERN.test(compatibilityDate)) {
     throw new Error(
-      `deploy.worker.compatibilityDate must use YYYY-MM-DD, received ${JSON.stringify(
+      `${label} must use YYYY-MM-DD, received ${JSON.stringify(
+        compatibilityDate,
+      )}.`,
+    );
+  }
+  if (compatibilityDate < DEFAULT_COMPATIBILITY_DATE) {
+    throw new Error(
+      `${label} must be ${DEFAULT_COMPATIBILITY_DATE} or later, the date the Cloudflare worker Node.js built-in contract is verified against; received ${JSON.stringify(
         compatibilityDate,
       )}.`,
     );
   }
-
   return compatibilityDate;
 };
 
+const getCompatibilityDate = (
+  modernConfig: CloudflareModernConfig,
+  wranglerCompatibilityDate: JsonValue | undefined,
+) => {
+  if (wranglerCompatibilityDate !== undefined) {
+    // A raw Wrangler override is the effective date, so it is validated too.
+    return assertSupportedCompatibilityDate(
+      wranglerCompatibilityDate,
+      'deploy.worker.wrangler.compatibility_date',
+    );
+  }
+  return assertSupportedCompatibilityDate(
+    modernConfig.deploy?.worker?.compatibilityDate?.trim() ||
+      DEFAULT_COMPATIBILITY_DATE,
+    'deploy.worker.compatibilityDate',
+  );
+};
+
 const getWorkerName = (appDirectory: string) => {
   const basename = path.basename(appDirectory);
   return basename.replace(/[^a-zA-Z0-9-_]/g, '-') || 'modern-cloudflare-worker';
@@ -59,6 +89,7 @@ const getConfiguredWrangler = (modernConfig: CloudflareModernConfig) => {
 
 const createWranglerCompatibilityFlags = (
   configuredFlags: JsonValue | undefined,
+  label = 'deploy.worker.wrangler.compatibility_flags',
 ) => {
   if (configuredFlags === undefined) {
     return [...REQUIRED_COMPATIBILITY_FLAGS];
@@ -68,14 +99,54 @@ const createWranglerCompatibilityFlags = (
     !Array.isArray(configuredFlags) ||
     configuredFlags.some(flag => typeof flag !== 'string')
   ) {
-    throw new Error(
-      'deploy.worker.wrangler.compatibility_flags must be an array of strings.',
-    );
+    throw new Error(`${label} must be an array of strings.`);
   }
 
   return [...new Set([...configuredFlags, ...REQUIRED_COMPATIBILITY_FLAGS])];
 };
 
+// `wrangler deploy --env <name>` uses an environment's own compatibility_date
+// and compatibility_flags instead of the top-level values, so each override
+// is held to the same verified date floor and required flags.
+const createWranglerEnvironments = (wranglerEnv: JsonValue | undefined) => {
+  if (wranglerEnv === undefined) {
+    return undefined;
+  }
+  if (!isJsonRecord(wranglerEnv)) {
+    throw new Error('deploy.worker.wrangler.env must be an object.');
+  }
+  return Object.fromEntries(
+    Object.entries(wranglerEnv).map(([name, environment]) => {
+      const label = `deploy.worker.wrangler.env.${name}`;
+      if (!isJsonRecord(environment)) {
+        throw new Error(`${label} must be an object.`);
+      }
+      return [
+        name,
+        {
+          ...environment,
+          ...(environment.compatibility_date === undefined
+            ? {}
+            : {
+                compatibility_date: assertSupportedCompatibilityDate(
+                  environment.compatibility_date,
+                  `${label}.compatibility_date`,
+                ),
+              }),
+          ...(environment.compatibility_flags === undefined
+            ? {}
+            : {
+                compatibility_flags: createWranglerCompatibilityFlags(
+                  environment.compatibility_flags,
+                  `${label}.compatibility_flags`,
+                ),
+              }),
+        },
+      ];
+    }),
+  );
+};
+
 const createWranglerAssetsConfig = (
   configuredAssets: JsonValue | undefined,
 ) => {
@@ -312,6 +383,7 @@ export const createWranglerConfig = (
   modernConfig: CloudflareModernConfig,
 ) => {
   const wrangler = getConfiguredWrangler(modernConfig);
+  const environments = createWranglerEnvironments(wrangler.env);
   const d1Databases = createWranglerD1Databases(
     modernConfig,
     wrangler.d1_databases,
@@ -325,13 +397,17 @@ export const createWranglerConfig = (
   return {
     $schema: 'node_modules/wrangler/config-schema.json',
     name: getConfiguredWorkerName(appDirectory, modernConfig),
-    compatibility_date: getCompatibilityDate(modernConfig),
     ...wrangler,
+    compatibility_date: getCompatibilityDate(
+      modernConfig,
+      wrangler.compatibility_date,
+    ),
     main: WORKER_ENTRY,
     compatibility_flags: createWranglerCompatibilityFlags(
       wrangler.compatibility_flags,
     ),
     assets: createWranglerAssetsConfig(wrangler.assets),
+    ...(environments === undefined ? {} : { env: environments }),
     ...(d1Databases === undefined ? {} : { d1_databases: d1Databases }),
     ...(wranglerServices === undefined ? {} : { services: wranglerServices }),
   };