diff --git a/Gemfile b/Gemfile index 4f4991e3b..f144584ef 100644 --- a/Gemfile +++ b/Gemfile @@ -3,11 +3,12 @@ source 'https://rubygems.org' gem 'rake' # jekyll, which builds it all -# 2.0 includes sass processing -gem 'jekyll', '~>2.0' +# 3.0 includes sass processing +gem 'jekyll', '~>3.1' -# Auto redirect pages +# Jekyll extensions gem 'jekyll-redirect-from' +gem 'jekyll-paginate' # JSON gem 'json' @@ -17,3 +18,12 @@ gem 'rb-fsevent' # For markdown header cleanup gem 'sanitize', '~>2.0' + +# Markdown +gem 'redcarpet' + +# Syntax highlighting +gem 'pygments.rb' + +# Avoid having to poll for changes on Windows +gem 'wdm', '>= 0.1.0' if Gem.win_platform? \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 89a0f264a..e2d319117 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,85 +1,69 @@ GEM remote: https://rubygems.org/ specs: - blankslate (2.1.2.4) - celluloid (0.15.2) - timers (~> 1.1.0) - classifier (1.3.4) - fast-stemmer (>= 1.0.0) - coffee-script (2.3.0) - coffee-script-source - execjs - coffee-script-source (1.7.1) colorator (0.1) - execjs (2.2.1) - fast-stemmer (1.0.2) - ffi (1.9.3) - jekyll (2.2.0) - classifier (~> 1.3) + ffi (1.9.10) + ffi (1.9.10-x64-mingw32) + jekyll (3.1.3) colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.0) + jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) - jekyll-coffeescript (1.0.0) - coffee-script (~> 2.2) - jekyll-gist (1.1.0) - jekyll-paginate (1.0.0) - jekyll-redirect-from (0.5.0) - jekyll (~> 2.0) - jekyll-sass-converter (1.2.0) - sass (~> 3.2) - jekyll-watch (1.1.0) - listen (~> 2.7) - json (1.8.1) - kramdown (1.4.1) - liquid (2.6.1) - listen (2.7.9) - celluloid (>= 0.15.2) + jekyll-paginate (1.1.0) + jekyll-redirect-from (0.10.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.4.0) + sass (~> 3.4) + jekyll-watch (1.3.1) + listen (~> 3.0) + json (1.8.3) + kramdown (1.10.0) + liquid (3.0.6) + listen (3.1.1) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - mercenary (0.3.4) - mini_portile (0.6.0) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.9) - pygments.rb (0.6.0) + rb-inotify (>= 0.9.7) + mercenary (0.3.6) + mini_portile2 (2.0.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.7.2-x64-mingw32) + mini_portile2 (~> 2.0.0.rc2) + posix-spawn (0.3.11) + pygments.rb (0.6.3) posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) - rake (10.3.2) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) + yajl-ruby (~> 1.2.0) + rake (11.1.2) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) - redcarpet (3.1.2) + redcarpet (3.3.4) + rouge (1.10.1) safe_yaml (1.0.4) - sanitize (2.0.6) + sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.3.14) - timers (1.1.0) - toml (0.1.1) - parslet (~> 1.5.0) - yajl-ruby (1.1.0) + sass (3.4.22) + wdm (0.1.1) + yajl-ruby (1.2.1) PLATFORMS ruby + x64-mingw32 DEPENDENCIES - jekyll (~> 2.0) + jekyll (~> 3.1) + jekyll-paginate jekyll-redirect-from json + pygments.rb rake rb-fsevent + redcarpet sanitize (~> 2.0) + wdm (>= 0.1.0) BUNDLED WITH - 1.10.1 + 1.11.2 diff --git a/_config.yml b/_config.yml index a4bdbce13..2a46105aa 100644 --- a/_config.yml +++ b/_config.yml @@ -5,19 +5,18 @@ url: https://facebook.github.io baseurl: "/react" permalink: "/blog/:year/:month/:day/:title.html" paginate_path: "/blog/page:num/" -relative_permalinks: true paginate: 5 timezone: America/Los_Angeles highlighter: pygments defaults: - scope: path: '' - type: post + type: posts values: layout: post - scope: path: docs - type: page + type: pages values: layout: docs exclude: @@ -36,6 +35,7 @@ sass: sass_dir: _css gems: - jekyll-redirect-from +- jekyll-paginate react_version: 15.2.1 react_hashes: dev: g2900ZIpFKhyIsz+bnx4YDEfAISugYRU58ljeAgI8TZ0A0AkRLGUCN7OmjF16Cj+ diff --git a/_layouts/default.html b/_layouts/default.html index d42b8b157..82659d8f3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -50,10 +50,10 @@ React