@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.64 → 3.2.0-ultramodern.66

package/dist/cjs/plugins/deploy/platforms/cloudflare.js

@@ -106,7 +106,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
         },
         workerBundles: {
             directory: WORKER_BUNDLE_DIRECTORY,
-            format: 'esm',
+            format: 'commonjs',
             importableFromModuleWorker: true,
             requestHandlerExport: 'requestHandler'
         },
@@ -201,7 +201,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
                 spaces: 2
             });
             await utils_namespaceObject.fs.writeJSON(external_node_path_default().join(outputDirectory, 'package.json'), {
-                type: 'module'
+                type: 'commonjs'
             });
         },
         async genEntry () {

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

@@ -121,6 +121,45 @@ function createRequestHandlerOptions({ route, htmlTemplate, routeManifest, loada
         }
     };
 }
+function collectRouteCssAssets(route, routeManifest) {
+    const routeAssets = routeManifest?.routeAssets || {};
+    const candidateKeys = [
+        route.entryName,
+        `async-${route.entryName}`
+    ].filter(Boolean);
+    const assets = new Set();
+    for (const key of candidateKeys){
+        const routeAsset = routeAssets[key];
+        const cssAssets = [
+            ...Array.isArray(routeAsset?.referenceCssAssets) ? routeAsset.referenceCssAssets : [],
+            ...Array.isArray(routeAsset?.assets) ? routeAsset.assets : []
+        ];
+        for (const asset of cssAssets)if ('string' == typeof asset && asset.endsWith('.css')) assets.add(asset);
+    }
+    return [
+        ...assets
+    ];
+}
+function escapeAttribute(value) {
+    return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+async function withRouteCssLinks(response, route, routeManifest, request) {
+    const contentType = response.headers.get('content-type') || '';
+    if (!contentType.includes('text/html')) return response;
+    const cssAssets = collectRouteCssAssets(route, routeManifest);
+    if (0 === cssAssets.length) return response;
+    const html = await response.text();
+    const links = cssAssets.filter((asset)=>!html.includes(asset)).map((asset)=>{
+        const href = new URL(asset, request.url).toString();
+        return `<link rel="stylesheet" href="${escapeAttribute(href)}">`;
+    });
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    return new Response(html.replace('</head>', `${links.join('')}</head>`), {
+        headers: response.headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
 async function getRequestHandlerOptions(route, request, env) {
     const [htmlTemplate, routeManifest, loadableStats] = await Promise.all([
         readAssetText(route.entryPath, request, env),
@@ -140,14 +179,24 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+function getRuntimeModule(workerModule) {
+    const defaultExport = workerModule.default;
+    const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
+    return defaultExport && 'object' == typeof defaultExport ? {
+        ...workerModule,
+        ...defaultExport,
+        ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
+    } : workerModule;
+}
 function getFetchHandler(workerModule) {
     const defaultExport = workerModule.default;
-    return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
+    const runtime = getRuntimeModule(workerModule);
+    return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
 }
 async function getRequestHandler(workerModule) {
     const defaultExport = workerModule.default;
-    const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
-    return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
+    const runtime = getRuntimeModule(workerModule);
+    return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
 }
 async function dispatchRouteWorker(route, request, env, ctx) {
     const workerPath = route.worker;
@@ -170,7 +219,7 @@ async function dispatchRouteWorker(route, request, env, ctx) {
     const requestHandler = await getRequestHandler(workerModule);
     if ('function' == typeof requestHandler) {
         const requestHandlerOptions = await getRequestHandlerOptions(route, request, env);
-        return requestHandler(request, requestHandlerOptions);
+        return withRouteCssLinks(await requestHandler(request, requestHandlerOptions), route, requestHandlerOptions.resource.routeManifest, request);
     }
     return new Response(`Worker bundle has no fetch or requestHandler export: ${workerPath}`, {
         status: 500,
@@ -223,10 +272,7 @@ async function dispatchBffRequest(request, env) {
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
     const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
-    const runtime = defaultExport && 'object' == typeof defaultExport ? {
-        ...workerModule,
-        ...defaultExport
-    } : workerModule;
+    const runtime = getRuntimeModule(workerModule);
     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;

package/dist/esm/plugins/deploy/platforms/cloudflare.mjs

@@ -68,7 +68,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
         },
         workerBundles: {
             directory: WORKER_BUNDLE_DIRECTORY,
-            format: 'esm',
+            format: 'commonjs',
             importableFromModuleWorker: true,
             requestHandlerExport: 'requestHandler'
         },
@@ -163,7 +163,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
                 spaces: 2
             });
             await fs.writeJSON(node_path.join(outputDirectory, 'package.json'), {
-                type: 'module'
+                type: 'commonjs'
             });
         },
         async genEntry () {

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

@@ -121,6 +121,45 @@ function createRequestHandlerOptions({ route, htmlTemplate, routeManifest, loada
         }
     };
 }
+function collectRouteCssAssets(route, routeManifest) {
+    const routeAssets = routeManifest?.routeAssets || {};
+    const candidateKeys = [
+        route.entryName,
+        `async-${route.entryName}`
+    ].filter(Boolean);
+    const assets = new Set();
+    for (const key of candidateKeys){
+        const routeAsset = routeAssets[key];
+        const cssAssets = [
+            ...Array.isArray(routeAsset?.referenceCssAssets) ? routeAsset.referenceCssAssets : [],
+            ...Array.isArray(routeAsset?.assets) ? routeAsset.assets : []
+        ];
+        for (const asset of cssAssets)if ('string' == typeof asset && asset.endsWith('.css')) assets.add(asset);
+    }
+    return [
+        ...assets
+    ];
+}
+function escapeAttribute(value) {
+    return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+async function withRouteCssLinks(response, route, routeManifest, request) {
+    const contentType = response.headers.get('content-type') || '';
+    if (!contentType.includes('text/html')) return response;
+    const cssAssets = collectRouteCssAssets(route, routeManifest);
+    if (0 === cssAssets.length) return response;
+    const html = await response.text();
+    const links = cssAssets.filter((asset)=>!html.includes(asset)).map((asset)=>{
+        const href = new URL(asset, request.url).toString();
+        return `<link rel="stylesheet" href="${escapeAttribute(href)}">`;
+    });
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    return new Response(html.replace('</head>', `${links.join('')}</head>`), {
+        headers: response.headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
 async function getRequestHandlerOptions(route, request, env) {
     const [htmlTemplate, routeManifest, loadableStats] = await Promise.all([
         readAssetText(route.entryPath, request, env),
@@ -140,14 +179,24 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+function getRuntimeModule(workerModule) {
+    const defaultExport = workerModule.default;
+    const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
+    return defaultExport && 'object' == typeof defaultExport ? {
+        ...workerModule,
+        ...defaultExport,
+        ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
+    } : workerModule;
+}
 function getFetchHandler(workerModule) {
     const defaultExport = workerModule.default;
-    return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
+    const runtime = getRuntimeModule(workerModule);
+    return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
 }
 async function getRequestHandler(workerModule) {
     const defaultExport = workerModule.default;
-    const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
-    return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
+    const runtime = getRuntimeModule(workerModule);
+    return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
 }
 async function dispatchRouteWorker(route, request, env, ctx) {
     const workerPath = route.worker;
@@ -170,7 +219,7 @@ async function dispatchRouteWorker(route, request, env, ctx) {
     const requestHandler = await getRequestHandler(workerModule);
     if ('function' == typeof requestHandler) {
         const requestHandlerOptions = await getRequestHandlerOptions(route, request, env);
-        return requestHandler(request, requestHandlerOptions);
+        return withRouteCssLinks(await requestHandler(request, requestHandlerOptions), route, requestHandlerOptions.resource.routeManifest, request);
     }
     return new Response(`Worker bundle has no fetch or requestHandler export: ${workerPath}`, {
         status: 500,
@@ -223,10 +272,7 @@ async function dispatchBffRequest(request, env) {
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
     const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
-    const runtime = defaultExport && 'object' == typeof defaultExport ? {
-        ...workerModule,
-        ...defaultExport
-    } : workerModule;
+    const runtime = getRuntimeModule(workerModule);
     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;

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

@@ -69,7 +69,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
         },
         workerBundles: {
             directory: WORKER_BUNDLE_DIRECTORY,
-            format: 'esm',
+            format: 'commonjs',
             importableFromModuleWorker: true,
             requestHandlerExport: 'requestHandler'
         },
@@ -164,7 +164,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
                 spaces: 2
             });
             await fs.writeJSON(node_path.join(outputDirectory, 'package.json'), {
-                type: 'module'
+                type: 'commonjs'
             });
         },
         async genEntry () {

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

@@ -121,6 +121,45 @@ function createRequestHandlerOptions({ route, htmlTemplate, routeManifest, loada
         }
     };
 }
+function collectRouteCssAssets(route, routeManifest) {
+    const routeAssets = routeManifest?.routeAssets || {};
+    const candidateKeys = [
+        route.entryName,
+        `async-${route.entryName}`
+    ].filter(Boolean);
+    const assets = new Set();
+    for (const key of candidateKeys){
+        const routeAsset = routeAssets[key];
+        const cssAssets = [
+            ...Array.isArray(routeAsset?.referenceCssAssets) ? routeAsset.referenceCssAssets : [],
+            ...Array.isArray(routeAsset?.assets) ? routeAsset.assets : []
+        ];
+        for (const asset of cssAssets)if ('string' == typeof asset && asset.endsWith('.css')) assets.add(asset);
+    }
+    return [
+        ...assets
+    ];
+}
+function escapeAttribute(value) {
+    return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+async function withRouteCssLinks(response, route, routeManifest, request) {
+    const contentType = response.headers.get('content-type') || '';
+    if (!contentType.includes('text/html')) return response;
+    const cssAssets = collectRouteCssAssets(route, routeManifest);
+    if (0 === cssAssets.length) return response;
+    const html = await response.text();
+    const links = cssAssets.filter((asset)=>!html.includes(asset)).map((asset)=>{
+        const href = new URL(asset, request.url).toString();
+        return `<link rel="stylesheet" href="${escapeAttribute(href)}">`;
+    });
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    return new Response(html.replace('</head>', `${links.join('')}</head>`), {
+        headers: response.headers,
+        status: response.status,
+        statusText: response.statusText
+    });
+}
 async function getRequestHandlerOptions(route, request, env) {
     const [htmlTemplate, routeManifest, loadableStats] = await Promise.all([
         readAssetText(route.entryPath, request, env),
@@ -140,14 +179,24 @@ async function loadWorkerModule(workerPath) {
     if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
     return workerModulePromises.get(workerPath);
 }
+function getRuntimeModule(workerModule) {
+    const defaultExport = workerModule.default;
+    const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
+    return defaultExport && 'object' == typeof defaultExport ? {
+        ...workerModule,
+        ...defaultExport,
+        ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
+    } : workerModule;
+}
 function getFetchHandler(workerModule) {
     const defaultExport = workerModule.default;
-    return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
+    const runtime = getRuntimeModule(workerModule);
+    return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
 }
 async function getRequestHandler(workerModule) {
     const defaultExport = workerModule.default;
-    const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
-    return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
+    const runtime = getRuntimeModule(workerModule);
+    return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
 }
 async function dispatchRouteWorker(route, request, env, ctx) {
     const workerPath = route.worker;
@@ -170,7 +219,7 @@ async function dispatchRouteWorker(route, request, env, ctx) {
     const requestHandler = await getRequestHandler(workerModule);
     if ('function' == typeof requestHandler) {
         const requestHandlerOptions = await getRequestHandlerOptions(route, request, env);
-        return requestHandler(request, requestHandlerOptions);
+        return withRouteCssLinks(await requestHandler(request, requestHandlerOptions), route, requestHandlerOptions.resource.routeManifest, request);
     }
     return new Response(`Worker bundle has no fetch or requestHandler export: ${workerPath}`, {
         status: 500,
@@ -223,10 +272,7 @@ async function dispatchBffRequest(request, env) {
     const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
     const effectContext = createEffectContext(request, mountedRequest, env);
     const defaultExport = workerModule.default;
-    const runtime = defaultExport && 'object' == typeof defaultExport ? {
-        ...workerModule,
-        ...defaultExport
-    } : workerModule;
+    const runtime = getRuntimeModule(workerModule);
     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;

package/package.json

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