From 47016ad364845b5a521f6f51f19dfa83aa8cfcc6 Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Thu, 16 May 2024 12:46:09 +0200 Subject: [PATCH] feat(new index.html): pass the vendor.css entry point from app to rewritten-app --- packages/compat/src/compat-app-builder.ts | 4 ---- packages/compat/src/compat-app.ts | 13 ------------- packages/core/src/ember-html.ts | 5 +---- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/packages/compat/src/compat-app-builder.ts b/packages/compat/src/compat-app-builder.ts index ddde258d1..c6678f67c 100644 --- a/packages/compat/src/compat-app-builder.ts +++ b/packages/compat/src/compat-app-builder.ts @@ -212,7 +212,6 @@ export class CompatAppBuilder { javascript: this.compatApp.findAppScript(scripts, entrypoint), styles: this.compatApp.findAppStyles(styles, entrypoint), implicitScripts: this.compatApp.findVendorScript(scripts, entrypoint), - implicitStyles: this.compatApp.findVendorStyles(styles, entrypoint), testJavascript: this.compatApp.findTestScript(scripts), }; }, @@ -463,9 +462,6 @@ export class CompatAppBuilder { } } - // virtual vendor.css entrypoint - html.insertStyleLink(html.implicitStyles, '@embroider/core/vendor.css'); - if (!asset.fileAsset.includeTests) { return; } diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts index 56f4c7a22..499f6c8e7 100644 --- a/packages/compat/src/compat-app.ts +++ b/packages/compat/src/compat-app.ts @@ -738,19 +738,6 @@ export default class CompatApp { ); } - findVendorStyles(styles: HTMLLinkElement[], entrypoint: string): HTMLLinkElement { - let vendorStyle = styles.find( - style => this.withoutRootURL(style.href) === this.legacyEmberAppInstance.options.outputPaths.vendor.css - ); - return throwIfMissing( - vendorStyle, - this.legacyEmberAppInstance.options.outputPaths.vendor.css, - styles.map(s => s.href), - entrypoint, - 'vendor css' - ); - } - findTestScript(scripts: HTMLScriptElement[]): HTMLScriptElement | undefined { return scripts.find( script => this.withoutRootURL(script.src) === this.legacyEmberAppInstance.options.outputPaths.tests.js diff --git a/packages/core/src/ember-html.ts b/packages/core/src/ember-html.ts index 5e512308c..5f0e4475f 100644 --- a/packages/core/src/ember-html.ts +++ b/packages/core/src/ember-html.ts @@ -12,7 +12,6 @@ export interface EmberHTML { javascript: Node; styles: Node; implicitScripts: Node; - implicitStyles: Node; // these are optional because you *may* choose to stick your implicit test // things into specific locations (which we need for backward-compat). But you @@ -80,7 +79,6 @@ export class PreparedEmberHTML { javascript: Placeholder; styles: Placeholder; implicitScripts: Placeholder; - implicitStyles: Placeholder; testJavascript: Placeholder; constructor(private asset: EmberAsset) { @@ -89,14 +87,13 @@ export class PreparedEmberHTML { this.javascript = Placeholder.replacing(html.javascript); this.styles = Placeholder.replacing(html.styles); this.implicitScripts = Placeholder.find(html.implicitScripts); - this.implicitStyles = Placeholder.replacing(html.implicitStyles); this.testJavascript = html.testJavascript ? Placeholder.replacing(html.testJavascript) : Placeholder.immediatelyAfter(this.javascript.end); } private placeholders(): Placeholder[] { - return [this.javascript, this.styles, this.implicitScripts, this.implicitStyles, this.testJavascript]; + return [this.javascript, this.styles, this.implicitScripts, this.testJavascript]; } clear() {