Merge pull request #1 from bluebirrrrd/bugfix/colspan-and-deps

Anna Kurylo

2018-10-16 76306226877e46f967f3af26e5e45e89e40c1cd3

 package.json

@@ -1,7 +1,7 @@
{
  "name": "react-datetime",
  "version": "2.11.1",
  "description": "A lightweight but complete datetime picker React.js component.",
  "version": "2.15.0",
  "description": "A lightweight but complete datetime picker React.js component",
  "homepage": "https://github.com/YouCanBookMe/react-datetime",
  "repository": {
    "type": "git",
@@ -20,12 +20,13 @@
    "build:mac": "./node_modules/.bin/gulp",
    "build:win": "./node_modules/.bin/gulp.cmd",
    "dev": "./node_modules/.bin/webpack-dev-server --config example/webpack.config.js --devtool eval --progress --colors --hot --content-base example",
    "lint": "./node_modules/.bin/eslint src/ DateTime.js test/",
    "lint": "./node_modules/.bin/eslint src/ DateTime.js test/ && echo 'Linting OK! 💪'",
    "notify-pre-commit-hook": "echo '### Starting pre-commit hook 🦄'",
    "test": "./node_modules/.bin/jest",
    "test:typings": "./node_modules/.bin/tsc -p ./typings",
    "test:snapshot": "./node_modules/.bin/jest snapshot",
    "test:snapshot:update": "./node_modules/.bin/jest snapshot --updateSnapshot",
    "test:all": "npm run test:typings && npm run test",
    "test:all": "echo 'Running tests...' && npm run test:typings && npm run test && echo 'All tests passed! 🤘'",
    "test:watch": "./node_modules/.bin/jest --watch"
  },
  "keywords": [
@@ -54,7 +55,7 @@
    "enzyme": "^3.0.0",
    "enzyme-adapter-react-15": "^1.0.5",
    "eslint": "^3.1.0",
    "gulp": "^3.9.0",
    "gulp": "^3.9.1",
    "gulp-babel": "^6.1",
    "gulp-insert": "^0.4.0",
    "gulp-plumber": "^1.1.0",
@@ -84,6 +85,7 @@
    "react-onclickoutside": "^6.5.0"
  },
  "pre-commit": [
    "notify-pre-commit-hook",
    "lint",
    "test:all"
  ]