Merge pull request #582 from artichoke/lopopolo/prettier-3.x

Reformat with prettier 3.0.0
artichoke · Jul 18, 2023 · 8110567 · 8110567
2 parents 17679c5 + 93afcc2
commit 8110567
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -66,6 +66,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3.5.3
 
+      - name: Install Node.js toolchain
+        uses: actions/setup-node@v3.6.0
+        with:
+          node-version: 18
+
+      - name: Install toolchain
+        run: npm ci
+
       - name: Lint and check formatting with prettier
         run: npx prettier --check '**/*'
 

diff --git a/build.mjs b/build.mjs
@@ -91,7 +91,7 @@ marked.use(
       const html = highlighted.value;
       return html;
     },
-  })
+  }),
 );
 
 const includeMarkdown = (source) => {
@@ -106,7 +106,7 @@ const renderTemplate = async (template, locale) => {
   const context = {
     locale,
     locales: Object.fromEntries(
-      locales.map((locale) => [locale.language, locale])
+      locales.map((locale) => [locale.language, locale]),
     ),
     defaultLocale: locales.find((locale) => locale.default),
     t,
@@ -166,7 +166,7 @@ const copyAssets = async (outdir, socialAssetDir, logosAssetDir) => {
         return;
       }
       await fs.copyFile(asset, path.join(outdir, file));
-    })
+    }),
   );
 };
 
@@ -179,16 +179,16 @@ const build = async () => {
     locales.map(async (locale) => {
       let index = await renderTemplate("index.html", locale);
       const indexOut = path.normalize(
-        path.join(outdir, locale.pathPrefix, "index.html")
+        path.join(outdir, locale.pathPrefix, "index.html"),
       );
       await fs.writeFile(indexOut, index);
 
       let install = await renderTemplate("install.html", locale);
       const installOut = path.normalize(
-        path.join(outdir, locale.pathPrefix, "install", "index.html")
+        path.join(outdir, locale.pathPrefix, "install", "index.html"),
       );
       await fs.writeFile(installOut, install);
-    })
+    }),
   );
 
   await esbuild.build({

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
     "eta": "^2.2.0",
     "highlight.js": "^11.8.0",
     "marked": "^5.0.4",
-    "marked-highlight": "^2.0.1"
+    "marked-highlight": "^2.0.1",
+    "prettier": "^3.0.0"
   },
   "eslintConfig": {
     "env": {
@@ -49,7 +50,7 @@
     "clean": "rm -rf dist",
     "dev:debug": "npx concurrently \"npm:serve\" \"npm:watch:debug\"",
     "dev:release": "npx concurrently \"npm:serve\" \"npm:watch:release\"",
-    "fmt": "npx prettier --write \"**/*\"",
+    "fmt": "prettier --write \"**/*\"",
     "lint": "npx eslint . --ext .js,.jsx,.mjs,.ts,.tsx",
     "lint:fix": "npx eslint . --ext .js,.jsx,.mjs,.ts,.tsx --fix",
     "release:markdown_link_check": "find . -name '*.md' -and -not -path '*/node_modules/*' | sort | xargs -n1 npx markdown-link-check --config .github/markdown-link-check.json",

diff --git a/src/index.html b/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="<%= it.language %>" dir="ltr">
   <head>
     <meta charset="utf-8" />

diff --git a/src/install.html b/src/install.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" dir="ltr">
   <head>
     <meta charset="utf-8" />

diff --git a/src/partials/nav.html b/src/partials/nav.html
@@ -28,16 +28,34 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav ms-auto">
         <li class="nav-item">
-          <!-- prettier-ignore -->
-          <a class="nav-link <% if (it.page === 'home') { %> active" aria-current="page" <% } else { %> " <% } %> href="<%= it.locale.links.home %>">
+          <% if (it.page === 'home') { %>
+          <a
+            class="nav-link active"
+            aria-current="page"
+            href="<%= it.locale.links.home %>"
+          >
+            <%= it.t.home %>
+          </a>
+          <% } else { %>
+          <a class="nav-link" href="<%= it.locale.links.home %>">
             <%= it.t.home %>
           </a>
+          <% } %>
         </li>
         <li class="nav-item">
-          <!-- prettier-ignore -->
-          <a class="nav-link <% if (it.page === 'install') { %> active" aria-current="page" <% } else { %> " <% } %> href="<%= it.locale.links.install %>">
+          <% if (it.page === 'install') { %>
+          <a
+            class="nav-link active"
+            aria-current="page"
+            href="<%= it.locale.links.install %>"
+          >
+            <%= it.t.install %>
+          </a>
+          <% } else { %>
+          <a class="nav-link" href="<%= it.locale.links.install %>">
             <%= it.t.install %>
           </a>
+          <% } %>
         </li>
         <li class="nav-item">
           <a class="nav-link" href="https://artichoke.run">Playground</a>