Skip to content

Commit

Permalink
feat: merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
edison-hm committed Feb 17, 2025
2 parents e7993a2 + e327663 commit 0ae9f18
Show file tree
Hide file tree
Showing 1,137 changed files with 99,806 additions and 58,910 deletions.
12 changes: 12 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
module.exports = {
extends: ['za/react', 'prettier'],
parserOptions: {
babelOptions: {
plugins: ['@babel/plugin-proposal-class-properties'],
},
},
env: {
jest: true,
},
overrides: [
{
rules: {
'react-hooks/exhaustive-deps': 0,
'react/sort-comp': 0,
'react/destructuring-assignment': 0,
'import/prefer-default-export': 0,
'@typescript-eslint/consistent-type-assertions': 0,
},
files: ['*.ts', '*.tsx'],
extends: ['za/typescript-react', 'prettier'],
},
Expand Down
19 changes: 0 additions & 19 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,6 @@ Then, you can runs Zarm Design website locally.
```bash
# develop for h5
$ yarn dev

If you want runs Zarm Design demo for react-native, Then
# develop for react-native
$ cd rnkit && yarn install && cd ios && pod install && cd ../..

# develop for iOS
$ yarn dev:ios

# develop for Android
$ yarn dev:android
```

## Lint
Expand Down Expand Up @@ -53,9 +43,6 @@ $ yarn test
# Test specified h5
$ yarn test:h5

# Test specified react-native
$ yarn test:rn

# Generate coverage
$ yarn test:h5 --coverage
```
Expand All @@ -75,10 +62,4 @@ $ yarn build:lib

# Build for umd
$ yarn build:umd

# Build react-native of iOS
$ yarn build:ios

# Build react-native of Android
$ yarn build:android
```
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ What needs to be done to address this issue? Ideally, provide a pull request wit
### Environment

- zarm version
- react/react-native version
- react version
- system version
- browser version

Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/cr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Code Review

permissions:
contents: read
pull-requests: write

on:
pull_request:
types: [opened, reopened, synchronize]

jobs:
test:
if: ${{ contains(github.event.*.labels.*.name, 'gpt review') }} # Optional; to run only when a label is attached
runs-on: ubuntu-latest
steps:
- uses: anc95/ChatGPT-CodeReview@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
# Optional
LANGUAGE: Chinese
MODEL:
top_p: 1
temperature: 1
28 changes: 14 additions & 14 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@master
- name: checkout
uses: actions/checkout@master

- name: install
run: yarn
- name: install
run: yarn

- name: build
run: yarn deploy:build
- name: build
run: yarn deploy:build

- name: deploy
uses: peaceiris/actions-gh-pages@v2
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
PUBLISH_DIR: ./packages/site/assets
with:
emptyCommits: false
- name: deploy
uses: peaceiris/actions-gh-pages@v2
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
PUBLISH_DIR: ./packages/site/assets
with:
emptyCommits: false
8 changes: 3 additions & 5 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Sync mirror to Gitee
on:
on:
delete:
push:
branches:
Expand All @@ -16,7 +16,5 @@ jobs:
- name: mirror to gitee
uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url:
[email protected]:zarm/zarm.git
ssh_private_key:
${{ secrets.GITEE_SSH_KEY }}
target_repo_url: [email protected]:zarm/zarm.git
ssh_private_key: ${{ secrets.GITEE_SSH_KEY }}
38 changes: 38 additions & 0 deletions .github/workflows/preview-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Preview Build

on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
build-preview:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: build
run: |
yarn
lerna exec --scope @zarm-design/cli -- yarn build
NODE_OPTIONS='--max-old-space-size=4096' lerna exec --scope site -- yarn build
- name: upload assets artifact
uses: actions/upload-artifact@v4
with:
name: assets
path: packages/site/assets/
retention-days: 5

- name: Save PR number
if: ${{ always() }}
run: echo ${{ github.event.number }} > ./pr-id.txt

- name: Upload PR number
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: pr
path: ./pr-id.txt
82 changes: 82 additions & 0 deletions .github/workflows/preview-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Preview Deploy

on:
workflow_run:
workflows: ['Preview Build']
types: [completed]

jobs:
success:
runs-on: ubuntu-latest
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
steps:
- name: download pr artifact
uses: dawidd6/action-download-artifact@v6
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
name: pr

- name: save PR id
id: pr
run: echo "::set-output name=id::$(<pr-id.txt)"

- name: download assets artifact
uses: dawidd6/action-download-artifact@v6
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
workflow_conclusion: success
name: assets

- name: upload surge service
id: deploy
run: |
export DEPLOY_DOMAIN=https://zarm-preview-pr-${{ steps.pr.outputs.id }}.surge.sh
npx surge --project ./ --domain $DEPLOY_DOMAIN --token ${{ secrets.SURGE_TOKEN }}
- name: update status comment
uses: actions-cool/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
🎊 PR Preview has been successfully built and deployed to https://zarm-preview-pr-${{ steps.pr.outputs.id }}.surge.sh
<img width="300" src="https://user-images.githubusercontent.com/507615/90250366-88233900-de6e-11ea-95a5-84f0762ffd39.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}

- name: The job failed
if: ${{ failure() }}
uses: actions-cool/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
😭 Deploy PR Preview failed.
<img width="300" src="https://user-images.githubusercontent.com/507615/90250824-4e066700-de6f-11ea-8230-600ecc3d6a6b.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}

failed:
runs-on: ubuntu-latest
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure'
steps:
- name: download pr artifact
uses: dawidd6/action-download-artifact@v6
with:
workflow: ${{ github.event.workflow_run.workflow_id }}
name: pr

- name: save PR id
id: pr
run: echo "::set-output name=id::$(<pr-id.txt)"

- name: The job failed
uses: actions-cool/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
😭 Deploy PR Preview failed.
<img width="300" src="https://user-images.githubusercontent.com/507615/90250824-4e066700-de6f-11ea-8230-600ecc3d6a6b.png">
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
number: ${{ steps.pr.outputs.id }}
17 changes: 17 additions & 0 deletions .github/workflows/preview-start.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Preview Start

on: pull_request_target

jobs:
preview:
runs-on: ubuntu-latest
steps:
- name: create
uses: actions-cool/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
⚡️ Deploying PR Preview...
<img src="https://user-images.githubusercontent.com/507615/90240294-8d2abd00-de5b-11ea-8140-4840a0b2d571.gif" width="300" />
<!-- Sticky Pull Request Comment -->
body-include: '<!-- Sticky Pull Request Comment -->'
Loading

0 comments on commit 0ae9f18

Please sign in to comment.