Skip to content

Update @types packages and fix options merge #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2019
Merged

Update @types packages and fix options merge #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3af3b8a
fix_compile_error_and_merge_object_deep
Feb 26, 2018
82339b7
reverse_merge_order_to_override_flags
Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as path from 'path';
import * as fs from 'fs';
import * as glob from 'glob';
import { render } from 'mustache';
import * as deepmerge from 'deepmerge';
import { Output, Plugin, getFilenameOf, createData } from './utility';
import { readFile, writeFile, createBuildDirectory, resolve, removeBuildDirectory } from './utility/fs';
import {
Expand Down Expand Up @@ -194,11 +195,11 @@ export class GraphQLDocumentor extends Command<Flags, Params> {
packageJSON = {};
}

packageJSON.graphdoc = Object.assign(packageJSON.graphdoc || {}, input.flags);
packageJSON.graphdoc = deepmerge(input.flags, packageJSON.graphdoc || {});

if (packageJSON.graphdoc.data) {
const data = packageJSON.graphdoc.data;
packageJSON.graphdoc = Object.assign(data, packageJSON.graphdoc);
packageJSON.graphdoc = deepmerge(data, packageJSON.graphdoc);
}

if (packageJSON.graphdoc.plugins.length === 0)
Expand Down
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"@types/marked": "0.0.27",
"@types/mocha": "^2.2.32",
"@types/mustache": "^0.8.28",
"@types/node": "^6.0.32",
"@types/request": "^0.0.40",
"@types/striptags": "^0.0.5",
"@types/node": "^9.4.6",
"@types/request": "^2.47.0",
"@types/striptags": "^3.1.1",
"chai": "^3.5.0",
"handlebars": "^4.0.10",
"jest": "^18.1.0",
Expand All @@ -56,14 +56,15 @@
"dependencies": {
"@2fd/command": "^1.1.2",
"bluebird": "^3.5.0",
"deepmerge": "^2.0.1",
"fs-extra": "^0.30.0",
"glob": "^7.1.0",
"graphql": "^0.7.0",
"marked": "^0.3.6",
"mustache": "^2.2.1",
"request": "^2.79.0",
"slug": "^0.9.1",
"striptags": "^3.0.1",
"striptags": "^3.1.1",
"word-wrap": "^1.2.1"
},
"graphdoc": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/document.require-by/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '../../lib/interface';

// Fix signature
const stript: typeof striptags.default = striptags as any;
const stript: typeof striptags = striptags as any;

export default class RequireByPlugin extends Plugin implements PluginInterface {

Expand Down