Skip to content

Commit

Permalink
Merge pull request #7 from BuidlerDAO/main
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
aboutmydreams authored Feb 8, 2024
2 parents 165ec3b + 2fd8656 commit ba826f7
Show file tree
Hide file tree
Showing 42 changed files with 4,418 additions and 221 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Build
run: yarn build
run: pnpm build

lint:
runs-on: ubuntu-latest
Expand All @@ -32,13 +32,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Lint
run: yarn ci:test:lint
run: pnpm ci:test:lint

typecheck:
runs-on: ubuntu-latest
Expand All @@ -47,13 +47,13 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'yarn'
cache: 'pnpm'

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Test types
run: yarn ci:test:types
run: pnpm ci:test:types

unit:
runs-on: ${{ matrix.os }}
Expand All @@ -71,10 +71,10 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
registry-url: https://registry.npmjs.org/
cache: yarn
cache: pnpm

- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
run: rm -rf node_modules && pnpm install --frozen-lockfile

- name: Unit test
run: yarn ci:test:unit
run: pnpm ci:test:unit
Binary file added dist.zip
Binary file not shown.
20 changes: 16 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,41 @@
"format:eslint": "run-s \" lint:eslint --fix \"",
"format:prettier": "run-s \" lint:prettier --write \"",
"format:stylelint": "run-s \" lint:stylelint --fix \"",
"lint": "run-p lint:*",
"lint:eslint": "eslint . --ext .js,.ts,.tsx --max-warnings 0 --ignore-path .gitignore",
"lint": "npm-run-all -p lint:*",
"lint:eslint": "eslint . --ext .js,.ts,.tsx --max-warnings 0 --ignore-path .gitignore --fix",
"lint:prettier": "prettier \"**/*.(md|json|yml)\" --ignore-path .gitignore --check",
"lint:stylelint": "stylelint \"**/*.css\" --ignore-path .gitignore",
"lint:stylelint": "stylelint \"**/*.css\" --ignore-path .gitignore --fix",
"test": "jest",
"test:types": "tsc --noEmit",
"prepare": "simple-git-hooks"
},
"dependencies": {
"@ant-design/cssinjs": "1.18.4",
"@eduardoac-skimlinks/webext-redux": "3.0.1-release-candidate",
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@material-ui/core": "4.12.4",
"@material-ui/icons": "4.11.3",
"@mui/base": "5.0.0-beta.33",
"@mui/icons-material": "5.15.5",
"@mui/lab": "5.0.0-alpha.162",
"@mui/material": "5.15.5",
"@mui/system": "5.15.6",
"@reduxjs/toolkit": "1.8.4",
"@types/mockjs": "1.0.10",
"@types/redux-thunk": "2.1.0",
"ahooks": "3.7.9",
"clsx": "2.1.0",
"install": "0.13.0",
"mockjs": "1.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-redux": "7.2.8",
"redux-persist-webextension-storage": "1.0.2",
"redux-thunk": "2.4.2",
"reduxjs-toolkit-persist": "7.2.1",
"webextension-polyfill": "0.9.0"
"webextension-polyfill": "0.9.0",
"zustand": "4.5.0"
},
"devDependencies": {
"@commitlint/cli": "17.0.3",
Expand Down
Loading

0 comments on commit ba826f7

Please sign in to comment.