Merge branch 'dev'

.babelrc.js

@@ -5,7 +5,7 @@ module.exports = api => {
       [
         '@babel/transform-runtime',
         {
-          regenerator: true,
+          regenerator: true
         }
       ]
     ]

README-zh.md

@@ -13,16 +13,16 @@
 
 ## Table of Contents
 
-* [Introduction](#introduction)
-  * [Use requestAnimationFrame](#use-requestanimationframe)
-  * [支持毫秒级计时](#支持毫秒级计时)
-  * [智能的默认 format](#智能的默认-format)
-* [Links](#links)
-* [Install](#install)
-* [Inspiration](#inspiration)
-* [Contributing](#contributing)
-* [Contributors](#contributors)
-* [License](#license)
+- [Introduction](#introduction)
+  - [Use requestAnimationFrame](#use-requestanimationframe)
+  - [支持毫秒级计时](#支持毫秒级计时)
+  - [智能的默认 format](#智能的默认-format)
+- [Links](#links)
+- [Install](#install)
+- [Inspiration](#inspiration)
+- [Contributing](#contributing)
+- [Contributors](#contributors)
+- [License](#license)
 
 ## Introduction
 
@@ -42,7 +42,7 @@ count-down 内部使用 requestAnimationFrame 计时，无论是浏览器进程
 
 ## Links
 
-* [API文档](https://femessage.github.io/count-down/)
+- [API 文档](https://femessage.github.io/count-down/)
 
 [⬆ Back to Top](#table-of-contents)
 
@@ -58,8 +58,8 @@ yarn add @femessage/count-down
 
 api 设计和实现参考了
 
-* [taro-ui](https://taro-ui.aotu.io/#/docs/countdown)
-* [vant](https://youzan.github.io/vant/#/zh-CN/count-down)
+- [taro-ui](https://taro-ui.aotu.io/#/docs/countdown)
+- [vant](https://youzan.github.io/vant/#/zh-CN/count-down)
 
 [⬆ Back to Top](#table-of-contents)
 

README.md

@@ -15,16 +15,16 @@ A user friendly vue count-down component 😃
 
 ## Table of Contents
 
-* [Introduction](#introduction)
-  * [Use requestAnimationFrame](#use-requestanimationframe)
-  * [Millisecond](#millisecond)
-  * [Smart default format](#smart-default-format)
-* [Links](#links)
-* [Install](#install)
-* [Inspiration](#inspiration)
-* [Contributing](#contributing)
-* [Contributors](#contributors)
-* [License](#license)
+- [Introduction](#introduction)
+  - [Use requestAnimationFrame](#use-requestanimationframe)
+  - [Millisecond](#millisecond)
+  - [Smart default format](#smart-default-format)
+- [Links](#links)
+- [Install](#install)
+- [Inspiration](#inspiration)
+- [Contributing](#contributing)
+- [Contributors](#contributors)
+- [License](#license)
 
 ## Introduction
 
@@ -44,7 +44,7 @@ The default format will adjust by the props which are days, hours, minutes & sec
 
 ## Links
 
-* [docs](https://femessage.github.io/count-down/)
+- [docs](https://femessage.github.io/count-down/)
 
 [⬆ Back to Top](#table-of-contents)
 
@@ -60,8 +60,8 @@ yarn add @femessage/count-down
 
 The api & implementation designs are inspired by
 
-* [taro-ui](https://taro-ui.aotu.io/#/docs/countdown)
-* [vant](https://youzan.github.io/vant/#/zh-CN/count-down)
+- [taro-ui](https://taro-ui.aotu.io/#/docs/countdown)
+- [vant](https://youzan.github.io/vant/#/zh-CN/count-down)
 
 [⬆ Back to Top](#table-of-contents)
 

build/rollup.config.js

@@ -21,6 +21,7 @@ const config = {
     }),
     babel({
       runtimeHelpers: true,
+      extensions: ['.js', '.jsx', '.es6', '.es', '.mjs', '.vue'],
       exclude: 'node_modules/**'
     })
   ]

package.json

@@ -25,7 +25,7 @@
   },
   "scripts": {
     "dev": "vue-styleguidist server",
-    "test": "jest",
+    "test": "jest --verbose",
     "doc": "vue-styleguidist build",
     "build": "npm run build:unpkg & npm run build:es & npm run build:umd & npm run doc",
     "build:umd": "rollup --config build/rollup.config.js --format umd --file dist/count-down.umd.js",
@@ -44,31 +44,51 @@
     "file-loader": "^3.0.1",
     "github-release-notes": "^0.17.0",
     "glob": "^7.1.3",
-    "husky": "^0.14.3",
+    "husky": "1.3.1",
     "jest": "^24.8.0",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
+    "lint-staged": "^8.1.0",
     "minimist": "^1.2.0",
-    "prettier": "1.12.1",
+    "prettier": "1.18.2",
     "pretty-quick": "^1.4.1",
     "rollup": "^1.9.0",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-vue": "^4.7.2",
     "standard-version": "^6.0.1",
-    "stylus": "^0.54.5",
-    "stylus-loader": "^3.0.2",
-    "vue": "^2.5.16",
-    "vue-loader": "^15.7.0",
+    "stylelint": "^9.10.0",
+    "stylelint-config-standard": "^18.2.0",
+    "vue": "^2.6.10",
+    "vue-loader": "^15.7.1",
     "vue-styleguidist": "^3.16.3",
     "vue-template-compiler": "^2.5.16",
     "webpack": "^4.29.6"
   },
   "publishConfig": {
     "access": "public"
   },
-  "vue-sfc-cli": "1.10.6",
+  "vue-sfc-cli": "1.10.7",
   "engines": {
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "post-commit": "git update-index --again"
+    }
+  },
+  "lint-staged": {
+    "*.(js|md|json)": [
+      "prettier --write",
+      "git add"
+    ],
+    "*.vue": [
+      "prettier --write",
+      "stylelint --fix",
+      "git add"
+    ]
   }
 }

src/count-down.vue

@@ -1,6 +1,6 @@
 <template>
   <span>
-    <slot v-bind="countdownData">{{countdownFormated}}</slot>
+    <slot v-bind="countdownData">{{ countdownFormated }}</slot>
   </span>
 </template>
 
@@ -140,6 +140,3 @@ export default {
   }
 }
 </script>
-
-<style>
-</style>

styleguide.config.js

@@ -59,8 +59,8 @@ module.exports = {
           loaders: ['style-loader', 'css-loader']
         },
         {
-          test: /\.styl(us)?$/,
-          loaders: ['vue-style-loader', 'css-loader', 'stylus-loader']
+          test: /\.less$/,
+          loaders: ['vue-style-loader', 'css-loader', 'less-loader']
         },
         {
           test: /\.(woff2?|eot|[ot]tf)(\?.*)?$/,