From d0bab00b403465a02c66875fc75ae8dfae83e330 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Sat, 22 Oct 2022 22:30:35 +0100
Subject: [PATCH] Moved web-ext config from flags to js file

---
 package.json      |  6 +++---
 web-ext-config.js |  7 +++++++
 woodpecker.yml    | 32 --------------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 woodpecker.yml

diff --git a/package.json b/package.json
index e057817..f547b97 100644
--- a/package.json
+++ b/package.json
@@ -6,9 +6,9 @@
 		"npm": ">=8.1.2"
 	},
 	"scripts": {
-		"start": "web-ext run --browser-console --source-dir ./src/",
-		"build": "web-ext build --overwrite-dest --source-dir ./src/",
-		"test": "web-ext lint --source-dir ./src/ || true",
+		"start": "web-ext run",
+		"build": "web-ext build",
+		"test": "web-ext lint",
 		"instances": "python3 src/instances/get_instances.py && git update-index --assume-unchanged src/instances/blacklist.json src/instances/data.json",
 		"ejs": "npx ejs src/pages/options/index.ejs -f src/config/config.json -o src/pages/options/index.html && npx ejs src/pages/popup/popup.ejs -f src/config/config.json -o src/pages/popup/popup.html"
 	},
diff --git a/web-ext-config.js b/web-ext-config.js
index f30b73e..dd90dec 100644
--- a/web-ext-config.js
+++ b/web-ext-config.js
@@ -1,3 +1,10 @@
 module.exports = {
 	ignoreFiles: ["instances/get_instances.py"],
+	sourceDir: "./src/",
+	run: {
+		browserConsole: true,
+	},
+	build: {
+		overwriteDest: true
+	}
 }
diff --git a/woodpecker.yml b/woodpecker.yml
deleted file mode 100644
index 1ee2cc1..0000000
--- a/woodpecker.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-pipeline:
-  instancefetch:
-    image: python:alpine
-    secrets: [token, mail]
-    when:
-      - event: cron
-        cron: instance_updater
-    commands:
-      - python -m pip install --upgrade pip
-      - pip install requests colorama
-      - python src/instances/get_instances.py
-      # SSH configuration
-      - mkdir ~/.ssh
-      - ssh-keyscan -t ed25519 codeberg.org >> ~/.ssh/known_hosts
-      - eval `ssh-agent`
-      - echo "$TOKEN" | tr -d '\r' | ssh-add -
-      # Git configuration
-      - git config --global user.email $MAIL
-      - git config --global user.name "Woodpecker CI"
-      - git commit -am "updated instances"
-      - git remote set-url origin git@codeberg.org:libredirect/libredirect.git
-      - git push --set-upstream origin master
-  lint:
-    image: node:lts-alpine
-    when:
-      event: [push, pull_request]
-      path:
-        exclude: ["src/instances/**"]
-        include: ["src/"]
-    commands:
-      - npm i
-      - npx web-ext lint --source-dir ./src/