Release v2.0.3 (#52)

- deps: bump versions - ci: test on node 18 & 20 (was 14 & 16) - rename data.uribl -> uribl - js: bump jquery versions
haraka · Dec 12, 2023 · 7b9e13a · 7b9e13a
1 parent 6b4dbb5
commit 7b9e13a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on: [ push ]
 
 env:
   CI: true
-  node-version: 16
+  node-version: 20
 
 jobs:
   lint:
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 18, 20 ]
       fail-fast: false
     steps:
     - uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest ]
-        node-version: [ 14, 16, 18 ]
+        node-version: [ 18, 20 ]
       fail-fast: false
     steps:
     - uses: actions/checkout@v3

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".release"]
+	path = .release
+	url = [email protected]:msimerson/.release.git
diff --git a/.release b/.release
diff --git a/Changes.md b/Changes.md
@@ -1,4 +1,12 @@
 
+### Unreleased
+
+### 2.0.3 - 2023-12-12
+
+- deps: bump versions
+- ci: test on node 18 & 20 (was 14 & 16)
+- rename data.uribl -> uribl
+
 
 ### 2.0.2 - 2022-05-27
 
@@ -108,3 +116,4 @@
 ### Oct 8 23:28:07 2016
 
 - initial import
+[2.0.4]: https://github.com/haraka/haraka-plugin-watch/releases/tag/2.0.4
diff --git a/html/client.js b/html/client.js
@@ -20,7 +20,7 @@ const rcpt_to_plugins  = [
 ];
 const data_plugins     = [
   'early_talker', 'bounce','headers','karma','spamassassin','rspamd',
-  'clamd','data.uribl','limit','dkim','attachment'
+  'clamd','uribl','limit','dkim','attachment'
 ];
 // 'seen' plugins are ones we've seen data reported for. When data from a new
 // plugin arrives, it gets added to one of the sections above and the table is

diff --git a/html/index.html b/html/index.html
@@ -3,13 +3,13 @@
 <head>
 		<meta charset="UTF-8">
 		<title>Haraka Activity</title>
-		<script src="//code.jquery.com/jquery-3.6.0.min.js"></script>
-		<script src="//code.jquery.com/ui/1.13.1/jquery-ui.min.js"></script>
+		<script src="//code.jquery.com/jquery-3.7.1.min.js"></script>
+		<script src="//code.jquery.com/ui/1.13.2/jquery-ui.min.js"></script>
 		<script src="/watch/client.js"></script>
 
 		<link rel="stylesheet" href="/watch/watch.css" />
 		<link rel="stylesheet" href="/watch/jquery.tipsy.css" />
-		<link rel="stylesheet" href="//code.jquery.com/ui/1.13.1/themes/smoothness/jquery-ui.css">
+		<link rel="stylesheet" href="//code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.css">
 		<style>
 label, input { display:block; }
 input.text { margin-bottom:12px; width:95%; padding: .4em; }

diff --git a/index.js b/index.js
@@ -216,6 +216,7 @@ exports.redis_subscribe_all_results = async function (next) {
         if (m.result.helo_host) return;
         break;
       case 'data.uribl':
+      case 'uribl':
         if (m.result.pass) return;
         if (m.result.skip) return;
         break;
@@ -349,6 +350,7 @@ exports.format_any = function (pi_name, r) {
       }
       break;
     case 'data.uribl':
+    case 'uribl':
     case 'dnsbl':
       if (r.fail) return { title: r.fail, classy: 'bg_lred' };
       break;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-watch",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Watch live SMTP traffic in a web interface",
   "main": "index.js",
   "scripts": {
@@ -26,14 +26,14 @@
   },
   "homepage": "https://github.com/haraka/haraka-plugin-watch#readme",
   "dependencies": {
-    "haraka-plugin-redis": "2",
-    "redis": "4",
-    "ws": "8"
+    "haraka-plugin-redis": "2.0.5",
+    "redis": "4.6.11",
+    "ws": "8.15.0"
   },
   "devDependencies": {
-    "eslint": "8",
+    "eslint": "8.55.0",
     "eslint-plugin-haraka": "*",
     "haraka-test-fixtures": "*",
-    "mocha": "9"
+    "mocha": "10.2.0"
   }
 }