diff --git a/Gemfile b/Gemfile index 4a73270c..06be2572 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,18 @@ source "https://rubygems.org" -gem "nokogiri" +gem "bootstrap-sass" gem "bourbon" gem "font-awesome-sass" - -gem "middleman", "~> 3.3" -gem "middleman-livereload", "~> 3.4" -gem "middleman-blog" -gem "middleman-minify-html" -gem "middleman-favicon-maker", "~> 3.7" -gem "middleman-autoprefixer", "~> 2.10" +gem "haml", "~> 4.0" gem "jquery-middleman" - -gem "middleman-rouge" - -gem "bootstrap-sass" - gem "localeapp" +gem "middleman", "~> 4.3" +gem "middleman-autoprefixer", "~> 2.10" +gem "middleman-blog", "~> 4.0" +gem "middleman-favicon-maker", "~> 4.1" +gem "middleman-livereload", "~> 3.4" +gem "middleman-minify-html" +gem "middleman-sprockets", "~> 4.1" +gem "middleman-syntax", "~> 3.2" +gem "nokogiri" +gem "redcarpet", "~> 3.5" diff --git a/Gemfile.lock b/Gemfile.lock index 83e0dcf7..27b3e9d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,73 +1,61 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11) - i18n (~> 0.7) + activesupport (5.0.7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) autoprefixer-rails (9.4.10.2) execjs + backports (3.17.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) bourbon (4.3.4) sass (~> 3.4) thor (~> 0.19) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chunky_png (1.3.5) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - docile (1.3.1) + coffee-script-source (1.12.2) + concurrent-ruby (1.1.6) + contracts (0.13.0) + docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) eventmachine (1.2.7) execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.1.7) favicon_maker (1.3.1) docile (~> 1.1) ffi (1.9.25) font-awesome-sass (4.7.0) sass (>= 3.2) gli (2.18.0) - haml (5.0.4) - temple (>= 0.8.0) + haml (4.0.7) tilt - hike (1.2.3) - hooks (0.4.1) - uber (~> 0.0.14) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.6.0) htmlcompressor (0.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http_parser.rb (0.6.0) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-middleman (3.1.2) thor (>= 0.14, < 2.0) json (2.3.0) - kramdown (1.11.1) + kramdown (1.17.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -76,39 +64,48 @@ GEM i18n (>= 0.7, < 2) json (>= 1.7.7) rest-client (>= 1.8.0) - middleman (3.4.1) + memoist (0.16.2) + middleman (4.3.6) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) - compass-import-once (= 1.0.5) - execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.4.1) - middleman-sprockets (>= 3.1.2) - sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) + middleman-cli (= 4.3.6) + middleman-core (= 4.3.6) middleman-autoprefixer (2.10.1) autoprefixer-rails (~> 9.1) middleman-core (>= 3.3.3) - middleman-blog (3.5.3) - addressable (~> 2.3.5) - middleman-core (~> 3.2) + middleman-blog (4.0.3) + addressable (~> 2.3) + middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-core (3.4.1) - activesupport (~> 4.1) - bundler (~> 1.1) - capybara (~> 2.4.4) + middleman-cli (4.3.6) + thor (>= 0.17.0, < 2.0) + middleman-core (4.3.6) + activesupport (>= 4.2, < 5.1) + addressable (~> 2.3) + backports (~> 3.6) + bundler + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) - i18n (~> 0.7.0) - listen (~> 3.0.3) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) - middleman-favicon-maker (3.7) - favicon_maker (~> 1.3) - middleman-core (>= 3.0.0) + 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) + uglifier (~> 3.0) + middleman-favicon-maker (4.1.0) + favicon_maker (~> 1.3, >= 1.3.1) + middleman-core (~> 4.0) middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) @@ -116,38 +113,34 @@ GEM middleman-minify-html (3.4.1) htmlcompressor (~> 0.2.0) middleman-core (>= 3.2) - middleman-rouge (0.0.1) - middleman-core (>= 3.0.0) - redcarpet (>= 2.2.0) - rouge (>= 0.3.0) - middleman-sprockets (3.4.2) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) + middleman-sprockets (4.1.1) + middleman-core (~> 4.0) + sprockets (>= 3.0) + middleman-syntax (3.2.0) + middleman-core (>= 3.2) + rouge (~> 3.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.0) netrc (0.11.0) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - padrino-helpers (0.12.9) + padrino-helpers (0.13.3.4) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.9) + padrino-support (= 0.13.3.4) tilt (>= 1.4.1, < 3) - padrino-support (0.12.9) + padrino-support (0.13.3.4) activesupport (>= 3.1) + parallel (1.19.1) + public_suffix (4.0.3) rack (1.6.12) rack-livereload (0.3.17) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) rest-client (2.0.2) @@ -159,31 +152,20 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - temple (0.8.0) + servolux (0.13.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) thor (0.20.3) thread_safe (0.3.6) - tilt (1.4.1) - tzinfo (1.2.5) + tilt (2.0.10) + tzinfo (1.2.6) thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - xpath (2.1.0) - nokogiri (~> 1.3) PLATFORMS ruby @@ -192,16 +174,19 @@ DEPENDENCIES bootstrap-sass bourbon font-awesome-sass + haml (~> 4.0) jquery-middleman localeapp - middleman (~> 3.3) + middleman (~> 4.3) middleman-autoprefixer (~> 2.10) - middleman-blog - middleman-favicon-maker (~> 3.7) + middleman-blog (~> 4.0) + middleman-favicon-maker (~> 4.1) middleman-livereload (~> 3.4) middleman-minify-html - middleman-rouge + middleman-sprockets (~> 4.1) + middleman-syntax (~> 3.2) nokogiri + redcarpet (~> 3.5) BUNDLED WITH 1.17.3 diff --git a/config.rb b/config.rb index a182f106..8cfa43f3 100644 --- a/config.rb +++ b/config.rb @@ -55,6 +55,19 @@ # Directory Indexes activate :directory_indexes +# activate :sprockets do |c| +# c.imported_asset_path = "source" +# c.expose_middleman_helpers = true +# # c.imported_asset_path = -> asset do +# # case asset.logical_path +# # when /\.js\z/ then "javascripts" +# # when /\.css\z/ then "stylesheets" +# # end +# # end +# end +activate :sprockets +sprockets.append_path "source" + Time.zone = 'Paris' # Methods defined in the helpers block are available in templates @@ -71,8 +84,8 @@ def get_menu_labels(labels) end end -set :css_dir, 'stylesheets' -set :js_dir, 'javascripts' +# set :css_dir, 'stylesheets' +# set :js_dir, 'javascripts' set :images_dir, 'images' set :markdown_engine, :redcarpet @@ -84,7 +97,7 @@ def get_menu_labels(labels) lax_spacing: true, with_toc_data: true -activate :rouge_syntax +activate :syntax # Use relative URLs # activate :relative_assets