embroider-build · bobisjan · Oct 25, 2020
diff --git a/packages/core/src/ember-html.ts b/packages/core/src/ember-html.ts
@@ -51,6 +51,7 @@ function immediatelyAfter(node: Node) {
 
 export class PreparedEmberHTML {
   dom: JSDOM;
+  origin: JSDOM;
   javascript: NodeRange;
   styles: NodeRange;
   implicitScripts: NodeRange;
@@ -60,7 +61,9 @@ export class PreparedEmberHTML {
   implicitTestStyles: NodeRange;
 
   constructor(private asset: EmberAsset) {
-    this.dom = new JSDOM(readFileSync(asset.sourcePath, 'utf8'));
+    let source = readFileSync(asset.sourcePath, 'utf8');
+    this.dom = new JSDOM(source);
+    this.origin = new JSDOM(source);
     let html = asset.prepare(this.dom);
     this.javascript = new NodeRange(html.javascript);
     this.styles = new NodeRange(html.styles);
@@ -97,7 +100,14 @@ export class PreparedEmberHTML {
   // root-relative via the configured rootURL
   insertScriptTag(location: NodeRange, relativeSrc: string, opts?: { type?: string; tag?: string }) {
     let newTag = this.dom.window.document.createElement(opts && opts.tag ? opts.tag : 'script');
-    newTag.setAttribute('src', this.asset.rootURL + relativeSrc);
+    let src = this.asset.rootURL + relativeSrc;
+    let origin = this.origin.window.document.querySelector(`script[src="${src}"]`);    
+    if (origin) {
+      for (let { name, value } of [...origin.attributes]) {
+        newTag.setAttribute(name, value);
+      }
+    }
+    newTag.setAttribute('src', src);
     if (opts && opts.type) {
       newTag.setAttribute('type', opts.type);
     }
@@ -109,8 +119,15 @@ export class PreparedEmberHTML {
   // root-relative via the configured rootURL
   insertStyleLink(location: NodeRange, relativeHref: string) {
     let newTag = this.dom.window.document.createElement('link');
+    let href = this.asset.rootURL + relativeHref;
+    let origin = this.origin.window.document.querySelector(`link[href="${href}"][rel="stylesheet"]`);    
+    if (origin) {
+      for (let { name, value } of [...origin.attributes]) {
+        newTag.setAttribute(name, value);
+      }
+    }
     newTag.rel = 'stylesheet';
-    newTag.href = this.asset.rootURL + relativeHref;
+    newTag.href = href;
     location.insert(this.dom.window.document.createTextNode('\n'));
     location.insert(newTag);
   }

diff --git a/packages/core/src/html-placeholder.ts b/packages/core/src/html-placeholder.ts
@@ -72,6 +72,9 @@ export default class Placeholder {
 
   insertStyleLink(href: string) {
     let newTag = this.end.ownerDocument.createElement('link');
+    for (let { name, value } of [...this.target.attributes]) {
+      newTag.setAttribute(name, value);
+    }
     newTag.href = href;
     newTag.rel = 'stylesheet';
 

diff --git a/tests/fixtures/html-attributes-app/app/index.html b/tests/fixtures/html-attributes-app/app/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <title>AppTemplate</title>
+    <meta name="description" content="" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    {{content-for "head"}}
+
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css" data-testid="custom-vendor-style-attr" />
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/app-template.css" data-testid="custom-app-style-attr" />
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="{{rootURL}}assets/vendor.js" data-testid="custom-vendor-script-attr"></script>
+    <script src="{{rootURL}}assets/app-template.js" data-testid="custom-app-script-attr"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>
diff --git a/tests/scenarios/build-test.ts b/tests/scenarios/build-test.ts
@@ -0,0 +1,34 @@
+import { appScenarios } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
+import QUnit from 'qunit';
+import merge from 'lodash/merge';
+import { join } from 'path';
+import { loadFromFixtureData } from './helpers';
+import fs from 'fs-extra';
+const { module: Qmodule, test } = QUnit;
+
+appScenarios
+  .map('html-attributes-tests', project => {
+    merge(project.files, loadFromFixtureData('html-attributes-app'));
+  })
+  .forEachScenario(scenario => {
+    Qmodule(scenario.name, function (hooks) {
+      let app: PreparedApp;
+
+      hooks.before(async () => {
+        app = await scenario.prepare();
+      });
+
+      test(`index.html contains custom attributes`, async function (assert) {
+        let result = await app.execute(`cross-env THROW_UNLESS_PARALLELIZABLE=1 yarn build:production`);
+        assert.equal(result.exitCode, 0, result.output);
+
+        let fileContents = fs.readFileSync(join(app.dir, 'dist', 'index.html'));
+
+        assert.ok(fileContents.includes('data-testid="custom-vendor-style-attr"'), 'custom attr for vendor style');
+        assert.ok(fileContents.includes('data-testid="custom-app-style-attr"'), 'custom attr for app style');
+        assert.ok(fileContents.includes('data-testid="custom-vendor-script-attr"'), 'custom attr for vendor script');
+        assert.ok(fileContents.includes('data-testid="custom-app-script-attr"'), 'custom attr for app script');
+      });
+    });
+  });