Fix fastboot-script assets with cutom root url

xg-wang · xg-wang · commit 2a9d3d005afa · 2021-08-21T23:18:21.000-07:00
diff --git a/packages/fastboot/src/html-entrypoint.js b/packages/fastboot/src/html-entrypoint.js
@@ -41,6 +41,8 @@ function htmlEntrypoint(appName, distPath, htmlPath) {
       let relativeSrc = urlWithin(src, rootURL);
       if (relativeSrc) {
         scripts.push(path.join(distPath, relativeSrc));
+      } else if (element.tagName === 'FASTBOOT-SCRIPT') {
+        scripts.push(path.join(distPath, src));
       }
     }
     if (element.tagName === 'FASTBOOT-SCRIPT') {
diff --git a/packages/fastboot/test/html-entrypoint-test.js b/packages/fastboot/test/html-entrypoint-test.js
@@ -334,6 +334,7 @@ describe('htmlEntrypoint', function() {
             ${metaTags}
           </head>
           <body>
+            <fastboot-script src="foo.js"></fastboot-script>
             <script src="/custom-root-url/bar.js"></script>
           </body>
         </html>
@@ -343,6 +344,6 @@ describe('htmlEntrypoint', function() {
     fixturify.writeSync(tmpLocation, project);
 
     let { scripts } = htmlEntrypoint('my-app', tmpLocation, 'index.html');
-    expect(scripts).to.deep.equal([`${tmpLocation}/bar.js`]);
+    expect(scripts).to.deep.equal([`${tmpLocation}/foo.js`, `${tmpLocation}/bar.js`]);
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ function htmlEntrypoint(appName, distPath, htmlPath) {`
`41`	`41`	`let relativeSrc = urlWithin(src, rootURL);`
`42`	`42`	`if (relativeSrc) {`
`43`	`43`	`scripts.push(path.join(distPath, relativeSrc));`
	`44`	`+ } else if (element.tagName === 'FASTBOOT-SCRIPT') {`
	`45`	`+ scripts.push(path.join(distPath, src));`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`	`if (element.tagName === 'FASTBOOT-SCRIPT') {`