Allow modulepreload to work for all module types without needing to specify type at the point of preload. Achieve this by adding 'module type must match' flag to 'fetch a single module script', which is unset only in the case of modulepreload.

Author: dandclark

source

@@ -86778,10 +86778,10 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
   <ol>
    <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>settings
    object</var>, "<code data-x="">script</code>", <var>options</var>, <var>settings object</var>,
-   "<code data-x="">client</code>", and with the <var>top-level module fetch flag</var> set. If the
-   caller of this algorithm specified custom <span data-x="fetching-scripts-perform-fetch">perform
-   the fetch</span> steps, pass those along as well. Wait until the algorithm asynchronously
-   completes with <var>result</var>.</p></li>
+   "<code data-x="">client</code>", with the <var>module type must match</var> flag set, and with
+   the <var>top-level module fetch flag</var> set. If the caller of this algorithm specified custom
+   <span data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps, pass those along as
+   well. Wait until the algorithm asynchronously completes with <var>result</var>.</p></li>
 
    <li><p>If <var>result</var> is null, asynchronously complete this algorithm with null, and abort
    these steps.</p></li>
@@ -86810,10 +86810,11 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
 
    <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>settings
    object</var>, "<code data-x="">script</code>", <var>options</var>, <var>settings object</var>,
-   "<code data-x="">client</code>", <var>moduleRequest</var>, and with the <var>top-level module
-   fetch flag</var> set. If the caller of this algorithm specified custom <span
-   data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps, pass those along as well.
-   Wait until the algorithm asynchronously completes with <var>result</var>.</p></li>
+   "<code data-x="">client</code>", <var>moduleRequest</var>, with the <var>module type must
+   match</var> flag set, and with the <var>top-level module fetch flag</var> set. If the caller of
+   this algorithm specified custom <span data-x="fetching-scripts-perform-fetch">perform the
+   fetch</span> steps, pass those along as well. Wait until the algorithm asynchronously completes
+   with <var>result</var>.</p></li>
 
    <li><p>If <var>result</var> is null, asynchronously complete this algorithm with null, and abort
    these steps.</p></li>
@@ -86835,14 +86836,15 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
   <ol>
    <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>settings
    object</var>, <var>destination</var>, <var>options</var>, <var>settings object</var>, "<code
-   data-x="">client</code>", and with the <var>top-level module fetch</var> flag set. Wait until
-   algorithm asynchronously completes with <var>result</var>.</p></li>
+   data-x="">client</code>", with the <var>module type must match</var> flag unset, and with the
+   <var>top-level module fetch</var> flag set. Wait until algorithm asynchronously completes with
+   <var>result</var>.</p></li>
 
    <li><p>Asynchronously complete this algorithm with <var>result</var>, but do <em>not</em> abort
    these steps.</p></li>
 
    <li>
-    <p>Optionally, perform the following steps:</p>
+    <p>If <var>result</var> is not null, optionally perform the following steps:</p>
 
     <ol>
      <li><p>Let <var>visited set</var> be « <var>url</var> ».</p></li>
@@ -86900,10 +86902,10 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
 
    <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>fetch client settings
    object</var>, <var>destination</var>, <var>options</var>, <var>module map settings object</var>,
-   "<code data-x="">client</code>", and with the <var>top-level module fetch flag</var> set. If the
-   caller of this algorithm specified custom <span data-x="fetching-scripts-perform-fetch">perform
-   the fetch</span> steps, pass those along as well. Wait until the algorithm asynchronously
-   completes with <var>result</var>.</p></li>
+   "<code data-x="">client</code>", with the <var>module type must match</var> flag set, and with
+   the <var>top-level module fetch flag</var> set. If the caller of this algorithm specified custom
+   <span data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps, pass those along as
+   well. Wait until the algorithm asynchronously completes with <var>result</var>.</p></li>
 
    <li><p>If <var>result</var> is null, asynchronously complete this algorithm with null, and abort
    these steps.</p></li>
@@ -87168,10 +87170,11 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
 
    <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>fetch client settings
    object</var>, <var>destination</var>, <var>options</var>, <var>module map settings object</var>,
-   <var>referrer</var>, <var>moduleRequest</var>, and with the
-   <var>top-level module fetch flag</var> unset. If the caller of this algorithm specified custom
-   <span data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps, pass those along
-   while <span data-x="fetch a single module script">fetching a single module script</span>.</p>
+   <var>referrer</var>, <var>moduleRequest</var>, with the <var>module type must match</var> flag
+   set, and with the <var>top-level module fetch flag</var> unset. If the caller of this algorithm
+   specified custom <span data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps,
+   pass those along while <span data-x="fetch a single module script">fetching a single module
+   script</span>.</p>
 
    <li><p>Return from this algorithm, and run the following steps when <span data-x="fetch a single
    module script">fetching a single module script</span> asynchronously completes with
@@ -87190,9 +87193,10 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
 
   <p>To <dfn>fetch a single module script</dfn>, given a <var>url</var>, a <var>fetch client
   settings object</var>, a <var>destination</var>, some <var>options</var>, a <var>module map
-  settings object</var>, a <var>referrer</var>, an optional <var>moduleRequest</var>, and
-  a <var>top-level module fetch</var> flag, run these steps. The algorithm will asynchronously
-  complete with either null (on failure) or a <span>module script</span> (on success).</p>
+  settings object</var>, a <var>referrer</var>, an optional <var>moduleRequest</var>, a
+  <var>module type must match</var> flag, and a <var>top-level module fetch</var> flag, run these
+  steps. The algorithm will asynchronously complete with either null (on failure) or a
+  <span>module script</span> (on success).</p>
 
   <ol>
    <li>
@@ -87221,6 +87225,8 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
        with <var>moduleMap</var>[<var>url</var>], and abort these steps.</p>
 
       <ul>
+       <li><p>The <var>module type must match</var> flag is unset.</p></li>
+
        <li><p><var>moduleMap</var>[<var>url</var>] is a <span>JavaScript module script</span>
        and <var>module type</var> is undefined.</p></li>
 
@@ -87315,8 +87321,8 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
     <p>If <var>MIME type</var> is a <span>JavaScript MIME type</span>, then:</p>
 
     <ol>
-     <li><p>If <var>module type</var> is not undefined, asynchronously complete this algorithm with
-      null, and abort these steps.</p></li>
+     <li><p>If the <var>module type must match</var> flag is set and <var>module type</var> is not
+      undefined, asynchronously complete this algorithm with null, and abort these steps.</p></li>
 
      <li><p>Let <var>source text</var> be the result of <span data-x="UTF-8 decode">UTF-8
      decoding</span> <var>response</var>'s <span data-x="concept-response-body">body</span>.</p></li>
@@ -87331,8 +87337,9 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
    <li>
     <p>If <var>MIME type</var> is a <span>JSON MIME type</span>, then:</p>
     <ol>
-     <li><p>If <var>module type</var> is not <code data-x="">"json"</code>, asynchronously complete
-      this algorithm with null, and abort these steps.</p></li>
+     <li><p>If the <var>module type must match</var> flag is set and <var>module type</var> is not
+     <code data-x="">"json"</code>, asynchronously complete this algorithm with null, and abort
+     these steps.</p></li>
 
      <li><p>Let <var>source text</var> be the result of <span data-x="UTF-8 decode">UTF-8
      decoding</span> <var>response</var>'s <span data-x="concept-response-body">body</span>.</p></li>