From 46787089cd8c0c32ec3b730bec95b5d2f6d7ae46 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Mon, 22 Jun 2020 23:47:07 +1000
Subject: [PATCH] Tech improvement: Fix CSS, and enable minification (#1472)

---
 .github/workflows/build.yml                   | 50 +++++++++++++++++++
 .travis.yml                                   |  2 +-
 Makefile                                      | 15 ------
 _sass/2017/components/announcements-item.scss |  3 +-
 _support/smoke_test.sh                        | 32 ++++++++++++
 cssnano.config.js                             | 11 ----
 netlify.toml                                  | 13 +++++
 package.json                                  |  3 +-
 postcss.config.js                             |  5 --
 9 files changed, 100 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 _support/smoke_test.sh
 delete mode 100644 cssnano.config.js
 delete mode 100644 postcss.config.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..5f0f00992
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,50 @@
+name: Build and test CI
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # https://github.com/actions/cache/blob/master/examples.md#node---yarn
+      - name: "Cache: Get yarn cache directory path"
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: "Cache: Set up yarn cache"
+        uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      # https://github.com/actions/cache/blob/master/examples.md#ruby---bundler
+      - name: "Cache: Set up bundler cache"
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with: { node-version: '12.x' }
+
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with: { ruby-version: '2.7.1' }
+
+      - name: Setup dependencies
+        run: |
+          yarn --frozen-lockfile
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+
+      - run: yarn build
+      - run: yarn test
+      - run: yarn test:smoke
diff --git a/.travis.yml b/.travis.yml
index f5002202e..82628a773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
 script:
   - yarn build
   - yarn test
-  - if ! make test; then make test-warning; exit 16; fi
+  - yarn test:smoke
 
 cache:
   bundler: true
diff --git a/Makefile b/Makefile
index f63846fed..317584336 100644
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,3 @@ _site:
 
 dev: 
 	yarn dev
-
-test: _site ## Runs rudimentary tests
-	@test -f _site/vim.html
-	@test -f _site/react.html
-	@test -f _site/index.html
-	@grep "<script src" _site/index.html >/dev/null
-	@grep "<script src" _site/vim.html >/dev/null
-	@grep "<script src" _site/react.html >/dev/null
-
-test-warning:
-	@echo "========="
-	@echo "If your build failed at this point, it means"
-	@echo "the site failed to generate. Check the project"
-	@echo "out locally and try to find out why."
-	@echo "========="
diff --git a/_sass/2017/components/announcements-item.scss b/_sass/2017/components/announcements-item.scss
index f1a74dd9e..a5c72599c 100644
--- a/_sass/2017/components/announcements-item.scss
+++ b/_sass/2017/components/announcements-item.scss
@@ -52,7 +52,8 @@
   }
 
   & > .close::before {
-    content: "\00D7";
+    // https://stackoverflow.com/a/30421654
+    content: unquote("\"")+str-insert("00D7", "\\", 1)+unquote("\"");
     font-size: 14px;
   }
 }
diff --git a/_support/smoke_test.sh b/_support/smoke_test.sh
new file mode 100644
index 000000000..2b59f02fc
--- /dev/null
+++ b/_support/smoke_test.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+set -eou pipefail
+
+exit_failure() {
+  echo 'Failed :('
+  echo ''
+  echo '  If your build failed at this point, it means'
+  echo '  the site failed to generate. Check the project'
+  echo '  out locally and try to find out why.'
+}
+
+trap exit_failure ERR
+
+
+files=(
+  _site/vim.html
+  _site/react.html
+  _site/index.html
+)
+
+for fn in "${files[@]}"; do
+  echo ''
+  echo -n "→ Checking: $fn... "
+  test -f "$fn"
+  grep -q '<script src' "$fn"
+  grep -q 'assets/packed/app.js' "$fn"
+  grep -q 'doctype html' "$fn"
+  grep -q 'link rel="canonical"' "$fn"
+done
+echo ''
+echo ''
+echo "✓ Smoke tests good :)"
diff --git a/cssnano.config.js b/cssnano.config.js
deleted file mode 100644
index 3feefd020..000000000
--- a/cssnano.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-  preset: [
-    'default',
-    {
-      calc: false,
-      discardComments: {
-        removeAll: true
-      }
-    }
-  ]
-}
diff --git a/netlify.toml b/netlify.toml
index 6d719fd80..b4a96f527 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,3 +1,16 @@
 [build]
   command = "yarn build"
   publish = "_site/"
+
+# [[plugins]]
+#   # https://www.npmjs.com/package/netlify-plugin-minify-html
+#   package = "netlify-plugin-minify-html"
+#  
+#   [plugins.inputs]
+#     contexts = [ 'production', 'branch-deploy', 'deploy-preview' ]
+#  
+#   # https://github.com/kangax/html-minifier#options-quick-reference
+#   [plugins.inputs.minifierOptions]
+#     removeComments = true
+#     minifyCSS = true
+#     minifyJS = true
diff --git a/package.json b/package.json
index a58da5321..4d7a9dc52 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "prejekyll:build": "bundle",
     "prejekyll:watch": "bundle",
     "prettier:format": "prettier --write '_parcel/**/*.{js,scss}'",
-    "test": "jest"
+    "test": "jest",
+    "test:smoke": "bash _support/smoke_test.sh"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
deleted file mode 100644
index 961986e2b..000000000
--- a/postcss.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: {
-    autoprefixer: {}
-  }
-}