bump エイヤ

.eslintrc

@@ -2,24 +2,16 @@
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
-    "plugin:import/recommended",
     "next/core-web-vitals",
     "prettier"
   ],
   "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "import"],
+  "plugins": ["@typescript-eslint"],
   "root": true,
   "rules": {
     "@next/next/no-img-element": "off",
     "@typescript-eslint/no-unused-vars": "warn",
     "@typescript-eslint/no-var-requires": "off",
-    "import/order": "warn",
     "react/display-name": "off"
-  },
-  // https://github.com/typescript-eslint/typescript-eslint/issues/154
-  "settings": {
-    "import/resolver": {
-      "typescript": {}
-    }
   }
 }

.github/workflows/gh-pages.yml

@@ -3,17 +3,19 @@ name: GitHub Pages
 on:
   push:
     branches: [master]
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/configure-pages@v3
+      - uses: actions/configure-pages@v4
       - uses: oven-sh/setup-bun@v1
-      - run: bun i
-      - run: bun run build
-      - uses: actions/upload-pages-artifact@v2
+      - run: |
+          bun i
+          bun run build
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: out
 
@@ -22,10 +24,10 @@ jobs:
       id-token: write
       pages: write
     needs: build
-    runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
     steps:
       - id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1,15 +1,12 @@
-node_modules
-*.tsbuildinfo
+/node_modules
 /build
-/out
 
 /.next
-/next-env.d.ts
+/out
 
-# next-pwa
+*.tsbuildinfo
+next-env.d.ts
 
-/public/workbox**
-/public/sw**
-/public/worker**
-/public/fallback**
-/public/precache**
+# PWA
+/public/sw.js
+/public/swe-worker-*.js

.prettierignore

@@ -0,0 +1 @@
+/pnpm-lock.yaml

.prettierrc

@@ -2,5 +2,6 @@
   "printWidth": 120,
   "semi": false,
   "bracketSameLine": true,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"]
 }

next.config.js

@@ -1,13 +1,11 @@
-import withPWAInit from "@ducanh2912/next-pwa"
+import withSerwistInit from "@serwist/next"
 
-const withPWA = withPWAInit({
-  dest: "public",
-  fallbacks: {
-    document: "/~offline",
-  },
+const withSerwist = withSerwistInit({
+  swSrc: "src/sw.ts",
+  swDest: "public/sw.js",
 })
 
-export default withPWA({
+export default withSerwist({
   trailingSlash: true,
   images: {
     unoptimized: true,

package.json

@@ -2,59 +2,62 @@
   "name": "minskey",
   "version": "0.1.0",
   "dependencies": {
-    "@ducanh2912/next-pwa": "9.6.0",
-    "@radix-ui/react-dialog": "1.0.4",
-    "@radix-ui/react-dropdown-menu": "2.0.5",
-    "@radix-ui/react-popover": "1.0.6",
+    "@radix-ui/react-dialog": "1.0.5",
+    "@radix-ui/react-dropdown-menu": "2.0.6",
+    "@radix-ui/react-popover": "1.0.7",
     "@radix-ui/react-radio-group": "1.1.3",
-    "@radix-ui/react-select": "1.2.2",
-    "@radix-ui/react-toast": "1.1.4",
-    "@radix-ui/react-tooltip": "1.0.6",
-    "ahooks": "3.7.8",
-    "clsx": "2.0.0",
-    "jotai": "2.4.2",
-    "lucide-react": "0.279.0",
-    "mfm-js": "0.23.3",
+    "@radix-ui/react-select": "2.0.0",
+    "@radix-ui/react-toast": "1.1.5",
+    "@radix-ui/react-tooltip": "1.0.7",
+    "ahooks": "3.7.10",
+    "clsx": "2.1.0",
+    "jotai": "2.6.4",
+    "lucide-react": "0.323.0",
+    "mfm-js": "0.24.0",
     "misskey-js": "0.0.16",
-    "next": "13.4.19",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "7.46.1",
+    "react-hook-form": "7.50.0",
     "react-textarea-autosize": "8.5.3",
-    "swr": "2.2.2",
+    "swr": "2.2.4",
     "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@types/node": "20.6.2",
-    "@types/react": "18.2.21",
-    "@types/react-dom": "18.2.7",
-    "@types/uuid": "9.0.4",
-    "@typescript-eslint/eslint-plugin": "6.7.0",
-    "@typescript-eslint/parser": "6.7.0",
-    "autoprefixer": "10.4.15",
-    "cssnano": "6.0.1",
-    "cssnano-preset-advanced": "6.0.1",
-    "eslint": "8.49.0",
-    "eslint-config-next": "13.4.19",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-import": "2.28.1",
-    "postcss": "8.4.29",
-    "prettier": "3.0.3",
-    "tailwindcss": "3.3.3",
+    "@serwist/next": "8.4.4",
+    "@serwist/precaching": "8.4.4",
+    "@serwist/sw": "8.4.4",
+    "@types/node": "20.11.16",
+    "@types/react": "18.2.54",
+    "@types/react-dom": "18.2.18",
+    "@types/uuid": "9.0.8",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "autoprefixer": "10.4.17",
+    "cssnano": "6.0.3",
+    "cssnano-preset-advanced": "6.0.3",
+    "eslint": "8.56.0",
+    "eslint-config-next": "14.1.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "next": "14.1.0",
+    "postcss": "8.4.34",
+    "prettier": "3.2.5",
+    "prettier-plugin-organize-imports": "3.2.4",
+    "prettier-plugin-tailwindcss": "0.5.11",
+    "tailwindcss": "3.4.1",
     "tailwindcss-radix": "2.8.0",
-    "typescript": "5.2.2",
-    "webpack": "5.88.2"
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=16.14.0"
+    "node": ">=18.17.0"
   },
-  "packageManager": "pnpm@8.7.5",
+  "packageManager": "pnpm@8.15.1",
   "private": true,
   "scripts": {
     "build": "next build --no-lint",
     "dev": "next dev",
-    "fmt": "prettier -w src",
-    "lint": "next lint"
+    "fmt": "prettier -w .",
+    "lint": "tsc && next lint"
   },
   "type": "module"
 }