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

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.21",
+  "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.21",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.21",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.9.0-ultramodern.21",
-    "@modern-js/runtime-renderer-extensions": "npm:@bleedingdev/modern-js-runtime-renderer-extensions@3.9.0-ultramodern.21",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.21",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.21",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.21",
-    "@modern-js/surface-resolution": "npm:@bleedingdev/modern-js-surface-resolution@3.9.0-ultramodern.21",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.21",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.21",
+    "@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.21",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.21",
-    "@modern-js/plugin-bff-extensions": "npm:@bleedingdev/modern-js-plugin-bff-extensions@3.9.0-ultramodern.21",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.21",
+    "@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/build-config/build-environment.ts

@@ -1,4 +1,3 @@
-import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import {
   accessSync,
@@ -14,37 +13,97 @@ import {
 } from 'node:fs';
 import { createRequire } from 'node:module';
 import { tmpdir } from 'node:os';
-import { basename, dirname, join, resolve } from 'node:path';
+import { basename, dirname, join } from 'node:path';
 import type { URL } from 'node:url';
 
 const EFFECT_TSGO_PACKAGE = '@effect/tsgo';
-const EFFECT_TSGO_BIN = 'effect-tsgo';
+/** Native TypeScript packages, in the order Effect TS-Go discovers them. */
+const NATIVE_TYPESCRIPT_PACKAGES = ['typescript', '@typescript/native'];
 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>();
 
 type PackageJson = {
-  bin?: Record<string, string> | string;
+  version?: unknown;
 };
 
-function resolveEffectTsgoCli(from: string | URL): string {
+type EffectTsgoUpstreamManifest = {
+  components?: {
+    typescript?: Record<string, unknown>;
+  };
+};
+
+function readJson<T>(fileName: string): T {
+  return JSON.parse(readFileSync(fileName, 'utf-8')) as T;
+}
+
+function resolvePackageVersion(
+  packageRequire: NodeJS.Require,
+  packageName: string,
+): { packageJsonPath: string; version: string } | undefined {
+  let packageJsonPath: string;
+  try {
+    packageJsonPath = packageRequire.resolve(`${packageName}/package.json`);
+  } catch {
+    return undefined;
+  }
+  const { version } = readJson<PackageJson>(packageJsonPath);
+  return typeof version === 'string' ? { packageJsonPath, version } : undefined;
+}
+
+/**
+ * Resolves only the TypeScript component packaged by Effect TS-Go.
+ *
+ * `effect-tsgo get-exe-path` discovers every integration before selecting the
+ * TypeScript one, so an installed Oxlint makes it fail on Linux musl. The
+ * TypeScript artifact itself is platform-neutral across libc: the
+ * `@effect/tsgo-<platform>-<arch>` package lists it in `lib/upstream.json`
+ * under `components.typescript` and ships it at
+ * `artifacts/typescript/<version>/tsc`, keyed by the installed
+ * `@typescript/typescript-<platform>-<arch>` version.
+ */
+function resolveEffectTsgoTypeScriptArtifact(from: string | URL): string {
   const projectRequire = createRequire(from);
-  const packageJsonPath = projectRequire.resolve(
+  const effectTsgoPackageJsonPath = projectRequire.resolve(
     `${EFFECT_TSGO_PACKAGE}/package.json`,
   );
-  const packageJson = JSON.parse(
-    readFileSync(packageJsonPath, 'utf-8'),
-  ) as PackageJson;
-  const bin =
-    typeof packageJson.bin === 'string'
-      ? packageJson.bin
-      : packageJson.bin?.[EFFECT_TSGO_BIN];
-
-  if (!bin) {
-    throw new Error(EFFECT_TSGO_RESOLUTION_ERROR);
+  const platformTarget = `${process.platform}-${process.arch}`;
+  const effectTsgoPlatformPackageJsonPath = createRequire(
+    effectTsgoPackageJsonPath,
+  ).resolve(`${EFFECT_TSGO_PACKAGE}-${platformTarget}/package.json`);
+  const upstream = readJson<EffectTsgoUpstreamManifest>(
+    join(dirname(effectTsgoPlatformPackageJsonPath), 'lib', 'upstream.json'),
+  );
+  const packagedTypeScriptVersions = upstream.components?.typescript ?? {};
+
+  for (const packageName of NATIVE_TYPESCRIPT_PACKAGES) {
+    const typescript = resolvePackageVersion(projectRequire, packageName);
+    const major = typescript && /^\s*(\d+)/u.exec(typescript.version);
+    if (!typescript || !major || Number(major[1]) < 7) {
+      continue;
+    }
+
+    const typescriptPlatform = resolvePackageVersion(
+      createRequire(typescript.packageJsonPath),
+      `@typescript/typescript-${platformTarget}`,
+    );
+    if (
+      !typescriptPlatform ||
+      !Object.hasOwn(packagedTypeScriptVersions, typescriptPlatform.version)
+    ) {
+      break;
+    }
+
+    return join(
+      dirname(effectTsgoPlatformPackageJsonPath),
+      'artifacts',
+      'typescript',
+      typescriptPlatform.version,
+      process.platform === 'win32' ? 'tsc.exe' : 'tsc',
+    );
   }
 
-  return resolve(dirname(packageJsonPath), bin);
+  throw new Error(EFFECT_TSGO_RESOLUTION_ERROR);
 }
 
 function resolveExecutableEffectTsgoCompiler(compilerPath: string): string {
@@ -143,17 +202,11 @@ export function resolveEffectTsgoCompiler(
   }
 
   try {
-    const compiler = execFileSync(
-      process.execPath,
-      [resolveEffectTsgoCli(options.from), 'get-exe-path'],
-      { encoding: 'utf-8' },
-    ).trim();
-
-    if (compiler) {
-      return resolveExecutableEffectTsgoCompiler(compiler);
-    }
+    return resolveExecutableEffectTsgoCompiler(
+      resolveEffectTsgoTypeScriptArtifact(options.from),
+    );
   } catch {
-    // Use one stable error for package, platform-binary, and CLI failures.
+    // Use one stable error for package, platform-package, and artifact failures.
   }
 
   throw new Error(EFFECT_TSGO_RESOLUTION_ERROR);

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,
           }