@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.100 → 3.2.0-ultramodern.102

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,6 +19,22 @@ function withCorsHeaders(response) {
19
19
  statusText: response.statusText
20
20
  });
21
21
  }
22
+ function createRenderableRequest(request) {
23
+ if ('HEAD' !== request.method) return request;
24
+ return new Request(request, {
25
+ method: 'GET'
26
+ });
27
+ }
28
+ function finalizeResponseForRequest(response, request) {
29
+ if ('HEAD' !== request.method) return response;
30
+ const headers = new Headers(response.headers);
31
+ headers.delete('content-length');
32
+ return new Response(null, {
33
+ headers,
34
+ status: response.status,
35
+ statusText: response.statusText
36
+ });
37
+ }
22
38
  function isFingerprintedAssetPathname(pathname) {
23
39
  return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
24
40
  }
@@ -420,19 +436,22 @@ export default {
420
436
  const corsPreflightResponse = createCorsPreflightResponse(request);
421
437
  if (corsPreflightResponse) return corsPreflightResponse;
422
438
  const assetResponse = await fetchAsset(request, env);
423
- if (assetResponse) return assetResponse;
439
+ if (assetResponse) return finalizeResponseForRequest(assetResponse, request);
424
440
  const bffResponse = await dispatchBffRequest(request, env);
425
- if (bffResponse) return withCorsHeaders(bffResponse);
441
+ if (bffResponse) return finalizeResponseForRequest(withCorsHeaders(bffResponse), request);
426
442
  const route = findRoute(request);
427
443
  const { pathname } = new URL(request.url);
428
- if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return withCorsHeaders(new Response('Not found', {
444
+ if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
429
445
  status: 404
430
- }));
431
- if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
446
+ })), request);
447
+ if (route?.worker) {
448
+ const renderableRequest = createRenderableRequest(request);
449
+ return finalizeResponseForRequest(withCorsHeaders(await dispatchRouteWorker(route, renderableRequest, env, ctx)), request);
450
+ }
432
451
  const htmlResponse = await fetchRouteHtml(route, request, env);
433
- if (htmlResponse) return htmlResponse;
434
- return withCorsHeaders(new Response('Not found', {
452
+ if (htmlResponse) return finalizeResponseForRequest(htmlResponse, request);
453
+ return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
435
454
  status: 404
436
- }));
455
+ })), request);
437
456
  }
438
457
  };
@@ -19,6 +19,22 @@ function withCorsHeaders(response) {
19
19
  statusText: response.statusText
20
20
  });
21
21
  }
22
+ function createRenderableRequest(request) {
23
+ if ('HEAD' !== request.method) return request;
24
+ return new Request(request, {
25
+ method: 'GET'
26
+ });
27
+ }
28
+ function finalizeResponseForRequest(response, request) {
29
+ if ('HEAD' !== request.method) return response;
30
+ const headers = new Headers(response.headers);
31
+ headers.delete('content-length');
32
+ return new Response(null, {
33
+ headers,
34
+ status: response.status,
35
+ statusText: response.statusText
36
+ });
37
+ }
22
38
  function isFingerprintedAssetPathname(pathname) {
23
39
  return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
24
40
  }
@@ -420,19 +436,22 @@ export default {
420
436
  const corsPreflightResponse = createCorsPreflightResponse(request);
421
437
  if (corsPreflightResponse) return corsPreflightResponse;
422
438
  const assetResponse = await fetchAsset(request, env);
423
- if (assetResponse) return assetResponse;
439
+ if (assetResponse) return finalizeResponseForRequest(assetResponse, request);
424
440
  const bffResponse = await dispatchBffRequest(request, env);
425
- if (bffResponse) return withCorsHeaders(bffResponse);
441
+ if (bffResponse) return finalizeResponseForRequest(withCorsHeaders(bffResponse), request);
426
442
  const route = findRoute(request);
427
443
  const { pathname } = new URL(request.url);
428
- if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return withCorsHeaders(new Response('Not found', {
444
+ if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
429
445
  status: 404
430
- }));
431
- if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
446
+ })), request);
447
+ if (route?.worker) {
448
+ const renderableRequest = createRenderableRequest(request);
449
+ return finalizeResponseForRequest(withCorsHeaders(await dispatchRouteWorker(route, renderableRequest, env, ctx)), request);
450
+ }
432
451
  const htmlResponse = await fetchRouteHtml(route, request, env);
433
- if (htmlResponse) return htmlResponse;
434
- return withCorsHeaders(new Response('Not found', {
452
+ if (htmlResponse) return finalizeResponseForRequest(htmlResponse, request);
453
+ return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
435
454
  status: 404
436
- }));
455
+ })), request);
437
456
  }
438
457
  };
@@ -19,6 +19,22 @@ function withCorsHeaders(response) {
19
19
  statusText: response.statusText
20
20
  });
21
21
  }
22
+ function createRenderableRequest(request) {
23
+ if ('HEAD' !== request.method) return request;
24
+ return new Request(request, {
25
+ method: 'GET'
26
+ });
27
+ }
28
+ function finalizeResponseForRequest(response, request) {
29
+ if ('HEAD' !== request.method) return response;
30
+ const headers = new Headers(response.headers);
31
+ headers.delete('content-length');
32
+ return new Response(null, {
33
+ headers,
34
+ status: response.status,
35
+ statusText: response.statusText
36
+ });
37
+ }
22
38
  function isFingerprintedAssetPathname(pathname) {
23
39
  return /(?:^|\/)[^/]+\.[a-f0-9]{8,}\.(?:css|js|mjs|json|svg|png|jpe?g|webp|avif|gif|woff2?|ttf)$/iu.test(pathname);
24
40
  }
@@ -420,19 +436,22 @@ export default {
420
436
  const corsPreflightResponse = createCorsPreflightResponse(request);
421
437
  if (corsPreflightResponse) return corsPreflightResponse;
422
438
  const assetResponse = await fetchAsset(request, env);
423
- if (assetResponse) return assetResponse;
439
+ if (assetResponse) return finalizeResponseForRequest(assetResponse, request);
424
440
  const bffResponse = await dispatchBffRequest(request, env);
425
- if (bffResponse) return withCorsHeaders(bffResponse);
441
+ if (bffResponse) return finalizeResponseForRequest(withCorsHeaders(bffResponse), request);
426
442
  const route = findRoute(request);
427
443
  const { pathname } = new URL(request.url);
428
- if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return withCorsHeaders(new Response('Not found', {
444
+ if (isAssetLikePathname(pathname) && !routeMatchesExactly(route, pathname)) return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
429
445
  status: 404
430
- }));
431
- if (route?.worker) return withCorsHeaders(await dispatchRouteWorker(route, request, env, ctx));
446
+ })), request);
447
+ if (route?.worker) {
448
+ const renderableRequest = createRenderableRequest(request);
449
+ return finalizeResponseForRequest(withCorsHeaders(await dispatchRouteWorker(route, renderableRequest, env, ctx)), request);
450
+ }
432
451
  const htmlResponse = await fetchRouteHtml(route, request, env);
433
- if (htmlResponse) return htmlResponse;
434
- return withCorsHeaders(new Response('Not found', {
452
+ if (htmlResponse) return finalizeResponseForRequest(htmlResponse, request);
453
+ return finalizeResponseForRequest(withCorsHeaders(new Response('Not found', {
435
454
  status: 404
436
- }));
455
+ })), request);
437
456
  }
438
457
  };
@@ -1,4 +1,4 @@
1
1
  declare const _default: {
2
- fetch(request: any, env: any, ctx: any): Promise<Response>;
2
+ fetch(request: any, env: any, ctx: any): Promise<any>;
3
3
  };
4
4
  export default _default;
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.2.0-ultramodern.100",
20
+ "version": "3.2.0-ultramodern.102",
21
21
  "types": "./dist/types/index.d.ts",
22
22
  "main": "./dist/cjs/index.js",
23
23
  "exports": {
@@ -99,16 +99,16 @@
99
99
  "ndepe": "^0.1.13",
100
100
  "pkg-types": "^2.3.1",
101
101
  "std-env": "4.1.0",
102
- "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.100",
103
- "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.100",
104
- "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.100",
105
- "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.100",
106
- "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.100",
107
- "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.100",
108
- "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.100",
109
- "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.100",
110
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.100",
111
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.100"
102
+ "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.102",
103
+ "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.102",
104
+ "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.102",
105
+ "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.102",
106
+ "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.102",
107
+ "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.102",
108
+ "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.102",
109
+ "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.102",
110
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.102",
111
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.102"
112
112
  },
113
113
  "devDependencies": {
114
114
  "@rslib/core": "0.21.5",