[pull] master from diygod:master

.devcontainer/devcontainer.json

@@ -1,8 +1,16 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/devcontainers/images/blob/v0.3.24/src/javascript-node/.devcontainer/devcontainer.json
+// https://github.com/devcontainers/images/blob/v0.4.19/src/typescript-node/.devcontainer/devcontainer.json
 {
-    "name": "Node.js",
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:20-bookworm",
+    "name": "Node.js & TypeScript",
+    "image": "mcr.microsoft.com/devcontainers/typescript-node:24-bookworm",
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker": {
+            "version": "latest"
+        },
+        "ghcr.io/devcontainers/features/github-cli": {
+            "version": "latest"
+        }
+    },
 
     // Configure tool-specific properties.
     "customizations": {
@@ -14,51 +22,36 @@
                 "dbaeumer.vscode-eslint",
                 "eamodio.gitlens",
                 "EditorConfig.EditorConfig",
-                "esbenp.prettier-vscode",
-                "deepscan.vscode-deepscan",
-                "rangav.vscode-thunder-client",
+                "prettier.prettier-vscode",
                 "SonarSource.sonarlint-vscode",
-                "unifiedjs.vscode-mdx",
+                "VASubasRaj.flashpost", // Thunder Client is paywalled in WSL/Codespaces/SSH > 2.30.0
                 "ZihanLi.at-helper"
             ]
         }
     },
 
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [1200, 3000],
+    "forwardPorts": [1200],
 
     "portsAttributes": {
         "1200": {
             "label": "app port",
             "onAutoForward": "notify"
-        },
-        "3000": {
-            "label": "docs port",
-            "onAutoForward": "notify"
         }
     },
 
-    "onCreateCommand": "sudo apt-get update && export DEBIAN_FRONTEND=noninteractive && sudo apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libgbm1 libglib2.0-0 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils redis-server && sudo apt-get autoremove -y && sudo apt-get clean -y && sudo rm -rf /var/lib/apt/lists/*",
+    "onCreateCommand": "sudo apt-get update && export DEBIAN_FRONTEND=noninteractive && sudo apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libgbm1 libglib2.0-0 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils redis-server default-jre-headless && sudo apt-get autoremove -y && sudo apt-get clean -y && sudo rm -rf /var/lib/apt/lists/*",
 
-    "updateContentCommand": "pnpm i && pnpm i -C website && pnpm rb",
+    "updateContentCommand": "export JAVA_HOME=/usr/lib/jvm/default-java && pnpm config set store-dir ~/.local/share/pnpm/store && pnpm i && pnpm rb && pnpx rebrowser-puppeteer browsers install chrome",
 
     // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "pnpm i && pnpm i -C website && pnpm rb",
+    "postCreateCommand": "pnpm i && pnpm rb && pnpx rebrowser-puppeteer browsers install chrome",
 
     // Disable auto start dev env since codespaces sometimes fails to attach to the terminal
     // "postAttachCommand": {
     //     "app": "pnpm i",
-    //     // "docs": "pnpm -C website start"
     // },
 
-    // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-    "remoteUser": "node",
-    "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker": {
-            "version": "latest"
-        },
-        "ghcr.io/devcontainers/features/github-cli": {
-            "version": "latest"
-        }
-    }
+    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "node"
 }

.dockerignore

@@ -3,14 +3,11 @@
 .github
 .husky
 .idea
+.idx
 .vscode
-Dockerfile*
-LICENSE
-Procfile
 app-minimal
-assets
 coverage
-docs
+eslint-plugins
 node_modules
 test
 
@@ -21,27 +18,28 @@ test
 .env
 .eslint*
 .gitignore
-.gitpod.yml
 .markdownlint.jsonc
 .prettier*
 .(yarn|npm|nvm)rc
 *.md
+Dockerfile*
+LICENSE
 app.json
+eslint.config.mjs
 docker-compose*
 fly.toml
 jsconfig.json
 npm-debug.log
 process.json
 package-lock.json
+vitest.config.ts
 vercel.json
 
-#git but keep the git commit hash
+# git but keep the git commit hash
 .git/logs
-.git/objects
 .git/index
 .git/info
 .git/hooks
 
-#rsshub auxiliary files
-lib/radar-rules.js
-lib/v2/**/radar.js
+# rsshub auxiliary files
+lib/routes/**/radar.js

.envrc

@@ -0,0 +1 @@
+use flake . --no-pure-eval