diff --git a/packages/compat/src/compat-app-builder.ts b/packages/compat/src/compat-app-builder.ts index 46011b72b..779babc1a 100644 --- a/packages/compat/src/compat-app-builder.ts +++ b/packages/compat/src/compat-app-builder.ts @@ -174,10 +174,8 @@ export class CompatAppBuilder { rootURL: this.rootURL(), prepare: (dom: JSDOM) => { let scripts = [...dom.window.document.querySelectorAll('script')]; - let styles = [...dom.window.document.querySelectorAll('link[rel*="stylesheet"]')] as HTMLLinkElement[]; return { javascript: this.compatApp.findAppScript(scripts, entrypoint), - styles: this.compatApp.findAppStyles(styles, entrypoint), implicitScripts: this.compatApp.findVendorScript(scripts, entrypoint), testJavascript: this.compatApp.findTestScript(scripts), }; @@ -361,8 +359,6 @@ export class CompatAppBuilder { } } - html.insertStyleLink(html.styles, `assets/${this.origAppPackage.name}.css`); - if (this.fastbootConfig) { // any extra fastboot vendor files get inserted into our // html.implicitScripts section, after the regular implicit script diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts index 483065d65..c2cc51499 100644 --- a/packages/compat/src/compat-app.ts +++ b/packages/compat/src/compat-app.ts @@ -738,19 +738,6 @@ export default class CompatApp { ); } - findAppStyles(styles: HTMLLinkElement[], entrypoint: string): HTMLLinkElement { - let style = styles.find( - style => this.withoutRootURL(style.href) === this.legacyEmberAppInstance.options.outputPaths.app.css.app - ); - return throwIfMissing( - style, - this.legacyEmberAppInstance.options.outputPaths.app.css.app, - styles.map(s => s.href), - entrypoint, - 'app css' - ); - } - findVendorScript(scripts: HTMLScriptElement[], entrypoint: string): HTMLScriptElement { const vendorScript = '/@embroider/core/vendor.js'; let vendor = scripts.find(script => this.withoutRootURL(script.src) === vendorScript); diff --git a/packages/core/src/ember-html.ts b/packages/core/src/ember-html.ts index ed8423b07..0ec2e4a99 100644 --- a/packages/core/src/ember-html.ts +++ b/packages/core/src/ember-html.ts @@ -10,7 +10,6 @@ export interface EmberHTML { // these are mandatory, the Ember app may need to put things into them. javascript: Node; - styles: Node; implicitScripts: Node; // these are optional because you *may* choose to stick your implicit test @@ -77,7 +76,6 @@ class Placeholder { export class PreparedEmberHTML { dom: JSDOM; javascript: Placeholder; - styles: Placeholder; implicitScripts: Placeholder; testJavascript: Placeholder; @@ -85,7 +83,6 @@ export class PreparedEmberHTML { this.dom = new JSDOM(readFileSync(asset.sourcePath, 'utf8')); let html = asset.prepare(this.dom); this.javascript = Placeholder.find(html.javascript); - this.styles = Placeholder.replacing(html.styles); this.implicitScripts = Placeholder.find(html.implicitScripts); this.testJavascript = html.testJavascript ? Placeholder.replacing(html.testJavascript) @@ -93,7 +90,7 @@ export class PreparedEmberHTML { } private placeholders(): Placeholder[] { - return [this.javascript, this.styles, this.implicitScripts, this.testJavascript]; + return [this.javascript, this.implicitScripts, this.testJavascript]; } clear() { diff --git a/packages/util/tests/dummy/app/index.html b/packages/util/tests/dummy/app/index.html index 27bc57ad8..cf73d3143 100644 --- a/packages/util/tests/dummy/app/index.html +++ b/packages/util/tests/dummy/app/index.html @@ -9,7 +9,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/test-packages/sample-transforms/tests/dummy/app/index.html b/test-packages/sample-transforms/tests/dummy/app/index.html index fb2ed81c0..9f699ffa6 100644 --- a/test-packages/sample-transforms/tests/dummy/app/index.html +++ b/test-packages/sample-transforms/tests/dummy/app/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/test-packages/sample-transforms/tests/index.html b/test-packages/sample-transforms/tests/index.html index f4d73ac41..90c4145d7 100644 --- a/test-packages/sample-transforms/tests/index.html +++ b/test-packages/sample-transforms/tests/index.html @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} diff --git a/tests/addon-template/tests/dummy/app/index.html b/tests/addon-template/tests/dummy/app/index.html index 27bc57ad8..cf73d3143 100644 --- a/tests/addon-template/tests/dummy/app/index.html +++ b/tests/addon-template/tests/dummy/app/index.html @@ -9,7 +9,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/tests/addon-template/tests/index.html b/tests/addon-template/tests/index.html index a5ca7c1c6..e89e8b419 100644 --- a/tests/addon-template/tests/index.html +++ b/tests/addon-template/tests/index.html @@ -10,7 +10,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} diff --git a/tests/app-template/app/index.html b/tests/app-template/app/index.html index 44db13c65..79df3661d 100644 --- a/tests/app-template/app/index.html +++ b/tests/app-template/app/index.html @@ -9,7 +9,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/tests/app-template/tests/index.html b/tests/app-template/tests/index.html index 142e3ca56..5c94ceb16 100644 --- a/tests/app-template/tests/index.html +++ b/tests/app-template/tests/index.html @@ -9,7 +9,7 @@ {{content-for "head"}} {{content-for "test-head"}} - + {{content-for "head-footer"}} {{content-for "test-head-footer"}} diff --git a/tests/fixtures/macro-test/tests/index.html b/tests/fixtures/macro-test/tests/index.html index 88283ec2c..1cb17eeee 100644 --- a/tests/fixtures/macro-test/tests/index.html +++ b/tests/fixtures/macro-test/tests/index.html @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} diff --git a/tests/scenarios/compat-addon-classic-features-test.ts b/tests/scenarios/compat-addon-classic-features-test.ts index caf9d503c..73dee6288 100644 --- a/tests/scenarios/compat-addon-classic-features-test.ts +++ b/tests/scenarios/compat-addon-classic-features-test.ts @@ -73,7 +73,7 @@ appScenarios {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/tests/ts-app-template/app/index.html b/tests/ts-app-template/app/index.html index 5ae76b8ae..efcb459a5 100644 --- a/tests/ts-app-template/app/index.html +++ b/tests/ts-app-template/app/index.html @@ -9,7 +9,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} diff --git a/tests/ts-app-template/tests/index.html b/tests/ts-app-template/tests/index.html index 252331e41..f72f2e7e9 100644 --- a/tests/ts-app-template/tests/index.html +++ b/tests/ts-app-template/tests/index.html @@ -10,7 +10,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}}