refactor: use pnpm

.github/workflows/build-pr.yml

@@ -14,25 +14,28 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
-      - name: Setup yarn
+          node-version: '20'
+      - name: Setup pnpm
         run: corepack enable
-      - name: Get yarn cache directory
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_ENV
-      - name: Cache yarn dependencies
-        uses: actions/cache@v3
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          path: ${{ env.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-pnpm-store-
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Build
         run: |
-          yarn build
-          yarn pack
+          pnpm build
+          pnpm pack
+          cp adofai-gg-*.tgz package.tgz
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:

.github/workflows/lint.yml

@@ -13,20 +13,21 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
-      - name: Setup yarn
+          node-version: '20'
+      - name: Setup pnpm
         run: corepack enable
-      - name: Get yarn cache directory
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_ENV
-      - name: Cache yarn dependencies
-        uses: actions/cache@v3
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          path: ${{ env.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-pnpm-store-
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Lint
-        run: yarn lint
+        run: pnpm lint

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn commitlint --edit $1
+pnpm commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged
+pnpm lint-staged

.prettierignore

@@ -19,3 +19,5 @@ src/assets
 
 storybook-static
 src/utils/search/parser.ts
+
+pnpm-lock.yaml

.stylelintrc.json

@@ -19,16 +19,10 @@
     "no-empty-source": null,
     "number-max-precision": 2,
     "color-no-hex": true,
-    "block-opening-brace-newline-before": null,
-    "block-closing-brace-newline-before": "always-multi-line",
-    "block-opening-brace-space-before": "always",
     "declaration-block-no-redundant-longhand-properties": true,
     "declaration-block-no-duplicate-custom-properties": true,
     "custom-property-empty-line-before": null,
     "declaration-block-no-duplicate-properties": true,
-    "declaration-colon-newline-after": null,
-    "value-list-comma-newline-after": null,
-    "value-list-comma-newline-before": null,
     "hue-degree-notation": "angle",
     "function-calc-no-unspaced-operator": true,
     "font-family-name-quotes": "always-unless-keyword",
@@ -39,9 +33,6 @@
     "selector-no-vendor-prefix": null,
     "media-feature-name-no-vendor-prefix": null,
     "at-rule-no-vendor-prefix": null,
-    "string-quotes": "single",
-    "indentation": null,
-    "selector-descendant-combinator-no-non-space": null,
     "selector-class-pattern": null,
     "string-no-newline": null,
     "selector-pseudo-class-no-unknown": [

.vscode/settings.json

@@ -15,5 +15,6 @@
   "[svelte]": {
     "editor.defaultFormatter": "svelte.svelte-vscode"
   },
-  "prettier.prettierPath": "./node_modules/prettier"
+  "prettier.prettierPath": "./node_modules/prettier",
+  "stylelint.stylelintPath": "./node_modules/stylelint"
 }

Dockerfile

@@ -4,11 +4,10 @@ RUN mkdir -p /app
 
 WORKDIR /app
 
-COPY package.json .yarnrc.yml yarn.lock ./
+COPY package.json pnpm-lock.yaml ./
+COPY patches ./patches
 
-COPY .yarn .yarn
-
-RUN corepack enable && yarn --frozen-lockfile
+RUN corepack enable && pnpm i --frozen-lockfile
 
 COPY . .
 
@@ -33,14 +32,14 @@ RUN apk add git && \
     PUBLIC_GTM_ID=${GTM_ID} PUBLIC_GA_ID=${GA_ID} SENTRY_ORG=${SENTRY_ORG} PUBLIC_USE_ACCOUNT=${USE_ACCOUNT} \
     PUBLIC_SENTRY_ENV=${SENTRY_ENV} PUBLIC_SENTRY_DSN=${SENTRY_DSN} SENTRY_ORG=${SENTRY_ORG} SENTRY_PROJECT=${SENTRY_PROJECT} \
     SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN} PUBLIC_SENTRY_RELEASE=$(git rev-parse --short HEAD) \
-    SENTRY_URL=${SENTRY_URL} yarn build && \
+    SENTRY_URL=${SENTRY_URL} pnpm build && \
     mv static/~partytown build/client/~partytown
 
 RUN apk add jq
 
 RUN cat package.json | jq 'del(.devDependencies) | del(.resolutions) | del(.scripts)' | tee package.json
 
-RUN yarn pack
+RUN pnpm pack && mv adofai-gg-*.tgz package.tgz
 
 FROM node:18-alpine AS runner
 
@@ -50,10 +49,9 @@ RUN tar xvzf package.tgz && \
     rm package.tgz && \
     mv package app && \
     cd app && \
-    echo "nodeLinker: pnpm" >> .yarnrc.yml && \
     corepack enable && \
-    yarn
+    pnpm i --production
 
 WORKDIR /app
 
-CMD ["yarn", "node", "server.js"]
+CMD ["node", "server.js"]

package.json

@@ -2,14 +2,17 @@
   "name": "adofai-gg",
   "version": "0.0.1",
   "scripts": {
-    "dev": "yarn prebuild && vite dev",
-    "build": "yarn prebuild && vite build",
+    "dev": "pnpm prebuild && vite dev",
+    "build": "pnpm prebuild && vite build",
     "package": "vite package",
     "preview": "vite preview",
-    "test": "yarn build && playwright test",
+    "test": "pnpm build && playwright test",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "prettier --check --plugin-search-dir=. . && eslint --max-warnings=0 .",
+    "lint": "pnpm run \"/lint:.*/\"",
+    "lint:stylelint": "pnpm stylelint --fix \"src/**/*.{svelte,css,scss}\"",
+    "lint:prettier": "prettier --check --plugin-search-dir=. .",
+    "lint:eslint": "eslint --max-warnings=0 .",
     "format": "prettier --write --plugin-search-dir=. .",
     "prebuild": "peggy --plugin ts-pegjs src/utils/search/parser.peggy -o src/utils/search/parser.ts",
     "storybook": "storybook dev -p 6006",
@@ -26,7 +29,7 @@
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-conventional": "^18.4.3",
     "@fluent/bundle": "^0.18.0",
-    "@fontsource/m-plus-rounded-1c": "^5.0.11",
+    "@fontsource/m-plus-rounded-1c": "4.5.10",
     "@fontsource/quicksand": "^5.0.16",
     "@fontsource/roboto-mono": "^5.0.16",
     "@playwright/test": "^1.40.1",
@@ -129,8 +132,10 @@
     "*.{js,ts,jsx,tsx,svelte}": "eslint --cache --fix",
     "*.{js,ts,jsx,tsx,svelte,css,scss,md}": "prettier --ignore-path .gitignore --write"
   },
-  "packageManager": "[email protected]",
-  "resolutions": {
-    "@fontsource/[email protected]": "patch:@fontsource/m-plus-rounded-1c@npm%3A4.5.10#./.yarn/patches/@fontsource-m-plus-rounded-1c-npm-4.5.10-3cae002275.patch"
+  "packageManager": "[email protected]",
+  "pnpm": {
+    "patchedDependencies": {
+      "@fontsource/[email protected]": "patches/@[email protected]"
+    }
   }
 }