Merge branch 'release/1.2.4'

Author: dwightjack

.eslintrc.js

@@ -1,23 +1,20 @@
 module.exports = {
   root: true,
   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'vue',
+  extends: ['plugin:vue-libs/recommended'],
   // required to lint *.vue files
-  env: {
-    'browser': true,
-  },
-  plugins: [
-    'html'
-  ],
+  // env: {
+  //   'browser': true,
+  // },
   // add your custom rules here
   'rules': {
     // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'comma-dangle': 0,
-    'no-unused-vars': 1,
-    'camelcase': 0,
-    'space-before-function-paren': 0,
+    // 'arrow-parens': 0,
+    // // allow debugger during development
+    // 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    // 'comma-dangle': 0,
+    // 'no-unused-vars': 1,
+    // 'camelcase': 0,
+    // 'space-before-function-paren': 0,
   }
 }

README.md

@@ -76,6 +76,12 @@ add the following script tags before your code
 <script src="https://unpkg.com/vue-types"></script>
 ```
 
+## Usage with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue)
+
+When used in a project with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue), the linter might report errors related to the `vue/require-default-prop` rule.
+
+To prevent that error use [eslint-plugin-vue-types](https://github.com/dwightjack/eslint-plugin-vue-types)
+
 ## Documentation
 
 ### Native Types

dist/index.js

@@ -82,8 +82,8 @@ var VueTypes = {
     }
 
     return (0, _utils.toType)(validatorFn.name || '<<anonymous function>>', {
-      validator: function validator() {
-        var valid = validatorFn.apply(undefined, arguments);
+      validator: function validator(value) {
+        var valid = validatorFn(value);
         if (!valid) (0, _utils.warn)(this._vueTypes_name + ' - ' + warnMsg);
         return valid;
       }

es/index.js

@@ -73,8 +73,8 @@ var VueTypes = {
     }
 
     return toType(validatorFn.name || '<<anonymous function>>', {
-      validator: function validator() {
-        var valid = validatorFn.apply(undefined, arguments);
+      validator: function validator(value) {
+        var valid = validatorFn(value);
         if (!valid) warn(this._vueTypes_name + ' - ' + warnMsg);
         return valid;
       }

karma.conf.js

@@ -42,7 +42,7 @@ const baseConfig = {
   // list of files / patterns to load in the browser
   files: [
     { pattern: 'src/*.js', included: false },
-    'test/**/*.spec.js'
+    'test/**/*.test.js'
   ],
 
   // list of files to exclude
@@ -54,7 +54,7 @@ const baseConfig = {
   preprocessors: {
     // add webpack as preprocessor
     'src/**/*.js': ['rollup'],
-    'test/**/*.spec.js': ['rollup']
+    'test/**/*.test.js': ['rollup']
   },
 
   rollupPreprocessor: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-types",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Prop types utility for Vue",
   "author": "Marco Solazzi",
   "license": "MIT",
@@ -9,22 +9,26 @@
   "unpkg": "umd/vue-types.min.js",
   "jsnext:main": "es/index.js",
   "module": "es/index.js",
+  "typings": "types/index.d.ts",
   "files": [
     "dist",
     "es",
     "src",
-    "umd"
+    "umd",
+    "types/*.d.ts"
   ],
   "scripts": {
     "prepublishOnly": "npm run build",
-    "build": "npm run lint && npm test && npm run build:cjs && npm run build:es && npm run build:umd",
+    "build": "npm run lint && npm run test:types && npm test && npm run build:cjs && npm run build:es && npm run build:umd",
     "build:cjs": "rimraf dist && cross-env BABEL_ENV=cjs babel ./src -d dist",
     "build:es": "rimraf es && cross-env BABEL_ENV=es babel ./src -d es",
     "build:umd": "rimraf umd && cross-env BABEL_ENV=rollup rollup -c rollup.config.js",
     "test": "cross-env BABEL_ENV=rollup karma start karma.conf.js --single-run --browsers PhantomJS",
     "test:all": "cross-env BABEL_ENV=rollup karma start karma.conf.js --single-run --browsers Chrome,Firefox",
     "test:saucelab": "cross-env BABEL_ENV=rollup karma start karma-sauce.conf.js --single-run",
+    "test:types": "tsc -p ./types/test/tsconfig.json",
     "lint": "eslint src/*.js test/*.js",
+    "lint:types": "dtslint types",
     "start": "node ./server/index.js"
   },
   "keywords": [
@@ -40,16 +44,17 @@
     "vue": "*"
   },
   "devDependencies": {
+    "@types/lodash.isplainobject": "4.0.3",
+    "@types/node": "10.1.4",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
     "babel-plugin-add-module-exports": "0.2.1",
     "babel-plugin-external-helpers": "6.22.0",
     "babel-preset-env": "1.7.0",
-    "cross-env": "5.1.5",
+    "cross-env": "5.1.6",
+    "dtslint": "0.3.0",
     "eslint": "4.19.1",
-    "eslint-config-vue": "2.0.2",
-    "eslint-plugin-html": "4.0.3",
-    "eslint-plugin-vue": "4.5.0",
+    "eslint-plugin-vue-libs": "3.0.0",
     "expect": "1.20.2",
     "express": "4.16.3",
     "karma": "2.0.2",
@@ -63,9 +68,9 @@
     "karma-rollup-preprocessor": "6.0.0",
     "karma-safari-launcher": "1.0.0",
     "karma-sauce-launcher": "1.2.0",
-    "mocha": "5.1.1",
+    "mocha": "5.2.0",
     "rimraf": "2.6.2",
-    "rollup": "0.58.2",
+    "rollup": "0.59.4",
     "rollup-plugin-babel": "3.0.4",
     "rollup-plugin-commonjs": "9.1.3",
     "rollup-plugin-filesize": "1.5.0",
@@ -74,9 +79,12 @@
     "rollup-plugin-node-resolve": "3.3.0",
     "rollup-plugin-replace": "2.0.0",
     "rollup-plugin-stub": "1.2.0",
-    "rollup-plugin-uglify": "3.0.0",
+    "rollup-plugin-uglify": "4.0.0",
     "serve-index": "1.9.1",
-    "vue": "2.5.16"
+    "tslint": "5.10.0",
+    "typescript": "2.8.3",
+    "vue": "~2.5.0",
+    "vue-class-component": "~6.2.0"
   },
   "dependencies": {
     "lodash.isplainobject": "4.0.6"

rollup.config.js

@@ -1,7 +1,7 @@
 import commonjs from 'rollup-plugin-commonjs'
 import resolve from 'rollup-plugin-node-resolve'
 import babel from 'rollup-plugin-babel'
-import uglify from 'rollup-plugin-uglify'
+import { uglify } from 'rollup-plugin-uglify'
 import replace from 'rollup-plugin-replace'
 import filesize from 'rollup-plugin-filesize'
 

src/index.js

@@ -3,81 +3,81 @@ import { noop, toType, getType, isFunction, validateType, isInteger, isArray, wa
 
 const VueTypes = {
 
-  get any() {
+  get any () {
     return toType('any', {
       type: null
     })
   },
 
-  get func() {
+  get func () {
     return toType('function', {
       type: Function
     }).def(currentDefaults.func)
   },
 
-  get bool() {
+  get bool () {
     return toType('boolean', {
       type: Boolean
     }).def(currentDefaults.bool)
   },
 
-  get string() {
+  get string () {
     return toType('string', {
       type: String
     }).def(currentDefaults.string)
   },
 
-  get number() {
+  get number () {
     return toType('number', {
       type: Number
     }).def(currentDefaults.number)
   },
 
-  get array() {
+  get array () {
     return toType('array', {
       type: Array
     }).def(currentDefaults.array)
   },
 
-  get object() {
+  get object () {
     return toType('object', {
       type: Object
     }).def(currentDefaults.object)
   },
 
-  get integer() {
+  get integer () {
     return toType('integer', {
       type: Number,
-      validator(value) {
+      validator (value) {
         return isInteger(value)
       }
     }).def(currentDefaults.integer)
   },
 
-  get symbol() {
+  get symbol () {
     return toType('symbol', {
       type: null,
-      validator(value) {
+      validator (value) {
         return typeof value === 'symbol'
       }
     })
   },
 
-  custom(validatorFn, warnMsg = 'custom validation failed') {
+  custom (validatorFn, warnMsg = 'custom validation failed') {
     if (typeof validatorFn !== 'function') {
       throw new TypeError('[VueTypes error]: You must provide a function as argument')
     }
 
     return toType(validatorFn.name || '<<anonymous function>>', {
-      validator(...args) {
-        const valid = validatorFn(...args)
+      validator (value) {
+        const valid = validatorFn(value)
         if (!valid) warn(`${this._vueTypes_name} - ${warnMsg}`)
         return valid
       }
     })
   },
 
-  oneOf(arr) {
+  oneOf (arr) {
     if (!isArray(arr)) {
       throw new TypeError('[VueTypes error]: You must provide an array as argument')
     }
@@ -91,21 +91,21 @@ const VueTypes = {
 
     return toType('oneOf', {
       type: allowedTypes.length > 0 ? allowedTypes : null,
-      validator(value) {
+      validator (value) {
         const valid = arr.indexOf(value) !== -1
         if (!valid) warn(msg)
         return valid
       }
     })
   },
 
-  instanceOf(instanceConstructor) {
+  instanceOf (instanceConstructor) {
     return toType('instanceOf', {
       type: instanceConstructor
     })
   },
 
-  oneOfType(arr) {
+  oneOfType (arr) {
     if (!isArray(arr)) {
       throw new TypeError('[VueTypes error]: You must provide an array as argument')
     }
@@ -144,7 +144,7 @@ const VueTypes = {
       return getType(type)
     }).reduce((ret, type) => ret.concat(isArray(type) ? type : [type]), []).join('", "')
 
-    return this.custom(function oneOfType(value) {
+    return this.custom(function oneOfType (value) {
       const valid = arr.some((type) => {
         if (type._vueTypes_name === 'oneOf') {
           return type.type ? validateType(type.type, value, true) : true
@@ -156,35 +156,35 @@ const VueTypes = {
     })
   },
 
-  arrayOf(type) {
+  arrayOf (type) {
     return toType('arrayOf', {
       type: Array,
-      validator(values) {
+      validator (values) {
         const valid = values.every((value) => validateType(type, value))
         if (!valid) warn(`arrayOf - value must be an array of "${getType(type)}"`)
         return valid
       }
     })
   },
 
-  objectOf(type) {
+  objectOf (type) {
     return toType('objectOf', {
       type: Object,
-      validator(obj) {
+      validator (obj) {
         const valid = Object.keys(obj).every((key) => validateType(type, obj[key]))
         if (!valid) warn(`objectOf - value must be an object of "${getType(type)}"`)
         return valid
       }
     })
   },
 
-  shape(obj) {
+  shape (obj) {
     const keys = Object.keys(obj)
     const requiredKeys = keys.filter((key) => obj[key] && obj[key].required === true)
 
     const type = toType('shape', {
       type: Object,
-      validator(value) {
+      validator (value) {
         if (!isPlainObject(value)) {
           return false
         }
@@ -215,7 +215,7 @@ const VueTypes = {
     })
 
     Object.defineProperty(type, 'loose', {
-      get() {
+      get () {
         this._vueTypes_isLoose = true
         return this
       },
@@ -241,7 +241,7 @@ let currentDefaults = typeDefaults()
 
 Object.defineProperty(VueTypes, 'sensibleDefaults', {
   enumerable: false,
-  set(value) {
+  set (value) {
     if (value === false) {
       currentDefaults = {}
     } else if (value === true) {
@@ -250,13 +250,13 @@ Object.defineProperty(VueTypes, 'sensibleDefaults', {
       currentDefaults = value
     }
   },
-  get() {
+  get () {
     return currentDefaults
   }
 })
 
 VueTypes.utils = {
-  validate(value, type) {
+  validate (value, type) {
     return validateType(type, value, true)
   },
   toType