Skip to content

Commit

Permalink
Merge pull request #580 from tnir/middleman-4.4.0
Browse files Browse the repository at this point in the history 
Update middleman 4.3.11+patches to 4.4.0
  • Loading branch information
@deivid-rodriguez
deivid-rodriguez authored Dec 10, 2021
2 parents fd17aad + 0b325a0 commit 0e61c6d
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 74 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ source 'https://rubygems.org'
ruby File.read(File.expand_path('../.ruby-version', __FILE__)).strip

gem 'octokit', '~> 4.15'
gem 'middleman', '~> 4.3', github: "middleman/middleman", branch: "4.x"
gem 'middleman', '~> 4.4'
gem 'middleman-syntax'
gem 'middleman-blog'
gem 'puma', '~> 4.3'
gem 'middleman-search'
gem 'middleman-search', github: 'deivid-rodriguez/middleman-search', branch: 'workarea-commerce-master'
gem 'rake'
gem 'ronn'
gem 'kramdown'
Expand Down
146 changes: 74 additions & 72 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,22 @@
GIT
remote: https://github.com/middleman/middleman.git
revision: 0c950d82f6f4f540e8572195f80c9a9fb15ab80c
branch: 4.x
remote: https://github.com/deivid-rodriguez/middleman-search.git
revision: 50465e1c1580e282a45247b77036da3c2719870d
branch: workarea-commerce-master
specs:
middleman (4.3.11)
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)
backports (~> 3.6)
bundler (~> 2.0)
contracts (~> 0.13.0)
dotenv
erubis
execjs (~> 2.0)
fast_blank
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 0.9.0)
listen (~> 3.0.0)
memoist (~> 0.14)
padrino-helpers (~> 0.13.0)
parallel
rack (>= 1.4.5, < 3)
sassc (~> 2.0)
servolux
tilt (~> 2.0.9)
toml
uglifier (~> 3.0)
webrick
middleman-search (0.10.0)
middleman-core (>= 3.2)
mini_racer (~> 0.5)
nokogiri (~> 1.6)

GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.5)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
backports (3.21.0)
Expand All @@ -55,66 +27,99 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
contracts (0.13.0)
dotenv (2.7.6)
erubis (2.7.0)
execjs (2.7.0)
execjs (2.8.1)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
fast_blank (1.0.0)
fastimage (2.2.3)
ffi (1.15.0)
fast_blank (1.0.1)
fastimage (2.2.5)
ffi (1.15.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.6.0)
hpricot (0.8.6)
i18n (0.9.5)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
kramdown (2.3.1)
rexml
libv8 (3.16.14.19)
libv8 (3.16.14.19-x86_64-linux)
libv8-node (16.10.0.0)
libv8-node (16.10.0.0-arm64-darwin)
libv8-node (16.10.0.0-x86_64-linux)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.16.2)
method_source (0.9.2)
middleman (4.4.2)
coffee-script (~> 2.2)
haml (>= 4.0.5)
kramdown (>= 2.3.0)
middleman-cli (= 4.4.2)
middleman-core (= 4.4.2)
middleman-blog (4.0.3)
addressable (~> 2.3)
middleman-core (>= 4.0.0)
tzinfo (>= 0.3.0)
middleman-search (0.10.0)
middleman-core (>= 3.2)
nokogiri (~> 1.6)
therubyracer (~> 0.12.2)
middleman-cli (4.4.2)
thor (>= 0.17.0, < 2.0)
middleman-core (4.4.2)
activesupport (>= 6.1, < 7.0)
addressable (~> 2.4)
backports (~> 3.6)
bundler (~> 2.0)
contracts (~> 0.13.0)
dotenv
erubis
execjs (~> 2.0)
fast_blank
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 1.6.0)
listen (~> 3.0.0)
memoist (~> 0.14)
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-syntax (3.2.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
mini_portile2 (2.6.1)
mini_racer (0.5.0)
libv8-node (~> 16.10.0.0)
minitest (5.14.4)
multipart-post (2.1.1)
mustache (1.0.5)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
nokogiri (1.12.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.12.5-x86_64-linux)
racc (~> 1.4)
octokit (4.15.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.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.20.1)
parslet (1.8.2)
padrino-support (0.15.1)
parallel (1.21.0)
parslet (2.0.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
Expand All @@ -127,11 +132,10 @@ GEM
racc (1.5.2)
rack (2.2.3)
rake (13.0.1)
rb-fsevent (0.10.4)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdiscount (2.2.0.2)
ref (2.0.0)
rexml (3.2.5)
ronn (0.7.3)
hpricot (>= 0.8.2)
Expand All @@ -145,31 +149,29 @@ GEM
faraday (> 0.8, < 2.0)
servolux (0.13.0)
temple (0.8.2)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
toml (0.2.0)
parslet (~> 1.8.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
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.1)

PLATFORMS
arm64-darwin-21
ruby
x86_64-linux

DEPENDENCIES
builder
haml (~> 5.1.2)
kramdown
middleman (~> 4.3)!
middleman (~> 4.4)
middleman-blog
middleman-search
middleman-search!
middleman-syntax
nokogiri (~> 1.12)
octokit (~> 4.15)
Expand All @@ -183,4 +185,4 @@ RUBY VERSION
ruby 3.0.3p157

BUNDLED WITH
2.2.15
2.2.33

0 comments on commit 0e61c6d

Please sign in to comment.