@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.72 → 3.2.0-ultramodern.73

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

@@ -19,6 +19,20 @@ function withCorsHeaders(response) {
         statusText: response.statusText
     });
 }
+function isFingerprintedAssetPathname(pathname) {
+    return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
+}
+function withAssetHeaders(response, request) {
+    const corsResponse = withCorsHeaders(response);
+    const headers = new Headers(corsResponse.headers);
+    const { pathname } = new URL(request.url);
+    if (isFingerprintedAssetPathname(pathname)) headers.set('cache-control', 'public, max-age=31536000, immutable');
+    return new Response(corsResponse.body, {
+        headers,
+        status: corsResponse.status,
+        statusText: corsResponse.statusText
+    });
+}
 function createCorsPreflightResponse(request) {
     if ('OPTIONS' !== request.method) return null;
     return new Response(null, {
@@ -31,7 +45,7 @@ async function fetchAsset(request, env) {
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return withCorsHeaders(response);
+    return withAssetHeaders(response, request);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -259,12 +273,19 @@ async function withRouteCssLinks(response, route, routeManifest, request, env) {
         ...await collectRenderedRemoteCssHrefs(html, request, env)
     ];
     if (0 === cssHrefs.length) return response;
-    const links = [
+    const uniqueCssHrefs = [
         ...new Set(cssHrefs)
-    ].filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
-    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    ];
+    const headers = new Headers(response.headers);
+    for (const href of uniqueCssHrefs)headers.append('link', `<${href}>; rel=preload; as=style`);
+    const links = uniqueCssHrefs.filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
     return new Response(html.replace('</head>', `${links.join('')}</head>`), {
-        headers: response.headers,
+        headers,
         status: response.status,
         statusText: response.statusText
     });

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

@@ -19,6 +19,20 @@ function withCorsHeaders(response) {
         statusText: response.statusText
     });
 }
+function isFingerprintedAssetPathname(pathname) {
+    return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
+}
+function withAssetHeaders(response, request) {
+    const corsResponse = withCorsHeaders(response);
+    const headers = new Headers(corsResponse.headers);
+    const { pathname } = new URL(request.url);
+    if (isFingerprintedAssetPathname(pathname)) headers.set('cache-control', 'public, max-age=31536000, immutable');
+    return new Response(corsResponse.body, {
+        headers,
+        status: corsResponse.status,
+        statusText: corsResponse.statusText
+    });
+}
 function createCorsPreflightResponse(request) {
     if ('OPTIONS' !== request.method) return null;
     return new Response(null, {
@@ -31,7 +45,7 @@ async function fetchAsset(request, env) {
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return withCorsHeaders(response);
+    return withAssetHeaders(response, request);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -259,12 +273,19 @@ async function withRouteCssLinks(response, route, routeManifest, request, env) {
         ...await collectRenderedRemoteCssHrefs(html, request, env)
     ];
     if (0 === cssHrefs.length) return response;
-    const links = [
+    const uniqueCssHrefs = [
         ...new Set(cssHrefs)
-    ].filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
-    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    ];
+    const headers = new Headers(response.headers);
+    for (const href of uniqueCssHrefs)headers.append('link', `<${href}>; rel=preload; as=style`);
+    const links = uniqueCssHrefs.filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
     return new Response(html.replace('</head>', `${links.join('')}</head>`), {
-        headers: response.headers,
+        headers,
         status: response.status,
         statusText: response.statusText
     });

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

@@ -19,6 +19,20 @@ function withCorsHeaders(response) {
         statusText: response.statusText
     });
 }
+function isFingerprintedAssetPathname(pathname) {
+    return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
+}
+function withAssetHeaders(response, request) {
+    const corsResponse = withCorsHeaders(response);
+    const headers = new Headers(corsResponse.headers);
+    const { pathname } = new URL(request.url);
+    if (isFingerprintedAssetPathname(pathname)) headers.set('cache-control', 'public, max-age=31536000, immutable');
+    return new Response(corsResponse.body, {
+        headers,
+        status: corsResponse.status,
+        statusText: corsResponse.statusText
+    });
+}
 function createCorsPreflightResponse(request) {
     if ('OPTIONS' !== request.method) return null;
     return new Response(null, {
@@ -31,7 +45,7 @@ async function fetchAsset(request, env) {
     if (!assets || 'function' != typeof assets.fetch) return null;
     const response = await assets.fetch(request);
     if (404 === response.status) return null;
-    return withCorsHeaders(response);
+    return withAssetHeaders(response, request);
 }
 async function fetchAssetByPath(pathname, request, env) {
     const url = new URL(request.url);
@@ -259,12 +273,19 @@ async function withRouteCssLinks(response, route, routeManifest, request, env) {
         ...await collectRenderedRemoteCssHrefs(html, request, env)
     ];
     if (0 === cssHrefs.length) return response;
-    const links = [
+    const uniqueCssHrefs = [
         ...new Set(cssHrefs)
-    ].filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
-    if (0 === links.length || !html.includes('</head>')) return new Response(html, response);
+    ];
+    const headers = new Headers(response.headers);
+    for (const href of uniqueCssHrefs)headers.append('link', `<${href}>; rel=preload; as=style`);
+    const links = uniqueCssHrefs.filter((href)=>!html.includes(href)).map((href)=>`<link rel="stylesheet" href="${escapeAttribute(href)}">`);
+    if (0 === links.length || !html.includes('</head>')) return new Response(html, {
+        headers,
+        status: response.status,
+        statusText: response.statusText
+    });
     return new Response(html.replace('</head>', `${links.join('')}</head>`), {
-        headers: response.headers,
+        headers,
         status: response.status,
         statusText: response.statusText
     });

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.72",
+  "version": "3.2.0-ultramodern.73",
   "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/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.72",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.72",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.72",
-    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.72",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.72",
-    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.72",
-    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.72",
-    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.72",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.72",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.72"
+    "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.73",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.73",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.73",
+    "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.73",
+    "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.73",
+    "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.73",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.73",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.73",
+    "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.73",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.73"
   },
   "devDependencies": {
     "@rslib/core": "0.21.5",