Replace license list generator (#1455)

ghostery · Feb 2, 2024 · 0e346ee · 0e346ee
1 parent 39a7492
commit 0e346ee
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 387 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,10 +33,6 @@ jobs:
         run: npm test
         working-directory: packages/ui
 
-      - name: MV2 - Build Licenses
-        working-directory: extension-manifest-v2
-        run: npm run licenses
-
       - name: MV2 - Lint
         working-directory: extension-manifest-v2
         run: npm run lint

diff --git a/extension-manifest-v2/package.json b/extension-manifest-v2/package.json
@@ -11,12 +11,11 @@
   "scripts": {
     "postinstall": "vendor-copy && npm run download-trackerdb",
     "start": "web-ext run --target=chromium",
-    "prebuild": "npm run licenses",
     "build.dev": "webpack --mode development --progress",
     "build": "webpack --mode production --progress",
     "build.prod": "npm run build",
     "build.watch": "webpack --mode development --progress --watch",
-    "licenses": "node ../tools/licenses.js",
+    "licenses": "license-report --config=../license-report-config.json > dist/licenses.html",
     "test": "jest",
     "test.watch": "jest --watch",
     "test.snapshot": "jest --updateSnapshot",

diff --git a/extension-manifest-v3/package.json b/extension-manifest-v3/package.json
@@ -9,7 +9,7 @@
     "start": "npm run build -- --watch",
     "download-engines": "node scripts/download-engines/index.js",
     "download-whotracksme-bloomfilter": "node scripts/download-whotracksme-bloomfilter.js",
-    "licenses": "node ../tools/licenses.js",
+    "licenses": "license-report --config=../license-report-config.json > dist/licenses.html",
     "lint": "eslint src/",
     "test": "npm run lint",
     "locales.ui": "hybrids extract -c --format=chrome.i18n ../node_modules/@ghostery/ui ./src/_locales/en/messages.json",

diff --git a/extension-manifest-v3/scripts/build.js b/extension-manifest-v3/scripts/build.js
@@ -158,7 +158,7 @@ if (manifest.declarative_net_request?.rule_resources) {
 }
 
 // generate license file
-execSync('node ../tools/licenses.js', { stdio: 'inherit' });
+execSync('npm run licenses', { stdio: 'inherit' });
 
 // --- Save manifest ---
 

diff --git a/license-report-config.json b/license-report-config.json
@@ -0,0 +1,11 @@
+{
+  "fields": [
+    "name",
+    "author",
+    "installedVersion",
+    "licenseType",
+    "link"
+  ],
+  "output": "html",
+  "only": "prod"
+}