Merge branch 'master' of https://github.com/jdf2e/nutui

Author: lifeifan

build/webpack.base.conf.js

@@ -5,6 +5,7 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const moment = require('moment');
 const isDev = process.env.NODE_ENV === 'development';
 var test = process.env.NODE_ENV === 'test';
+const path = require('path');
 module.exports = {
     stats: {
         entrypoints: false,
@@ -18,6 +19,11 @@ module.exports = {
     },
     module: {
         rules: [
+            test ? {
+                test: /\.(js|ts)/,
+                include: path.resolve('src'), // instrument only testing sources with Istanbul, after ts-loader runs
+                loader: 'istanbul-instrumenter-loader'
+            }: {},
             test ? { test: /\.css$/, loader: 'style!css' } : {},
             test ? { test: /\.scss$/, loader: 'style-loader!css-loader!sass-loader' } : {},
             !test ?{

package.json

@@ -24,7 +24,9 @@
     "build": "npm run build:prod && npm run build:prodmin && npm run build:disp",
     "eslint": "eslint src/packages/**/*.{js,vue}",
     "add": "node scripts/createCptTpl.js",
-    "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/*/__test__/**.spec.js"
+    "test": "cross-env NODE_ENV=test  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/*/__test__/**.spec.js",
+    "cover": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text npm run test",
+    "test:watch": "npm run test --watch"
   },
   "repository": {
     "type": "git",
@@ -47,6 +49,7 @@
     "autoprefixer": "9.1.3",
     "clipboard": "2.0.1",
     "highlight.js": "^9.13.1",
+    "path": "^0.12.7",
     "postcss-loader": "3.0.0",
     "vue": "2.5.17",
     "vue-i18n": "8.1.0",
@@ -63,6 +66,7 @@
     "@babel/preset-env": "7.1.0",
     "@nutui/carefree": "^0.4.0",
     "@tweenjs/tween.js": "17.2.0",
+    "istanbul-instrumenter-loader": "^3.0.1",
     "@vue/test-utils": "1.0.0-beta.25",
     "autoprefixer": "9.1.3",
     "babel-eslint": "8.2.6",