better refine when standard CSS plugin should intercept (#1262)

ProjectEvergreen · Aug 8, 2024 · 390d7a1 · 390d7a1
1 parent 2d7f762
commit 390d7a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/packages/cli/src/config/rollup.config.js b/packages/cli/src/config/rollup.config.js
@@ -530,8 +530,8 @@ function greenwoodSyncImportAttributes(compilation) {
               // since we can't do async work inside a sync AST operation
               if (!asset.preBundled) {
                 const assetUrl = unbundledAssetsRefMapper[asset].sourceURL;
-                const request = new Request(assetUrl, { headers: { 'Content-Type': 'text/css' } });
-                let response = new Response(unbundledAssetsRefMapper[asset].source);
+                const request = new Request(assetUrl, { headers: { 'Accept': 'text/css' } });
+                let response = new Response(unbundledAssetsRefMapper[asset].source, { headers: { 'Content-Type': 'text/css' } });
 
                 for (const plugin of resourcePlugins) {
                   if (plugin.shouldPreIntercept && await plugin.shouldPreIntercept(assetUrl, request, response.clone())) {

diff --git a/packages/cli/src/plugins/resource/plugin-standard-css.js b/packages/cli/src/plugins/resource/plugin-standard-css.js
@@ -306,11 +306,13 @@ class StandardCssResource extends ResourceInterface {
     });
   }
 
-  async shouldIntercept(url) {
+  async shouldIntercept(url, request, response) {
     const { pathname } = url;
     const ext = pathname.split('.').pop();
 
-    return url.protocol === 'file:' && ext === this.extensions[0];
+    return url.protocol === 'file:'
+      && ext === this.extensions[0]
+      && (response.headers.get('Content-Type')?.indexOf('text/css') >= 0 || request.headers.get('Accept')?.indexOf('text/javascript') >= 0);
   }
 
   async intercept(url, request, response) {

diff --git a/...ages/cli/test/cases/loaders-build.prerender-import-attributes/src/components/hero/hero.js b/...ages/cli/test/cases/loaders-build.prerender-import-attributes/src/components/hero/hero.js
@@ -29,11 +29,6 @@ export default class HeroBanner extends HTMLElement {
     }
 
     this.shadowRoot.adoptedStyleSheets = [sheet];
-    // TODO upstream to WCC?
-    // this.shadowRoot.querySelectorAll('button')
-    //   .forEach(button => {
-    //     button.addEventListener('click', () => this.clickButton(button))
-    //   });
   }
 }