Skip to content

Commit

Permalink
chore: merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
luckyadam committed Jan 7, 2020
1 parent 1620d9d commit 4897266
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion packages/taro-cli/src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default class Builder {
})
break
default:
console.log(chalk.red('输入类型错误,目前只支持 weapp/swan/alipay/tt/h5/quickapp/rn 七端类型'))
console.log(chalk.red('输入类型错误,目前只支持 weapp/swan/alipay/tt/qq/h5/quickapp/rn 八端类型'))
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/taro-mini-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tarojs/mini-runner",
"version": "1.3.14",
"version": "1.3.17",
"description": "Mini app runner for taro",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,8 +32,8 @@
},
"homepage": "https://github.com/NervJS/taro#readme",
"dependencies": {
"@tarojs/taro": "1.3.14",
"@tarojs/transformer-wx": "1.3.14",
"@tarojs/taro": "1.3.17",
"@tarojs/transformer-wx": "1.3.17",
"babel-core": "^6.26.3",
"babel-generator": "^6.26.1",
"babel-loader": "^8.0.6",
Expand Down

0 comments on commit 4897266

Please sign in to comment.