Update dependencies

.github/workflows/crowdin.yml

@@ -2,7 +2,7 @@ name: Crowdin
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths:
       - "src/pages/**"
       - "src/assets/**"

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   workflow_dispatch:
 
 concurrency:
@@ -46,4 +46,4 @@ jobs:
           HOST: ${{ secrets.VPS_HOST }}
           KEY: ${{ secrets.VPS_SSH_PRIVATE_KEY }}
           TARGET: "/home/website/thenewoil/"
-          ARGS: '-z -r -v -l -t --delete-after --exclude node_modules/ .git/'
+          ARGS: "-z -r -v -l -t --delete-after --exclude node_modules/ .git/"

.github/workflows/validate-caddy.yml

@@ -2,10 +2,10 @@ name: Validate Caddyfile
 on:
   push:
     paths:
-      - 'caddy/**'
+      - "caddy/**"
   pull_request:
     paths:
-      - 'caddy/**'
+      - "caddy/**"
 
 jobs:
   validate:

.gitignore

@@ -14,3 +14,5 @@
 
 # Typescript
 .tsbuildinfo
+
+.astro

.prettierrc

@@ -22,13 +22,11 @@
       "options": {
         "parser": "astro",
         "singleQuote": false,
-        "editorconfig": true,
         "trailingComma": "none",
         "printWidth": 120,
         "semi": true
       }
     }
   ],
-  "pluginSearchDirs": false,
   "singleQuote": false
 }

FUNDING.yml

@@ -2,4 +2,4 @@ github: tnonate
 open_collective: thenewoil
 liberapay: thenewoil
 patreon: TheNewOil413
-custom: https://thenewoil.org/en/support/
+custom: https://thenewoil.org/en/support/

README.md

@@ -31,4 +31,4 @@ Readers who speak foreign languages can help us translate the site on [Crowdin](
 -   [**2023 Transparency Report**](https://blog.thenewoil.org/transparency-report-2023)
 -   [**2022 Transparency Report**](https://blog.thenewoil.org/transparency-report-2022-and-goals-for-2023)
 -   [**2021 Transparency Report**](https://blog.thenewoil.org/transparency-report-2021-and-goals-for-2022)
--   [**2020 Transparency Report**](https://blog.thenewoil.org/2020-recap-2021-plans)
+-   [**2020 Transparency Report**](https://blog.thenewoil.org/2020-recap-2021-plans)

astro.config.ts

@@ -9,7 +9,7 @@ import type Config from "./typings/config";
 const DIRNAME = path.dirname(fileURLToPath(import.meta.url));
 
 const config = JSON.parse(
-  (await fs.readFile(path.resolve(DIRNAME, "config.json"))).toString()
+  (await fs.readFile(path.resolve(DIRNAME, "config.json"))).toString(),
 ) as Config;
 
 // https://astro.build/config
@@ -21,6 +21,8 @@ import sitemap from "@astrojs/sitemap";
 // https://astro.build/config
 import mdx from "@astrojs/mdx";
 
+import icon from "astro-icon";
+
 import compress from "astro-compress";
 
 import robotsTxt from "astro-robots-txt";
@@ -32,15 +34,33 @@ export default defineConfig({
   site: "https://thenewoil.org",
   outDir: "./www",
   integrations: [
-    tailwind({ config: { applyBaseStyles: false } }),
+    tailwind({
+      applyBaseStyles: false,
+    }),
     mdx(),
     sitemap(),
-    robotsTxt({ sitemap: false, policy: [{disallow: "/", userAgent: "GPTBot"}, {disallow: "/", userAgent: "ia_archiver"}, {disallow: "/", userAgent: "User-Agent: Google-Extended"}] }),
+    icon(),
+    robotsTxt({
+      sitemap: false,
+      policy: [
+        { disallow: "/", userAgent: "GPTBot" },
+        { disallow: "/", userAgent: "ia_archiver" },
+        { disallow: "/", userAgent: "User-Agent: Google-Extended" },
+      ],
+    }),
     compress({
-      css: { comments: false },
-      html: { removeComments: true },
-      js: false,
-      logger: 1,
+      Logger: 1,
+      JavaScript: false,
+      CSS: {
+        csso: {
+          comments: false,
+        },
+      },
+      HTML: {
+        "html-minifier-terser": {
+          removeComments: true,
+        },
+      },
     }),
     languagePlugin({
       supportedLanguageCodes: config.languages.map((lang) => lang.code),

crowdin.yml

@@ -21,11 +21,7 @@ files:
       source: "/pages/en/**/*.mdx",
       translation: "/pages/%two_letters_code%/**/%file_name%.mdx",
       ignore:
-        [
-          "/pages/en/blog-index.mdx",
-          "/pages/en/pgp.mdx",
-          "/pages/en/xmr2.mdx",
-        ],
+        ["/pages/en/blog-index.mdx", "/pages/en/pgp.mdx", "/pages/en/xmr2.mdx"],
     },
     {
       source: "/pages/404.mdx",

docs/content/icons.md

@@ -2,10 +2,10 @@
 
 Within `.mdx` and `.astro` you are able to use icons. To allow for this we use "[astro-icon](https://github.com/natemoo-re/astro-icon#readme)" which is able to take icons from various [icon sets](https://icon-sets.iconify.design). Currently most icons are from [Material Design Icons (MDI)](https://icon-sets.iconify.design/mdi/), but others can be used.
 
-The following example shows how to use the Icon component in MDX. First you need to import the Icon component from `astro-icon` and then place it like a regular HTML element. Then specify the specific icon set it needs to take the icons from with the `pack` attribute. Now get specify an icon-name with the `name` attribute. If you wanted to add some extra styling to the icon (which will be passed through directly to the SVG element) you can do this with the `class` attribute.
+The following example shows how to use the Icon component in MDX. First you need to import the Icon component from `astro-icon` and then place it like a regular HTML element. Now specify an icon-name with the `name` attribute. If you wanted to add some extra styling to the icon (which will be passed through directly to the SVG element) you can do this with the `class` attribute.
 
 ```tsx
-import { Icon } from "astro-icon";
+import { Icon } from "astro-icon/components";
 
-<Icon pack="mdi" name="house" class="h-7 w-7" />
+<Icon name="mdi:house" class="h-7 w-7" />
 ```