From 9649a5e053d3d9e49cbfbafd88712300fc971ffb Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sat, 29 Mar 2025 09:49:36 +0200 Subject: [PATCH] update deps, css --- .pre-commit-config.yaml | 10 ++--- .ruby-version | 2 +- Gemfile.lock | 86 +++++++++++++++++++++++------------------ _includes/head.html | 3 ++ assets/main.scss | 8 ++-- package.json | 13 +++++-- 6 files changed, 70 insertions(+), 52 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bf273e21d..4ab650c28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,13 +14,9 @@ ci: autoupdate_schedule: quarterly skip: [pnpm-install-dev, prettier] -# Use pypy3 for the Python hooks. Except don't, see .gitlab-ci.yml -#default_language_version: -# python: pypy3 - repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace args: ["--markdown-linebreak-ext", "md,markdown"] @@ -54,7 +50,7 @@ repos: args: [--update-only, --notitle] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.6 + rev: 0.32.1 hooks: - id: check-dependabot - id: check-github-workflows @@ -80,7 +76,7 @@ repos: language: system - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: "2.7.3" + rev: "3.2.0" hooks: - id: editorconfig-checker alias: ec diff --git a/.ruby-version b/.ruby-version index 619b53766..4d9d11cf5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.4.2 diff --git a/Gemfile.lock b/Gemfile.lock index 6ff9765d0..2cb2e398d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,36 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.4) + activesupport (8.0.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) colorator (1.1.0) - commonmarker (0.23.10) - concurrent-ruby (1.3.3) - connection_pool (2.4.1) - dnsruby (1.72.1) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + csv (3.3.3) + dnsruby (1.72.4) + base64 (~> 0.2.0) + logger (~> 1.6.5) simpleidn (~> 0.2.1) drb (2.2.1) em-websocket (0.5.3) @@ -32,20 +39,22 @@ GEM ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.9.1) - faraday (2.9.2) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http - ffi (1.17.0-x86_64-linux-gnu) + execjs (2.10.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1-x86_64-linux-gnu) forwardable-extended (2.6.0) gemoji (4.1.0) - github-pages (231) + github-pages (232) github-pages-health-check (= 1.18.2) - jekyll (= 3.9.5) + jekyll (= 3.10.0) jekyll-avatar (= 0.8.0) jekyll-coffeescript (= 1.2.2) - jekyll-commonmark-ghpages (= 0.4.0) + jekyll-commonmark-ghpages (= 0.5.1) jekyll-default-layout (= 0.1.5) jekyll-feed (= 0.17.0) jekyll-gist (= 1.5.0) @@ -82,9 +91,10 @@ GEM liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.13.6, < 2.0) + nokogiri (>= 1.16.2, < 2.0) rouge (= 3.30.0) terminal-table (~> 1.4) + webrick (~> 1.8) github-pages-health-check (1.18.2) addressable (~> 2.3) dnsruby (~> 1.60) @@ -95,11 +105,12 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (3.9.5) + jekyll (3.10.0) addressable (~> 2.4) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) @@ -110,6 +121,7 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + webrick (>= 1.0) jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) @@ -117,9 +129,9 @@ GEM coffee-script-source (~> 1.12) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) - jekyll-commonmark-ghpages (0.4.0) - commonmarker (~> 0.23.7) - jekyll (~> 3.9.0) + jekyll-commonmark-ghpages (0.5.1) + commonmarker (>= 0.23.7, < 1.1.0) + jekyll (>= 3.9, < 4.0) jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.5) @@ -205,6 +217,7 @@ GEM gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) + json (2.10.2) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -213,16 +226,16 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.6) mercenary (0.3.6) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.24.1) - mutex_m (0.2.0) - net-http (0.4.1) + minitest (5.25.5) + net-http (0.6.0) uri - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.18.6-x86_64-linux-gnu) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -230,14 +243,13 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (5.1.1) - racc (1.8.0) + racc (1.8.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.1) - strscan + rexml (3.4.1) rouge (3.30.0) - rubyzip (2.3.2) + rubyzip (2.4.1) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -247,8 +259,8 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + securerandom (0.4.1) simpleidn (0.2.3) - strscan (3.1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) typhoeus (1.4.1) @@ -256,8 +268,8 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (1.8.0) - uri (0.13.0) - webrick (1.8.1) + uri (1.0.3) + webrick (1.9.1) PLATFORMS x86_64-linux @@ -268,7 +280,7 @@ DEPENDENCIES webrick RUBY VERSION - ruby 3.3.3p89 + ruby 3.4.2p28 BUNDLED WITH - 2.5.11 + 2.6.2 diff --git a/_includes/head.html b/_includes/head.html index a30141430..e65ae12eb 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,6 +7,9 @@ + + + diff --git a/assets/main.scss b/assets/main.scss index 284a3b9d1..da996d70d 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -5,10 +5,10 @@ /** @format */ @charset "utf-8"; -$base-font-family: ui-sans-serif, system-ui, "Liberation Sans", Arimo, Arial, - sans-serif; -$monospace-font-family: ui-monospace, "Liberation Mono", Cousine, "Courier New", - monospace; +$base-font-family: + ui-sans-serif, system-ui, "Liberation Sans", Arimo, Arial, sans-serif; +$monospace-font-family: + ui-monospace, "Liberation Mono", Cousine, "Courier New", monospace; @import "{{ site.theme }}"; diff --git a/package.json b/package.json index addae139f..a94069dba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,14 @@ { "devDependencies": { - "prettier": "3.3.0", - "prettier-plugin-sh": "0.14.0" + "@aminda/global-prettier-config": "2025.13.1", + "@prettier/plugin-ruby": "4.0.4", + "@prettier/plugin-xml": "3.4.1", + "corepack": "latest", + "prettier": "3.5.3", + "prettier-plugin-nginx": "1.0.3", + "prettier-plugin-sh": "0.16.0", + "prettier-plugin-toml": "2.0.3" }, - "packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a" + "packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6", + "prettier": "@aminda/global-prettier-config" }