[pull] master from diygod:master

.devcontainer/devcontainer.json

@@ -1,8 +1,8 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/devcontainers/images/blob/v0.2.24/src/javascript-node/.devcontainer/devcontainer.json
+// https://github.com/devcontainers/images/blob/v0.3.24/src/javascript-node/.devcontainer/devcontainer.json
 {
     "name": "Node.js",
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:22-bookworm",
 
     // Configure tool-specific properties.
     "customizations": {
@@ -16,8 +16,9 @@
                 "EditorConfig.EditorConfig",
                 "esbenp.prettier-vscode",
                 "deepscan.vscode-deepscan",
-                "rangav.vscode-thunder-client",
                 "SonarSource.sonarlint-vscode",
+                "unifiedjs.vscode-mdx",
+                "VASubasRaj.flashpost", // Thunder Client is paywalled in WSL/Codespaces/SSH > 2.30.0
                 "ZihanLi.at-helper"
             ]
         }
@@ -37,12 +38,12 @@
         }
     },
 
-    "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",
 
     // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "pnpm i && pnpm i -C website && pnpm rb",
+    "postCreateCommand": "pnpm i && pnpm rb",
 
     // Disable auto start dev env since codespaces sometimes fails to attach to the terminal
     // "postAttachCommand": {

.dockerignore

@@ -8,9 +8,7 @@ Dockerfile*
 LICENSE
 Procfile
 app-minimal
-assets
 coverage
-docs
 node_modules
 test
 
@@ -27,21 +25,21 @@ test
 .(yarn|npm|nvm)rc
 *.md
 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

.github/ISSUE_TEMPLATE/bug_report_en.yml

@@ -6,7 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure you have read [documentation](https://docs.rsshub.app/en), and provide all the information required by this template, otherwise the issue will be closed immediately.
+        Please ensure you have read [documentation](https://docs.rsshub.app/), and provide all the information required by this template, otherwise the issue will be closed immediately.
         Due to the anti-crawling policy implemented by certain websites, some RSS routes provided by the demo will return status code 403. This is not an issue caused by RSSHub and please do not report it.
 
   - type: textarea

.github/ISSUE_TEMPLATE/feature_request_en.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure the feature requested is not listed in [documentation](https://docs.rsshub.app/en) or [issue](https://github.com/DIYgod/RSSHub/issues), and is not a [new RSS proposal](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_en.yml), and provide all the information required by this template.
+        Please ensure the feature requested is not listed in [documentation](https://docs.rsshub.app/) or [issue](https://github.com/DIYgod/RSSHub/issues), and is not a [new RSS proposal](https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+proposal&template=rss_request_en.yml), and provide all the information required by this template.
         Otherwise the issue will be closed immediately.
 
   - type: textarea

.github/ISSUE_TEMPLATE/rss_request_en.yml

@@ -1,4 +1,4 @@
-name: 🍰 RSS Proposal
+name: 🧡 RSS Proposal
 description: Submit a new RSS proposal
 labels: ['RSS proposal']
 
@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please ensure the RSS proposal is not listed in [documentation](https://docs.rsshub.app/en) or [issue](https://github.com/DIYgod/RSSHub/issues), website doesn't provide this kind of RSS feed, and provide all the information required by this template.
+        Please ensure the RSS proposal is not listed in [documentation](https://docs.rsshub.app/) or [issue](https://github.com/DIYgod/RSSHub/issues), website doesn't provide this kind of RSS feed, and provide all the information required by this template.
         Otherwise the issue will be closed immediately.
 
         We are flooded with feature requests and short-handed, please try to make it yourself, the [guide](https://docs.rsshub.app/joinus) is a good place to start. Submit a pull request when done!

.github/ISSUE_TEMPLATE/rss_request_zh.yml

@@ -1,4 +1,4 @@
-name: 🍰 RSS 提案
+name: 🧡 RSS 提案
 description: 提交新的 RSS 提案
 labels: ['RSS proposal']
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!-- 
-Reference: https://docs.rsshub.app/joinus/new-rss/submit-route
-如有疑问，请参考 https://docs.rsshub.app/zh/joinus/new-rss/submit-route
+If you have any difficulties in filling out this form, please refer to https://docs.rsshub.app/joinus/new-rss/submit-route
+如果你在填写此表单时遇到任何困难，请参考 https://docs.rsshub.app/zh/joinus/new-rss/submit-route
 -->
 
 ## Involved Issue / 该 PR 相关 Issue
@@ -15,7 +15,7 @@ Fail to comply will result in your pull request being closed automatically.
 请在 `routes` 区域填写以 / 开头的完整路由地址，否则你的 PR 将会被无条件关闭。
 如果路由包含在文档中列出可以完全穷举的参数（例如分类），请依次全部列出。
 
-```route
+```routes
 /some/route
 /some/other/route
 /dont/use/this/or/modify/it
@@ -32,14 +32,9 @@ If your changes are not related to route, please fill in `routes` section with `
 ## New RSS Route Checklist / 新 RSS 路由检查表
 
 - [ ] New Route / 新的路由
-  - [ ] Follows [v2 Script Standard](https://docs.rsshub.app/joinus/advanced/script-standard) / 跟随 [v2 路由规范](https://docs.rsshub.app/zh/joinus/advanced/script-standard)
-- [ ] Documentation / 文档说明
-  - [ ] EN / 英文文档
-  - [ ] CN / 中文文档
-- [ ] Full text / 全文获取
-  - [ ] Use cache / 使用缓存
-- [ ] Anti-bot or rate limit / 反爬/频率限制 
-  - [ ] If yes, do your code reflect this sign? / 如果有, 是否有对应的措施? 
+  - [ ] Follows [Script Standard](https://docs.rsshub.app/joinus/advanced/script-standard) / 跟随 [路由规范](https://docs.rsshub.app/zh/joinus/advanced/script-standard)
+- [ ] Anti-bot or rate limit / 反爬/频率限制
+  - [ ] If yes, do your code reflect this sign? / 如果有, 是否有对应的措施?
 - [ ] [Date and time](https://docs.rsshub.app/joinus/advanced/pub-date) / [日期和时间](https://docs.rsshub.app/zh/joinus/advanced/pub-date)
   - [ ] Parsed / 可以解析
   - [ ] Correct time zone / 时区正确

.github/dependabot.yml

@@ -4,73 +4,19 @@ updates:
     directory: '/'
     schedule:
       interval: daily
-      time: '21:00'
-    open-pull-requests-limit: 10
+      time: '08:00'
+    open-pull-requests-limit: 100
     labels:
       - dependencies
     ignore:
-    # ESM only packages
-      - dependency-name: fanfou-sdk
-        versions: ['>=5.0.0']
-      - dependency-name: got
-        versions: ['>=12.0.0']
-      - dependency-name: ip-regex
-        versions: ['>=5.0.0']
-      - dependency-name: query-string
-        versions: ['>=8.0.0']
-      - dependency-name: rand-user-agent
-        versions: ['>=2.0.1']
-      - dependency-name: remark
-        versions: ['>=14.0.0']
-      - dependency-name: remark-frontmatter
-        versions: ['>=4.0.0']
-      - dependency-name: remark-gfm
-        versions: ['>=2.0.0']
-      - dependency-name: remark-parse
-        versions: ['>=10.0.0']
-      - dependency-name: remark-preset-prettier
-        versions: ['>=1.0.0']
-      - dependency-name: remark-stringify
-        versions: ['>=10.0.0']
-      - dependency-name: string-width
-        versions: ['>=5.0.0']
-      - dependency-name: unified
-        versions: ['>=10.0.0']
-
-  - package-ecosystem: npm
-    directory: '/website'
-    schedule:
-      interval: daily
-      time: '21:00'
-    open-pull-requests-limit: 10
-    labels:
-      - dependencies
-    ignore:
-    # ESM only packages
-      - dependency-name: remark
-        versions: ['>=14.0.0']
-      - dependency-name: remark-frontmatter
-        versions: ['>=4.0.0']
-      - dependency-name: remark-gfm
-        versions: ['>=2.0.0']
-      - dependency-name: remark-parse
-        versions: ['>=10.0.0']
-      - dependency-name: remark-preset-prettier
-        versions: ['>=1.0.0']
-      - dependency-name: remark-stringify
-        versions: ['>=10.0.0']
-      - dependency-name: string-width
-        versions: ['>=5.0.0']
-    groups:
-      docs:
-        patterns:
-          - '@docusaurus/*'
+      - dependency-name: jsrsasign
+        versions: ['>=11.0.0'] # no longer includes KJUR.crypto.Cipher for RSA
 
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
       interval: daily
-      time: '21:00'
-    open-pull-requests-limit: 10
+      time: '08:00'
+    open-pull-requests-limit: 100
     labels:
       - dependencies

.github/labeler.yml

@@ -1,15 +1,17 @@
-'Route: v1':
-- lib/router.js
-- any: ['lib/routes/**/*.js', '!lib/routes/index.js']
+'Route: deprecated':
+- changed-files:
+  - any-glob-to-any-file: ['lib/router.js']
+  - all-globs-to-any-file: ['lib/routes-deprecated/**/*.js', '!lib/routes-deprecated/index.js']
 
-'Route: v2':
-- 'lib/v2/**/*.js'
+'Route':
+- changed-files:
+  - any-glob-to-any-file: ['lib/routes/**/*.ts']
 
 core enhancement:
-- lib/routes/index.js
-- any: ['lib/**', '!lib/radar-rules.js', '!lib/router.js', '!lib/routes/**', '!lib/v2/**']
+- changed-files:
+  - any-glob-to-any-file: ['lib/routes/index.ts']
+  - all-globs-to-any-file: ['lib/**', '!lib/config.ts', '!lib/router.js', '!lib/routes/**', '!lib/routes-deprecated/**']
 
 dependencies:
-- package.json
-- pnpm-lock.yaml
-- yarn.lock
+- changed-files:
+  - any-glob-to-any-file: ['package.json', 'pnpm-lock.yaml', 'yarn.lock']