Skip to content

Commit dcd64a5

Browse files
committed
don't try to jump that many versions!
1 parent 955c142 commit dcd64a5

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

lib/command.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as path from 'path';
22
import * as fs from 'fs';
33
import * as glob from 'glob';
4+
import * as deepmerge from 'deepmerge';
45
import { render } from 'mustache';
56
import { Output, Plugin, getFilenameOf, createData } from './utility';
67
import { readFile, writeFile, createBuildDirectory, resolve, removeBuildDirectory } from './utility/fs';
@@ -194,11 +195,11 @@ export class GraphQLDocumentor extends Command<Flags, Params> {
194195
packageJSON = {};
195196
}
196197

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

199200
if (packageJSON.graphqldoc.data) {
200201
const data = packageJSON.graphqldoc.data;
201-
packageJSON.graphqldoc = Object.assign(data, packageJSON.graphqldoc);
202+
packageJSON.graphqldoc = deepmerge(data, packageJSON.graphqldoc);
202203
}
203204

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

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
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,6 +56,7 @@
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",
6162
"graphql": "^0.7.0",

0 commit comments

Comments
 (0)