Skip to content

Commit 6ee2255

Browse files
committed
update graphql version and use deepmerge for options - close #8
1 parent 9352877 commit 6ee2255

File tree

4 files changed

+43
-22
lines changed

4 files changed

+43
-22
lines changed

lib/command.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as path from 'path';
22
import * as fs from 'fs';
33
import * as glob from 'glob';
44
import { render } from 'mustache';
5+
import * as deepmerge from 'deepmerge';
56
import { Output, Plugin, getFilenameOf, createData } from './utility';
67
import { readFile, writeFile, createBuildDirectory, resolve, removeBuildDirectory } from './utility/fs';
78
import {
@@ -185,7 +186,6 @@ export class GraphQLDocumentor extends Command<Flags, Params> {
185186
}
186187

187188
getProjectPackage(input: Input) {
188-
189189
let packageJSON: any & { graphqldoc: any };
190190

191191
try {
@@ -194,11 +194,11 @@ export class GraphQLDocumentor extends Command<Flags, Params> {
194194
packageJSON = {};
195195
}
196196

197-
packageJSON.graphqldoc = Object.assign(packageJSON.graphqldoc || {}, input.flags);
197+
packageJSON.graphqldoc = deepmerge(input.flags, packageJSON.graphqldoc || {});
198198

199199
if (packageJSON.graphqldoc.data) {
200200
const data = packageJSON.graphqldoc.data;
201-
packageJSON.graphqldoc = Object.assign(data, packageJSON.graphqldoc);
201+
packageJSON.graphqldoc = deepmerge(data, packageJSON.graphqldoc);
202202
}
203203

204204
if (packageJSON.graphqldoc.plugins.length === 0)

package-lock.json

Lines changed: 33 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"@types/chai": "^3.4.34",
4141
"@types/fs-extra": "0.0.32",
4242
"@types/glob": "^5.0.30",
43-
"@types/graphql": "^0.8.6",
43+
"@types/graphql": "^14.0.7",
4444
"@types/jest": "^18.1.0",
4545
"@types/marked": "0.0.27",
4646
"@types/mocha": "^2.2.32",
4747
"@types/mustache": "^0.8.28",
4848
"@types/node": "^10.14.4",
49-
"@types/request": "^0.0.40",
49+
"@types/request": "^2.48.1",
5050
"chai": "^3.5.0",
5151
"handlebars": "^4.0.10",
5252
"jest": "^18.1.0",
@@ -56,9 +56,10 @@
5656
"dependencies": {
5757
"@2fd/command": "^1.1.2",
5858
"bluebird": "^3.5.0",
59+
"deepmerge": "^3.2.0",
5960
"fs-extra": "^0.30.0",
6061
"glob": "^7.1.0",
61-
"graphql": "^0.7.0",
62+
"graphql": "^14.1.1",
6263
"marked": "^0.3.6",
6364
"mustache": "^2.2.1",
6465
"request": "^2.79.0",

tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"es5",
1111
"es2015",
1212
"es2015.core",
13-
"scripthost"
13+
"scripthost",
14+
"esnext"
1415
],
1516
"types": [
1617
"node",
@@ -24,4 +25,4 @@
2425
"gh-pages",
2526
"templates"
2627
]
27-
}
28+
}

0 commit comments

Comments
 (0)