Update ResourcesPlugin util method

This was the only plugin that didn't use the utils file. This is for parity.
extension-js · Feb 29, 2024 · 9d6aed4 · 9d6aed4
1 parent 92f7a55
commit 9d6aed4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/packages/resources-plugin/src/helpers/shoudExclude.ts b/packages/resources-plugin/src/helpers/shoudExclude.ts
diff --git a/packages/resources-plugin/loaders/utils.ts → ...ges/resources-plugin/src/helpers/utils.ts b/packages/resources-plugin/loaders/utils.ts → ...ges/resources-plugin/src/helpers/utils.ts
@@ -1,5 +1,5 @@
 import {type Compilation} from 'webpack'
-import {type Manifest} from '../types'
+import {type Manifest} from '../../types'
 
 function getManifestContent(
   compilation: Compilation,
@@ -16,6 +16,13 @@ function getManifestContent(
   return require(manifestPath)
 }
 
+function shouldExclude(path: string, ignorePatterns: string[]): boolean {
+  return ignorePatterns.some((pattern) => {
+    return path.includes(pattern)
+  })
+}
+
 export default {
-  getManifestContent
+  getManifestContent,
+  shouldExclude
 }
diff --git a/packages/resources-plugin/src/steps/AutoParseWebResourcesFolder.ts b/packages/resources-plugin/src/steps/AutoParseWebResourcesFolder.ts
@@ -1,6 +1,6 @@
 import type webpack from 'webpack'
 import manifestFields from 'browser-extension-manifest-fields'
-import shouldExclude from '../helpers/shoudExclude'
+import utils from '../helpers/utils'
 import {type WebResourcesPluginInterface} from '../../types'
 
 export default class OutputWebAccessibleResourcesFolder {
@@ -48,7 +48,7 @@ export default class OutputWebAccessibleResourcesFolder {
               )
 
               if (!isContentCss) {
-                if (!shouldExclude(this.manifestPath, resource, this.exclude)) {
+                if (!utils.shouldExclude(resource, this.exclude || [])) {
                   compilation.assets[`web_accessible_resources/${resource}`] =
                     compilation.assets[resource]
                 }
@@ -61,13 +61,7 @@ export default class OutputWebAccessibleResourcesFolder {
                 )
 
                 if (!isContentCss) {
-                  if (
-                    !shouldExclude(
-                      this.manifestPath,
-                      resourcePath,
-                      this.exclude
-                    )
-                  ) {
+                  if (!utils.shouldExclude(resourcePath, this.exclude || [])) {
                     compilation.assets[
                       `web_accessible_resources/resource-${index}/${resourcePath}`
                     ] = compilation.assets[resourcePath]