Merge branch 'main' into production

.github/release-drafter.yml

@@ -0,0 +1,6 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES
+exclude-labels:
+  - 'generate chapters'

.github/workflows/add-to-release-notes.yml

@@ -0,0 +1,21 @@
+######################################
+## Custom Web Almanac GitHub action ##
+######################################
+#
+# This updates the current draft release notes with this commit
+# Excluding certain automated commits (e.g. Generate Chapters or Ebooks)
+#
+name: Add to Release Notes
+on:
+  push:
+    branches:
+      - main
+jobs:
+  release-notes:
+    runs-on: ubuntu-latest
+    if: github.repository == 'HTTPArchive/almanac.httparchive.org'
+    steps:
+    - name: Update release notes
+      uses: release-drafter/release-drafter@v5.11.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate_chapters.yml

@@ -27,6 +27,7 @@ on:
       - src/requirements.txt
 jobs:
   build:
+    name: Generate Chapters and Update Timestamps
     runs-on: ubuntu-latest
     if: github.repository == 'HTTPArchive/almanac.httparchive.org'
     steps:
@@ -42,7 +43,7 @@ jobs:
     - name: Setup Node.js for use with actions
       uses: actions/setup-node@v1.4.2
       with:
-        version:  12.x
+        node-version: 12.x
     - name: Set up Python 3.7
       uses: actions/setup-python@v2.1.2
       with:

.github/workflows/generate_ebooks.yml

@@ -16,6 +16,7 @@ on:
 
 jobs:
   build:
+    name: Auto-generate Ebooks
     # Prince needs ubuntu 20 and ubuntu-latest is only on 18
     runs-on: ubuntu-20.04
     steps:

.github/workflows/linter.yml

@@ -33,7 +33,7 @@ jobs:
         run: |
           echo "::set-env name=VALIDATE_ALL_CODEBASE::false"
       - name: Lint Code Base
-        uses: docker://github/super-linter:v3
+        uses: github/super-linter@v3.7.0
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test_website.yml

@@ -9,16 +9,9 @@ name: Test Website
 on:
   workflow_dispatch:
   pull_request:
-    paths:
-      - src/**.js
-      - src/**.css
-      - src/**.html
-      - src/content/**.md
-      - src/**.py
-      - src/**.json
-      - src/requirements.txt
 jobs:
   build:
+    name: Build and Test Website
     runs-on: ubuntu-latest
     if: github.repository == 'HTTPArchive/almanac.httparchive.org'
     steps:
@@ -27,10 +20,16 @@ jobs:
     - name: Setup Node.js for use with actions
       uses: actions/setup-node@v1.4.2
       with:
-        version:  12.x
+        node-version: 12.x
     - name: Set up Python 3.7
       uses: actions/setup-python@v2.1.2
       with:
         python-version: '3.7'
     - name: Run the website
       run: ./src/tools/scripts/run_and_test_website.sh
+    - name: Lint Generated HTML
+      uses: github/super-linter@v3.7.0
+      env:
+        DEFAULT_BRANCH: main
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        VALIDATE_HTML: true

README.md

@@ -12,9 +12,10 @@ Our mission is to combine the raw stats and trends of the HTTP Archive with the
 
 The 2019 Web Almanac is available in:
 - [English](https://almanac.httparchive.org/en/2019/)
-- [Spanish](https://almanac.httparchive.org/es/2019/)
 - [French](https://almanac.httparchive.org/fr/2019/)
 - [Japanese](https://almanac.httparchive.org/ja/2019/)
+- [Simplified Chinese](https://almanac.httparchive.org/zh-CN/2019/)
+- [Spanish](https://almanac.httparchive.org/es/2019/)
 
 ## Contributing
 

src/.gitignore

@@ -1,3 +1,4 @@
 .idea/
 .vscode/
-node_modules/
+node_modules/
+static/html/

src/config/2020.json

@@ -92,6 +92,12 @@
         {
           "part": "II",
           "chapter": "13",
+          "title": "Capabilities",
+          "slug": "capabilities"
+        },
+        {
+          "part": "II",
+          "chapter": "14",
           "title": "PWA",
           "slug": "pwa"
         }
@@ -103,20 +109,20 @@
       "chapters": [
         {
           "part": "III",
-          "chapter": "14",
+          "chapter": "15",
           "title": "CMS",
           "slug": "cms"
         },
         {
           "part": "III",
-          "chapter": "15",
+          "chapter": "16",
           "title": "Ecommerce",
           "slug": "ecommerce"
         },
         {
           "part": "III",
-          "chapter": "16",
-          "title": "JAMstack",
+          "chapter": "17",
+          "title": "Jamstack",
           "slug": "jamstack"
         }
       ]
@@ -127,31 +133,31 @@
       "chapters": [
         {
           "part": "IV",
-          "chapter": "17",
+          "chapter": "18",
           "title": "Page Weight",
           "slug": "page-weight"
         },
         {
           "part": "IV",
-          "chapter": "18",
+          "chapter": "19",
           "title": "Compression",
           "slug": "compression"
         },
         {
           "part": "IV",
-          "chapter": "19",
+          "chapter": "20",
           "title": "Caching",
           "slug": "caching"
         },
         {
           "part": "IV",
-          "chapter": "20",
+          "chapter": "21",
           "title": "Resource Hints",
           "slug": "resource-hints"
         },
         {
           "part": "IV",
-          "chapter": "21",
+          "chapter": "22",
           "title": "HTTP/2",
           "slug": "http2"
         }
@@ -165,6 +171,9 @@
     "authors": {
       "name": "Authors"
     },
+    "designers": {
+      "name": "Designers"
+    },
     "developers": {
       "name": "Developers"
     },
@@ -888,6 +897,12 @@
       "github": "ipullrank",
       "twitter": "IPullRank"
     },
+    "michelleoconnor": {
+      "name": "Michelle O'Connor",
+      "teams": [
+        "designers"
+      ]
+    },
     "MikeBishop": {
       "name": "Mike Bishop",
       "teams": [