Update GH actions and lint/format

tyom · Oct 3, 2023 · 1258af6 · 1258af6
1 parent be05aeb
commit 1258af6
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 22 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,16 +12,21 @@ jobs:
     name: build and test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint source
-        run: yarn lint
+        run: pnpm lint
 
       - name: Build app and generate PDF
-        run: yarn predeploy
+        run: pnpm predeploy
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -9,18 +9,26 @@ jobs:
     name: build and deploys
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
+
+      - name: Lint source
+        run: pnpm lint
 
-      - name: Build app and Storybook and prepare for deployment
-        run: yarn predeploy
+      - name: Build app and generate PDF
+        run: pnpm predeploy
         env:
-          GA_TRACKING_ID: UA-332655-6
+          PUBLIC_GA_MEASUREMENT_ID: G-T41297TYQ1
 
       - name: Deploy to GH Pages
         uses: peaceiris/actions-gh-pages@v3

diff --git a/.prettierignore b/.prettierignore
@@ -4,3 +4,4 @@ build/**
 node_modules/**
 dist/
 storybook-static/
+pnpm-lock.yaml
diff --git a/README.md b/README.md
@@ -64,8 +64,8 @@ The static site is deployed to GH Pages. To deploy manually (this also runs pred
 
 ## Environment variables
 
-| Variable                 | Description                              |
-|:-------------------------|:-----------------------------------------|
-| GIT_USER_EMAIL           | Git user email for pushing to GH pages   |
-| GIT_USER_NAME            | Git user name for pushing to GH pages    |
-| PUBLIC_GA_MEASUREMENT_ID | Google Analytics measuremet ID           |
+| Variable                 | Description                            |
+| :----------------------- | :------------------------------------- |
+| GIT_USER_EMAIL           | Git user email for pushing to GH pages |
+| GIT_USER_NAME            | Git user name for pushing to GH pages  |
+| PUBLIC_GA_MEASUREMENT_ID | Google Analytics measuremet ID         |
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "build": "vite build",
     "start": "vite preview",
     "create-pdf": "node scripts/create-pdf.cjs",
-    "predeploy": "rm -rf build && yarn create-pdf && yarn build && yarn build-storybook && cp -a storybook-static/. build/storybook && echo tyom.semonov.com > build/CNAME",
+    "predeploy": "rm -rf build && pnpm create-pdf && pnpm build && pnpm build-storybook && cp -a storybook-static/. build/storybook && echo tyom.semonov.com > build/CNAME",
     "deploy": "gh-pages -d build --dotfiles",
     "lint": "eslint --ignore-path .gitignore . && prettier --check .",
     "format": "prettier --write .",

diff --git a/src/app.html b/src/app.html
@@ -9,8 +9,7 @@
       href="https://fonts.googleapis.com/css?family=Roboto:400,700"
       rel="stylesheet"
     />
-    %sveltekit.head%
-    %unocss-svelte-scoped.global%
+    %sveltekit.head% %unocss-svelte-scoped.global%
   </head>
   <body>
     <div id="container">%sveltekit.body%</div>

diff --git a/src/components/ExperienceItem.svelte b/src/components/ExperienceItem.svelte
@@ -58,6 +58,7 @@
   </header>
   {#if description}
     <div class="description">
+      <!-- eslint-disable-next-line svelte/no-at-html-tags -->
       {@html description}
     </div>
   {/if}

diff --git a/src/components/Summary.svelte b/src/components/Summary.svelte
@@ -28,6 +28,7 @@
   <h1 class="font-bold tracking-wide leading-none text-[2.9em]">{name}</h1>
   <h2 class="leading-none opacity-60 text-[1.4em]">{title}</h2>
   <div class="max-w-[68ch] leading-snug">
+    <!-- eslint-disable-next-line svelte/no-at-html-tags -->
     {@html details}
   </div>
   <section class="divided">
@@ -93,6 +94,7 @@
               <div class="space-y-1">
                 <dt class="sr-only">{type}</dt>
                 <dd>
+                  <!-- eslint-disable-next-line svelte/no-at-html-tags -->
                   {@html details}
                 </dd>
               </div>

diff --git a/svelte.config.js b/svelte.config.js
@@ -11,7 +11,9 @@ export default {
     }),
   ],
   kit: {
-    adapter: staticAdapter(),
+    adapter: staticAdapter({
+      fallback: 'index.html',
+    }),
     alias: {
       $data: 'data',
       $src: 'src',