Update dependencies and fix build server issues

.buildrc

@@ -0,0 +1,10 @@
+export BUILD_DATE=$(TZ=UTC date "+%Y-%m-%d")
+export BUILD_TIME=$(TZ=UTC date "+%H:%M:%S %Z")
+
+npm install
+bundle install
+
+sed -i "s/^     date:.*$/     date: $BUILD_DATE/" _config.yml
+sed -i "s/^     time:.*$/     time: $BUILD_TIME/" _config.yml
+
+JEKYLL_ENV=production bundle exec jekyll build

.gitignore

@@ -7,5 +7,6 @@ font/_sass/
 font/.fontcustom-manifest.json
 assets/webfonts/ptio-font-preview.html
 vendor
-.bundle
 node_modules
+.bundle
+.jekyll-cache

.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.0

Gemfile

@@ -8,22 +8,18 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.9.0"
+gem "jekyll", "~> 4.2"
-
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
 
+# Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/)
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-brotli", "~> 2.2"
 end
 
-# Jekyll 3.9.0 now requires this explicitly installs, apparently
+# Jekyll 3.9.0 now requires this explicitly installed, apparently
-gem "kramdown-parser-gfm", "~> 1.1.0"
+gem "kramdown-parser-gfm", "~> 1.1"
+gem "webrick", "~> 1.7"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    brotli (0.2.3)
     colorator (1.1.0)
     concurrent-ruby (1.1.7)
     em-websocket (0.5.2)
@@ -12,27 +13,30 @@ GEM
     ffi (1.14.2)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
+    jekyll-brotli (2.2.1)
+      brotli (~> 0.2.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (1.5.2)
+    jekyll-sass-converter (2.1.0)
-      sass (~> 3.4)
+      sassc (> 2.0.1, < 3.0)
-    jekyll-seo-tag (2.7.1)
-      jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.3.0)
@@ -43,11 +47,7 @@ GEM
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
-    minima (2.5.1)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
@@ -57,21 +57,23 @@ GEM
     rexml (3.2.4)
     rouge (3.26.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
+    sassc (2.4.0)
-      sass-listen (~> 4.0.0)
+      ffi (~> 1.9)
-    sass-listen (4.0.0)
+    terminal-table (2.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
+      unicode-display_width (~> 1.1, >= 1.1.1)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-20
 
 DEPENDENCIES
-  jekyll (~> 3.9.0)
+  jekyll (~> 4.2)
+  jekyll-brotli (~> 2.2)
   jekyll-feed (~> 0.6)
-  kramdown-parser-gfm (~> 1.1.0)
+  kramdown-parser-gfm (~> 1.1)
-  minima (~> 2.0)
   tzinfo-data
+  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.2.4
+   2.2.5

README.md

@@ -0,0 +1,68 @@
+<div align="center">
+<a href="https://privacyguides.org">
+	<img src="/assets/img/layout/privacy-guides-logo.svg" width="500px" alt="Privacy Guides" />
+</a>
+<p>
+	<em>The guide to restoring your online privacy.</em>
+</p>
+<p>
+<a href="https://privacyguides.org">
+	<img src="https://img.shields.io/uptimerobot/status/m786935055-1117e0819f5c23c651d46a17?label=website%20status">
+</a>
+<a href="#">
+	<img src="https://img.shields.io/uptimerobot/ratio/7/m786935055-1117e0819f5c23c651d46a17">
+</a>
+<a href="#">
+	<img src="https://img.shields.io/github/stars/privacyguides?style=social">
+</a>
+<a href="#">
+	<img src="https://img.shields.io/github/stars/privacyguides?style=social">
+</a>
+</p>
+<p>
+<a href="https://www.reddit.com/r/PrivacyGuides/">
+	<img src="https://img.shields.io/reddit/subreddit-subscribers/privacyguides?style=social">
+</a>
+<a href="#">
+	<img src="https://img.shields.io/github/stars/privacyguides?style=social">
+</a>
+</p>
+<p>
+<a href="https://app.netlify.com/sites/privacyguides/deploys">
+	<img src="https://img.shields.io/netlify/f40bcb64-a6ed-4650-9ca6-7d3ac293d2be">
+</a>
+<a href="https://opencollective.com/privacyguides#support">
+	<img src="https://img.shields.io/opencollective/all/privacyguides?label=opencollective%20contributors">
+</a>
+<a href="https://github.com/privacyguides/privacyguides.org/issues">
+	<img src="https://img.shields.io/github/issues-raw/privacyguides/privacyguides.org">
+</a>
+<a href="https://github.com/privacyguides/privacyguides.org/issues?q=is%3Aissue+is%3Aclosed">
+	<img src="https://img.shields.io/github/issues-closed-raw/privacyguides/privacyguides.org">
+</a>
+<a href="https://github.com/privacyguides/privacyguides.org/pulls">
+	<img src="https://img.shields.io/github/issues-pr-raw/privacyguides/privacyguides.org">
+</a>
+<a href="https://github.com/privacyguides/privacyguides.org/pulls?q=is%3Apr+is%3Aclosed">
+	<img src="https://img.shields.io/github/issues-pr-closed-raw/privacyguides/privacyguides.org">
+</a>
+<a href="https://github.com/privacytools/privacytools.io/issues">
+	<img src="https://img.shields.io/github/issues/privacytools/privacytools.io?color=black&label=upstream%20issues">
+</a>
+</p>
+</div>
+
+## Developing
+
+1. Install the version of [Ruby](https://www.ruby-lang.org/en/downloads/) currently specified by [`.ruby-version`](.ruby-version)
+	* With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install`
+	* With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"`
+	* [Manually](https://www.ruby-lang.org/en/downloads/)
+1. Install [Bundler](https://bundler.io/) v2.2.5:
+	* `gem install bundler:2.2.5`
+1. Install the required dependencies:
+	* `bundle install`
+1. Build the website (the output can be found in the `_site` directory):
+	* `bundle exec jekyll build`
+1. Serve the website locally with live reloading:
+	* `bundle exec jekyll serve --incremental --livereload`

_config.yml

@@ -88,6 +88,7 @@ build:
 # Build settings
 plugins:
   - jekyll-feed
+  - jekyll-brotli
 exclude: [privacytools.io/]
 
 # Exclude from processing.

_layouts/default.html

@@ -8,10 +8,10 @@
     <main>
       {{ content }}
     </main>
-  <script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
+  <script src="/assets/js/jquery.min.js?v=5"></script>
-  <script src="/assets/js/popper.min.js?v=4"></script>
+  <script src="/assets/js/popper.min.js?v=5"></script>
-  <script src="/assets/js/bootstrap.min.js?v=4"></script>
+  <script src="/assets/js/bootstrap.min.js?v=5"></script>
-  <script src="/assets/js/sortable.min.js?v=4"></script>
+  <script src="/assets/js/sortable.min.js?v=5"></script>
-  <script src="/assets/js/main.js?v=5"></script>
+  <script src="/assets/js/main.js?v=6"></script>
 </body>
 </html>

assets/js/bootstrap.min.js.map

@@ -0,0 +1 @@
+../../node_modules/bootstrap/dist/js/bootstrap.min.js.map

assets/js/jquery.min.js

@@ -0,0 +1 @@
+../../node_modules/jquery/dist/jquery.min.js