diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index da76a2b..d6558d0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "features": { "ghcr.io/devcontainers-contrib/features/poetry:2": {} }, - "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && yarn install", + "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install -E all && poetry run pre-commit install && npm install -g pnpm && pnpm install", "customizations": { "vscode": { "settings": { diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml new file mode 100644 index 0000000..117926f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.yml @@ -0,0 +1,61 @@ +name: 问题报告 +description: 我遇到了问题 + +body: + - type: markdown + id: environment + attributes: + value: | + ## 环境 + + - type: input + id: nonebot_bison_version + attributes: + label: nonebot-bison 版本 + description: 请填写 nonebot-bison 的版本 + + - type: input + id: nonebot_version + attributes: + label: nonebot 版本 + description: 请填写 nonebot 的版本 + + - type: dropdown + id: installation_method + attributes: + label: 安装方式 + description: 请选择安装方式 + options: + - 通过 nb-cli 安装 + - 使用 poetry/pdm 等现代包管理器安装 + - 通过 pip install 安装 + - 克隆或下载项目直接使用 + + - type: input + id: operating_system + attributes: + label: 操作系统 + description: 请填写操作系统 + + - type: textarea + id: issue_description + attributes: + label: 问题 + description: 请在这里描述你遇到的问题 + + - type: textarea + id: logs + attributes: + label: 日志 + description: 请在这里粘贴你的日志 + render: shell + + - type: checkboxes + id: confirmations + attributes: + label: 确认 + options: + - label: 我搜索过了 issue,但是并没有发现过与我类似的问题 + required: true + - label: 我确认在日志中去掉了敏感信息 + required: true diff --git a/.github/ISSUE_TEMPLATE/问题报告.md b/.github/ISSUE_TEMPLATE/问题报告.md deleted file mode 100644 index 6112f9f..0000000 --- a/.github/ISSUE_TEMPLATE/问题报告.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: 问题报告 -about: 我遇到了问题 -title: "" -labels: "" -assignees: "" ---- - -## 环境 - -- nonebot-bison 版本: -- nonebot 版本: -- 安装方式:(以下方式的一种或者其他方式) - 1. 通过 nb-cli 安装 - 2. 使用 poetry/pdm 等现代包管理器安装 - 3. 通过 pip install 安装 - 4. 克隆或下载项目直接使用 -- 操作系统: - -## 问题 - -请在这里描述你遇到的问题 - -## 日志 - -``` -请在这里粘贴你的日志 -``` - -- [ ] 我搜索过了 issue,但是并没有发现过与我类似的问题 -- [ ] 我确认在日志中去掉了敏感信息 diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml index 5a296a3..0f82548 100644 --- a/.github/actions/build-docs/action.yml +++ b/.github/actions/build-docs/action.yml @@ -10,5 +10,5 @@ runs: - name: Build Frontend shell: bash run: | - yarn install - yarn docs:build + pnpm install + pnpm docs:build diff --git a/.github/actions/build-frontend/action.yml b/.github/actions/build-frontend/action.yml index aa39679..a3117b6 100644 --- a/.github/actions/build-frontend/action.yml +++ b/.github/actions/build-frontend/action.yml @@ -11,5 +11,5 @@ runs: shell: bash working-directory: ./admin-frontend run: | - yarn install - yarn build + pnpm install + pnpm build diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index 83c3f27..7c96332 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -8,11 +8,16 @@ runs: with: node-version: "20" - - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + - name: Set Up Pnpm + uses: pnpm/action-setup@v4 + with: + version: 9 + + - id: pnpm-cache-dir-path + run: echo "::set-output name=dir::$(pnpm store path)" shell: bash - uses: actions/cache@v4 with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + path: ${{ steps.pnpm-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f4f58..dd4a759 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 最近更新 + +### 文档 + +- 📝 小刻食堂剪彩文档 [@phidiaLam](https://github.com/phidiaLam) ([#636](https://github.com/MountainDash/nonebot-bison/pull/636)) + ## v0.9.4 ### Bug 修复 diff --git a/docker/Dockerfile b/docker/Dockerfile index 0b5d4b3..4147e6f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,8 @@ FROM node:20.17.0 as frontend ADD . /app WORKDIR /app/admin-frontend -RUN yarn && yarn build +RUN npm install -g pnpm +RUN pnpm install && pnpm build FROM python:3.11 RUN python3 -m pip install poetry && poetry config virtualenvs.create false diff --git a/docs/README.md b/docs/README.md index 3fcf340..fc13553 100644 --- a/docs/README.md +++ b/docs/README.md @@ -70,7 +70,7 @@ highlights: details: 一个由玩家创造的幻想世界 link: https://adsrff.web.sdo.com/web1/ - - title: 小刻食堂 (即将支持) + - title: 小刻食堂 details: 实时获取鹰角发的动态 link: https://www.ceobecanteen.top