Skip to content

Commit

Permalink
Merge branch 'jdf2e:next' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan-CW-Code authored Apr 3, 2024
2 parents 5a8e74d + 31a894a commit 74c2df8
Show file tree
Hide file tree
Showing 1,938 changed files with 56,311 additions and 95,413 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:@typescript-eslint/recommended',
'plugin:markdown/recommended',
'plugin:markdown/recommended-legacy',
'plugin:prettier/recommended',
],
parser: '@typescript-eslint/parser',
Expand Down Expand Up @@ -62,6 +62,7 @@ module.exports = {
},
],
radix: 0,
'no-alert': 0,
'unused-imports/no-unused-imports': 2,
'no-underscore-dangle': 0,
'no-useless-constructor': 0,
Expand Down
5 changes: 4 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"extends": [
"config:base", "schedule:weekly", "group:allNonMajor"
],
"rangeStrategy": "bump",
"labels": ["dependencies"],
"ignorePaths": [
"src/**",
Expand All @@ -16,6 +17,8 @@
],
"ignoreDeps": [
"node",
"typescript"
"typescript",
"eslint-config-taro",
"babel-preset-taro"
]
}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Upload coverage reports to Codecov
if: ${{ always() }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/issue-close.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Close Issue

on:
schedule:
- cron: "0 2 * * 1"
workflow_dispatch: # Allow for running this manually.

jobs:
issue-to-be-closed:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- name: close-issues
uses: actions-cool/issues-helper@v3
with:
actions: 'close-issues'
token: ${{ secrets.GITHUB_TOKEN }}
labels: 'to be closed'
inactive-day: 7
close-reason: 'completed'
34 changes: 34 additions & 0 deletions .github/workflows/realease-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Create Release Tag

on:
push:
tags:
- 'v*'

jobs:
release-tag:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install pnpm
run: corepack enable

- uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install

- name: Generate Changlog
run: pnpm changelog

- name: Create Release Tag
id: release_tag
uses: ncipollo/release-action@v1
with:
bodyFile: '.github/changelog.md'
6 changes: 4 additions & 2 deletions .github/workflows/sync-gitee.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
name: Sync to Gitee

on:
push:
branches: [next]
workflow_dispatch:
schedule:
- cron: '0 1 * * *'

jobs:
deploy-site-sync-gitee:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- name: Sync to Gitee
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-h5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ on:

jobs:
copy:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm i fs-extra --force
- run: node scripts/copy-docs-h5-or-taro.js
- name : Sync
uses : JamesIves/github-pages-deploy-action@4.1.7
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
folder : site_docs #操作应该部署的文件夹 。
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ on:

jobs:
copy:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm i fs-extra --force
- run: node scripts/copy-migrate-from-v1.js
- name : Sync
uses : JamesIves/github-pages-deploy-action@4.1.7
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
folder : site_docs_migrate #操作应该部署的文件夹 。
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-taro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ on:

jobs:
copy:
if: github.repository == 'jdf2e/nutui-react'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: npm i fs-extra --force
- run: node scripts/copy-docs-h5-or-taro.js taro
- name : Sync
uses : JamesIves/github-pages-deploy-action@4.1.7
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
folder : site_docs #操作应该部署的文件夹 。
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ pnpm-debug.log*
*.ntvs*
*.njsproj
*.sln
*.sw?
*.sw?

# vitest
/html
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

node ./scripts/verifymail.js
npx lint-staged
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
registry=https://registry.npmmirror.com/
registry=https://registry.npmjs.org/
engine-strict=true
strict-peer-dependencies=false
Loading

0 comments on commit 74c2df8

Please sign in to comment.