Merge pull request #853 from ember-fastboot/html-entry

xg-wang · web-flow · commit 9a471e5eaffa · 2021-08-23T08:31:14.000-07:00
Fix fastboot-script assets with cutom root url
diff --git a/packages/fastboot/src/html-entrypoint.js b/packages/fastboot/src/html-entrypoint.js
@@ -27,6 +27,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
@@ -250,6 +250,7 @@ describe('htmlEntrypoint', function() {
         <html>
           <meta name="my-app/config/environment" content="%7B%22rootURL%22%3A%22%2Fcustom-root-url%2F%22%7D" >
           <body>
+            <fastboot-script src="foo.js"></fastboot-script>
             <script src="/custom-root-url/bar.js"></script>
           </body>
         </html>
@@ -259,6 +260,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
`@@ -27,6 +27,8 @@ function htmlEntrypoint(appName, distPath, htmlPath) {`
`27`	`27`	`let relativeSrc = urlWithin(src, rootURL);`
`28`	`28`	`if (relativeSrc) {`
`29`	`29`	`scripts.push(path.join(distPath, relativeSrc));`
	`30`	`+ } else if (element.tagName === 'FASTBOOT-SCRIPT') {`
	`31`	`+ scripts.push(path.join(distPath, src));`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`	`if (element.tagName === 'FASTBOOT-SCRIPT') {`