Merge branch 'main' into lgarron/csp-trusted-types

lgarron · lgarron · commit 4da1393266f1 · 2022-11-14T20:38:42.000-08:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Node CI
 
-on: [push]
+on: [pull_request, push]
 
 jobs:
   build:
diff --git a/src/index.ts b/src/index.ts
@@ -197,24 +197,23 @@ export default class IncludeFragmentElement extends HTMLElement {
     // We mimic the same event order as <img>, including the spec
     // which states events must be dispatched after "queue a task".
     // https://www.w3.org/TR/html52/semantics-embedded-content.html#the-img-element
+    try {
+      await this.#task(['loadstart'])
+      const response = await this.fetch(this.request())
+      if (response.status !== 200) {
+        throw new Error(`Failed to load resource: the server responded with a status of ${response.status}`)
+      }
+      const ct = response.headers.get('Content-Type')
+      if (!isWildcard(this.accept) && (!ct || !ct.includes(this.accept ? this.accept : 'text/html'))) {
+        throw new Error(`Failed to load resource: expected ${this.accept || 'text/html'} but was ${ct}`)
+      }
 
-    await this.#task(['loadstart'])
-    const response = await this.fetch(this.request())
-    if (response.status !== 200) {
-      throw new Error(`Failed to load resource: the server responded with a status of ${response.status}`)
-    }
-    const ct = response.headers.get('Content-Type')
-    if (!isWildcard(this.accept) && (!ct || !ct.includes(this.accept ? this.accept : 'text/html'))) {
-      throw new Error(`Failed to load resource: expected ${this.accept || 'text/html'} but was ${ct}`)
-    }
-
-    const responseText: string = await response.text()
-    let data: string | CSPTrustedHTMLToStringable = responseText
-    if (cspTrustedTypesPolicy) {
-      data = await cspTrustedTypesPolicy.then(policy => policy.createHTML(responseText, response))
-    }
+      const responseText: string = await response.text()
+      let data: string | CSPTrustedHTMLToStringable = responseText
+      if (cspTrustedTypesPolicy) {
+        data = await cspTrustedTypesPolicy.then(policy => policy.createHTML(responseText, response))
+      }
 
-    try {
       // Dispatch `load` and `loadend` async to allow
       // the `load()` promise to resolve _before_ these
       // events are fired.
