fix: Fix map (#99)

matallo · Nov 13, 2019 · df16ef2 · df16ef2
1 parent fd0ad95
commit df16ef2
Show file tree

Hide file tree

Showing 8 changed files with 1,829 additions and 1,986 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.jekyll-cache
 .jekyll-metadata
 app/_js/vendor
 dist

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.1.0] - 2019-11-12
+### Fixes
+- Fix map.
+
 ## [4.0.1] - 2019-11-12
 ### Features
 - Update dependencies.

diff --git a/Dockerfile b/Dockerfile
@@ -5,12 +5,13 @@ RUN apk update && apk upgrade && \
     echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories && \
     echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories && \
     apk add --no-cache \
-    chromium@edge=~73.0.3683.103 \
-    nss@edge \
-    freetype@edge \
-    freetype-dev@edge \
-    harfbuzz@edge \
-    ttf-freefont@edge \
+    chromium \
+    nss \
+    freetype \
+    freetype-dev \
+    harfbuzz \
+    ca-certificates \
+    ttf-freefont \
     automake \
     autoconf \
     nasm \

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'jekyll', '3.8.6'
-gem 'html-proofer', '3.11.0'
+gem 'jekyll', '4.0.0'
+gem 'html-proofer', '3.12.0'
 gem 'rake'
 
 group :jekyll_plugins do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
-      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)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
     concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
@@ -16,84 +11,83 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    ffi (1.11.1)
+    ffi (1.11.2)
     forwardable-extended (2.6.0)
-    html-proofer (3.11.0)
-      activesupport (>= 4.2, < 6.0)
+    html-proofer (3.12.0)
       addressable (~> 2.3)
-      mercenary (~> 0.3.2)
-      nokogiri (~> 1.9)
+      mercenary (~> 0.3)
+      nokogiri (~> 1.10)
       parallel (~> 1.3)
       rainbow (~> 3.0)
+      timerizer (~> 0.3)
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.6)
+    jekyll (4.0.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (>= 0.9.5, < 2)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
+      terminal-table (~> 1.8)
     jekyll-feed (0.12.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.15.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (2.0.1)
+      sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.3.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.3)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
+    parallel (1.18.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (3.6.0)
-    ruby_dep (1.5.0)
+    rouge (3.13.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    thread_safe (0.3.6)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    timerizer (0.3.3)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
     yell (2.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer (= 3.11.0)
-  jekyll (= 3.8.6)
+  html-proofer (= 3.12.0)
+  jekyll (= 4.0.0)
   jekyll-feed (= 0.12.1)
   jekyll-redirect-from (= 0.15.0)
   jekyll-sitemap (= 1.3.1)

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ There are several tasks available to help you build and test the website. We'll
 ### Run locally
 
 ```
-docker-compose run --rm web yarn start
+docker-compose run --rm -e JEKYLL_ENV=development web yarn start
 ```
 
 This will have Jekyll build the site, webpack compile the assets, run a static server to listen on port 9000 (which you can now reach at [http://localhost:9000/](http://localhost:9000/)), and watch for changes to site files. Every change will cause Jekyll to rebuild the affected files, webpack to compile the assets, and reload the page.
@@ -120,3 +120,6 @@ aws s3 sync --acl public-read dist/ s3://${AWS_BUCKET} --delete --exclude "*" --
 ```
 
 ## TODO
+
+- [Bump scrollama to 2.0.0+](https://pudding.cool/process/scrollytelling-sticky/)
+- [Serve ES2017 bundles to modern browsers](https://instagram-engineering.com/making-instagram-com-faster-code-size-and-execution-optimizations-part-4-57668be796a8)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matall.in",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Personal website of Carlos Matallín",
   "main": "index.js",
   "scripts": {
@@ -79,7 +79,7 @@
     "prettier-eslint-cli": "^5.0.0",
     "pretty-quick": "^2.0.0",
     "sass-loader": "^8.0.0",
-    "scrollama": "^2.0.0",
+    "scrollama": "1.4.4",
     "smoothscroll": "^0.4.0",
     "stylelint": "^11.0.0",
     "stylelint-config-prettier": "^6.0.0",