@bleedingdev/modern-js-app-tools 3.5.0-ultramodern.23 → 3.5.0-ultramodern.25

package/dist/cjs/builder/generator/getBuilderEnvironments.js

@@ -302,6 +302,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
                         chain.output.module(true).library({
                             type: 'module'
                         }).chunkFormat('module').chunkLoading('import').workerChunkLoading('import');
+                        chain.optimization.usedExports(false).providedExports(true).innerGraph(false).sideEffects(false);
                         chain.plugins.delete('plugin-module-federation');
                         if (tanstackRouterSsrServerFile) {
                             chain.resolve.alias.set('@tanstack/router-core/ssr/server$', tanstackRouterSsrServerFile);

package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-entry.mjs

@@ -2,6 +2,8 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const effectBffHandlerPromises = new Map();
+let effectEdgeRuntimePromise;
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = false !== CORS_POLICY.assets;
@@ -163,6 +165,7 @@ async function createCorsPreflightResponse(request, env) {
     });
 }
 async function fetchAsset(request, env) {
+    if ('GET' !== request.method && 'HEAD' !== request.method) return null;
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
@@ -211,7 +214,7 @@ function getPathExtension(pathname) {
 }
 function isAssetLikePathname(pathname) {
     const extension = getPathExtension(pathname);
-    return '' !== extension && '.html' !== extension && '.htm' !== extension;
+    return '' !== extension;
 }
 function routeMatchesExactly(route, pathname) {
     if ('string' != typeof route?.urlPath) return false;
@@ -712,6 +715,10 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+async function loadEffectEdgeRuntime() {
+    effectEdgeRuntimePromise ??= import('@modern-js/plugin-bff/effect-edge');
+    return effectEdgeRuntimePromise;
+}
 function getRuntimeModule(workerModule) {
     const defaultExport = workerModule.default;
     const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
@@ -776,21 +783,6 @@ function createRequestForMountedPrefix(request, prefix) {
     url.pathname = nextPath.startsWith('/') ? nextPath : `/${nextPath}`;
     return new Request(url, request);
 }
-function createEffectContext(originalRequest, mountedRequest, env) {
-    const url = new URL(originalRequest.url);
-    return {
-        request: mountedRequest,
-        env: env || {},
-        path: url.pathname,
-        method: originalRequest.method,
-        operationContext: {
-            request: mountedRequest,
-            env: env || {},
-            path: url.pathname,
-            method: originalRequest.method
-        }
-    };
-}
 async function dispatchBffRequest(request, env) {
     const bff = MODERN_WORKER_MANIFEST.bff;
     if (!bff?.worker || !matchesPrefix(new URL(request.url).pathname, bff.prefix)) return null;
@@ -803,9 +795,23 @@ async function dispatchBffRequest(request, env) {
         }
     });
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
-    const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
     const runtime = getRuntimeModule(workerModule);
+    if ('effect' === bff.runtimeFramework) {
+        let effectHandlerPromise = effectBffHandlerPromises.get(bff.worker);
+        if (!effectHandlerPromise) {
+            const { createEffectBffEdgeHandler } = await loadEffectEdgeRuntime();
+            effectHandlerPromise = createEffectBffEdgeHandler({
+                module: runtime,
+                prefix: bff.prefix
+            });
+            effectBffHandlerPromises.set(bff.worker, effectHandlerPromise);
+        }
+        const effectHandler = await effectHandlerPromise;
+        return effectHandler.handler(request, {
+            env
+        });
+    }
     const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
     const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
     const handler = directHandler || createdHandler;
@@ -816,7 +822,19 @@ async function dispatchBffRequest(request, env) {
             'x-modern-js-bff-worker': bff.worker
         }
     });
-    return handler.length > 1 ? handler(mountedRequest, effectContext) : handler(mountedRequest);
+    const effectContext = {
+        request: mountedRequest,
+        env: env || {},
+        path: new URL(request.url).pathname,
+        method: request.method,
+        operationContext: {
+            request: mountedRequest,
+            env: env || {},
+            path: new URL(request.url).pathname,
+            method: request.method
+        }
+    };
+    return handler(mountedRequest, effectContext);
 }
 export default {
     async fetch (request, env, ctx) {

package/dist/esm/builder/generator/getBuilderEnvironments.mjs

@@ -259,6 +259,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
                         chain.output.module(true).library({
                             type: 'module'
                         }).chunkFormat('module').chunkLoading('import').workerChunkLoading('import');
+                        chain.optimization.usedExports(false).providedExports(true).innerGraph(false).sideEffects(false);
                         chain.plugins.delete('plugin-module-federation');
                         if (tanstackRouterSsrServerFile) {
                             chain.resolve.alias.set('@tanstack/router-core/ssr/server$', tanstackRouterSsrServerFile);

package/dist/esm/plugins/deploy/platforms/templates/cloudflare-entry.mjs

@@ -2,6 +2,8 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const effectBffHandlerPromises = new Map();
+let effectEdgeRuntimePromise;
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = false !== CORS_POLICY.assets;
@@ -163,6 +165,7 @@ async function createCorsPreflightResponse(request, env) {
     });
 }
 async function fetchAsset(request, env) {
+    if ('GET' !== request.method && 'HEAD' !== request.method) return null;
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
@@ -211,7 +214,7 @@ function getPathExtension(pathname) {
 }
 function isAssetLikePathname(pathname) {
     const extension = getPathExtension(pathname);
-    return '' !== extension && '.html' !== extension && '.htm' !== extension;
+    return '' !== extension;
 }
 function routeMatchesExactly(route, pathname) {
     if ('string' != typeof route?.urlPath) return false;
@@ -712,6 +715,10 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+async function loadEffectEdgeRuntime() {
+    effectEdgeRuntimePromise ??= import('@modern-js/plugin-bff/effect-edge');
+    return effectEdgeRuntimePromise;
+}
 function getRuntimeModule(workerModule) {
     const defaultExport = workerModule.default;
     const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
@@ -776,21 +783,6 @@ function createRequestForMountedPrefix(request, prefix) {
     url.pathname = nextPath.startsWith('/') ? nextPath : `/${nextPath}`;
     return new Request(url, request);
 }
-function createEffectContext(originalRequest, mountedRequest, env) {
-    const url = new URL(originalRequest.url);
-    return {
-        request: mountedRequest,
-        env: env || {},
-        path: url.pathname,
-        method: originalRequest.method,
-        operationContext: {
-            request: mountedRequest,
-            env: env || {},
-            path: url.pathname,
-            method: originalRequest.method
-        }
-    };
-}
 async function dispatchBffRequest(request, env) {
     const bff = MODERN_WORKER_MANIFEST.bff;
     if (!bff?.worker || !matchesPrefix(new URL(request.url).pathname, bff.prefix)) return null;
@@ -803,9 +795,23 @@ async function dispatchBffRequest(request, env) {
         }
     });
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
-    const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
     const runtime = getRuntimeModule(workerModule);
+    if ('effect' === bff.runtimeFramework) {
+        let effectHandlerPromise = effectBffHandlerPromises.get(bff.worker);
+        if (!effectHandlerPromise) {
+            const { createEffectBffEdgeHandler } = await loadEffectEdgeRuntime();
+            effectHandlerPromise = createEffectBffEdgeHandler({
+                module: runtime,
+                prefix: bff.prefix
+            });
+            effectBffHandlerPromises.set(bff.worker, effectHandlerPromise);
+        }
+        const effectHandler = await effectHandlerPromise;
+        return effectHandler.handler(request, {
+            env
+        });
+    }
     const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
     const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
     const handler = directHandler || createdHandler;
@@ -816,7 +822,19 @@ async function dispatchBffRequest(request, env) {
             'x-modern-js-bff-worker': bff.worker
         }
     });
-    return handler.length > 1 ? handler(mountedRequest, effectContext) : handler(mountedRequest);
+    const effectContext = {
+        request: mountedRequest,
+        env: env || {},
+        path: new URL(request.url).pathname,
+        method: request.method,
+        operationContext: {
+            request: mountedRequest,
+            env: env || {},
+            path: new URL(request.url).pathname,
+            method: request.method
+        }
+    };
+    return handler(mountedRequest, effectContext);
 }
 export default {
     async fetch (request, env, ctx) {

package/dist/esm-node/builder/generator/getBuilderEnvironments.mjs

@@ -264,6 +264,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
                         chain.output.module(true).library({
                             type: 'module'
                         }).chunkFormat('module').chunkLoading('import').workerChunkLoading('import');
+                        chain.optimization.usedExports(false).providedExports(true).innerGraph(false).sideEffects(false);
                         chain.plugins.delete('plugin-module-federation');
                         if (tanstackRouterSsrServerFile) {
                             chain.resolve.alias.set('@tanstack/router-core/ssr/server$', tanstackRouterSsrServerFile);

package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-entry.mjs

@@ -2,6 +2,8 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const effectBffHandlerPromises = new Map();
+let effectEdgeRuntimePromise;
 const remoteJsonPromises = new Map();
 const CORS_POLICY = MODERN_WORKER_MANIFEST.security?.cors || {};
 const ASSET_CORS_ENABLED = false !== CORS_POLICY.assets;
@@ -163,6 +165,7 @@ async function createCorsPreflightResponse(request, env) {
     });
 }
 async function fetchAsset(request, env) {
+    if ('GET' !== request.method && 'HEAD' !== request.method) return null;
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
@@ -211,7 +214,7 @@ function getPathExtension(pathname) {
 }
 function isAssetLikePathname(pathname) {
     const extension = getPathExtension(pathname);
-    return '' !== extension && '.html' !== extension && '.htm' !== extension;
+    return '' !== extension;
 }
 function routeMatchesExactly(route, pathname) {
     if ('string' != typeof route?.urlPath) return false;
@@ -712,6 +715,10 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+async function loadEffectEdgeRuntime() {
+    effectEdgeRuntimePromise ??= import('@modern-js/plugin-bff/effect-edge');
+    return effectEdgeRuntimePromise;
+}
 function getRuntimeModule(workerModule) {
     const defaultExport = workerModule.default;
     const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
@@ -776,21 +783,6 @@ function createRequestForMountedPrefix(request, prefix) {
     url.pathname = nextPath.startsWith('/') ? nextPath : `/${nextPath}`;
     return new Request(url, request);
 }
-function createEffectContext(originalRequest, mountedRequest, env) {
-    const url = new URL(originalRequest.url);
-    return {
-        request: mountedRequest,
-        env: env || {},
-        path: url.pathname,
-        method: originalRequest.method,
-        operationContext: {
-            request: mountedRequest,
-            env: env || {},
-            path: url.pathname,
-            method: originalRequest.method
-        }
-    };
-}
 async function dispatchBffRequest(request, env) {
     const bff = MODERN_WORKER_MANIFEST.bff;
     if (!bff?.worker || !matchesPrefix(new URL(request.url).pathname, bff.prefix)) return null;
@@ -803,9 +795,23 @@ async function dispatchBffRequest(request, env) {
         }
     });
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
-    const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
     const runtime = getRuntimeModule(workerModule);
+    if ('effect' === bff.runtimeFramework) {
+        let effectHandlerPromise = effectBffHandlerPromises.get(bff.worker);
+        if (!effectHandlerPromise) {
+            const { createEffectBffEdgeHandler } = await loadEffectEdgeRuntime();
+            effectHandlerPromise = createEffectBffEdgeHandler({
+                module: runtime,
+                prefix: bff.prefix
+            });
+            effectBffHandlerPromises.set(bff.worker, effectHandlerPromise);
+        }
+        const effectHandler = await effectHandlerPromise;
+        return effectHandler.handler(request, {
+            env
+        });
+    }
     const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
     const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
     const handler = directHandler || createdHandler;
@@ -816,7 +822,19 @@ async function dispatchBffRequest(request, env) {
             'x-modern-js-bff-worker': bff.worker
         }
     });
-    return handler.length > 1 ? handler(mountedRequest, effectContext) : handler(mountedRequest);
+    const effectContext = {
+        request: mountedRequest,
+        env: env || {},
+        path: new URL(request.url).pathname,
+        method: request.method,
+        operationContext: {
+            request: mountedRequest,
+            env: env || {},
+            path: new URL(request.url).pathname,
+            method: request.method
+        }
+    };
+    return handler(mountedRequest, effectContext);
 }
 export default {
     async fetch (request, env, ctx) {

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.23",
+  "version": "3.5.0-ultramodern.25",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -90,16 +90,16 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^2.3.1",
     "std-env": "4.1.0",
-    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.23",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.23",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.23",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.23",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.23",
-    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.23",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.23",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.23",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.23",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.23"
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.5.0-ultramodern.25",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.25",
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.25",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.25",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.5.0-ultramodern.25",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.5.0-ultramodern.25",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.25",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.25",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.25",
+    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.5.0-ultramodern.25"
   },
   "devDependencies": {
     "@rslib/core": "0.23.1",