Docs: 添加 nonemoji 并更新开发指南

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/codespaces-linux/.devcontainer/base.Dockerfile
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/codespaces-linux/.devcontainer/base.Dockerfile
 
-FROM mcr.microsoft.com/vscode/devcontainers/universal:linux
+FROM mcr.microsoft.com/vscode/devcontainers/universal:2-focal
 
 # ** [Optional] Uncomment this section to install additional packages. **
 # USER root
@@ -13,8 +13,3 @@ USER codespace
 # [Required] Poetry
 RUN curl -sSL https://install.python-poetry.org | python - -y
 RUN poetry config virtualenvs.in-project true
-
-# [Required] Gitmoji CLI
-# Deprecated: Maybe removed once nonemoji is done
-RUN yarn global add gitmoji-cli
-ENV PATH="$PATH:/home/codespace/.yarn/bin"

.devcontainer/devcontainer.json

@@ -1,60 +1,87 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/codespaces-linux
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/codespaces-linux
 {
-  "name": "NoneBot",
+  "name": "GitHub Codespaces (Default)",
+
   "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".."
+    "dockerfile": "Dockerfile"
   },
-  "settings": {
-    "go.toolsManagement.checkForUpdates": "local",
-    "go.useLanguageServer": true,
-    "go.gopath": "/go",
-    "python.defaultInterpreterPath": "/opt/python/latest/bin/python",
-    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-    "python.analysis.diagnosticMode": "workspace",
-    "python.analysis.typeCheckingMode": "basic",
-    "[python]":{
-      "editor.defaultFormatter": "ms-python.black-formatter",
-      "editor.codeActionsOnSave": {
-        "source.organizeImports": true
-      }
-    },
-    "[javascript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[html]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[javascriptreact]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[typescriptreact]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "lldb.executable": "/usr/bin/lldb",
-    "files.exclude": {
-      "**/__pycache__": true
-    },
-    "files.watcherExclude": {
-      "**/target/**": true,
-      "**/__pycache__": true
+
+  // Configure tool-specific properties.
+  "customizations": {
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "go.toolsManagement.checkForUpdates": "local",
+        "go.useLanguageServer": true,
+        "go.gopath": "/go",
+        "python.defaultInterpreterPath": "/opt/python/latest/bin/python",
+        "python.linting.enabled": true,
+        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+        "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+        "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+        "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+        "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+        "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
+        "python.analysis.diagnosticMode": "workspace",
+        "python.analysis.typeCheckingMode": "basic",
+        "[python]": {
+          "editor.defaultFormatter": "ms-python.black-formatter",
+          "editor.codeActionsOnSave": {
+            "source.organizeImports": true
+          }
+        },
+        "[javascript]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[html]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[typescript]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[javascriptreact]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[typescriptreact]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "lldb.executable": "/usr/bin/lldb",
+        "files.exclude": {
+          "**/__pycache__": true
+        },
+        "files.watcherExclude": {
+          "**/target/**": true,
+          "**/__pycache__": true
+        }
+      },
+
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
+        "GitHub.vscode-pull-request-github",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "ms-python.isort",
+        "ms-python.black-formatter",
+        "EditorConfig.EditorConfig",
+        "esbenp.prettier-vscode",
+        "bradlc.vscode-tailwindcss"
+      ]
     }
   },
+
   "remoteUser": "codespace",
+
   "overrideCommand": false,
-  "mounts": ["source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"],
+
+  "mounts": [
+    "source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"
+  ],
+
   "runArgs": [
     "--cap-add=SYS_PTRACE",
     "--security-opt",
@@ -63,21 +90,9 @@
     "--init"
   ],
 
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "GitHub.vscode-pull-request-github",
-    "ms-python.python",
-    "ms-python.vscode-pylance",
-    "ms-python.isort",
-    "ms-python.black-formatter",
-    "EditorConfig.EditorConfig",
-    "esbenp.prettier-vscode",
-    "bradlc.vscode-tailwindcss"
-  ],
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
 
   // "oryx build" will automatically install your dependencies and attempt to build your project
-  "postCreateCommand": "poetry install -E all && poetry run pre-commit install && yarn install"
+  "postCreateCommand": "poetry install && poetry run pre-commit install && yarn install"
 }

.github/workflows/release-drafter.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           changelog_file: website/src/pages/changelog.md
           latest_changes_position: '# 更新日志\n\n'
-          latest_changes_title: '## 最近更新'
+          latest_changes_title: "## 最近更新"
           replace_regex: '(?<=## 最近更新\n)[\s\S]*?(?=\n## )'
           changelog_body: ${{ steps.release-drafter.outputs.body }}
           commit_and_push: false
@@ -49,7 +49,6 @@ jobs:
           git diff-index --quiet HEAD || git commit -m ":memo: Update changelog"
           git push
 
-
   release:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+default_install_hook_types: [pre-commit, prepare-commit-msg]
 ci:
   autofix_commit_msg: ":rotating_light: auto fix by pre-commit hooks"
   autofix_prs: true
@@ -9,14 +10,23 @@ repos:
     rev: 5.10.1
     hooks:
       - id: isort
+        stages: [commit]
 
   - repo: https://github.com/psf/black
     rev: 22.6.0
     hooks:
       - id: black
+        stages: [commit]
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1
     hooks:
       - id: prettier
-        types_or: [javascript, jsx, ts, tsx, markdown]
+        types_or: [javascript, jsx, ts, tsx, markdown, yaml]
+        stages: [commit]
+
+  - repo: https://github.com/nonebot/nonemoji
+    rev: v0.1.0
+    hooks:
+      - id: nonemoji
+        stages: [prepare-commit-msg]

CONTRIBUTING.md

@@ -29,9 +29,6 @@ NoneBot 使用 [poetry](https://python-poetry.org/) 管理项目依赖，由于
 poetry install
 # 安装 pre-commit git hook
 pre-commit install
-# 安装 gitmoji git hook
-yarn global add gitmoji-cli
-gitmoji -i
 ```
 
 ### 使用 GitHub Codespaces（Dev Container）
@@ -44,6 +41,12 @@ gitmoji -i
 
 NoneBot 的 commit message 格式遵循 [gitmoji](https://gitmoji.dev/) 规范，在创建 commit 时请牢记这一点。
 
+或者使用 [nonemoji](https://github.com/nonebot/nonemoji) 代替 git 进行 commit，nonemoji 已默认作为项目开发依赖安装。
+
+```bash
+nonemoji commit [-e EMOJI] [-m MESSAGE] [-- ...]
+```
+
 ### 工作流概述
 
 `master` 分支为 NoneBot 的开发分支，在任何情况下都请不要直接修改 `master` 分支，而是创建一个目标分支为 `nonebot:master` 的 Pull Request 来提交修改。Pull Request 标题请尽量更改成中文，以便自动生成更新日志。

pyproject.toml

@@ -39,6 +39,7 @@ httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"], optional = true }
 [tool.poetry.dev-dependencies]
 isort = "^5.10.1"
 black = "^22.1.0"
+nonemoji = "^0.1.0"
 pytest-cov = "^3.0.0"
 pre-commit = "^2.16.0"
 pytest-xdist = "^2.5.0"