From a9846cab5ee30c62ffcbae25273f2b43df0bf3dd Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 5 Aug 2019 16:12:11 +0200 Subject: [PATCH] Upgrade graphql to 14.X and make it a peer dependency --- .travis.yml | 3 +- package-lock.json | 304 +++++++++++++++---------------- package.json | 5 +- test/acceptance/exampleServer.js | 48 +++-- 4 files changed, 186 insertions(+), 174 deletions(-) diff --git a/.travis.yml b/.travis.yml index d954ccc..6468b93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: node_js matrix: include: - - node_js: "6" + - node_js: "10" + - node_js: "12" before_script: - npm run build-ts diff --git a/package-lock.json b/package-lock.json index e478bc5..f378533 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "~2.1.18", "negotiator": "0.6.1" } }, @@ -48,7 +48,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "array-flatten": { @@ -75,8 +75,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "balanced-match": { @@ -90,7 +90,7 @@ "resolved": "https://registry.npmjs.org/biskviit/-/biskviit-1.0.1.tgz", "integrity": "sha1-A3oM1LcbnjMf2QoRIt4X3EnkIKc=", "requires": { - "psl": "1.1.25" + "psl": "^1.1.7" } }, "bluebird": { @@ -105,7 +105,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -127,9 +127,9 @@ "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=", "dev": true, "requires": { - "assertion-error": "1.1.0", - "deep-eql": "0.1.3", - "type-detect": "1.0.0" + "assertion-error": "^1.0.1", + "deep-eql": "^0.1.3", + "type-detect": "^1.0.0" } }, "chalk": { @@ -137,11 +137,11 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "commander": { @@ -161,8 +161,8 @@ "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", "dev": true, "requires": { - "ini": "1.3.5", - "proto-list": "1.2.4" + "ini": "^1.3.4", + "proto-list": "~1.2.1" } }, "content-disposition": { @@ -251,9 +251,9 @@ "integrity": "sha1-vpewhcufSgt+gINdVH53uGh9Cgw=", "dev": true, "requires": { - "commander": "2.9.0", - "jsdoctypeparser": "1.2.0", - "markdown-it": "7.0.1" + "commander": "~2.9.0", + "jsdoctypeparser": "^1.2.0", + "markdown-it": "~7.0.0" }, "dependencies": { "commander": { @@ -262,7 +262,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } } } @@ -273,11 +273,11 @@ "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==", "dev": true, "requires": { - "bluebird": "3.5.1", - "commander": "2.15.0", - "lru-cache": "3.2.0", - "semver": "5.5.0", - "sigmund": "1.0.1" + "bluebird": "^3.0.5", + "commander": "^2.9.0", + "lru-cache": "^3.2.0", + "semver": "^5.1.0", + "sigmund": "^1.0.1" } }, "ee-first": { @@ -291,7 +291,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { - "iconv-lite": "0.4.19" + "iconv-lite": "~0.4.13" } }, "entities": { @@ -323,31 +323,31 @@ "integrity": "sha1-PAt288d1kMg0VzkGHsC9O6Bn7CQ=", "dev": true, "requires": { - "accepts": "1.2.13", + "accepts": "~1.2.12", "array-flatten": "1.1.1", "content-disposition": "0.5.1", - "content-type": "1.0.4", + "content-type": "~1.0.1", "cookie": "0.1.5", "cookie-signature": "1.0.6", - "debug": "2.2.0", - "depd": "1.1.1", - "escape-html": "1.0.3", - "etag": "1.7.0", + "debug": "~2.2.0", + "depd": "~1.1.0", + "escape-html": "~1.0.3", + "etag": "~1.7.0", "finalhandler": "0.4.1", "fresh": "0.3.0", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.2", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.1", "path-to-regexp": "0.1.7", - "proxy-addr": "1.0.10", + "proxy-addr": "~1.0.10", "qs": "4.0.0", - "range-parser": "1.0.3", + "range-parser": "~1.0.3", "send": "0.13.1", - "serve-static": "1.10.3", - "type-is": "1.6.16", + "serve-static": "~1.10.2", + "type-is": "~1.6.6", "utils-merge": "1.0.0", - "vary": "1.0.1" + "vary": "~1.0.1" }, "dependencies": { "accepts": { @@ -356,7 +356,7 @@ "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "~2.1.6", "negotiator": "0.5.3" } }, @@ -389,10 +389,10 @@ "integrity": "sha512-ouLWV0hRw4hnaLtXzzwhdC79ewxKbY2PRvm05mPc/zOH5W5WVCHDQ1SmNxEPBQdUeeSNh29aIqW9zEQkA3kMuA==", "dev": true, "requires": { - "accepts": "1.3.5", - "content-type": "1.0.4", - "http-errors": "1.6.2", - "raw-body": "2.3.2" + "accepts": "^1.3.0", + "content-type": "^1.0.4", + "http-errors": "^1.3.0", + "raw-body": "^2.3.2" } }, "fetch": { @@ -410,10 +410,10 @@ "integrity": "sha1-haF8bFmpRxfSYtYSMNSw6+PUoU0=", "dev": true, "requires": { - "debug": "2.2.0", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "unpipe": "1.0.0" + "debug": "~2.2.0", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "unpipe": "~1.0.0" }, "dependencies": { "debug": { @@ -457,12 +457,12 @@ "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-readlink": { @@ -472,11 +472,11 @@ "dev": true }, "graphql": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-0.9.6.tgz", - "integrity": "sha1-UUQh6dIlwp38j9MFRZq65YgV7yw=", + "version": "14.4.2", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.4.2.tgz", + "integrity": "sha512-6uQadiRgnpnSS56hdZUSvFrVcQ6OF9y6wkxJfKquFtHlnl7+KSuWwSJsdwiK1vybm1HgcdbpGkCpvhvsVQ0UZQ==", "requires": { - "iterall": "1.2.2" + "iterall": "^1.2.2" } }, "graphql-relay": { @@ -485,7 +485,7 @@ "integrity": "sha1-FhJ5ExC99yBbn4RaduB+txpcIqk=", "dev": true, "requires": { - "babel-runtime": "5.8.38" + "babel-runtime": "~5.8.3" }, "dependencies": { "babel-runtime": { @@ -494,7 +494,7 @@ "integrity": "sha1-HAsC62MxL18If/IEUIJ7QlydTBk=", "dev": true, "requires": { - "core-js": "1.2.7" + "core-js": "^1.0.0" } }, "core-js": { @@ -516,7 +516,7 @@ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -540,7 +540,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": "1.4.0" + "statuses": ">= 1.3.1 < 2" } }, "iconv-lite": { @@ -554,8 +554,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -587,8 +587,8 @@ "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "dev": true, "requires": { - "node-fetch": "1.7.3", - "whatwg-fetch": "2.0.3" + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" } }, "iterall": { @@ -602,10 +602,10 @@ "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==", "dev": true, "requires": { - "config-chain": "1.1.11", - "editorconfig": "0.13.3", - "mkdirp": "0.5.1", - "nopt": "3.0.6" + "config-chain": "~1.1.5", + "editorconfig": "^0.13.2", + "mkdirp": "~0.5.0", + "nopt": "~3.0.1" } }, "jsdoctest": { @@ -614,12 +614,12 @@ "integrity": "sha512-mSSYyKXNDerEEwhV7NiNRVU+KCNlkACrYP6T1odwoB9N47m28e8eU8O0SoG5iy8JcydcLUf0cd3u8aKUyDv8LA==", "dev": true, "requires": { - "commander": "2.15.0", - "dox": "0.9.0", - "js-beautify": "1.7.5", - "lodash": "4.17.5", - "should": "11.2.1", - "uglify-js": "3.3.15" + "commander": "^2.8.1", + "dox": "^0.9.0", + "js-beautify": "^1.5.4", + "lodash": "^4.0.1", + "should": "^11.2.1", + "uglify-js": "^3.0.13" }, "dependencies": { "uglify-js": { @@ -628,8 +628,8 @@ "integrity": "sha512-bqtBCAINYXX/OkdnqMGpbXr+OPWc00hsozRpk+dAtfnbdk2jjKiLmyOkQ7zamg648lVMnzATL8JrSN6LmaVpYA==", "dev": true, "requires": { - "commander": "2.15.0", - "source-map": "0.6.1" + "commander": "~2.15.0", + "source-map": "~0.6.1" } } } @@ -640,7 +640,7 @@ "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=", "dev": true, "requires": { - "lodash": "3.10.1" + "lodash": "^3.7.0" }, "dependencies": { "lodash": { @@ -663,7 +663,7 @@ "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=", "dev": true, "requires": { - "uc.micro": "1.0.5" + "uc.micro": "^1.0.1" } }, "lodash": { @@ -677,8 +677,8 @@ "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" } }, "lodash._basecopy": { @@ -711,9 +711,9 @@ "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", "dev": true, "requires": { - "lodash._baseassign": "3.2.0", - "lodash._basecreate": "3.0.3", - "lodash._isiterateecall": "3.0.9" + "lodash._baseassign": "^3.0.0", + "lodash._basecreate": "^3.0.0", + "lodash._isiterateecall": "^3.0.0" } }, "lodash.isarguments": { @@ -734,9 +734,9 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, "lru-cache": { @@ -745,7 +745,7 @@ "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", "dev": true, "requires": { - "pseudomap": "1.0.2" + "pseudomap": "^1.0.1" } }, "markdown-it": { @@ -754,11 +754,11 @@ "integrity": "sha1-8S2LiKk+ZCVDSN/Rg71wv2BWekI=", "dev": true, "requires": { - "argparse": "1.0.10", - "entities": "1.1.1", - "linkify-it": "2.0.3", - "mdurl": "1.0.1", - "uc.micro": "1.0.5" + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.1" } }, "mdurl": { @@ -803,7 +803,7 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "minimatch": { @@ -812,7 +812,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -856,7 +856,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } }, "supports-color": { @@ -865,7 +865,7 @@ "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -887,8 +887,8 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" } }, "nopt": { @@ -897,7 +897,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "on-finished": { @@ -915,7 +915,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "parseurl": { @@ -948,7 +948,7 @@ "integrity": "sha1-DUCoL4Afw1VWfS7LZe/j8HfxIcU=", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.0", "ipaddr.js": "1.0.5" } }, @@ -1005,18 +1005,18 @@ "integrity": "sha1-ow1fTILIqbrprQCh2bG9vm8Zntc=", "dev": true, "requires": { - "debug": "2.2.0", - "depd": "1.1.1", - "destroy": "1.0.4", - "escape-html": "1.0.3", - "etag": "1.7.0", + "debug": "~2.2.0", + "depd": "~1.1.0", + "destroy": "~1.0.4", + "escape-html": "~1.0.3", + "etag": "~1.7.0", "fresh": "0.3.0", - "http-errors": "1.3.1", + "http-errors": "~1.3.1", "mime": "1.3.4", "ms": "0.7.1", - "on-finished": "2.3.0", - "range-parser": "1.0.3", - "statuses": "1.2.1" + "on-finished": "~2.3.0", + "range-parser": "~1.0.3", + "statuses": "~1.2.1" }, "dependencies": { "debug": { @@ -1034,8 +1034,8 @@ "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", "dev": true, "requires": { - "inherits": "2.0.3", - "statuses": "1.2.1" + "inherits": "~2.0.1", + "statuses": "1" } }, "ms": { @@ -1058,8 +1058,8 @@ "integrity": "sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=", "dev": true, "requires": { - "escape-html": "1.0.3", - "parseurl": "1.3.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.1", "send": "0.13.2" }, "dependencies": { @@ -1078,8 +1078,8 @@ "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", "dev": true, "requires": { - "inherits": "2.0.3", - "statuses": "1.2.1" + "inherits": "~2.0.1", + "statuses": "1" } }, "ms": { @@ -1094,18 +1094,18 @@ "integrity": "sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=", "dev": true, "requires": { - "debug": "2.2.0", - "depd": "1.1.1", - "destroy": "1.0.4", - "escape-html": "1.0.3", - "etag": "1.7.0", + "debug": "~2.2.0", + "depd": "~1.1.0", + "destroy": "~1.0.4", + "escape-html": "~1.0.3", + "etag": "~1.7.0", "fresh": "0.3.0", - "http-errors": "1.3.1", + "http-errors": "~1.3.1", "mime": "1.3.4", "ms": "0.7.1", - "on-finished": "2.3.0", - "range-parser": "1.0.3", - "statuses": "1.2.1" + "on-finished": "~2.3.0", + "range-parser": "~1.0.3", + "statuses": "~1.2.1" } }, "statuses": { @@ -1128,11 +1128,11 @@ "integrity": "sha1-kPVRRVUtAc/CAGZuToGKHJZw7aI=", "dev": true, "requires": { - "should-equal": "1.0.1", - "should-format": "3.0.3", - "should-type": "1.4.0", - "should-type-adaptors": "1.1.0", - "should-util": "1.0.0" + "should-equal": "^1.0.0", + "should-format": "^3.0.2", + "should-type": "^1.4.0", + "should-type-adaptors": "^1.0.1", + "should-util": "^1.0.0" } }, "should-equal": { @@ -1141,7 +1141,7 @@ "integrity": "sha1-C26VFvJgGp+wuy3MNpr6HH4gCvc=", "dev": true, "requires": { - "should-type": "1.4.0" + "should-type": "^1.0.0" } }, "should-format": { @@ -1150,8 +1150,8 @@ "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=", "dev": true, "requires": { - "should-type": "1.4.0", - "should-type-adaptors": "1.1.0" + "should-type": "^1.3.0", + "should-type-adaptors": "^1.0.1" } }, "should-type": { @@ -1166,8 +1166,8 @@ "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", "dev": true, "requires": { - "should-type": "1.4.0", - "should-util": "1.0.0" + "should-type": "^1.3.0", + "should-util": "^1.0.0" } }, "should-util": { @@ -1205,7 +1205,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -1219,7 +1219,7 @@ "integrity": "sha1-TnbS1TizIQNlpKgHpygnhq1mtl8=", "dev": true, "requires": { - "babel-runtime": "6.26.0", + "babel-runtime": ">=6.0.0", "dataloader": "1.2.0", "express": "4.13.4", "express-graphql": "0.4.13", @@ -1246,9 +1246,9 @@ "integrity": "sha1-u5mQHcGBoadMyrSUYG96Ah7H4w0=", "dev": true, "requires": { - "content-type": "1.0.4", - "http-errors": "1.3.1", - "raw-body": "2.1.7" + "content-type": "~1.0.1", + "http-errors": "~1.3.1", + "raw-body": "~2.1.2" } }, "graphql": { @@ -1257,7 +1257,7 @@ "integrity": "sha1-gLkj8tgB5Tc9+ZMWucWCnyBsSCw=", "dev": true, "requires": { - "babel-runtime": "5.8.38" + "babel-runtime": "^5.8.x" }, "dependencies": { "babel-runtime": { @@ -1266,7 +1266,7 @@ "integrity": "sha1-HAsC62MxL18If/IEUIJ7QlydTBk=", "dev": true, "requires": { - "core-js": "1.2.7" + "core-js": "^1.0.0" } } } @@ -1277,8 +1277,8 @@ "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", "dev": true, "requires": { - "inherits": "2.0.3", - "statuses": "1.4.0" + "inherits": "~2.0.1", + "statuses": "1" } }, "iconv-lite": { @@ -1313,7 +1313,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.18" + "mime-types": "~2.1.18" } }, "typescript": { @@ -1340,10 +1340,10 @@ "integrity": "sha1-YyknMZ+mo9o/yR+Xc6wnv+bD7pI=", "dev": true, "requires": { - "async": "0.2.10", + "async": "~0.2.6", "source-map": "0.1.34", - "uglify-to-browserify": "1.0.2", - "yargs": "1.3.3" + "uglify-to-browserify": "~1.0.0", + "yargs": "~1.3.3" }, "dependencies": { "source-map": { @@ -1352,7 +1352,7 @@ "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } diff --git a/package.json b/package.json index cff1801..a6ab1bc 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "@types/node": "^8.0.28", "chai": "^3.5.0", "express-graphql": "^0.6.6", + "graphql": "^14.0", "jsdoctest": "^1.7.0", "mocha": "^3.3.0", "swapi-graphql": "0.0.6", @@ -40,8 +41,10 @@ "chalk": "^1.1.3", "commander": "^2.9.0", "fetch": "^1.1.0", - "graphql": "^0.9.2", "lodash": "^4.17.4", "node-fetch": "^1.6.3" + }, + "peerDependencies": { + "graphql": "^14.0" } } diff --git a/test/acceptance/exampleServer.js b/test/acceptance/exampleServer.js index e8d7d04..5834c50 100644 --- a/test/acceptance/exampleServer.js +++ b/test/acceptance/exampleServer.js @@ -17,34 +17,42 @@ var schema = buildSchema(` rollOnce: Int! statistics(page: Int!): RandomnessStatistics! - # Scalar field with non nullable arg and example section - # Examples: - # rollXTimes(times: 10) - # rollXTimes(times: 11) + """ + Scalar field with non nullable arg and example section + Examples: + rollXTimes(times: 10) + rollXTimes(times: 11) + """ rollXTimes(times: Int!): Int! - # A description for ignored field with parameters - # - # Examples: - # ignoredWithExamples(parameter: 42) - # +NOFOLLOW + """ + A description for ignored field with parameters + + Examples: + ignoredWithExamples(parameter: 42) + +NOFOLLOW + """ ignoredWithExamples(parameter: Int!): IgnoredSubtype - # +NOFOLLOW + """ + +NOFOLLOW + """ ignoredNoParameters: IgnoredSubtype } type Query { - # RollDice has four examples - # - # Examples: - # rollDice(numDice: 4, numSides: 2) - # rollDice( numDice : 40 , numSides:2) - # rollDice ( numDice: 2, numSides: 299 ) - # rollDice ( - # numDice:4, - # numSides: 2342 - # ) + """ + RollDice has four examples + + Examples: + rollDice(numDice: 4, numSides: 2) + rollDice( numDice : 40 , numSides:2) + rollDice ( numDice: 2, numSides: 299 ) + rollDice ( + numDice:4, + numSides: 2342 + ) + """ rollDice(numDice: Int!, numSides: Int): RandomDie } `);