@bleedingdev/modern-js-plugin-bff-extensions 3.9.0-ultramodern.2 → 3.9.0-ultramodern.4

package/dist/cjs/effect-source-loader/index.js

@@ -29,19 +29,23 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     bundleEffectEntryForNode: ()=>external_loader_js_namespaceObject.bundleEffectEntryForNode,
+    bundleEffectWorkerRuntimeSource: ()=>external_worker_runtime_source_js_namespaceObject.bundleEffectWorkerRuntimeSource,
     generateEffectClientCode: ()=>external_worker_runtime_wrapper_js_namespaceObject.generateEffectClientCode,
     generateEffectWorkerRuntimeWrapper: ()=>external_worker_runtime_wrapper_js_namespaceObject.generateEffectWorkerRuntimeWrapper,
     resolveEffectEntryFile: ()=>paths_js_namespaceObject.resolveEffectEntryFile
 });
 const paths_js_namespaceObject = require("../client-generator/paths.js");
 const external_loader_js_namespaceObject = require("./loader.js");
+const external_worker_runtime_source_js_namespaceObject = require("./worker-runtime-source.js");
 const external_worker_runtime_wrapper_js_namespaceObject = require("./worker-runtime-wrapper.js");
 exports.bundleEffectEntryForNode = __webpack_exports__.bundleEffectEntryForNode;
+exports.bundleEffectWorkerRuntimeSource = __webpack_exports__.bundleEffectWorkerRuntimeSource;
 exports.generateEffectClientCode = __webpack_exports__.generateEffectClientCode;
 exports.generateEffectWorkerRuntimeWrapper = __webpack_exports__.generateEffectWorkerRuntimeWrapper;
 exports.resolveEffectEntryFile = __webpack_exports__.resolveEffectEntryFile;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "bundleEffectEntryForNode",
+    "bundleEffectWorkerRuntimeSource",
     "generateEffectClientCode",
     "generateEffectWorkerRuntimeWrapper",
     "resolveEffectEntryFile"

package/dist/cjs/effect-source-loader/loader.js

@@ -145,7 +145,6 @@ function isBareSpecifier(specifier) {
     return !specifier.startsWith('.') && !specifier.startsWith('/') && !external_node_path_default().isAbsolute(specifier);
 }
 function externalizeInstalledDependencies(options) {
-    const runtimeRequire = (0, external_node_module_namespaceObject.createRequire)(external_node_path_default().join(options.runtimeResolveDir, '__modern_effect_entry.cjs'));
     return {
         name: 'modern-js-effect-installed-dependencies',
         setup (buildApi) {
@@ -185,28 +184,10 @@ function externalizeInstalledDependencies(options) {
                         },
                         resolveDir: options.runtimeResolveDir
                     });
-                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) {
-                        if ('cjs' === options.format) {
-                            let requiredPath;
-                            try {
-                                requiredPath = runtimeRequire.resolve(args.path);
-                            } catch  {
-                                requiredPath = runtimeResolution.path;
-                            }
-                            if (await isEsmOnlyFile(requiredPath)) return {
-                                namespace: resolution.namespace,
-                                path: resolution.path,
-                                pluginData: resolution.pluginData,
-                                sideEffects: resolution.sideEffects,
-                                suffix: resolution.suffix,
-                                warnings: resolution.warnings
-                            };
-                        }
-                        return {
-                            external: true,
-                            path: args.path
-                        };
-                    }
+                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) return {
+                        external: true,
+                        path: args.path
+                    };
                 }
                 return {
                     namespace: resolution.namespace,
@@ -234,7 +215,6 @@ async function bundleEffectEntryForNode(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: options.format,
                 runtimeResolveDir: options.appDir
             }),
             preserveSourceModuleSemantics()
@@ -308,7 +288,6 @@ async function loadEffectSourceModule(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: 'esm',
                 runtimeResolveDir: appDir
             }),
             preserveSourceModuleSemantics()

package/dist/cjs/effect-source-loader/worker-runtime-source.js

@@ -0,0 +1,71 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    bundleEffectWorkerRuntimeSource: ()=>bundleEffectWorkerRuntimeSource
+});
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const external_esbuild_namespaceObject = require("esbuild");
+async function bundleEffectWorkerRuntimeSource(source, resourcePath, loader) {
+    const result = await (0, external_esbuild_namespaceObject.build)({
+        absWorkingDir: external_node_path_default().dirname(resourcePath),
+        bundle: true,
+        format: 'esm',
+        metafile: true,
+        packages: 'external',
+        platform: 'neutral',
+        stdin: {
+            contents: source,
+            loader: 'js',
+            resolveDir: external_node_path_default().dirname(resourcePath),
+            sourcefile: resourcePath
+        },
+        target: 'es2024',
+        write: false
+    });
+    for (const dependency of Object.keys(result.metafile.inputs))if ('<stdin>' !== dependency) loader.addDependency(external_node_path_default().resolve(external_node_path_default().dirname(resourcePath), dependency));
+    return result.outputFiles[0].text;
+}
+exports.bundleEffectWorkerRuntimeSource = __webpack_exports__.bundleEffectWorkerRuntimeSource;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "bundleEffectWorkerRuntimeSource"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/effect-source-loader/index.mjs

@@ -1,3 +1,4 @@
 export { resolveEffectEntryFile } from "../client-generator/paths.mjs";
 export { bundleEffectEntryForNode } from "./loader.mjs";
+export { bundleEffectWorkerRuntimeSource } from "./worker-runtime-source.mjs";
 export { generateEffectClientCode, generateEffectWorkerRuntimeWrapper } from "./worker-runtime-wrapper.mjs";

package/dist/esm/effect-source-loader/loader.mjs

@@ -99,7 +99,6 @@ function isBareSpecifier(specifier) {
     return !specifier.startsWith('.') && !specifier.startsWith('/') && !node_path.isAbsolute(specifier);
 }
 function externalizeInstalledDependencies(options) {
-    const runtimeRequire = createRequire(node_path.join(options.runtimeResolveDir, '__modern_effect_entry.cjs'));
     return {
         name: 'modern-js-effect-installed-dependencies',
         setup (buildApi) {
@@ -139,28 +138,10 @@ function externalizeInstalledDependencies(options) {
                         },
                         resolveDir: options.runtimeResolveDir
                     });
-                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) {
-                        if ('cjs' === options.format) {
-                            let requiredPath;
-                            try {
-                                requiredPath = runtimeRequire.resolve(args.path);
-                            } catch  {
-                                requiredPath = runtimeResolution.path;
-                            }
-                            if (await isEsmOnlyFile(requiredPath)) return {
-                                namespace: resolution.namespace,
-                                path: resolution.path,
-                                pluginData: resolution.pluginData,
-                                sideEffects: resolution.sideEffects,
-                                suffix: resolution.suffix,
-                                warnings: resolution.warnings
-                            };
-                        }
-                        return {
-                            external: true,
-                            path: args.path
-                        };
-                    }
+                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) return {
+                        external: true,
+                        path: args.path
+                    };
                 }
                 return {
                     namespace: resolution.namespace,
@@ -188,7 +169,6 @@ async function bundleEffectEntryForNode(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: options.format,
                 runtimeResolveDir: options.appDir
             }),
             preserveSourceModuleSemantics()
@@ -262,7 +242,6 @@ async function loadEffectSourceModule(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: 'esm',
                 runtimeResolveDir: appDir
             }),
             preserveSourceModuleSemantics()

package/dist/esm/effect-source-loader/worker-runtime-source.mjs

@@ -0,0 +1,23 @@
+import node_path from "node:path";
+import { build } from "esbuild";
+async function bundleEffectWorkerRuntimeSource(source, resourcePath, loader) {
+    const result = await build({
+        absWorkingDir: node_path.dirname(resourcePath),
+        bundle: true,
+        format: 'esm',
+        metafile: true,
+        packages: 'external',
+        platform: 'neutral',
+        stdin: {
+            contents: source,
+            loader: 'js',
+            resolveDir: node_path.dirname(resourcePath),
+            sourcefile: resourcePath
+        },
+        target: 'es2024',
+        write: false
+    });
+    for (const dependency of Object.keys(result.metafile.inputs))if ('<stdin>' !== dependency) loader.addDependency(node_path.resolve(node_path.dirname(resourcePath), dependency));
+    return result.outputFiles[0].text;
+}
+export { bundleEffectWorkerRuntimeSource };

package/dist/esm-node/effect-source-loader/index.mjs

@@ -1,4 +1,5 @@
 import "node:module";
 export { resolveEffectEntryFile } from "../client-generator/paths.mjs";
 export { bundleEffectEntryForNode } from "./loader.mjs";
+export { bundleEffectWorkerRuntimeSource } from "./worker-runtime-source.mjs";
 export { generateEffectClientCode, generateEffectWorkerRuntimeWrapper } from "./worker-runtime-wrapper.mjs";

package/dist/esm-node/effect-source-loader/loader.mjs

@@ -100,7 +100,6 @@ function isBareSpecifier(specifier) {
     return !specifier.startsWith('.') && !specifier.startsWith('/') && !node_path.isAbsolute(specifier);
 }
 function externalizeInstalledDependencies(options) {
-    const runtimeRequire = createRequire(node_path.join(options.runtimeResolveDir, '__modern_effect_entry.cjs'));
     return {
         name: 'modern-js-effect-installed-dependencies',
         setup (buildApi) {
@@ -140,28 +139,10 @@ function externalizeInstalledDependencies(options) {
                         },
                         resolveDir: options.runtimeResolveDir
                     });
-                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) {
-                        if ('cjs' === options.format) {
-                            let requiredPath;
-                            try {
-                                requiredPath = runtimeRequire.resolve(args.path);
-                            } catch  {
-                                requiredPath = runtimeResolution.path;
-                            }
-                            if (await isEsmOnlyFile(requiredPath)) return {
-                                namespace: resolution.namespace,
-                                path: resolution.path,
-                                pluginData: resolution.pluginData,
-                                sideEffects: resolution.sideEffects,
-                                suffix: resolution.suffix,
-                                warnings: resolution.warnings
-                            };
-                        }
-                        return {
-                            external: true,
-                            path: args.path
-                        };
-                    }
+                    if (0 === runtimeResolution.errors.length && runtimeResolution.path) return {
+                        external: true,
+                        path: args.path
+                    };
                 }
                 return {
                     namespace: resolution.namespace,
@@ -189,7 +170,6 @@ async function bundleEffectEntryForNode(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: options.format,
                 runtimeResolveDir: options.appDir
             }),
             preserveSourceModuleSemantics()
@@ -263,7 +243,6 @@ async function loadEffectSourceModule(options) {
         platform: 'node',
         plugins: [
             externalizeInstalledDependencies({
-                format: 'esm',
                 runtimeResolveDir: appDir
             }),
             preserveSourceModuleSemantics()

package/dist/esm-node/effect-source-loader/worker-runtime-source.mjs

@@ -0,0 +1,24 @@
+import "node:module";
+import node_path from "node:path";
+import { build } from "esbuild";
+async function bundleEffectWorkerRuntimeSource(source, resourcePath, loader) {
+    const result = await build({
+        absWorkingDir: node_path.dirname(resourcePath),
+        bundle: true,
+        format: 'esm',
+        metafile: true,
+        packages: 'external',
+        platform: 'neutral',
+        stdin: {
+            contents: source,
+            loader: 'js',
+            resolveDir: node_path.dirname(resourcePath),
+            sourcefile: resourcePath
+        },
+        target: 'es2024',
+        write: false
+    });
+    for (const dependency of Object.keys(result.metafile.inputs))if ('<stdin>' !== dependency) loader.addDependency(node_path.resolve(node_path.dirname(resourcePath), dependency));
+    return result.outputFiles[0].text;
+}
+export { bundleEffectWorkerRuntimeSource };

package/dist/types/effect-source-loader/index.d.ts

@@ -1,3 +1,4 @@
 export { resolveEffectEntryFile } from '../client-generator/paths.js';
 export { bundleEffectEntryForNode } from './loader.js';
+export { bundleEffectWorkerRuntimeSource } from './worker-runtime-source.js';
 export { generateEffectClientCode, generateEffectWorkerRuntimeWrapper, } from './worker-runtime-wrapper.js';

package/dist/types/effect-source-loader/worker-runtime-source.d.ts

@@ -0,0 +1,4 @@
+/** Keep the worker implementation graph out of the API-to-client loader. */
+export declare function bundleEffectWorkerRuntimeSource(source: string, resourcePath: string, loader: {
+    addDependency: (dependency: string) => void;
+}): Promise<string>;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "ultramodern.js"
   ],
-  "version": "3.9.0-ultramodern.2",
+  "version": "3.9.0-ultramodern.4",
   "files": [
     "dist",
     "src"
@@ -169,13 +169,13 @@
     "node": ">=26.7.0"
   },
   "dependencies": {
-    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.2",
-    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.2",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.2",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.2",
-    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.2",
+    "@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.4",
+    "@modern-js/bff-effect": "npm:@bleedingdev/modern-js-bff-effect@3.9.0-ultramodern.4",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.4",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.4",
+    "@modern-js/server-runtime-extensions": "npm:@bleedingdev/modern-js-server-runtime-extensions@3.9.0-ultramodern.4",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.4",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.4",
     "@module-federation/runtime": "2.9.0",
     "esbuild": "^0.28.2"
   },

package/src/effect-source-loader/index.ts

@@ -1,5 +1,6 @@
 export { resolveEffectEntryFile } from '../client-generator/paths';
 export { bundleEffectEntryForNode } from './loader';
+export { bundleEffectWorkerRuntimeSource } from './worker-runtime-source';
 export {
   generateEffectClientCode,
   generateEffectWorkerRuntimeWrapper,

package/src/effect-source-loader/loader.ts

@@ -125,12 +125,8 @@ function isBareSpecifier(specifier: string) {
  * generated entry is relocatable and directly executable by Node 26.7.
  */
 function externalizeInstalledDependencies(options: {
-  format: 'cjs' | 'esm';
   runtimeResolveDir: string;
 }): Plugin {
-  const runtimeRequire = createRequire(
-    path.join(options.runtimeResolveDir, '__modern_effect_entry.cjs'),
-  );
   return {
     name: 'modern-js-effect-installed-dependencies',
     setup(buildApi) {
@@ -176,24 +172,8 @@ function externalizeInstalledDependencies(options: {
             resolveDir: options.runtimeResolveDir,
           });
           if (runtimeResolution.errors.length === 0 && runtimeResolution.path) {
-            if (options.format === 'cjs') {
-              let requiredPath: string;
-              try {
-                requiredPath = runtimeRequire.resolve(args.path);
-              } catch {
-                requiredPath = runtimeResolution.path;
-              }
-              if (await isEsmOnlyFile(requiredPath)) {
-                return {
-                  namespace: resolution.namespace,
-                  path: resolution.path,
-                  pluginData: resolution.pluginData,
-                  sideEffects: resolution.sideEffects,
-                  suffix: resolution.suffix,
-                  warnings: resolution.warnings,
-                };
-              }
-            }
+            // Node 26 loads installed ESM from CommonJS natively. Rebundling
+            // it here would split dependency identity from the BFF runtime.
             return { external: true, path: args.path };
           }
         }
@@ -227,7 +207,6 @@ export async function bundleEffectEntryForNode(options: {
     platform: 'node',
     plugins: [
       externalizeInstalledDependencies({
-        format: options.format,
         runtimeResolveDir: options.appDir,
       }),
       preserveSourceModuleSemantics(),
@@ -365,7 +344,6 @@ export async function loadEffectSourceModule(
     platform: 'node',
     plugins: [
       externalizeInstalledDependencies({
-        format: 'esm',
         runtimeResolveDir: appDir,
       }),
       preserveSourceModuleSemantics(),

package/src/effect-source-loader/worker-runtime-source.ts

@@ -0,0 +1,34 @@
+import path from 'node:path';
+import { build } from 'esbuild';
+
+/** Keep the worker implementation graph out of the API-to-client loader. */
+export async function bundleEffectWorkerRuntimeSource(
+  source: string,
+  resourcePath: string,
+  loader: { addDependency: (dependency: string) => void },
+) {
+  const result = await build({
+    absWorkingDir: path.dirname(resourcePath),
+    bundle: true,
+    format: 'esm',
+    metafile: true,
+    packages: 'external',
+    platform: 'neutral',
+    stdin: {
+      contents: source,
+      loader: 'js',
+      resolveDir: path.dirname(resourcePath),
+      sourcefile: resourcePath,
+    },
+    target: 'es2024',
+    write: false,
+  });
+  for (const dependency of Object.keys(result.metafile.inputs)) {
+    if (dependency !== '<stdin>') {
+      loader.addDependency(
+        path.resolve(path.dirname(resourcePath), dependency),
+      );
+    }
+  }
+  return result.outputFiles[0].text;
+}