Merge pull request #280 from rtfpessoa/fix-website

clean: Tweak users section to avoid margin issues

Author: rtfpessoa

.github/workflows/website.yml

@@ -62,4 +62,5 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
           cd website
-          aws s3 sync . s3://diff2html.xyz --region eu-west-1
+          aws s3 sync --region eu-west-1 --delete . s3://diff2html.xyz --metadata-directive REPLACE --cache-control max-age=31557600
+          aws cloudfront create-invalidation --region eu-west-1 --distribution-id ${{ secrets.AWS_CF_DISTRIBUTION_ID }} --paths '/index.html /demo.html'

webpack.website.ts

@@ -30,21 +30,6 @@ const config: webpack.Configuration[] = pages.map(page => {
           use: 'ts-loader',
           exclude: /node_modules/,
         },
-        {
-          test: /\.handlebars$/,
-          loader: 'handlebars-loader',
-          options: {
-            precompileOptions: {
-              knownHelpersOnly: false,
-            },
-            helperDirs: [path.join(__dirname, 'website/templates/helpers')],
-            partialDirs: [path.join(__dirname, 'website/templates')],
-          },
-        },
-        {
-          test: /\.(css)$/,
-          use: [MiniCssExtractPlugin.loader, { loader: 'css-loader', options: { importLoaders: 1 } }, 'postcss-loader'],
-        },
         {
           test: /\.(html)$/,
           use: {
@@ -55,30 +40,26 @@ const config: webpack.Configuration[] = pages.map(page => {
           },
         },
         {
-          test: /\.woff(2)?(\?v=\d\.\d\.\d)?$/,
-          use: [
-            {
-              loader: 'url-loader',
-              options: {
-                limit: 1000,
-                mimetype: 'application/font-woff',
-              },
+          test: /\.handlebars$/,
+          loader: 'handlebars-loader',
+          options: {
+            inlineRequires: '/images/',
+            precompileOptions: {
+              knownHelpersOnly: false,
             },
-          ],
-        },
-        {
-          test: /\.(ttf|eot|svg)(\?v=\d\.\d\.\d)?$/,
-          loader: 'file-loader',
+            helperDirs: [path.join(__dirname, 'website/templates/helpers')],
+            partialDirs: [path.join(__dirname, 'website/templates')],
+          },
         },
         {
-          test: /\.(jpeg|jpg|png|gif)$/,
+          test: /\.(gif|png|jpe?g|webp)$/i,
           use: [
             {
               loader: 'file-loader',
               options: {
-                name: '[name].[ext]',
-                outputPath: 'images/',
-                useRelativePath: true,
+                name: '[name].[ext]?[hash]',
+                outputPath: 'images',
+                esModule: false,
               },
             },
             {
@@ -105,6 +86,26 @@ const config: webpack.Configuration[] = pages.map(page => {
             },
           ],
         },
+        {
+          test: /\.(css)$/,
+          use: [MiniCssExtractPlugin.loader, { loader: 'css-loader', options: { importLoaders: 1 } }, 'postcss-loader'],
+        },
+        {
+          test: /\.woff(2)?(\?v=\d\.\d\.\d)?$/,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                limit: 1000,
+                mimetype: 'application/font-woff',
+              },
+            },
+          ],
+        },
+        {
+          test: /\.(ttf|eot|svg)(\?v=\d\.\d\.\d)?$/,
+          loader: 'file-loader',
+        },
       ],
     },
     plugins: [