Skip to content

Commit

Permalink
Merge dd8b2b2 into 3ed3344
Browse files Browse the repository at this point in the history
  • Loading branch information
sorrycc committed Jun 11, 2019
2 parents 3ed3344 + dd8b2b2 commit 13aa59f
Show file tree
Hide file tree
Showing 7 changed files with 6,695 additions and 823 deletions.
8 changes: 4 additions & 4 deletions lerna.json
Expand Up @@ -3,10 +3,10 @@
"changelog": {
"repo": "dvajs/dva",
"labels": {
"pr: enhancement": ":rocket: Enhancement",
"pr: bug": ":bug: Bug Fix",
"pr: documentation": ":book: Documentation",
"pr: dependency": ":deciduous_tree: Dependency"
"pr(enhancement)": ":rocket: Enhancement",
"pr(bug)": ":bug: Bug Fix",
"pr(documentation)": ":book: Documentation",
"pr(dependency)": ":deciduous_tree: Dependency"
},
"cacheDir": ".changelog"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,7 +1,7 @@
{
"private": true,
"scripts": {
"build": "umi-lib build",
"build": "father build",
"doc:dev": "./website/node_modules/.bin/vuepress dev ./docs",
"doc:deploy": "rm -rf ./website/yarn.lock && cd ./website && npm run deploy && cd -",
"changelog": "lerna-changelog",
Expand Down Expand Up @@ -33,7 +33,7 @@
"react-dom": "^16.8.4",
"react-testing-library": "^6.0.0",
"shelljs": "^0.8.1",
"umi-library": "^1.0.0",
"father": "^2.6.6",
"umi-test": "^1.5.2"
},
"lint-staged": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 13aa59f

Please sign in to comment.