@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.41 → 3.2.0-ultramodern.42

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

@@ -2,14 +2,35 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const CORS_HEADERS = {
+    'access-control-allow-headers': '*',
+    'access-control-allow-methods': 'GET, HEAD, OPTIONS',
+    'access-control-allow-origin': '*'
+};
 globalThis.__dirname ??= '/';
 globalThis.__filename ??= '/index.js';
+function withCorsHeaders(response) {
+    const headers = new Headers(response.headers);
+    for (const [name, value] of Object.entries(CORS_HEADERS))if (!headers.has(name)) headers.set(name, value);
+    return new Response(response.body, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
+function createCorsPreflightResponse(request) {
+    if ('OPTIONS' !== request.method) return null;
+    return new Response(null, {
+        headers: CORS_HEADERS,
+        status: 204
+    });
+}
 async function fetchAsset(request, env) {
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return response;
+    return withCorsHeaders(response);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -220,16 +241,18 @@ async function dispatchBffRequest(request, env) {
 }
 export default {
     async fetch (request, env, ctx) {
+        const corsPreflightResponse = createCorsPreflightResponse(request);
+        if (corsPreflightResponse) return corsPreflightResponse;
         const assetResponse = await fetchAsset(request, env);
         if (assetResponse) return assetResponse;
         const bffResponse = await dispatchBffRequest(request, env);
-        if (bffResponse) return bffResponse;
+        if (bffResponse) return withCorsHeaders(bffResponse);
         const route = findRoute(request);
-        if (route?.worker) return dispatchRouteWorker(route, request, env, ctx);
+        if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
         const htmlResponse = await fetchRouteHtml(route, request, env);
         if (htmlResponse) return htmlResponse;
-        return new Response('Not found', {
+        return withCorsHeaders(new Response('Not found', {
             status: 404
-        });
+        }));
     }
 };

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

@@ -2,14 +2,35 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const CORS_HEADERS = {
+    'access-control-allow-headers': '*',
+    'access-control-allow-methods': 'GET, HEAD, OPTIONS',
+    'access-control-allow-origin': '*'
+};
 globalThis.__dirname ??= '/';
 globalThis.__filename ??= '/index.js';
+function withCorsHeaders(response) {
+    const headers = new Headers(response.headers);
+    for (const [name, value] of Object.entries(CORS_HEADERS))if (!headers.has(name)) headers.set(name, value);
+    return new Response(response.body, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
+function createCorsPreflightResponse(request) {
+    if ('OPTIONS' !== request.method) return null;
+    return new Response(null, {
+        headers: CORS_HEADERS,
+        status: 204
+    });
+}
 async function fetchAsset(request, env) {
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return response;
+    return withCorsHeaders(response);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -220,16 +241,18 @@ async function dispatchBffRequest(request, env) {
 }
 export default {
     async fetch (request, env, ctx) {
+        const corsPreflightResponse = createCorsPreflightResponse(request);
+        if (corsPreflightResponse) return corsPreflightResponse;
         const assetResponse = await fetchAsset(request, env);
         if (assetResponse) return assetResponse;
         const bffResponse = await dispatchBffRequest(request, env);
-        if (bffResponse) return bffResponse;
+        if (bffResponse) return withCorsHeaders(bffResponse);
         const route = findRoute(request);
-        if (route?.worker) return dispatchRouteWorker(route, request, env, ctx);
+        if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
         const htmlResponse = await fetchRouteHtml(route, request, env);
         if (htmlResponse) return htmlResponse;
-        return new Response('Not found', {
+        return withCorsHeaders(new Response('Not found', {
             status: 404
-        });
+        }));
     }
 };

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

@@ -2,14 +2,35 @@ const ASSETS_BINDING = 'ASSETS';
 const MODERN_WORKER_MANIFEST = p_workerManifest;
 const WORKER_MODULE_LOADERS = p_workerModuleLoaders;
 const workerModulePromises = new Map();
+const CORS_HEADERS = {
+    'access-control-allow-headers': '*',
+    'access-control-allow-methods': 'GET, HEAD, OPTIONS',
+    'access-control-allow-origin': '*'
+};
 globalThis.__dirname ??= '/';
 globalThis.__filename ??= '/index.js';
+function withCorsHeaders(response) {
+    const headers = new Headers(response.headers);
+    for (const [name, value] of Object.entries(CORS_HEADERS))if (!headers.has(name)) headers.set(name, value);
+    return new Response(response.body, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
+function createCorsPreflightResponse(request) {
+    if ('OPTIONS' !== request.method) return null;
+    return new Response(null, {
+        headers: CORS_HEADERS,
+        status: 204
+    });
+}
 async function fetchAsset(request, env) {
     const assets = env?.[ASSETS_BINDING];
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return response;
+    return withCorsHeaders(response);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -220,16 +241,18 @@ async function dispatchBffRequest(request, env) {
 }
 export default {
     async fetch (request, env, ctx) {
+        const corsPreflightResponse = createCorsPreflightResponse(request);
+        if (corsPreflightResponse) return corsPreflightResponse;
         const assetResponse = await fetchAsset(request, env);
         if (assetResponse) return assetResponse;
         const bffResponse = await dispatchBffRequest(request, env);
-        if (bffResponse) return bffResponse;
+        if (bffResponse) return withCorsHeaders(bffResponse);
         const route = findRoute(request);
-        if (route?.worker) return dispatchRouteWorker(route, request, env, ctx);
+        if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
         const htmlResponse = await fetchRouteHtml(route, request, env);
         if (htmlResponse) return htmlResponse;
-        return new Response('Not found', {
+        return withCorsHeaders(new Response('Not found', {
             status: 404
-        });
+        }));
     }
 };

package/dist/types/plugins/deploy/platforms/templates/cloudflare-entry.d.mts

@@ -1,4 +1,4 @@
 declare const _default: {
-    fetch(request: any, env: any, ctx: any): Promise<any>;
+    fetch(request: any, env: any, ctx: any): Promise<Response>;
 };
 export default _default;

package/package.json

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