Update dependencies and fix linting.

NREL · Jul 19, 2024 · 09ea6ea · 09ea6ea
1 parent 0b4c498
commit 09ea6ea
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 29 deletions.
diff --git a/Gemfile b/Gemfile
@@ -40,7 +40,7 @@ gem "oj", "~> 3.10"
 # Database libraries
 gem "activerecord", "~> 7.1.1", :require => "active_record"
 gem "pg", "~> 1.5.3"
-gem "opensearch-ruby", "~> 3.3.0"
+gem "opensearch-ruby", "~> 3.4.0"
 gem "faraday-typhoeus", "~> 1.1.0"
 gem "active_attr", "~> 0.16.0"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -71,7 +71,7 @@ GEM
       ffi (>= 1.15.0)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    faker (3.4.1)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
     faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -128,18 +128,18 @@ GEM
       racc (~> 1.4)
     oj (3.16.4)
       bigdecimal (>= 3.0)
-    opensearch-ruby (3.3.0)
+    opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    path_expander (1.1.1)
+    path_expander (1.1.2)
     pg (1.5.6)
     public_suffix (6.0.0)
     racc (1.8.0)
-    rack (3.1.6)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -154,22 +154,22 @@ GEM
     rails_compatible_cookies_utils (0.1.2)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.0)
+    rubocop-minitest (0.35.1)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
@@ -189,7 +189,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    websocket (1.2.10)
+    websocket (1.2.11)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zonebie (0.6.1)
@@ -226,7 +226,7 @@ DEPENDENCIES
   net-smtp (~> 0.5.0)
   nokogiri (~> 1.14)
   oj (~> 3.10)
-  opensearch-ruby (~> 3.3.0)
+  opensearch-ruby (~> 3.4.0)
   pg (~> 1.5.3)
   rails_compatible_cookies_utils (~> 0.1.0)
   rainbow (~> 3.1.1)

diff --git a/docker/dev/docker-entrypoint b/docker/dev/docker-entrypoint
@@ -43,6 +43,6 @@ mkdir -p /app/src/api-umbrella/admin-ui/tmp
 chmod 1777 /app/src/api-umbrella/admin-ui/tmp
 
 mkdir -p ~/.config/pnpm
-printf "update-notifier=false\nstore-dir=${PNPM_HOME}/store\n" > ~/.config/pnpm/rc
+printf "update-notifier=false\nstore-dir=%s/store\n" "$PNPM_HOME" > ~/.config/pnpm/rc
 
 exec "$@"
diff --git a/src/api-umbrella/example-website/.prettierignore b/src/api-umbrella/example-website/.prettierignore
@@ -0,0 +1,4 @@
+/node_modules
+/public
+/resources
+/pnpm-lock.yaml
diff --git a/src/api-umbrella/example-website/package.json b/src/api-umbrella/example-website/package.json
@@ -2,7 +2,7 @@
   "scripts": {
     "lint:js": "eslint --ignore-path .gitignore .",
     "lint": "pnpm run lint:js",
-    "prettier:check": "prettier --ignore-path .gitignore --check ."
+    "prettier:check": "prettier --check ."
   },
   "dependencies": {
     "a11y-dialog": "^8.0.4",

diff --git a/tasks/build-deps/crane b/tasks/build-deps/crane
@@ -3,14 +3,14 @@
 set -e -u -x
 source ./tasks/helpers.sh
 
-crane_version="0.19.2"
-crane_hash="8e5a27413b3fa3b95467c8d36dfb55f7109075872a05fcc0dd674f537439513d"
+crane_version="0.20.1"
+crane_hash="c394da2c1238b4c255cb517722a4e0925fdb4c3f1e9a3ae6ea2dd630201fac59"
 
 download_arch="$TARGETARCH"
 if [ "$TARGETARCH" == "amd64" ]; then
   download_arch="x86_64"
 elif [ "$TARGETARCH" == "arm64" ]; then
-  crane_hash="09193f2c1f3f6ce383dcd6fc5d9e964fe40ceb542cd06bc708f0b4973fcae648"
+  crane_hash="a941091345c7c411f7750575addf3d1c2d9b1214f0197ded78309f1daa59897f"
 fi
 
 task_working_dir

diff --git a/tasks/build-deps/hugo b/tasks/build-deps/hugo
@@ -3,10 +3,10 @@
 set -e -u -x
 source ./tasks/helpers.sh
 
-hugo_version="0.128.2"
-hugo_hash="a83253c155d76c197f1bee375662e3a2bc8c2335d2ffdfa7ec43e59c38c412c5"
+hugo_version="0.129.0"
+hugo_hash="14a4919808a10c876a2725dd0a119f979982c1636b099868fdbd358578093521"
 if [ "$TARGETARCH" == "arm64" ]; then
-  hugo_hash="23f83541cf3dabef275263eb83c01da4cd969528637eccdfb946a46b2d6cf01e"
+  hugo_hash="628e8c5dad51ee9b2cf114af2c3d31ef7d8c7d6e9ff3ef38e40849f1a9d489c2"
 fi
 
 task_working_dir

diff --git a/tasks/build-deps/nodejs b/tasks/build-deps/nodejs
@@ -4,14 +4,14 @@
 set -e -u -x
 source ./tasks/helpers.sh
 
-nodejs_version="20.15.0"
-nodejs_hash="4f57f7828e6adb9f6bc77932f10e316cca68b0f160c82b21d9a2c7647c7f10bf"
+nodejs_version="20.15.1"
+nodejs_hash="26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f"
 
 download_arch="$TARGETARCH"
 if [ "$TARGETARCH" == "amd64" ]; then
   download_arch="x64"
 elif [ "$TARGETARCH" == "arm64" ]; then
-  nodejs_hash="ecdd2645630a35abd98ebcf2d989f38cec8cca6f198712d8ce72eaee77131307"
+  nodejs_hash="10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e"
 fi
 
 task_working_dir

diff --git a/tasks/build-deps/pnpm b/tasks/build-deps/pnpm
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+pnpm_version="9.5.0"
+
+set -e -u -x
+source ./tasks/helpers.sh
+
+env
+PATH="$DEV_PATH" PREFIX="$DEV_INSTALL_PREFIX" npm install -g "@pnpm/exe@${pnpm_version}"
+
+mkdir -p ~/.config/pnpm
+echo "update-notifier=false" > ~/.config/pnpm/rc
+
+# Workaround for PNPM_HOME not affecting things with some of our
+# development volume mounts: https://github.com/pnpm/pnpm/issues/7050
+echo "store-dir=${PNPM_HOME}/store" >> ~/.config/pnpm/rc
+
+stamp
diff --git a/tasks/deps/fluent-bit b/tasks/deps/fluent-bit
@@ -3,12 +3,12 @@
 set -e -u -x
 source ./tasks/helpers.sh
 
-fluent_bit_version="3.0.7"
-fluent_bit_hash="9c9b94bcdcf1cd0a899b24e1d3e18c6269227512661631814c2ac820683e2ec8"
+fluent_bit_version="3.1.3"
+fluent_bit_hash="4c745066223811047e3911c19db118eadec579ca62ef833a1b1fb573acd8cb85"
 
 task_working_dir
 download "https://github.com/fluent/fluent-bit/archive/refs/tags/v${fluent_bit_version}.tar.gz" "sha256" "$fluent_bit_hash"
-extract_download "864631cfc8-v${fluent_bit_version}.tar.gz"
+extract_download "fb0a7a286c-v${fluent_bit_version}.tar.gz"
 
 cd "fluent-bit-${fluent_bit_version}/build"
 

diff --git a/tasks/test-deps/mailpit b/tasks/test-deps/mailpit
@@ -3,10 +3,10 @@
 set -e -u -x
 source ./tasks/helpers.sh
 
-mailpit_version="1.19.0"
-mailpit_hash="c8112e9d9a9c0cbbf7531a4146b0f3af3a07ae6a86c565ebb8719fd878c859a4"
+mailpit_version="1.19.1"
+mailpit_hash="e123cce9718cf91e68ac363934b5bcdce270d26398b223c29b1314b720867862"
 if [ "$TARGETARCH" == "arm64" ]; then
-  mailpit_hash="c6f67f2498a139349cd46f73fc0e5e7645edb626e5d8db230f2af3a04d7d2ce9"
+  mailpit_hash="59764a3e6b3b5f0a0d1005c6115b1993c35c0431482ae4e2100682a60f7c5fd1"
 fi
 
 task_working_dir