Merge branch 'rebrand'

Author: pimterry

.github/workflows/ci.yml

@@ -122,15 +122,15 @@ jobs:
     needs: publish-docker
     steps:
       - name: Redeploy container
-        uses: thibaultchazal/scaleway-serverless-container-deploy-action@0d290edda0c3359e51442bd8bf730eafef4e290f
+        uses: httptoolkit/scaleway-serverless-container-deploy-action@v1
         with:
           container_id: ${{ vars.SCW_API_CONTAINER_ID }}
           region: ${{ vars.SCW_API_CONTAINER_REGION }}
           secret_key: ${{ secrets.SCW_SECRET_KEY }}
           registry_image_url: "registry.hub.docker.com/httptoolkit/ui:prod"
 
       - name: Redeploy failover container
-        uses: thibaultchazal/scaleway-serverless-container-deploy-action@0d290edda0c3359e51442bd8bf730eafef4e290f
+        uses: httptoolkit/scaleway-serverless-container-deploy-action@v1
         with:
           container_id: ${{ vars.SCW_FAILOVER_API_CONTAINER_ID }}
           region: ${{ vars.SCW_FAILOVER_API_CONTAINER_REGION }}
@@ -139,9 +139,6 @@ jobs:
 
       - name: Flush CDN cache
         run: |
-          # Wait a little - the reploy commands don't wait for the container to start up
-          sleep 30
-
           # Clear CDN cache to re-request content:
           curl -f --request POST \
             --url https://api.bunny.net/pullzone/$PULL_ZONE_ID/purgeCache \

automation/webpack.common.ts

@@ -2,7 +2,6 @@ import * as path from 'path';
 import * as Webpack from 'webpack';
 
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import GoogleFontsPlugin from '@beyonk/google-fonts-webpack-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import ForkTsCheckerNotifierWebpackPlugin from 'fork-ts-checker-notifier-webpack-plugin';
@@ -165,16 +164,6 @@ export default <Webpack.Configuration>{
                 'wordOperations'
             ]
         }),
-        new GoogleFontsPlugin({
-            fonts: [
-                { family: "Fira Mono" },
-                { family: "Lato" }
-            ],
-            path: '.',
-            formats: ['woff2'], // Supported by Chrome, FF, Edge, Safari 12+
-            filename: 'fonts.css',
-            apiUrl: 'https://gwfh.mranftl.com/api/fonts'
-        }),
         new Webpack.ProvidePlugin({
             'process': 'process/browser.js',
             'Buffer': ['buffer', 'Buffer']