From 470a515814c60ef87bddcec3b52296139d6a2d4c Mon Sep 17 00:00:00 2001
From: Cezar Augusto <boss@cezaraugusto.net>
Date: Sun, 20 Oct 2024 23:32:08 -0300
Subject: [PATCH] Fix content_scripts declaration adding extraneous css

Fix #213
---
 .../feature-manifest/steps/update-manifest.ts | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/programs/develop/webpack/plugin-extension/feature-manifest/steps/update-manifest.ts b/programs/develop/webpack/plugin-extension/feature-manifest/steps/update-manifest.ts
index 01f9a45f..f69a1c86 100644
--- a/programs/develop/webpack/plugin-extension/feature-manifest/steps/update-manifest.ts
+++ b/programs/develop/webpack/plugin-extension/feature-manifest/steps/update-manifest.ts
@@ -1,4 +1,5 @@
 import path from 'path'
+import fs from 'fs'
 import {type Compiler, Compilation, sources} from 'webpack'
 import {getManifestOverrides} from '../manifest-overrides'
 import {getFilename, getManifestContent} from '../../../lib/utils'
@@ -43,16 +44,20 @@ export class UpdateManifest {
       (contentObj: {js: string[]; css: string[]}, index: number) => {
         if (contentObj.js.length && !contentObj.css.length) {
           const outputPath = compiler.options.output?.path || ''
-
-          // Make a .css file for every .js file in content_scripts
-          // so we can later reference it in the manifest.
-          contentObj.css = contentObj.js.map((js: string) => {
-            const contentCss = path.join(outputPath, js.replace('.js', '.css'))
-            return getFilename(
-              `content_scripts/content-${index}.css`,
-              contentCss,
-              {}
-            )
+          const contentScriptsPath = path.join(outputPath, 'content_scripts')
+
+          // Iterate over the content_scripts output path and for every css file found,
+          // create a .css file entry so we can later reference it in the manifest.
+          fs.readdirSync(contentScriptsPath).forEach((file) => {
+            if (file.endsWith('.css')) {
+              contentObj.css.push(
+                getFilename(
+                  `content_scripts/content-${index}.css`,
+                  path.join(contentScriptsPath, file),
+                  {}
+                )
+              )
+            }
           })
         }
 
@@ -97,16 +102,6 @@ export class UpdateManifest {
               }
             }
 
-            // During production, webpack styles are bundled in a CSS file,
-            // and not injected in the page via <style> tag. We need to
-            // reference these files in the manifest.
-            if (compiler.options.mode === 'development') {
-              if (patchedManifest.content_scripts) {
-                patchedManifest.content_scripts =
-                  this.applyDevOverrides(patchedManifest)
-              }
-            }
-
             const source = JSON.stringify(patchedManifest, null, 2)
             const rawSource = new sources.RawSource(source)