Skip to content

Commit

Permalink
Merge pull request #126 from Conflux-Chain/dev
Browse files Browse the repository at this point in the history
feat: several featues
  • Loading branch information
zctocm authored Jan 11, 2021
2 parents 5cc5384 + fc3d0f0 commit 35bd026
Show file tree
Hide file tree
Showing 140 changed files with 29,054 additions and 24,548 deletions.
10 changes: 4 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ jobs:

- restore_cache:
keys:
- v2-dependencies-{{ checksum "package.json" }}
- v2-dependencies-
- v2-dependencies-{{ checksum "yarn.lock" }}

- run: yarn --frozen-lockfile

- save_cache:
paths:
- node_modules
key: v2-dependencies-{{ checksum "package.json" }}
key: v2-dependencies-{{ checksum "yarn.lock" }}

- run: yarn run lint
- run: yarn test -w 1 --coverage
Expand All @@ -49,15 +48,14 @@ jobs:

- restore_cache:
keys:
- v2-dependencies-{{ checksum "package.json" }}
- v2-dependencies-
- v2-dependencies-{{ checksum "yarn.lock" }}

- run: yarn

- save_cache:
paths:
- node_modules
key: v2-dependencies-{{ checksum "package.json" }}
key: v2-dependencies-{{ checksum "yarn.lock" }}

- run: yarn run build
- persist_to_workspace:
Expand Down
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ components/link/* @jnoodle
components/date-picker/* @jnoodle
components/message/* @chain-txz
components/button-group/* @chain-txz
components/skeleton/* @chain-txz
components/notification/* @chain-txz


pages/*/components/input.mdx @yqrashawn
Expand All @@ -37,3 +39,5 @@ pages/*/components/link.mdx @jnoodle
pages/*/components/date-picker.mdx @jnoodle
pages/*/components/message.mdx @chain-txz
pages/*/components/button-group.mdx @chain-txz
pages/*/components/skeleton.mdx @chain-txz
pages/*/components/notification.mdx @chain-txz
2 changes: 1 addition & 1 deletion .jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
verbose: true,

setupFiles: ['./tests/setup.js'],
setupFiles: ['./tests/setup.js', 'jest-date-mock'],

moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
node
lts/erbium
Loading

0 comments on commit 35bd026

Please sign in to comment.