fix: update preload type

module-federation · Feb 5, 2024 · d2070a3 · d2070a3
1 parent 0198667
commit d2070a3
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 39 deletions.
diff --git a/packages/runtime/__tests__/__snapshots__/preload-remote.spec.ts.snap b/packages/runtime/__tests__/__snapshots__/preload-remote.spec.ts.snap
@@ -3,8 +3,19 @@
 exports[`preload-remote inBrowser > 1 preload with default config 1`] = `
 {
   "links": [
+    {
+      "href": "http://localhost:1111/resources/preload/preload-resource/button.sync.js",
+      "rel": "preload",
+      "type": "script",
+    },
+    {
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub1-button/button.sync.js",
+      "rel": "preload",
+      "type": "script",
+    },
     {
       "href": "http://localhost:1111/resources/preload/preload-resource/button.sync.css",
+      "rel": "preload",
       "type": "style",
     },
   ],
@@ -17,14 +28,6 @@ exports[`preload-remote inBrowser > 1 preload with default config 1`] = `
       "crossorigin": "",
       "src": "http://localhost:1111/resources/preload/preload-resource/sub1-button/federation-remote-entry.js",
     },
-    {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/button.sync.js",
-    },
-    {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub1-button/button.sync.js",
-    },
   ],
 }
 `;
@@ -33,78 +36,90 @@ exports[`preload-remote inBrowser > 2 preload with all config  1`] = `
 {
   "links": [
     {
-      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.async.css",
-      "type": "style",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.async.js",
+      "rel": "preload",
+      "type": "script",
     },
     {
-      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.sync.css",
-      "type": "style",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.sync.js",
+      "rel": "preload",
+      "type": "script",
     },
-  ],
-  "scripts": [
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2/federation-remote-entry.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2-button/button.async.js",
+      "rel": "preload",
+      "type": "script",
     },
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-button/federation-remote-entry.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2-button/button.sync.js",
+      "rel": "preload",
+      "type": "script",
     },
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2/button.async.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2-add/add.async.js",
+      "rel": "preload",
+      "type": "script",
     },
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2/button.sync.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2-add/add.sync.js",
+      "rel": "preload",
+      "type": "script",
     },
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-button/button.async.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.async.css",
+      "rel": "preload",
+      "type": "style",
     },
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-button/button.sync.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub2/button.sync.css",
+      "rel": "preload",
+      "type": "style",
     },
+  ],
+  "scripts": [
     {
       "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-add/add.async.js",
+      "src": "http://localhost:1111/resources/preload/preload-resource/sub2/federation-remote-entry.js",
     },
     {
       "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-add/add.sync.js",
+      "src": "http://localhost:1111/resources/preload/preload-resource/sub2-button/federation-remote-entry.js",
     },
   ],
 }
 `;
 
 exports[`preload-remote inBrowser > 3 preload with expose config  1`] = `
 {
-  "links": [],
-  "scripts": [
+  "links": [
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/federation-remote-entry.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub3/add.sync.js",
+      "rel": "preload",
+      "type": "script",
     },
+  ],
+  "scripts": [
     {
       "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/add.sync.js",
+      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/federation-remote-entry.js",
     },
   ],
 }
 `;
 
 exports[`preload-remote inBrowser > 3 preload with expose config  2`] = `
 {
-  "links": [],
-  "scripts": [
+  "links": [
     {
-      "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/federation-remote-entry.js",
+      "href": "http://localhost:1111/resources/preload/preload-resource/sub3/add.sync.js",
+      "rel": "preload",
+      "type": "script",
     },
+  ],
+  "scripts": [
     {
       "crossorigin": "",
-      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/add.sync.js",
+      "src": "http://localhost:1111/resources/preload/preload-resource/sub3/federation-remote-entry.js",
     },
   ],
 }

diff --git a/packages/runtime/__tests__/preload-remote.spec.ts b/packages/runtime/__tests__/preload-remote.spec.ts
@@ -17,6 +17,7 @@ function getLinkInfos(): Array<LinkInfo> {
   const linkInfos: Array<LinkInfo> = [...links].map((link) => ({
     type: link.getAttribute('as') || '',
     href: link.getAttribute('href') || '',
+    rel: link.getAttribute('rel') || '',
   }));
   return linkInfos;
 }

diff --git a/packages/runtime/src/utils/preload.ts b/packages/runtime/src/utils/preload.ts
@@ -138,7 +138,7 @@ export function preloadAssets(
         },
         {
           rel: 'preload',
-          as: 'style',
+          as: 'script',
         },
         (url: string) => {
           const res = host.loaderHook.lifecycle.createLink.emit({