From 22bf03a42c8b4d649ebe009a3c56be0af13c3bba Mon Sep 17 00:00:00 2001 From: Nick Nichols Date: Sun, 13 Oct 2024 21:06:08 +0000 Subject: [PATCH 1/3] Clean up wallbrew config --- CODEOWNERS => .github/CODEOWNERS | 0 {.bouncer => .wallbrew/bouncer}/config.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-0-0.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-1-0.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-2-0.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-2-1.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-2-2.edn | 0 {.sealog => .wallbrew/sealog}/changes/3-3-0.edn | 0 {.sealog/changes => .wallbrew/sealog/changes/v0}/0-0-0.edn | 0 {.sealog/changes => .wallbrew/sealog/changes/v1}/1-0-0.edn | 0 {.sealog/changes => .wallbrew/sealog/changes/v2}/2-0-0.edn | 0 {.sealog/changes => .wallbrew/sealog/changes/v2}/2-1-0.edn | 0 {.sealog/changes => .wallbrew/sealog/changes/v2}/2-2-0.edn | 0 {.sealog => .wallbrew/sealog}/config.edn | 2 +- project.clj | 7 +++---- test/brew_bot/core_test.cljc | 5 ++--- test/brew_bot/util_test.cljc | 5 ++--- 17 files changed, 8 insertions(+), 11 deletions(-) rename CODEOWNERS => .github/CODEOWNERS (100%) rename {.bouncer => .wallbrew/bouncer}/config.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-0-0.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-1-0.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-2-0.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-2-1.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-2-2.edn (100%) rename {.sealog => .wallbrew/sealog}/changes/3-3-0.edn (100%) rename {.sealog/changes => .wallbrew/sealog/changes/v0}/0-0-0.edn (100%) rename {.sealog/changes => .wallbrew/sealog/changes/v1}/1-0-0.edn (100%) rename {.sealog/changes => .wallbrew/sealog/changes/v2}/2-0-0.edn (100%) rename {.sealog/changes => .wallbrew/sealog/changes/v2}/2-1-0.edn (100%) rename {.sealog/changes => .wallbrew/sealog/changes/v2}/2-2-0.edn (100%) rename {.sealog => .wallbrew/sealog}/config.edn (67%) diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to .github/CODEOWNERS diff --git a/.bouncer/config.edn b/.wallbrew/bouncer/config.edn similarity index 100% rename from .bouncer/config.edn rename to .wallbrew/bouncer/config.edn diff --git a/.sealog/changes/3-0-0.edn b/.wallbrew/sealog/changes/3-0-0.edn similarity index 100% rename from .sealog/changes/3-0-0.edn rename to .wallbrew/sealog/changes/3-0-0.edn diff --git a/.sealog/changes/3-1-0.edn b/.wallbrew/sealog/changes/3-1-0.edn similarity index 100% rename from .sealog/changes/3-1-0.edn rename to .wallbrew/sealog/changes/3-1-0.edn diff --git a/.sealog/changes/3-2-0.edn b/.wallbrew/sealog/changes/3-2-0.edn similarity index 100% rename from .sealog/changes/3-2-0.edn rename to .wallbrew/sealog/changes/3-2-0.edn diff --git a/.sealog/changes/3-2-1.edn b/.wallbrew/sealog/changes/3-2-1.edn similarity index 100% rename from .sealog/changes/3-2-1.edn rename to .wallbrew/sealog/changes/3-2-1.edn diff --git a/.sealog/changes/3-2-2.edn b/.wallbrew/sealog/changes/3-2-2.edn similarity index 100% rename from .sealog/changes/3-2-2.edn rename to .wallbrew/sealog/changes/3-2-2.edn diff --git a/.sealog/changes/3-3-0.edn b/.wallbrew/sealog/changes/3-3-0.edn similarity index 100% rename from .sealog/changes/3-3-0.edn rename to .wallbrew/sealog/changes/3-3-0.edn diff --git a/.sealog/changes/0-0-0.edn b/.wallbrew/sealog/changes/v0/0-0-0.edn similarity index 100% rename from .sealog/changes/0-0-0.edn rename to .wallbrew/sealog/changes/v0/0-0-0.edn diff --git a/.sealog/changes/1-0-0.edn b/.wallbrew/sealog/changes/v1/1-0-0.edn similarity index 100% rename from .sealog/changes/1-0-0.edn rename to .wallbrew/sealog/changes/v1/1-0-0.edn diff --git a/.sealog/changes/2-0-0.edn b/.wallbrew/sealog/changes/v2/2-0-0.edn similarity index 100% rename from .sealog/changes/2-0-0.edn rename to .wallbrew/sealog/changes/v2/2-0-0.edn diff --git a/.sealog/changes/2-1-0.edn b/.wallbrew/sealog/changes/v2/2-1-0.edn similarity index 100% rename from .sealog/changes/2-1-0.edn rename to .wallbrew/sealog/changes/v2/2-1-0.edn diff --git a/.sealog/changes/2-2-0.edn b/.wallbrew/sealog/changes/v2/2-2-0.edn similarity index 100% rename from .sealog/changes/2-2-0.edn rename to .wallbrew/sealog/changes/v2/2-2-0.edn diff --git a/.sealog/config.edn b/.wallbrew/sealog/config.edn similarity index 67% rename from .sealog/config.edn rename to .wallbrew/sealog/config.edn index 6a2fb61..ed01009 100644 --- a/.sealog/config.edn +++ b/.wallbrew/sealog/config.edn @@ -1,4 +1,4 @@ {:changelog-filename "CHANGELOG.md" - :changelog-entry-directory ".sealog/changes/" + :changelog-entry-directory ".wallbrew/sealog/changes/" :version-scheme :semver3 :pretty-print-edn? true} diff --git a/project.clj b/project.clj index a621103..89bdfdb 100644 --- a/project.clj +++ b/project.clj @@ -19,11 +19,10 @@ [org.clojure/clojurescript "1.11.132" :scope "provided"]] :plugins [[com.github.clj-kondo/lein-clj-kondo "2024.09.27"] - [com.wallbrew/lein-sealog "1.7.0"] - [com.wallbrew/bouncer "1.0.0"] + [com.wallbrew/lein-sealog "1.8.0"] + [com.wallbrew/bouncer "1.1.1"] [lein-cljsbuild/lein-cljsbuild "1.1.8"] - [mvxcvi/cljstyle "0.16.630"] - [ns-sort/ns-sort "1.0.3"]] + [mvxcvi/cljstyle "0.16.630"]] :deploy-repositories [["clojars" {:url "https://clojars.org/repo" :username :env/clojars_user diff --git a/test/brew_bot/core_test.cljc b/test/brew_bot/core_test.cljc index fdced12..a0be89f 100644 --- a/test/brew_bot/core_test.cljc +++ b/test/brew_bot/core_test.cljc @@ -1,8 +1,7 @@ (ns brew-bot.core-test - (:require #? (:clj [clojure.test :refer [deftest is testing]]) - #? (:cljs [cljs.test :refer-macros [deftest is testing]]) - [brew-bot.core :as sut] + (:require [brew-bot.core :as sut] [clojure.spec.alpha :as spec] + [clojure.test :refer [deftest is testing]] [common-beer-data.core :as data] [common-beer-format.fermentables :as fermentables] [common-beer-format.hops :as hops] diff --git a/test/brew_bot/util_test.cljc b/test/brew_bot/util_test.cljc index 630c49e..27603a9 100644 --- a/test/brew_bot/util_test.cljc +++ b/test/brew_bot/util_test.cljc @@ -1,8 +1,7 @@ (ns brew-bot.util-test - (:require #? (:clj [clojure.test :refer [deftest is testing]]) - #? (:cljs [cljs.test :refer-macros [deftest is testing]]) - [brew-bot.util :as sut] + (:require [brew-bot.util :as sut] [clojure.spec.alpha :as spec] + [clojure.test :refer [deftest is testing]] [common-beer-data.core :as data] [common-beer-format.fermentables :as fermentables] [common-beer-format.hops :as hops] From 2d4cfa4495ea4b585be40b316e6420a8aac32272 Mon Sep 17 00:00:00 2001 From: Nick Nichols Date: Sun, 13 Oct 2024 21:06:33 +0000 Subject: [PATCH 2/3] Cleanup makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b1a5d7..15bfd3e 100755 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +.PHONE: version/major version/minor version/patch changelog/render MAKE = make # These are the locations of the directories we'll use From 9af999550056786180ddb1359064c535ff5f28cf Mon Sep 17 00:00:00 2001 From: Nick Nichols Date: Sun, 13 Oct 2024 21:07:52 +0000 Subject: [PATCH 3/3] Bump vulnerable deps --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 735a700..8694405 100644 --- a/package-lock.json +++ b/package-lock.json @@ -290,9 +290,9 @@ } }, "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -411,9 +411,9 @@ } }, "node_modules/engine.io": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.1.tgz", - "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz", + "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==", "license": "MIT", "dependencies": { "@types/cookie": "^0.4.1", @@ -421,7 +421,7 @@ "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "~0.4.1", + "cookie": "~0.7.2", "cors": "~2.8.5", "debug": "~4.3.1", "engine.io-parser": "~5.2.1",