@bleedingdev/modern-js-app-tools-extensions 3.9.0-ultramodern.22 → 3.9.0-ultramodern.23

package/dist/esm-node/cloudflare/wrangler-config.mjs

@@ -128,6 +128,129 @@ const createWorkerServiceBindings = (modernConfig, configuredWranglerServices)=>
     if (!Array.isArray(services)) throw new Error('deploy.worker.services must be an array.');
     return services.map(normalizeServiceBinding);
 };
+const normalizeVpcService = (vpcService, index)=>{
+    const binding = assertNonEmptyString(vpcService.binding, `deploy.worker.vpcServices[${index}].binding`);
+    const serviceId = assertNonEmptyString(vpcService.serviceId, `deploy.worker.vpcServices[${index}].serviceId`);
+    const prefix = void 0 === vpcService.prefix ? void 0 : assertNonEmptyString(vpcService.prefix, `deploy.worker.vpcServices[${index}].prefix`);
+    return {
+        binding,
+        serviceId,
+        ...void 0 === prefix ? {} : {
+            prefix
+        }
+    };
+};
+const decodeRoutePrefix = (prefix)=>{
+    let decoded = prefix;
+    for(let round = 0; round < 4; round += 1){
+        let next;
+        try {
+            next = decodeURIComponent(decoded);
+        } catch  {
+            break;
+        }
+        if (next === decoded) break;
+        decoded = next;
+    }
+    return decoded;
+};
+const normalizeRoutePrefix = (prefix)=>{
+    const decoded = decodeRoutePrefix(prefix);
+    return '/' === decoded ? decoded : decoded.replace(/\/+$/u, '');
+};
+const isCanonicalRoutePrefix = (prefix)=>prefix.startsWith('/') && !prefix.includes('\\') && decodeRoutePrefix(prefix) === prefix && new URL(prefix, 'https://route.invalid').pathname === prefix;
+const collectWorkerBindingNames = (config)=>{
+    const names = new Set();
+    const visit = (value, inArray)=>{
+        if (Array.isArray(value)) {
+            for (const item of value)visit(item, true);
+            return;
+        }
+        if (!isJsonRecord(value)) return;
+        for (const field of inArray ? [
+            'binding',
+            'name'
+        ] : [
+            'binding'
+        ]){
+            const name = value[field];
+            if ('string' == typeof name) names.add(name.trim());
+        }
+        for (const child of Object.values(value))visit(child, false);
+    };
+    for (const [key, value] of Object.entries(config))if ('env' !== key && 'services' !== key && 'vpc_services' !== key) {
+        if ('vars' === key && isJsonRecord(value)) {
+            for (const name of Object.keys(value))names.add(name);
+            continue;
+        }
+        visit(value, false);
+    }
+    return names;
+};
+const prefixesOverlap = (left, right)=>{
+    const [first, second] = [
+        normalizeRoutePrefix(left),
+        normalizeRoutePrefix(right)
+    ];
+    return '/' === first || '/' === second || first === second || first.startsWith(`${second}/`) || second.startsWith(`${first}/`);
+};
+const getWorkerEffectBffPrefix = (modernConfig)=>{
+    const bffPrefix = modernConfig.bff?.prefix;
+    const primaryBffPrefix = Array.isArray(bffPrefix) ? bffPrefix[0] : bffPrefix;
+    const isEffectApi = Boolean(modernConfig.bff) && modernConfig.bff?.runtimeFramework !== 'hono';
+    return isEffectApi && primaryBffPrefix ? primaryBffPrefix : void 0;
+};
+const effectiveServiceBindings = (serviceBindings)=>{
+    const bindings = Array.isArray(serviceBindings) ? serviceBindings : [];
+    return bindings.flatMap((service)=>isJsonRecord(service) && 'string' == typeof service.binding ? [
+            {
+                binding: service.binding.trim(),
+                prefix: 'string' == typeof service.prefix ? service.prefix : void 0
+            }
+        ] : []);
+};
+const createWorkerVpcServiceBindings = (modernConfig, configuredWranglerVpcServices, serviceBindings, workerBindingNames)=>{
+    const vpcServices = modernConfig.deploy?.worker?.vpcServices;
+    if (void 0 === vpcServices) return;
+    if (void 0 !== configuredWranglerVpcServices) throw new Error('Use deploy.worker.vpcServices or deploy.worker.wrangler.vpc_services, not both.');
+    if (!Array.isArray(vpcServices)) throw new Error('deploy.worker.vpcServices must be an array.');
+    const services = effectiveServiceBindings(serviceBindings);
+    const serviceBindingNames = new Set(services.map(({ binding })=>binding));
+    const effectBffPrefix = getWorkerEffectBffPrefix(modernConfig);
+    const routes = [
+        ...void 0 === effectBffPrefix ? [] : [
+            {
+                owner: 'the Effect BFF',
+                prefix: effectBffPrefix
+            }
+        ],
+        ...services.flatMap(({ binding, prefix })=>void 0 === prefix ? [] : [
+                {
+                    owner: `binding "${binding}"`,
+                    prefix
+                }
+            ])
+    ];
+    const vpcBindingNames = new Set();
+    return vpcServices.map((vpcService, index)=>{
+        const normalized = normalizeVpcService(vpcService, index);
+        if (serviceBindingNames.has(normalized.binding)) throw new Error(`deploy.worker.vpcServices[${index}].binding "${normalized.binding}" is already declared by deploy.worker.services.`);
+        if (workerBindingNames.has(normalized.binding)) throw new Error(`deploy.worker.vpcServices[${index}].binding "${normalized.binding}" is already a binding of this Worker.`);
+        if (vpcBindingNames.has(normalized.binding)) throw new Error(`deploy.worker.vpcServices[${index}].binding "${normalized.binding}" is declared more than once.`);
+        vpcBindingNames.add(normalized.binding);
+        if (void 0 !== normalized.prefix) {
+            const { prefix } = normalized;
+            if (!isCanonicalRoutePrefix(prefix)) throw new Error(`deploy.worker.vpcServices[${index}].prefix "${prefix}" must be a decoded URL path that starts with "/" (no query, fragment, "." or ".." segments).`);
+            const shadow = routes.find((route)=>prefixesOverlap(route.prefix, prefix));
+            if (void 0 !== shadow) throw new Error(`deploy.worker.vpcServices[${index}].prefix "${prefix}" overlaps the prefix "${shadow.prefix}" of ${shadow.owner}; the worker dispatcher would route one of them ambiguously.`);
+            routes.push({
+                owner: `binding "${normalized.binding}"`,
+                prefix
+            });
+        }
+        return normalized;
+    });
+};
 const createWranglerServices = (serviceBindings)=>{
     if (!Array.isArray(serviceBindings)) return serviceBindings;
     if (!serviceBindings.every(isJsonRecord)) return serviceBindings;
@@ -136,8 +259,16 @@ const createWranglerServices = (serviceBindings)=>{
         return wranglerService;
     });
 };
-const createWorkerManifestServiceBindings = (serviceBindings)=>{
-    if (!Array.isArray(serviceBindings)) return;
+const createWorkerManifestServiceBindings = (serviceBindings, vpcServiceBindings)=>{
+    const vpcManifestBindings = (vpcServiceBindings ?? []).flatMap(({ binding, prefix, serviceId })=>void 0 === prefix ? [] : [
+            {
+                binding,
+                interface: 'fetch',
+                prefix,
+                vpcServiceId: serviceId
+            }
+        ]);
+    if (!Array.isArray(serviceBindings)) return vpcManifestBindings.length > 0 ? vpcManifestBindings : void 0;
     const bindings = serviceBindings;
     const manifestBindings = bindings.filter((service)=>isJsonRecord(service) && 'string' == typeof service.binding && 'string' == typeof service.service && ('string' == typeof service.prefix || Array.isArray(service.fragments) && service.fragments.length > 0)).map((service)=>({
             binding: service.binding,
@@ -150,7 +281,11 @@ const createWorkerManifestServiceBindings = (serviceBindings)=>{
                 fragments: service.fragments
             }
         }));
-    return manifestBindings.length > 0 ? manifestBindings : void 0;
+    const allBindings = [
+        ...manifestBindings,
+        ...vpcManifestBindings
+    ];
+    return allBindings.length > 0 ? allBindings : void 0;
 };
 const createWranglerConfig = (appDirectory, modernConfig)=>{
     const wrangler = getConfiguredWrangler(modernConfig);
@@ -158,7 +293,7 @@ const createWranglerConfig = (appDirectory, modernConfig)=>{
     const d1Databases = createWranglerD1Databases(modernConfig, wrangler.d1_databases);
     const serviceBindings = createWorkerServiceBindings(modernConfig, wrangler.services);
     const wranglerServices = createWranglerServices(serviceBindings);
-    return {
+    const workerConfig = {
         $schema: 'node_modules/wrangler/config-schema.json',
         name: getConfiguredWorkerName(appDirectory, modernConfig),
         ...wrangler,
@@ -176,5 +311,33 @@ const createWranglerConfig = (appDirectory, modernConfig)=>{
             services: wranglerServices
         }
     };
+    const vpcServiceBindings = createWorkerVpcServiceBindings(modernConfig, wrangler.vpc_services, serviceBindings, collectWorkerBindingNames(workerConfig));
+    if (void 0 === vpcServiceBindings) return workerConfig;
+    const vpcServicesConfig = vpcServiceBindings.map(({ binding, serviceId })=>({
+            binding,
+            service_id: serviceId
+        }));
+    return {
+        ...workerConfig,
+        ...void 0 === environments ? {} : {
+            env: Object.fromEntries(Object.entries(environments).map(([name, environment])=>{
+                if (void 0 !== environment.vpc_services) throw new Error(`Use deploy.worker.vpcServices or deploy.worker.wrangler.env.${name}.vpc_services, not both.`);
+                const environmentBindingNames = new Set([
+                    ...collectWorkerBindingNames(environment),
+                    ...effectiveServiceBindings(environment.services).map(({ binding })=>binding)
+                ]);
+                const collision = vpcServiceBindings.find(({ binding })=>environmentBindingNames.has(binding));
+                if (void 0 !== collision) throw new Error(`deploy.worker.vpcServices binding "${collision.binding}" is already a binding of deploy.worker.wrangler.env.${name}.`);
+                return [
+                    name,
+                    {
+                        ...environment,
+                        vpc_services: vpcServicesConfig
+                    }
+                ];
+            }))
+        },
+        vpc_services: vpcServicesConfig
+    };
 };
-export { createWorkerManifestServiceBindings, createWorkerServiceBindings, createWranglerConfig };
+export { createWorkerManifestServiceBindings, createWorkerServiceBindings, createWorkerVpcServiceBindings, createWranglerConfig, getWorkerEffectBffPrefix };

package/dist/esm-node/cloudflare-output-contract.mjs

@@ -80,7 +80,8 @@ const CLOUDFLARE_WORKER_NODE_BUILTINS = [
     'zlib'
 ];
 const CLOUDFLARE_WORKER_PLATFORM_MODULES = [
-    'cloudflare:sockets'
+    'cloudflare:sockets',
+    'cloudflare:workers'
 ];
 const CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS = [
     'nodejs_compat',

package/dist/types/cloudflare/worker-manifest.d.ts

@@ -130,7 +130,12 @@ export declare const createWorkerManifest: (outputDirectory: string, modernConfi
             };
         } | undefined;
     } | undefined;
-    serviceBindings?: {
+    serviceBindings?: ({
+        binding: string;
+        interface: string;
+        prefix: string;
+        vpcServiceId: string;
+    } | {
         binding: string;
         service: string;
         interface: string;
@@ -141,7 +146,7 @@ export declare const createWorkerManifest: (outputDirectory: string, modernConfi
             boundaryId: string;
             path: string;
         }[] | undefined;
-    }[] | undefined;
+    })[] | undefined;
 }>;
 export declare const createWorkerModuleLoaders: (manifest: any) => string;
 export declare const getPublicAssetExcludes: (appDirectory: string, modernConfig: CloudflareModernConfig) => string[];

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

@@ -11,7 +11,22 @@ export declare const createWorkerServiceBindings: (modernConfig: CloudflareModer
         path: string;
     }[] | undefined;
 }[] | JsonValue | undefined;
-export declare const createWorkerManifestServiceBindings: (serviceBindings: ReturnType<typeof createWorkerServiceBindings>) => {
+/**
+ * The prefix the worker's Effect BFF dispatcher owns. It runs before any
+ * service binding, so it takes part in route-overlap checks.
+ */
+export declare const getWorkerEffectBffPrefix: (modernConfig: CloudflareModernConfig) => string | undefined;
+export declare const createWorkerVpcServiceBindings: (modernConfig: CloudflareModernConfig, configuredWranglerVpcServices: JsonValue | undefined, serviceBindings: ReturnType<typeof createWorkerServiceBindings>, workerBindingNames: ReadonlySet<string>) => {
+    binding: string;
+    serviceId: string;
+    prefix?: string | undefined;
+}[] | undefined;
+export declare const createWorkerManifestServiceBindings: (serviceBindings: ReturnType<typeof createWorkerServiceBindings>, vpcServiceBindings: ReturnType<typeof createWorkerVpcServiceBindings>) => ({
+    binding: string;
+    interface: string;
+    prefix: string;
+    vpcServiceId: string;
+} | {
     binding: string;
     service: string;
     interface: string;
@@ -22,7 +37,7 @@ export declare const createWorkerManifestServiceBindings: (serviceBindings: Retu
         boundaryId: string;
         path: string;
     }[] | undefined;
-}[] | undefined;
+})[] | undefined;
 export declare const createWranglerConfig: (appDirectory: string, modernConfig: CloudflareModernConfig) => {
     $schema: string;
     name: string;
@@ -34,10 +49,38 @@ export declare const createWranglerConfig: (appDirectory: string, modernConfig:
         binding: string;
         run_worker_first: boolean;
     };
-    env?: {
+    env?: Record<string, Record<string, JsonValue>> | undefined;
+    d1_databases?: {
+        binding: string;
+        database_name: string;
+        database_id: string;
+        migrations_dir?: string | undefined;
+        preview_database_id?: string | undefined;
+        remote?: boolean | undefined;
+    }[] | JsonValue | undefined;
+    services?: string | number | boolean | JsonValue[] | {
+        binding: string;
+        service: string;
+    }[] | {
+        [key: string]: JsonValue;
+    } | null | undefined;
+} | {
+    $schema: string;
+    name: string;
+    compatibility_date: string;
+    main: string;
+    compatibility_flags: JsonValue[];
+    assets: {
+        directory: string;
+        binding: string;
+        run_worker_first: boolean;
+    };
+    env?: Record<string, Record<string, JsonValue>> | {
         [k: string]: {
-            compatibility_date?: string | undefined;
-            compatibility_flags?: JsonValue[] | undefined;
+            vpc_services: {
+                binding: string;
+                service_id: string;
+            }[];
         };
     } | undefined;
     d1_databases?: {
@@ -54,4 +97,8 @@ export declare const createWranglerConfig: (appDirectory: string, modernConfig:
     }[] | {
         [key: string]: JsonValue;
     } | null | undefined;
+    vpc_services: {
+        binding: string;
+        service_id: string;
+    }[];
 };

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

@@ -13,5 +13,5 @@ export declare const CLOUDFLARE_WORKER_BUNDLE_FORMAT = "commonjs";
 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_WORKER_PLATFORM_MODULES: readonly ['cloudflare:sockets', 'cloudflare:workers'];
 export declare const CLOUDFLARE_REQUIRED_COMPATIBILITY_FLAGS: readonly ['nodejs_compat', 'global_fetch_strictly_public'];

package/dist/types/config.d.ts

@@ -84,6 +84,18 @@ export interface CloudflareWorkerServiceBindingConfig {
      */
     fragments?: CloudflareWorkerServiceBindingFragmentConfig[];
 }
+export interface CloudflareWorkerVpcServiceConfig {
+    /** Worker binding name exposed on the module worker `env` object. */
+    binding: string;
+    /** Workers VPC service id (`wrangler vpc service create`). */
+    serviceId: string;
+    /**
+     * Optional application path prefix that Modern.js should dispatch to this
+     * private origin with `env[binding].fetch(request)`, exactly like a
+     * prefixed Worker service binding.
+     */
+    prefix?: string;
+}
 export interface CloudflareWorkerServiceBindingFragmentConfig {
     /** Stable remote id used by the shell's composition contract. */
     remote: string;
@@ -174,19 +186,64 @@ export interface CloudflareWorkerSecurityConfig {
     };
     reason?: string;
 }
+export interface CloudflareWorkerDeployConfig {
+    name?: string;
+    /**
+     * Cloudflare Workers compatibility date for generated wrangler config.
+     * Use YYYY-MM-DD. Defaults to the date validated against the bundled
+     * Wrangler version used by UltraModern generated workspaces.
+     */
+    compatibilityDate?: string;
+    ssr?: boolean;
+    security?: CloudflareWorkerSecurityConfig;
+    /**
+     * Raw Wrangler-compatible config merged into `.output/wrangler.json`.
+     * Framework-owned worker invariants still win for `main`, the assets
+     * binding/directory/run mode, and required compatibility flags.
+     */
+    wrangler?: Record<string, JsonValue>;
+    /**
+     * Additional app-root files or directories to stage under `.output`.
+     * Use this for provider resources such as migrations or generated config.
+     */
+    artifacts?: CloudflareWorkerArtifactConfig[];
+    /**
+     * Additional app-root files or directories to serve as Cloudflare Worker
+     * Static Assets under `.output/public`. Use `to: '.'` to copy a
+     * source directory's contents into the public asset root.
+     */
+    publicAssets?: CloudflareWorkerPublicAssetConfig[];
+    /**
+     * First-class Cloudflare D1 bindings. Modern.js writes these to
+     * `wrangler.json` as `d1_databases` and stages configured migration
+     * directories into `.output`.
+     */
+    d1Databases?: CloudflareWorkerD1DatabaseConfig[];
+    /**
+     * First-class Cloudflare service bindings. Modern.js writes these to
+     * `wrangler.json` as `services`; when a binding also has `prefix`,
+     * the generated Worker dispatches matching requests through
+     * `env[binding].fetch(request)`.
+     */
+    services?: CloudflareWorkerServiceBindingConfig[];
+    /**
+     * First-class Workers VPC service bindings to private origins reached
+     * through a Cloudflare Tunnel. Modern.js writes these to `wrangler.json`
+     * as `vpc_services`; a binding with `prefix` joins the prefix dispatch of
+     * `services`.
+     */
+    vpcServices?: CloudflareWorkerVpcServiceConfig[];
+    /**
+     * Dist output paths that must not be copied into Cloudflare public assets.
+     * Entries are slash-normalized path prefixes relative to the app dist root.
+     * Top-level `api` and `shared` dist directories are excluded when matching
+     * source directories exist in the app root because they conventionally
+     * contain server-only implementation code.
+     */
+    publicAssetExcludes?: string[];
+}
 export interface CloudflareDeployConfig {
-    worker?: {
-        name?: string;
-        compatibilityDate?: string;
-        ssr?: boolean;
-        security?: CloudflareWorkerSecurityConfig;
-        wrangler?: Record<string, JsonValue>;
-        artifacts?: CloudflareWorkerArtifactConfig[];
-        publicAssets?: CloudflareWorkerPublicAssetConfig[];
-        d1Databases?: CloudflareWorkerD1DatabaseConfig[];
-        services?: CloudflareWorkerServiceBindingConfig[];
-        publicAssetExcludes?: string[];
-    };
+    worker?: CloudflareWorkerDeployConfig;
 }
 export interface NodeDeployConfig {
     node?: {

package/package.json

@@ -11,7 +11,7 @@
     "directory": "packages/solutions/app-tools-extensions"
   },
   "license": "MIT",
-  "version": "3.9.0-ultramodern.22",
+  "version": "3.9.0-ultramodern.23",
   "files": [
     "dist",
     "src"
@@ -153,16 +153,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.22",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.22",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.22",
-    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.22",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.22",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.22",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.22",
-    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.22",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.22",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.22",
+    "@modern-js/backend-federation-contracts": "npm:@bleedingdev/modern-js-backend-federation-contracts@3.9.0-ultramodern.23",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.23",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.23",
+    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.23",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.23",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.23",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.23",
+    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.23",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.23",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.23",
     "@swc/helpers": "^0.5.23",
     "@vercel/nft": "^1.11.0",
     "compression-webpack-plugin": "^12.0.0",
@@ -179,10 +179,10 @@
     }
   },
   "devDependencies": {
-    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.22",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.22",
-    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.22",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.22",
+    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.23",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.23",
+    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.23",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.23",
     "@module-federation/modern-js-v3": "2.9.2",
     "@module-federation/runtime-tools": "2.9.2",
     "@rsbuild/core": "2.2.10",

package/src/cloudflare/worker-manifest.ts

@@ -28,6 +28,8 @@ import { isRecord, normalizeRelativePath } from './utils';
 import {
   createWorkerManifestServiceBindings,
   createWorkerServiceBindings,
+  createWorkerVpcServiceBindings,
+  getWorkerEffectBffPrefix,
 } from './wrangler-config';
 
 const createMissingEffectBffWorkerError = (
@@ -157,20 +159,31 @@ export const createWorkerManifest = async (
     }),
   );
 
-  const bffPrefix = modernConfig.bff?.prefix;
-  const primaryBffPrefix = Array.isArray(bffPrefix) ? bffPrefix[0] : bffPrefix;
   const isEffectApi =
     Boolean(modernConfig.bff) && modernConfig.bff?.runtimeFramework !== 'hono';
+  const effectBffPrefix = getWorkerEffectBffPrefix(modernConfig);
   const effectApiWorkerExists = await fse.pathExists(
     path.join(outputDirectory, BFF_EFFECT_WORKER_ENTRY),
   );
+  const typedServiceBindings = createWorkerServiceBindings(
+    modernConfig,
+    undefined,
+  );
   const serviceBindings = createWorkerManifestServiceBindings(
-    createWorkerServiceBindings(modernConfig, undefined),
+    typedServiceBindings,
+    // The wrangler config checks VPC names against every Worker binding; the
+    // manifest only needs the framework-owned assets binding reserved.
+    createWorkerVpcServiceBindings(
+      modernConfig,
+      undefined,
+      typedServiceBindings,
+      new Set([ASSETS_BINDING]),
+    ),
   );
   const moduleFederation =
     await createModuleFederationWorkerManifest(outputDirectory);
 
-  if (isEffectApi && primaryBffPrefix && !effectApiWorkerExists) {
+  if (effectBffPrefix !== undefined && !effectApiWorkerExists) {
     throw createMissingEffectBffWorkerError(
       outputDirectory,
       BFF_EFFECT_WORKER_ENTRY,
@@ -212,11 +225,11 @@ export const createWorkerManifest = async (
     ...(deliveryUnitStamp ? { deliveryUnit: deliveryUnitStamp } : {}),
     i18n: createI18nWorkerManifest(routeSpec, appContext),
     bff:
-      isEffectApi && primaryBffPrefix && effectApiWorkerExists
+      effectBffPrefix !== undefined && effectApiWorkerExists
         ? {
             dispatcherExport: BFF_EFFECT_WORKER_DISPATCHER_EXPORT,
             runtimeFramework: 'effect',
-            prefix: primaryBffPrefix,
+            prefix: effectBffPrefix,
             worker: BFF_EFFECT_WORKER_ENTRY,
             effect: effectBffManifest,
           }