Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
lianghx-319 committed Mar 25, 2020
2 parents d817ece + e1447f2 commit f5acd0c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ install:
script:
- yarn test
- yarn generate
- yarn build
# https://stackoverflow.com/questions/37544306/travis-different-script-for-different-branch
- test "$TRAVIS_BRANCH" = "dev" && yarn build && ./lhci.sh || echo skip
- test "$TRAVIS_BRANCH" = "dev" && ./lhci.sh || echo skip
- test "$TRAVIS_BRANCH" = "master" && yarn zip || echo skip
addons:
chrome: stable
Expand Down
2 changes: 1 addition & 1 deletion template/framework-base/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@babel/core": "7.8.3",
"@babel/preset-env": "7.8.3",
"@babel/preset-env": "7.8.7",
"@babel/plugin-proposal-optional-chaining": "7.8.3",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
"@commitlint/cli": "8.2.0",
Expand Down
4 changes: 2 additions & 2 deletions test/snapshots/index.test.js.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Generated by [AVA](https://ava.li).
'@babel/core': '7.8.3',
'@babel/plugin-proposal-nullish-coalescing-operator': '7.8.3',
'@babel/plugin-proposal-optional-chaining': '7.8.3',
'@babel/preset-env': '7.8.3',
'@babel/preset-env': '7.8.7',
'@commitlint/cli': '8.2.0',
'@commitlint/config-conventional': '8.2.0',
'babel-eslint': '8.2.6',
Expand Down Expand Up @@ -294,7 +294,7 @@ Generated by [AVA](https://ava.li).
'@babel/core': '7.8.3',
'@babel/plugin-proposal-nullish-coalescing-operator': '7.8.3',
'@babel/plugin-proposal-optional-chaining': '7.8.3',
'@babel/preset-env': '7.8.3',
'@babel/preset-env': '7.8.7',
'@commitlint/cli': '8.2.0',
'@commitlint/config-conventional': '8.2.0',
'babel-eslint': '8.2.6',
Expand Down
Binary file modified test/snapshots/index.test.js.snap
Binary file not shown.

0 comments on commit f5acd0c

Please sign in to comment.