Merge pull request #77 from syfxlin/develop

refactor(format): Remove prettier

.github/workflows/deploy.yaml

@@ -15,15 +15,15 @@ jobs:
         uses: denoland/setup-deno@v1
       - name: Setup Depker
         run: |
-          deno install -A https://raw.githubusercontent.com/syfxlin/depker/master/depker.ts --root /usr/local --name depker
+          wget -O /usr/local/bin/depker https://github.com/syfxlin/depker/releases/latest/download/depker.linux.amd64
+          chmod +x /usr/local/bin/depker
       - name: Deploy to docker
         run: |
-          echo "$SECRETS_ENV" > .env
+          depker --version
           depker service deploy
         env:
           TZ: Asia/Shanghai
           REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
           REMOTE_CA: ${{ secrets.REMOTE_CA }}
           REMOTE_CERT: ${{ secrets.REMOTE_CERT }}
           REMOTE_KEY: ${{ secrets.REMOTE_KEY }}
-          SECRETS_ENV: ${{ secrets.SECRETS_ENV }}

.gitignore

@@ -251,3 +251,12 @@ next-env.d.ts
 # content
 /public/sw.js*
 /public/workbox-*.js*
+
+### VisualStudioCode template
+.vscode/*
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix

depker.config.ts

@@ -10,6 +10,18 @@ app.service(
     name: "blog",
     domain: "blog.ixk.me",
     tls: true,
+    secrets: {
+      NEXT_PUBLIC_COLINE_LANGUAGE: "@BLOG_COLINE_LANGUAGE",
+      NEXT_PUBLIC_COLINE_GOOGLE_ANALYTICS: "@BLOG_COLINE_GOOGLE_ANALYTICS",
+      NEXT_PUBLIC_COLINE_ARTALK_SITE_NAME: "@BLOG_COLINE_ARTALK_SITE_NAME",
+      NEXT_PUBLIC_COLINE_ARTALK_SERVER_URL: "@BLOG_COLINE_ARTALK_SERVER_URL",
+      NEXT_PUBLIC_COLINE_GITHUB_REPO: "@BLOG_COLINE_GITHUB_REPO",
+      COLINE_GITHUB_TOKEN: "@BLOG_COLINE_GITHUB_TOKEN",
+      KEYSTATIC_SECRET: "@BLOG_KEYSTATIC_SECRET",
+      KEYSTATIC_GITHUB_CLIENT_ID: "@BLOG_KEYSTATIC_GITHUB_CLIENT_ID",
+      KEYSTATIC_GITHUB_CLIENT_SECRET: "@BLOG_KEYSTATIC_GITHUB_CLIENT_SECRET",
+      NEXT_PUBLIC_KEYSTATIC_GITHUB_APP_SLUG: "@BLOG_KEYSTATIC_GITHUB_APP_SLUG",
+    },
   }),
 );
 

eslint.config.js

@@ -0,0 +1,8 @@
+import config from "@syfxlin/eslint-config";
+
+export default config({
+  jsx: true,
+  react: true,
+  typescript: true,
+  formatters: true,
+});

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@syfxlin/blog",
+  "type": "module",
   "version": "0.0.0-semantic-release",
+  "private": true,
   "description": "Otstar's Blog",
   "author": "syfxlin <i@ixk.me>",
-  "private": true,
-  "type": "module",
   "keywords": [
     "blog",
     "next-blog",
@@ -52,35 +52,19 @@
   },
   "devDependencies": {
     "@next/bundle-analyzer": "14.0.4",
+    "@syfxlin/eslint-config": "^1.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/katex": "^0.16.7",
     "@types/next-pwa": "^5.6.9",
     "@types/node": "^20.10.5",
     "@types/react": "^18.2.45",
     "@types/react-dom": "^18.2.18",
     "@types/rss": "^0.0.32",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
     "@vanilla-extract/next-plugin": "^2.3.2",
     "esbuild": "^0.19.10",
     "eslint": "^8.56.0",
-    "eslint-config-next": "14.0.4",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.2",
     "esno": "^4.0.0",
-    "prettier": "^3.1.1",
     "typescript": "^5.3.3",
     "webpack": "^5.89.0"
-  },
-  "pnpm": {
-    "overrides": {
-      "@opentelemetry/api": "1.4.1",
-      "@opentelemetry/core": "1.13.0",
-      "@opentelemetry/exporter-trace-otlp-grpc": "0.39.1",
-      "@opentelemetry/resources": "1.13.0",
-      "@opentelemetry/sdk-trace-base": "1.13.0",
-      "@opentelemetry/sdk-trace-node": "1.13.0",
-      "@opentelemetry/semantic-conventions": "1.13.0"
-    }
   }
 }