Skip to content

Commit

Permalink
Merge pull request #887 from Conflux-Chain/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
AngeliaQ authored Jan 11, 2023
2 parents c5fce9f + f8f485a commit e8dd1fe
Show file tree
Hide file tree
Showing 44 changed files with 2,310 additions and 3,044 deletions.
7 changes: 1 addition & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 11 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
"@cfxjs/react-ui": "2.0.0-alpha.15",
"@cfxjs/use-wallet": "0.0.18",
"@conflux-dev/conflux-address-js": "1.3.16",
"@ensdomains/eth-ens-namehash": "2.0.15",
"@google/model-viewer": "2.1.1",
"@testing-library/jest-dom": "5.1.1",
"@testing-library/react": "10.0.1",
"@types/fontfaceobserver": "0.0.6",
Expand Down Expand Up @@ -63,7 +65,7 @@
"react-json-pretty": "2.2.0",
"react-json-view": "1.19.1",
"react-router-dom": "5.1.2",
"react-scripts": "3.4.3",
"react-scripts": "3.4.1",
"react-test-renderer": "16.13.0",
"react-use": "15.3.4",
"recoil": "0.0.10",
Expand All @@ -78,7 +80,8 @@
"swr": "0.3.2",
"ts-node": "8.8.2",
"typescript": "4.5.4",
"webfontloader": "1.6.28"
"webfontloader": "1.6.28",
"zustand": "4.1.4"
},
"scripts": {
"start": "react-app-rewired start",
Expand All @@ -99,19 +102,11 @@
"generate": "cross-env TS_NODE_PROJECT='./internals/ts-node.tsconfig.json' plop --plopfile internals/generators/plopfile.ts",
"prettify": "prettier --write"
},
"browserslist": {
"production": [
">1%",
"not IE 11",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"engines": {
"npm": "^6.14.15",
"node": "^14.17.0"
Expand Down Expand Up @@ -180,6 +175,6 @@
"resolutions": {
"@types/react": "16.9.25",
"@types/react-dom": "16.9.3",
"lodash": "4.17.20"
"lodash": "4.17.21"
}
}
Loading

0 comments on commit e8dd1fe

Please sign in to comment.