Merge pull request #47 from CalebMorris/master_/package-vulnerabilities

Update package dev dependencies completing #28
CalebMorris · Aug 15, 2019 · 5d9bb9a · 5d9bb9a
2 parents 6a0da84 + a7344be
commit 5d9bb9a
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 60 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -2,25 +2,6 @@
   "env": {
     "node": true
   },
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "forOf": true,
-    "generators": true,
-    "modules": true,
-    "objectLiteralComputedProperties": true,
-    "objectLiteralDuplicateProperties": false,
-    "objectLiteralShorthandMethods": true,
-    "objectLiteralShorthandProperties": true,
-    "superInFunctions": true,
-    "templateStrings": true,
-    "unicodeCodePointEscapes": true,
-    "globalReturn": false,
-    "jsx": true
-  },
   "rules": {
     "comma-dangle": [ 1, "always-multiline" ],
     "no-cond-assign" : [ 2 ],
@@ -44,7 +25,6 @@
     "no-negated-in-lhs": [ 2 ],
     "no-obj-calls": [ 2 ],
     "no-regex-spaces": [ 2 ],
-    "no-reserved-keys": [ 2 ],
     "no-sparse-arrays": [ 2 ],
     "no-unreachable": [ 2 ],
     "use-isnan": [ 2 ],
@@ -67,7 +47,6 @@
     "no-caller": [ 2 ],
     "no-div-regex": [ 2 ],
     "no-else-return": [ 2 ],
-    "no-empty-label": [ 2 ],
     "no-eq-null": [ 2 ],
     "no-eval": [ 2 ],
     "no-extend-native": [ 2 ],
@@ -139,8 +118,9 @@
     "consistent-this": [ 2, "self" ],
     "eol-last": [ 2 ],
     "func-style": [ 2, "declaration" ],
-    "indent": [ 2, 2, { "indentSwitchCase" : true } ],
+    "indent": [ "error", 2 ],
     "key-spacing": [ 0, { "beforeColon": true, "afterColon": true }],
+	"keyword-spacing": [ "error", { "after": true, "before": true } ],
     "linebreak-style": [ 2 ],
     "lines-around-comment": [ 0 ],
     "max-nested-callbacks": [ 2, 3 ],
@@ -169,12 +149,10 @@
     "quotes": [ 2, "single", "avoid-escape" ],
     "semi": [ 2, "always" ],
     "semi-spacing": [ 2, {"before": false, "after": true}],
-    "space-after-keywords": [ 2, "always" ],
     "space-before-blocks": [ 2, "always" ],
     "space-before-function-paren": [ 2, "never" ],
     "space-in-parens": [ 2, "never" ],
     "space-infix-ops": [ 2 ],
-    "space-return-throw-case": [ 2 ],
     "spaced-comment": [ 2 ],
     "wrap-regex": [ 2 ],
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-node_modules
-coverage
-.coveralls.yml
-
-package-lock.json
+node_modules
+.coveralls.yml
+.nyc_output
+
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,13 @@
-language: node_js
-node_js:
-    - "4"
-    - "6"
-    - "7"
-    - "8"
-    - "9"
-    - "node"
-script:
-    - npm run lint-quiet
-    - npm test
-    - npm run coverage
-    - npm run coveralls
-    - npm run test-1.6
-    - npm run test-1.7
+language: node_js
+node_js:
+    - "8"
+    - "10"
+    - "12"
+    - "node"
+script:
+    - npm run lint-quiet
+    - npm test
+    - npm run coverage
+    - npm run coveralls
+    - npm run test-1.6
+    - npm run test-1.7
diff --git a/package.json b/package.json
@@ -14,40 +14,47 @@
     "url": "git@github.com:CalebMorris/react-moment-proptypes.git"
   },
   "scripts": {
-    "clean": "rm -Rf ./coverage",
-    "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "test": "./node_modules/.bin/mocha --recursive --compilers js:babel/register --require ./test/suppress-fallback-warning.js",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "test": "./node_modules/.bin/mocha --recursive --require @babel/register --require ./test/suppress-fallback-warning.js --require ./test/require-enzyme-adapter.js",
     "test-all": "npm run test-1.6 && npm run test-1.7 && npm run test-latest",
     "test-1.6": "rm -Rf ./node_modules/moment/ && npm i moment@1.6.0 && npm test",
     "test-1.7": "rm -Rf ./node_modules/moment/ && npm i moment@1.7.0 && npm test",
     "test-latest": "rm -Rf ./node_modules/moment/ && npm i moment@latest && npm test",
     "lint": "./node_modules/.bin/eslint --ext .js . --ignore-path .gitignore",
     "lint-quiet": "./node_modules/.bin/eslint --ext .js --quiet . --ignore-path .gitignore",
-    "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter dot --recursive --compilers js:babel/register --require ./test/suppress-fallback-warning.js"
+    "coverage": "./node_modules/.bin/nyc npm run test"
   },
   "author": {
     "name": "Caleb Morris",
     "email": "caleb.morris.g@gmail.com"
   },
   "license": "MIT",
+  "engine": {
+    "node": ">= 8.0"
+  },
   "dependencies": {
     "moment": ">=1.6.0"
   },
   "peerDependencies": {
     "moment": ">=1.6.0"
   },
   "devDependencies": {
-    "babel": "^5.6.23",
-    "babel-eslint": "^4.1.6",
-    "chai": "^2.3.0",
-    "coveralls": "^2.11.6",
-    "enzyme": "^2.9.1",
-    "eslint": "^0.24.0",
-    "istanbul": "^0.3.13",
-    "mocha": "^3.4.2",
-    "react": "^15.6.1",
-    "react-dom": "^15.6.1",
-    "react-test-renderer": "^15.6.1",
-    "sinon": "^2.3.6"
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/register": "^7.5.5",
+    "acorn": "^7.0.0",
+    "babel-eslint": "^10.0.2",
+    "chai": "^4.2.0",
+    "coveralls": "^3.0.6",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.14.0",
+    "eslint": "^6.1.0",
+    "mocha": "^6.2.0",
+    "nyc": "^14.1.1",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
+    "react-test-renderer": "^16.9.0",
+    "sinon": "^7.4.1"
   }
 }
diff --git a/test/.babelrc b/test/.babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+	"@babel/preset-env",
+	"@babel/preset-react"
+  ]
+}
diff --git a/test/require-enzyme-adapter.js b/test/require-enzyme-adapter.js
@@ -0,0 +1,6 @@
+import Adapter from 'enzyme-adapter-react-16';
+import { configure } from 'enzyme';
+
+configure({
+  adapter: new Adapter(),
+});