fix(@nguniversal/common): correctly handle headers for jsdom in Clover

(cherry picked from commit 39e474a)
angular · Jun 7, 2022 · baff49b · baff49b
1 parent 94fd257
commit baff49b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/modules/common/clover/server/src/custom-resource-loader.ts b/modules/common/clover/server/src/custom-resource-loader.ts
@@ -12,11 +12,14 @@ import { normalize } from 'path';
 
 export class CustomResourceLoader extends ResourceLoader {
   constructor(
-    private readonly baseUrl: string,
+    readonly headers: Record<string, string | undefined | string[]> | undefined,
     private readonly publicPath: string,
+    private readonly baseUrl: string,
     private readonly fileCache: Map<string, Buffer>,
   ) {
-    super();
+    super({
+      userAgent: headers?.['user-agent'] as string | undefined,
+    });
   }
 
   fetch(url: string, _options: FetchOptions): AbortablePromise<Buffer> | null {

diff --git a/modules/common/clover/server/src/server-engine.ts b/modules/common/clover/server/src/server-engine.ts
@@ -51,8 +51,9 @@ export class Engine {
     const inlineCriticalCss = options.inlineCriticalCss !== false;
 
     const customResourceLoader = new CustomResourceLoader(
-      origin,
+      options.headers,
       options.publicPath,
+      origin,
       this.resourceLoaderCache,
     );
 
@@ -76,7 +77,6 @@ export class Engine {
         resources: customResourceLoader,
         url: options.url,
         referrer: options.headers?.referrer as string | undefined,
-        userAgent: options.headers?.['user-agent'] as string | undefined,
         beforeParse: (window) => {
           augmentWindowWithStubs(window);
           window.ngRenderMode = true;