Update formatters and run formatter

.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:

.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)

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",

package.json

@@ -21,9 +21,9 @@
     "astro-robots-txt": "^1.0.0",
     "linkedom": "^0.18.4",
     "node-fetch": "^3.3.0",
-    "prettier": "^3.1.1",
-    "prettier-plugin-astro": "^0.12.3",
-    "prettier-plugin-tailwindcss": "^0.5.6",
+    "prettier": "^3.3.3",
+    "prettier-plugin-astro": "^0.14.1",
+    "prettier-plugin-tailwindcss": "^0.6.6",
     "sass": "^1.57.1",
     "string-strip-html": "^13.0.4",
     "svgo": "2.8",

plugins/astro-alias/index.ts

@@ -31,20 +31,20 @@ const plugin = (options: Options): AstroIntegration => {
           aliases = JSON.parse(aliasFileContent);
         } catch (error) {
           throw Error(
-            `${CONSOLE_TAG} Invalid JSOn in file "${options.aliasFile}"`
+            `${CONSOLE_TAG} Invalid JSOn in file "${options.aliasFile}"`,
           );
         }
 
         if (!Array.isArray(aliases))
           throw Error(
-            `${CONSOLE_TAG} Root element of "${options.aliasFile}" has to be a JSON array`
+            `${CONSOLE_TAG} Root element of "${options.aliasFile}" has to be a JSON array`,
           );
 
         Promise.all(
           aliases.map(async (possibleAlias, i) => {
             if (!possibleAlias.target || !possibleAlias.source)
               return console.warn(
-                `${CONSOLE_TAG} Alias index: ${i} does not have a "target" or a "source"`
+                `${CONSOLE_TAG} Alias index: ${i} does not have a "target" or a "source"`,
               );
             const alias: Alias = possibleAlias;
 
@@ -53,15 +53,15 @@ const plugin = (options: Options): AstroIntegration => {
 
             if (!fileExists(sourceFilepath))
               return console.warn(
-                `${CONSOLE_TAG} File: "${sourceFilepath}" does not exist. To create an alias point to a file that exists`
+                `${CONSOLE_TAG} File: "${sourceFilepath}" does not exist. To create an alias point to a file that exists`,
               );
             if (fileExists(targetFilepath))
               return console.warn(
-                `${CONSOLE_TAG} File: ${targetFilepath} already exists. Cannot overwrite existing file, so I will skip it`
+                `${CONSOLE_TAG} File: ${targetFilepath} already exists. Cannot overwrite existing file, so I will skip it`,
               );
 
             await fs.link(sourceFilepath, targetFilepath);
-          })
+          }),
         );
       },
     },

plugins/astro-language/index.ts

@@ -52,11 +52,11 @@ const plugin = (options: Options): AstroIntegration => {
     hooks: {
       "astro:config:setup": async ({ injectScript, command }) => {
         const supportedLanguageCodes = await runResolver(
-          options.supportedLanguageCodes
+          options.supportedLanguageCodes,
         );
         if (supportedLanguageCodes.length < 0)
           throw Error(
-            "Language plugin requires at least 1 language code to be supported"
+            "Language plugin requires at least 1 language code to be supported",
           );
 
         config = {
@@ -69,7 +69,7 @@ const plugin = (options: Options): AstroIntegration => {
           const nodeModulePath = path.join(
             process.cwd(),
             config.pathToNodeModules,
-            NODE_MODULE_NAME
+            NODE_MODULE_NAME,
           );
 
           try {
@@ -107,7 +107,7 @@ const plugin = (options: Options): AstroIntegration => {
                           localPathPrefixes: LOCAL_PATH_PREFIXES,
                           protocolIdentifier: PROTOCOL_IDENTIFIER,
                           publicPrefix: PUBLIC_PREFIX,
-                        })}).then().catch();`
+                        })}).then().catch();`,
           );
         }
       },
@@ -137,7 +137,7 @@ const plugin = (options: Options): AstroIntegration => {
           });
 
           const anchorElements: HTMLAnchorElement[] = Array.from(
-            document.querySelectorAll("a")
+            document.querySelectorAll("a"),
           ) as any[];
 
           const transformAnchorTasks = anchorElements.map(anchorTransformer);
@@ -163,7 +163,7 @@ const plugin = (options: Options): AstroIntegration => {
 
         console.log(
           CONSOLE_TAG +
-            `Done! A total of ${transformedAnchorsTotal} A-tags were changed, in a total of ${transformedFilesTotal} files`
+            `Done! A total of ${transformedAnchorsTotal} A-tags were changed, in a total of ${transformedFilesTotal} files`,
         );
         console.log("");
       },

plugins/astro-language/module/client.js

@@ -16,7 +16,7 @@ export const transformAllAnchors = async (config) => {
 
   const transformAnchorTasks = anchorElements.map(anchorTransformer);
   const changedAnchorsHrefs = (await Promise.all(transformAnchorTasks)).filter(
-    (href) => Boolean(href)
+    (href) => Boolean(href),
   );
 
   if (config.logChanges)

plugins/astro-language/module/transform-anchor.d.ts

@@ -9,11 +9,11 @@ export interface TransformerConfig {
 }
 
 export type AnchorTransformer = (
-  anchor: HTMLAnchorElement
+  anchor: HTMLAnchorElement,
 ) => Promise<string | undefined>;
 
 export type CreateAnchorTransformer = (
-  config: TransformerConfig
+  config: TransformerConfig,
 ) => AnchorTransformer;
 
 declare const createAnchorTransformer: CreateAnchorTransformer;

plugins/astro-language/module/transform-anchor.js

@@ -8,22 +8,22 @@ export const createAnchorTransformer = (config) => {
     const shoudNotChangeHref =
       originalHref.includes(config.protocolIdentifier) || // Link contains a protocol, only local links should be changed
       config.excludeStartWithPatterns.some((pattern) =>
-        originalHref.startsWith(pattern)
+        originalHref.startsWith(pattern),
       ); // If link starts with something like `mailto:`
     if (shoudNotChangeHref) return;
 
     // Contains the public prefix, links with this prefix will not be changed
     if (originalHref.startsWith(config.publicPrefix)) {
       anchor.setAttribute(
         "href",
-        `${originalHref.substring(config.publicPrefix.length)}`
+        `${originalHref.substring(config.publicPrefix.length)}`,
       );
       return originalHref;
     }
 
     const pathPrefix =
       config.localPathPrefixes.find((prefix) =>
-        originalHref.startsWith(prefix)
+        originalHref.startsWith(prefix),
       ) ?? "";
     if (pathPrefix === "") return;
 
@@ -40,7 +40,7 @@ export const createAnchorTransformer = (config) => {
 
     anchor.setAttribute(
       "href",
-      `${pathPrefix}${config.language}/${hrefWithoutPrefix}`
+      `${pathPrefix}${config.language}/${hrefWithoutPrefix}`,
     );
     anchor.setAttribute("hreflang", config.language);
     return originalHref;

plugins/astro-language/utils/packager.ts

@@ -9,10 +9,10 @@ export const copyDir = async (packageDir: string, targetDir: string) => {
     filesToCopy.map((filename) => {
       fs.copyFile(
         path.join(packageDir, filename),
-        path.join(targetDir, filename)
+        path.join(targetDir, filename),
       );
       return filename;
-    })
+    }),
   );
 };
 
@@ -69,7 +69,7 @@ export const packageDir = async (options: PackageDirOptions) => {
       main: packageOptions.entryMain,
       types: packageOptions.entryTypes,
       exports: packageOptions.exports,
-    })
+    }),
   );
 
   await copyDir(packageDir, targetDir);

plugins/tw-gradient/index.cjs

@@ -28,7 +28,7 @@ module.exports = plugin(({ matchUtilities, theme }) => {
         "background-image": value,
       }),
     },
-    { values: addDefaultValues(theme("gradients")) }
+    { values: addDefaultValues(theme("gradients")) },
   );
 
   matchUtilities(
@@ -37,6 +37,6 @@ module.exports = plugin(({ matchUtilities, theme }) => {
         "--tw-border-gradient-background": value,
       }),
     },
-    { values: addDefaultValues(flattenColorPalette(theme("colors"))) }
+    { values: addDefaultValues(flattenColorPalette(theme("colors"))) },
   );
 });

plugins/tw-gradient/utils/flattenColorPalette.cjs

@@ -6,8 +6,8 @@ const flattenColorPalette = (colors) =>
         ? Object.entries(flattenColorPalette(values)).map(([number, hex]) => ({
             [color + (number === "DEFAULT" ? "" : `-${number}`)]: hex,
           }))
-        : [{ [`${color}`]: values }]
-    )
+        : [{ [`${color}`]: values }],
+    ),
   );
 
 module.exports = flattenColorPalette;