Merge pull request #130 from kosendj/chore

Chore (update ruby, bundler, node, yarn, actions and middleman)
kosendj · Jan 27, 2024 · 27e7210 · 27e7210
2 parents 52c225e + 5c70dd0
commit 27e7210
Show file tree

Hide file tree

Showing 10 changed files with 1,091 additions and 194 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,16 +4,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-      - run: yarn install
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - run: corepack enable
+      - run: corepack install
+      - run: yarn install --immutable
 
       - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
 
       - run: bundle install
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,15 +6,12 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - run: yarn install
-
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - run: corepack enable
+      - run: corepack install
+      - run: yarn install --immutable
       - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
 
       - run: bundle install
 

diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,11 @@
 .DS_Store
 
 .tmp
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+18.19.0
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.2
+3.2.3
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,5 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
+nodeLinker: node-modules
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-alpine3.13
+FROM ruby:3.2.3-alpine3.19
 
 RUN apk update && \
     apk add --no-cache tzdata curl-dev make g++ git bash nodejs yarn
@@ -8,7 +8,7 @@ WORKDIR /app
 
 COPY ./Gemfile ./Gemfile.lock ./package.json ./yarn.lock ./
 
-RUN gem install bundler -v 1.17.2
+RUN gem install bundler
 RUN bundle install
 RUN yarn install
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,110 +1,115 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (5.2.6.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    backports (3.23.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    backports (3.24.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
-    contracts (0.13.0)
-    dotenv (2.7.6)
+    concurrent-ruby (1.2.3)
+    contracts (0.16.1)
+    dotenv (2.8.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
+    execjs (2.9.1)
     fast_blank (1.0.1)
-    fastimage (2.2.6)
-    ffi (1.15.5)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    fastimage (2.3.0)
+    ffi (1.16.3)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashie (3.6.0)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     memoist (0.16.2)
-    middleman (4.3.11)
+    middleman (4.5.1)
       coffee-script (~> 2.2)
       haml (>= 4.0.5)
       kramdown (>= 2.3.0)
-      middleman-cli (= 4.3.11)
-      middleman-core (= 4.3.11)
-    middleman-cli (4.3.11)
-      thor (>= 0.17.0, < 2.0)
-    middleman-core (4.3.11)
-      activesupport (>= 4.2, < 6.0)
-      addressable (~> 2.3)
+      middleman-cli (= 4.5.1)
+      middleman-core (= 4.5.1)
+    middleman-cli (4.5.1)
+      thor (>= 0.17.0, < 1.3.0)
+    middleman-core (4.5.1)
+      activesupport (>= 6.1, < 7.1)
+      addressable (~> 2.4)
       backports (~> 3.6)
-      bundler
-      contracts (~> 0.13.0)
+      bundler (~> 2.0)
+      contracts (~> 0.13, < 0.17)
       dotenv
       erubis
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.9.0)
-      listen (~> 3.0.0)
+      i18n (~> 1.6.0)
+      listen (~> 3.0)
       memoist (~> 0.14)
-      padrino-helpers (~> 0.13.0)
+      padrino-helpers (~> 0.15.0)
       parallel
       rack (>= 1.4.5, < 3)
       sassc (~> 2.0)
       servolux
       tilt (~> 2.0.9)
+      toml
       uglifier (~> 3.0)
+      webrick
     middleman-livereload (3.4.7)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
-    minitest (5.15.0)
-    padrino-helpers (0.13.3.4)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.4)
+    minitest (5.21.2)
+    padrino-helpers (0.15.3)
+      i18n (>= 0.6.7, < 2)
+      padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.4)
-      activesupport (>= 3.1)
-    parallel (1.21.0)
-    public_suffix (4.0.6)
-    rack (2.2.4)
+    padrino-support (0.15.3)
+    parallel (1.24.0)
+    parslet (2.0.0)
+    public_suffix (5.0.4)
+    rack (2.2.8)
     rack-livereload (0.3.17)
       rack
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     sassc (2.4.0)
       ffi (~> 1.9)
     servolux (0.13.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
     temple (0.8.2)
-    thor (1.2.1)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    thor (1.2.2)
+    tilt (2.0.11)
+    toml (0.3.0)
+      parslet (>= 1.8.0, < 3.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby
@@ -115,4 +120,4 @@ DEPENDENCIES
   slim
 
 BUNDLED WITH
-   1.17.2
+   2.2.33
diff --git a/package.json b/package.json
@@ -5,5 +5,6 @@
   },
   "devDependencies": {
     "sass": "^1.26.10"
-  }
+  },
+  "packageManager": "yarn@4.0.2+sha256.825003a0f561ad09a3b1ac4a3b3ea6207af2796d54f62a9420520915721f5186"
 }