Merge pull request #511 from maxmind/upgrade-node-modules

wesrice · web-flow · commit a8801ba656bc · 2021-06-21T10:29:42.000-04:00
Upgrade node modules
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [10, 12, 14, 15]
+        version: [12, 14, 16]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0 (XXXX)
+------------------
+
+* **Breaking** Drop Node 10 support
+* Upgrade yarn dependencies
+
 3.4.0 (2021-04-13)
 ------------------
 
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Factors, and Report Transaction web services](https://dev.maxmind.com/minfraud/)
 
 ## Requirements
 
-MaxMind has tested this API with Node.js versions 10 and 12.  We aim to support
+MaxMind has tested this API with Node.js versions 12 and 14.  We aim to support
 active LTS versions of Node.js, as well as the latest stable release.
 
 ## Installation
diff --git a/e2e/js/package.json b/e2e/js/package.json
@@ -4,6 +4,6 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "jest": "^26.6.3"
+    "jest": "^27.0.4"
   }
 }
diff --git a/e2e/js/yarn.lock b/e2e/js/yarn.lock
diff --git a/e2e/ts/package.json b/e2e/ts/package.json
@@ -5,8 +5,8 @@
   "license": "MIT",
   "dependencies": {
     "@types/jest": "^26.0.20",
-    "jest": "^26.6.3",
-    "ts-jest": "^26.5.0",
+    "jest": "^27.0.4",
+    "ts-jest": "^27.0.2",
     "typescript": "^4.0.3"
   }
 }
diff --git a/e2e/ts/yarn.lock b/e2e/ts/yarn.lock
diff --git a/package.json b/package.json
@@ -24,22 +24,21 @@
     "@types/jest": "^26.0.0",
     "@types/lodash.clonedeep": "^4.5.4",
     "@types/node": "^14.0.5",
-    "@types/snakecase-keys": "^2.1.0",
     "@types/validator": "^13.0.0",
     "gh-pages": "^3.0.0",
     "husky": "^6.0.0",
-    "jest": "^26.5.0",
-    "lint-staged": "^10.5.3",
+    "jest": "^27.0.4",
+    "lint-staged": "^11.0.0",
     "lodash.clonedeep": "^4.5.0",
     "nock": "^13.0.2",
     "np": "^7.0.0",
     "pinst": "^2.1.4",
     "prettier": "^2.2.1",
-    "ts-jest": "^26.4.1",
+    "ts-jest": "^27.0.3",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0",
     "tslint-eslint-rules": "^5.4.0",
-    "typedoc": "^0.20.16",
+    "typedoc": "^0.21.0",
     "typescript": "^4.0.3"
   },
   "lint-staged": {
@@ -69,11 +68,11 @@
     "postpublish": "pinst --enable"
   },
   "dependencies": {
-    "@maxmind/geoip2-node": "^2.0.1",
+    "@maxmind/geoip2-node": "^3.0.0",
     "camelcase-keys": "^6.0.1",
     "maxmind": "^4.1.0",
     "punycode": "^2.1.1",
-    "snakecase-keys": "^3.1.0",
+    "snakecase-keys": "^4.0.2",
     "validator": "^13.0.0"
   }
 }
diff --git a/src/request/account.ts b/src/request/account.ts
@@ -1,4 +1,4 @@
-import * as crypto from 'crypto';
+import crypto from 'crypto';
 
 interface AccountProps {
   /**
diff --git a/src/request/email.ts b/src/request/email.ts
@@ -1,5 +1,5 @@
-import * as crypto from 'crypto';
-import * as punycode from 'punycode';
+import crypto from 'crypto';
+import punycode from 'punycode';
 import isEmail from 'validator/lib/isEmail';
 import isFQDN from 'validator/lib/isFQDN';
 import { ArgumentError } from '../errors';
diff --git a/src/request/transaction-report.ts b/src/request/transaction-report.ts
@@ -1,5 +1,5 @@
 import { isIP } from 'net';
-import * as snakecaseKeys from 'snakecase-keys';
+import snakecaseKeys from 'snakecase-keys';
 import { Tag } from '../constants';
 import { ArgumentError } from '../errors';
 
diff --git a/src/request/transaction.ts b/src/request/transaction.ts
@@ -1,4 +1,4 @@
-import * as snakecaseKeys from 'snakecase-keys';
+import snakecaseKeys from 'snakecase-keys';
 import { ArgumentError } from '../errors';
 import Account from './account';
 import Billing from './billing';
@@ -140,7 +140,7 @@ export default class Transaction {
 
   private checkRegularProps(props: TransactionProps) {
     // Excludes array props (customInputs, shoppingCart)
-    const propTypeMap = ({
+    const propTypeMap = {
       account: Account,
       billing: Billing,
       creditCard: CreditCard,
@@ -150,7 +150,7 @@ export default class Transaction {
       order: Order,
       payment: Payment,
       shipping: Shipping,
-    } as unknown) as typeof props;
+    } as unknown as typeof props;
 
     const keys = Object.keys(propTypeMap) as (keyof typeof props)[];
 
diff --git a/src/response/models/insights.ts b/src/response/models/insights.ts
@@ -59,7 +59,7 @@ export default class Insights extends Score {
     prop: keyof webRecords.InsightsResponse
   ): T | undefined {
     return response[prop]
-      ? ((camelizeResponse(response[prop]) as unknown) as T)
+      ? (camelizeResponse(response[prop]) as unknown as T)
       : undefined;
   }
 
diff --git a/src/response/models/score.ts b/src/response/models/score.ts
@@ -49,7 +49,7 @@ export default class Score {
     this.queriesRemaining = response.queries_remaining;
     this.riskScore = response.risk_score;
     this.warnings = response.warnings
-      ? ((camelizeResponse(response.warnings) as unknown) as records.Warning[])
+      ? (camelizeResponse(response.warnings) as unknown as records.Warning[])
       : undefined;
   }
 }
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,4 @@
-import * as camelcaseKeys from 'camelcase-keys';
+import camelcaseKeys from 'camelcase-keys';
 
 export const camelizeResponse = (response: any) =>
   camelcaseKeys(response, {
diff --git a/src/webServiceClient.spec.ts b/src/webServiceClient.spec.ts
@@ -1,5 +1,5 @@
 import cloneDeep = require('lodash.clonedeep');
-import * as nock from 'nock';
+import nock from 'nock';
 import * as insights from '../fixtures/insights.json';
 import * as score from '../fixtures/score.json';
 import * as subscores from '../fixtures/subscores.json';
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,14 +4,14 @@
     "baseUrl": ".",
     "allowJs": false,
     "declaration": true,
+    "esModuleInterop": true,
     "lib": ["es2015", "es2016", "es2017"],
     "module": "commonjs",
     "outDir": "dist",
     "pretty": true,
     "removeComments": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
-    "sourceMap": false,
     "strict": true,
     "target": "es6"
   },
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"dependencies": {`
`7`		`- "jest": "^26.6.3"`
	`7`	`+ "jest": "^27.0.4"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"@types/jest": "^26.0.20",`
`8`		`- "jest": "^26.6.3",`
`9`		`- "ts-jest": "^26.5.0",`
	`8`	`+ "jest": "^27.0.4",`
	`9`	`+ "ts-jest": "^27.0.2",`
`10`	`10`	`"typescript": "^4.0.3"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as crypto from 'crypto';`
	`1`	`+import crypto from 'crypto';`
`2`	`2`
`3`	`3`	`interface AccountProps {`
`4`	`4`	`/**`