From 1fb388def33070fce2f34eee68443144d9499e13 Mon Sep 17 00:00:00 2001 From: Ravi K Date: Fri, 28 Apr 2017 13:26:33 -0400 Subject: [PATCH] update deps and typings --- fetch-mock.typings.d.ts | 2 +- package.json | 43 ++++++++++--------- .../ApolloNetworkInterface.ts | 2 +- tslint.json | 7 --- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/fetch-mock.typings.d.ts b/fetch-mock.typings.d.ts index c9264ed..867d8f6 100644 --- a/fetch-mock.typings.d.ts +++ b/fetch-mock.typings.d.ts @@ -79,7 +79,7 @@ declare namespace FetchMock { * Function(url, opts): A function that is passed the url and opts fetch() is called with and that returns any of the responses listed above */ - type MockResponse = IResponse | Promise + type MockResponse = Response | Promise | number | Promise | string | Promise | Object | Promise diff --git a/package.json b/package.json index 33c9677..858d6e4 100644 --- a/package.json +++ b/package.json @@ -24,28 +24,31 @@ "persistgraphql": "./bin/persistgraphql" }, "dependencies": { - "@types/chai": "^3.4.34", - "@types/lodash": "^4.14.37", - "@types/mocha": "^2.2.32", - "@types/node": "^6.0.45", - "@types/yargs": "^6.5.0", - "chai": "^3.5.0", - "es6-promise": "^4.0.5", - "graphql": "^0.7.2", - "graphql-tag": "^0.1.14", - "lodash": "^4.16.4", - "mocha": "^3.1.2", - "source-map-support": "^0.4.3", - "typescript": "^2.0.3", - "whatwg-fetch": "^2.0.0", - "yargs": "^6.5.0" + "apollo-client": "^1.1", + "graphql": "^0.9.4", + "graphql-tag": "^2.0.0", + "lodash": "^4.17.4", + "whatwg-fetch": "^2.0.3", + "yargs": "^7.1.0" }, "devDependencies": { - "@types/express": "^4.0.34", - "@types/graphql": "^0.8.5", - "apollo-client": "^0.8", - "fetch-mock": "^5.5.0", + "@types/chai": "^3.5.1", + "@types/express": "^4.0.35", + "@types/lodash": "^4.14.63", + "@types/mocha": "^2.2.41", + "@types/node": "^7.0.14", + "@types/yargs": "^6.6.0", + "chai": "^3.5.0", + "es6-promise": "^4.1.0", + "fetch-mock": "^5.10.0", "isomorphic-fetch": "^2.2.1", - "tslint": "^3.15.1" + "mocha": "^3.3.0", + "source-map-support": "^0.4.15", + "tslint": "^5.1.0", + "typescript": "^2.3.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.0", + "@types/isomorphic-fetch": "0.0.34" } } diff --git a/test/network_interface/ApolloNetworkInterface.ts b/test/network_interface/ApolloNetworkInterface.ts index b364509..594649f 100644 --- a/test/network_interface/ApolloNetworkInterface.ts +++ b/test/network_interface/ApolloNetworkInterface.ts @@ -371,7 +371,7 @@ describe('addPersistedQueries', () => { id: string, }, operationName: string, - } + }; const networkInterface = new GenericNetworkInterface(); addPersistedQueries(networkInterface, queryMap); diff --git a/tslint.json b/tslint.json index bb24179..71c0db0 100644 --- a/tslint.json +++ b/tslint.json @@ -18,7 +18,6 @@ "interface-name": false, "jsdoc-format": true, "label-position": true, - "label-undefined": true, "max-line-length": [ true, 140 @@ -44,9 +43,7 @@ "trace" ], "no-construct": true, - "no-constructor-vars": true, "no-debugger": true, - "no-duplicate-key": true, "no-duplicate-variable": true, "no-empty": true, "no-eval": true, @@ -57,7 +54,6 @@ "no-shadowed-variable": true, "no-switch-case-fall-through": true, "no-trailing-whitespace": true, - "no-unreachable": true, "no-unused-expression": true, "no-unused-variable": true, "no-use-before-declare": true, @@ -119,9 +115,6 @@ "variable-declaration": "space" } ], - "use-strict": [ - false - ], "variable-name": [ true, "check-format",