From a22e859212742d697f20d7d3bb1d0cb1d56ff671 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 21:35:34 -0700 Subject: [PATCH 1/9] Updated babel and babel register --- package.json | 7 +++++-- test/.babelrc | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/.babelrc diff --git a/package.json b/package.json index e129f40..3f7e503 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "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", + "test": "./node_modules/.bin/mocha --recursive --require @babel/register --require ./test/suppress-fallback-warning.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", @@ -37,7 +37,10 @@ "moment": ">=1.6.0" }, "devDependencies": { - "babel": "^5.6.23", + "@babel/core": "^7.5.5", + "@babel/preset-env": "^7.5.5", + "@babel/preset-react": "^7.0.0", + "@babel/register": "^7.5.5", "babel-eslint": "^4.1.6", "chai": "^2.3.0", "coveralls": "^2.11.6", diff --git a/test/.babelrc b/test/.babelrc new file mode 100644 index 0000000..52cb403 --- /dev/null +++ b/test/.babelrc @@ -0,0 +1,6 @@ +{ + "presets": [ + "@babel/preset-env", + "@babel/preset-react" + ] +} From 989db87dd9ba23c4853443dedc1db08eeddb4028 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 21:41:54 -0700 Subject: [PATCH 2/9] Replaced `istanbul` with `nyc` --- .gitignore | 1 + package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 02ce724..3d72555 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules coverage .coveralls.yml +.nyc_output package-lock.json diff --git a/package.json b/package.json index 3f7e503..9912538 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "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", @@ -46,8 +46,8 @@ "coveralls": "^2.11.6", "enzyme": "^2.9.1", "eslint": "^0.24.0", - "istanbul": "^0.3.13", "mocha": "^3.4.2", + "nyc": "^14.1.1", "react": "^15.6.1", "react-dom": "^15.6.1", "react-test-renderer": "^15.6.1", From 91f4b051988128060e56bc165318a84ff5e67312 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 21:46:06 -0700 Subject: [PATCH 3/9] Updated `chai` and `mocha` --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9912538..088c324 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,11 @@ "@babel/preset-react": "^7.0.0", "@babel/register": "^7.5.5", "babel-eslint": "^4.1.6", - "chai": "^2.3.0", + "chai": "^4.2.0", "coveralls": "^2.11.6", "enzyme": "^2.9.1", "eslint": "^0.24.0", - "mocha": "^3.4.2", + "mocha": "^6.2.0", "nyc": "^14.1.1", "react": "^15.6.1", "react-dom": "^15.6.1", From e43af7566b48c81f009235200a854bd988e1384b Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 21:51:30 -0700 Subject: [PATCH 4/9] Updated `sinon` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 088c324..345dcf1 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,6 @@ "react": "^15.6.1", "react-dom": "^15.6.1", "react-test-renderer": "^15.6.1", - "sinon": "^2.3.6" + "sinon": "^7.4.1" } } From 6ee27aa4c98e30bd44c6efff1512e2ffac2167f4 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 21:57:05 -0700 Subject: [PATCH 5/9] Updated `coveralls` --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 345dcf1..7cfab86 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "scripts": { "clean": "rm -Rf ./coverage", - "coveralls": "cat ./coverage/lcov.info | coveralls", + "coveralls": "nyc report --reporter=text-lcov | coveralls", "test": "./node_modules/.bin/mocha --recursive --require @babel/register --require ./test/suppress-fallback-warning.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", @@ -43,7 +43,7 @@ "@babel/register": "^7.5.5", "babel-eslint": "^4.1.6", "chai": "^4.2.0", - "coveralls": "^2.11.6", + "coveralls": "^3.0.6", "enzyme": "^2.9.1", "eslint": "^0.24.0", "mocha": "^6.2.0", From 55e75ae3a547162e47f1622bdfa96e45e3c80e12 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 22:15:09 -0700 Subject: [PATCH 6/9] Updated `react`-* and `enzyme` --- package.json | 11 ++++++----- test/require-enzyme-adapter.js | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 test/require-enzyme-adapter.js diff --git a/package.json b/package.json index 7cfab86..f9203ce 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "scripts": { "clean": "rm -Rf ./coverage", "coveralls": "nyc report --reporter=text-lcov | coveralls", - "test": "./node_modules/.bin/mocha --recursive --require @babel/register --require ./test/suppress-fallback-warning.js", + "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", @@ -44,13 +44,14 @@ "babel-eslint": "^4.1.6", "chai": "^4.2.0", "coveralls": "^3.0.6", - "enzyme": "^2.9.1", + "enzyme": "^3.10.0", + "enzyme-adapter-react-16": "^1.14.0", "eslint": "^0.24.0", "mocha": "^6.2.0", "nyc": "^14.1.1", - "react": "^15.6.1", - "react-dom": "^15.6.1", - "react-test-renderer": "^15.6.1", + "react": "^16.9.0", + "react-dom": "^16.9.0", + "react-test-renderer": "^16.9.0", "sinon": "^7.4.1" } } diff --git a/test/require-enzyme-adapter.js b/test/require-enzyme-adapter.js new file mode 100644 index 0000000..315a05c --- /dev/null +++ b/test/require-enzyme-adapter.js @@ -0,0 +1,4 @@ +import Adapter from 'enzyme-adapter-react-16'; +import { configure } from 'enzyme'; + +configure({adapter: new Adapter()}); From ca8d9a1069f0854eb3c8a4620aa395dcbd7e93e8 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 22:29:55 -0700 Subject: [PATCH 7/9] Updated linting --- .eslintrc | 26 ++------------------------ package.json | 5 +++-- test/require-enzyme-adapter.js | 4 +++- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/.eslintrc b/.eslintrc index 1c4b8f7..5230427 100644 --- 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/package.json b/package.json index f9203ce..affb8a7 100644 --- a/package.json +++ b/package.json @@ -41,12 +41,13 @@ "@babel/preset-env": "^7.5.5", "@babel/preset-react": "^7.0.0", "@babel/register": "^7.5.5", - "babel-eslint": "^4.1.6", + "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": "^0.24.0", + "eslint": "^6.1.0", "mocha": "^6.2.0", "nyc": "^14.1.1", "react": "^16.9.0", diff --git a/test/require-enzyme-adapter.js b/test/require-enzyme-adapter.js index 315a05c..72d118a 100644 --- a/test/require-enzyme-adapter.js +++ b/test/require-enzyme-adapter.js @@ -1,4 +1,6 @@ import Adapter from 'enzyme-adapter-react-16'; import { configure } from 'enzyme'; -configure({adapter: new Adapter()}); +configure({ + adapter: new Adapter(), +}); From 9dec0a605a6e6bc5fdbce285e373244db6bf4587 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 22:32:51 -0700 Subject: [PATCH 8/9] Removed `clean` script as it's not really needed with the `istanbul` removal --- .gitignore | 11 +++++------ package.json | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3d72555..3bc9cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ -node_modules -coverage -.coveralls.yml -.nyc_output - -package-lock.json +node_modules +.coveralls.yml +.nyc_output + +package-lock.json diff --git a/package.json b/package.json index affb8a7..eb451e1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "url": "git@github.com:CalebMorris/react-moment-proptypes.git" }, "scripts": { - "clean": "rm -Rf ./coverage", "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", From a7344be0f744fccb22e9d24ce5df6da03cecea10 Mon Sep 17 00:00:00 2001 From: Caleb Morris Date: Wed, 14 Aug 2019 22:46:36 -0700 Subject: [PATCH 9/9] Updated engine requirements. Now must be Node 8.x or above 8.x is LTS until 01/20 --- .travis.yml | 28 +++++++++++++--------------- package.json | 3 +++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29ff124..548db1d 100644 --- 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 index eb451e1..0d427a9 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,9 @@ "email": "caleb.morris.g@gmail.com" }, "license": "MIT", + "engine": { + "node": ">= 8.0" + }, "dependencies": { "moment": ">=1.6.0" },