Merge PR #147 from 'rithvikvibhu/update-deps'

handshake-org · Jul 14, 2022 · 311d0cc · 311d0cc
2 parents 22adda8 + 0aa77c0
commit 311d0cc
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 85 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,7 +16,7 @@ jobs:
         pandoc-version: '2.7.3'
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0
         bundler-cache: true
 
     - run: ./bin/build

diff --git a/bin/build-docs b/bin/build-docs
@@ -15,8 +15,8 @@ destDir=`pwd`
 buildDir=`mktemp -d`
 trap "rm -rf $buildDir" EXIT
 
-echo "cloning [email protected]:handshake-org/hsd.git"
-git clone git@github.com:handshake-org/hsd.git $buildDir
+echo "cloning handshake-org/hsd.git"
+git clone https://github.com/handshake-org/hsd.git $buildDir
 cd $buildDir
 
 if [ "$1" ]; then

diff --git a/src/api-docs/Gemfile b/src/api-docs/Gemfile
@@ -2,12 +2,13 @@ ruby '>=2.3.1'
 source 'https://rubygems.org'
 
 # Middleman
-gem 'middleman', '~>4.2.1'
-gem 'middleman-syntax', '~> 3.0.0'
+gem 'middleman', '~>4.4.2'
+gem 'middleman-syntax', '~> 3.2.0'
 gem 'middleman-autoprefixer', '~> 2.7.0'
 gem 'middleman-livereload'
-gem 'middleman-sprockets', '~> 4.1.0'
-gem 'rouge', '~> 2.0.5'
-gem 'redcarpet', '~> 3.4.0'
-gem 'nokogiri', '>= 1.8.5'
-gem 'rack', '>= 2.0.6'
+gem 'middleman-sprockets', '~> 4.1.1'
+gem 'rouge', '~> 3.28.0'
+gem 'redcarpet', '~> 3.5.1'
+gem 'nokogiri', '>= 1.13.4'
+gem 'rack', '>= 2.2.3'
+gem 'webrick', '>= 1.7.0'
diff --git a/src/api-docs/Gemfile.lock b/src/api-docs/Gemfile.lock
@@ -1,65 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.7.2)
+    activesupport (6.1.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     autoprefixer-rails (6.7.7.2)
       execjs
-    backports (3.13.0)
+    backports (3.23.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.10)
     contracts (0.13.0)
-    dotenv (2.7.2)
-    em-websocket (0.5.1)
+    dotenv (2.7.6)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    fast_blank (1.0.0)
-    fastimage (2.1.5)
-    ffi (1.10.0)
-    haml (5.0.4)
+    execjs (2.8.1)
+    fast_blank (1.0.1)
+    fastimage (2.2.6)
+    ffi (1.15.5)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashie (3.6.0)
-    http_parser.rb (0.6.0)
-    i18n (0.7.0)
-    kramdown (1.17.0)
+    http_parser.rb (0.8.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    kramdown (2.4.0)
+      rexml
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    memoist (0.16.0)
-    middleman (4.2.1)
+    memoist (0.16.2)
+    middleman (4.4.2)
       coffee-script (~> 2.2)
-      compass-import-once (= 1.0.5)
       haml (>= 4.0.5)
-      kramdown (~> 1.2)
-      middleman-cli (= 4.2.1)
-      middleman-core (= 4.2.1)
-      sass (>= 3.4.0, < 4.0)
+      kramdown (>= 2.3.0)
+      middleman-cli (= 4.4.2)
+      middleman-core (= 4.4.2)
     middleman-autoprefixer (2.7.1)
       autoprefixer-rails (>= 6.5.2, < 7.0.0)
       middleman-core (>= 3.3.3)
-    middleman-cli (4.2.1)
+    middleman-cli (4.4.2)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.2.1)
-      activesupport (>= 4.2, < 5.1)
-      addressable (~> 2.3)
+    middleman-core (4.4.2)
+      activesupport (>= 6.1, < 7.0)
+      addressable (~> 2.4)
       backports (~> 3.6)
-      bundler (~> 1.1)
+      bundler (~> 2.0)
       contracts (~> 0.13.0)
       dotenv
       erubis
@@ -68,76 +67,87 @@ GEM
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.7.0)
+      i18n (~> 1.6.0)
       listen (~> 3.0.0)
       memoist (~> 0.14)
-      padrino-helpers (~> 0.13.0)
+      padrino-helpers (~> 0.15.0)
       parallel
       rack (>= 1.4.5, < 3)
-      sass (>= 3.4)
+      sassc (~> 2.0)
       servolux
-      tilt (~> 2.0)
+      tilt (~> 2.0.9)
+      toml
       uglifier (~> 3.0)
-    middleman-livereload (3.4.6)
+      webrick
+    middleman-livereload (3.4.7)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
     middleman-sprockets (4.1.1)
       middleman-core (~> 4.0)
       sprockets (>= 3.0)
-    middleman-syntax (3.0.0)
+    middleman-syntax (3.2.0)
       middleman-core (>= 3.2)
-      rouge (~> 2.0)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    padrino-helpers (0.13.3.4)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.4)
+      rouge (~> 3.2)
+    minitest (5.15.0)
+    nokogiri (1.13.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.4-x86_64-linux)
+      racc (~> 1.4)
+    padrino-helpers (0.15.1)
+      i18n (>= 0.6.7, < 2)
+      padrino-support (= 0.15.1)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.4)
-      activesupport (>= 3.1)
-    parallel (1.17.0)
-    public_suffix (3.0.3)
-    rack (2.0.8)
+    padrino-support (0.15.1)
+    parallel (1.22.1)
+    parslet (2.0.0)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-livereload (0.3.17)
       rack
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.4.0)
-    rouge (2.0.7)
-    sass (3.4.25)
+    redcarpet (3.5.1)
+    rexml (3.2.5)
+    rouge (3.28.0)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     servolux (0.13.0)
-    sprockets (3.7.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    temple (0.8.1)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    temple (0.8.2)
+    thor (1.2.1)
+    tilt (2.0.10)
+    toml (0.3.0)
+      parslet (>= 1.8.0, < 3.0.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    webrick (1.7.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  middleman (~> 4.2.1)
+  middleman (~> 4.4.2)
   middleman-autoprefixer (~> 2.7.0)
   middleman-livereload
-  middleman-sprockets (~> 4.1.0)
-  middleman-syntax (~> 3.0.0)
-  nokogiri (>= 1.8.5)
-  rack (>= 2.0.6)
-  redcarpet (~> 3.4.0)
-  rouge (~> 2.0.5)
+  middleman-sprockets (~> 4.1.1)
+  middleman-syntax (~> 3.2.0)
+  nokogiri (>= 1.13.4)
+  rack (>= 2.2.3)
+  redcarpet (~> 3.5.1)
+  rouge (~> 3.28.0)
+  webrick (>= 1.7.0)
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 3.0.3p157
 
 BUNDLED WITH
-   1.16.3
+   2.3.12
diff --git a/src/api-docs/config.rb b/src/api-docs/config.rb
@@ -25,7 +25,9 @@
   require './lib/multilang.rb'
 end
 
-activate :sprockets
+activate :sprockets do |sprockets|
+  sprockets.supported_output_extensions = ['.js']
+end
 activate :livereload
 
 activate :autoprefixer do |config|