Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a76e7a3

Browse files
UrigoUrigo
committed
Merge branch 'master' into subscriptions
# Conflicts: # package.json
2 parents e3f695c + 8abef41 commit a76e7a3

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

‎.babelrc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"transform-es2015-function-name",
1111
"transform-es2015-arrow-functions",
1212
"transform-es2015-block-scoped-functions",
13-
["transform-es2015-classes", {loose: true}],
13+
["transform-es2015-classes", {"loose": true}],
1414
"transform-es2015-object-super",
1515
"transform-es2015-shorthand-properties",
1616
"transform-es2015-duplicate-keys",
1717
"transform-es2015-computed-properties",
1818
"check-es2015-constants",
19-
["transform-es2015-spread", {loose: true}],
19+
["transform-es2015-spread", {"loose": true}],
2020
"transform-es2015-parameters",
21-
["transform-es2015-destructuring", {loose: true}],
21+
["transform-es2015-destructuring", {"loose": true}],
2222
"transform-es2015-block-scoping",
2323
"transform-es2015-modules-commonjs",
2424
"transform-regenerator",

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"prepublish": ". ./resources/prepublish.sh"
3737
},
3838
"dependencies": {
39-
"iterall": "1.1.0"
39+
"iterall": "^1.1.0"
4040
},
4141
"devDependencies": {
4242
"babel-cli": "6.24.1",
@@ -71,10 +71,10 @@
7171
"coveralls": "2.13.1",
7272
"eslint": "3.19.0",
7373
"eslint-plugin-babel": "4.1.1",
74-
"eslint-plugin-flowtype": "2.32.1",
75-
"flow-bin": "0.45.0",
74+
"eslint-plugin-flowtype": "2.33.0",
75+
"flow-bin": "0.46.0",
7676
"isparta": "4.0.0",
77-
"mocha": "3.3.0",
77+
"mocha": "3.4.1",
7878
"sane": "1.6.0"
7979
}
8080
}

‎src/error/GraphQLError.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export function GraphQLError( // eslint-disable-line no-redeclare
129129
message: {
130130
value: message,
131131
// By being enumerable, JSON.stringify will include `message` in the
132-
// resulting output. This ensures that the simplist possible GraphQL
132+
// resulting output. This ensures that the simplest possible GraphQL
133133
// service adheres to the spec.
134134
enumerable: true,
135135
writable: true
@@ -139,7 +139,7 @@ export function GraphQLError( // eslint-disable-line no-redeclare
139139
// in JSON.stringify() when not provided.
140140
value: _locations || undefined,
141141
// By being enumerable, JSON.stringify will include `locations` in the
142-
// resulting output. This ensures that the simplist possible GraphQL
142+
// resulting output. This ensures that the simplest possible GraphQL
143143
// service adheres to the spec.
144144
enumerable: true
145145
},
@@ -148,7 +148,7 @@ export function GraphQLError( // eslint-disable-line no-redeclare
148148
// in JSON.stringify() when not provided.
149149
value: path || undefined,
150150
// By being enumerable, JSON.stringify will include `path` in the
151-
// resulting output. This ensures that the simplist possible GraphQL
151+
// resulting output. This ensures that the simplest possible GraphQL
152152
// service adheres to the spec.
153153
enumerable: true
154154
},

‎src/execution/execute.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ export type ExecutionContext = {
9393
/**
9494
* The result of GraphQL execution.
9595
*
96-
* - `data` is the result of a successful execution of the query.
9796
* - `errors` is included when any errors occurred as a non-empty array.
97+
* - `data` is the result of a successful execution of the query.
9898
*/
9999
export type ExecutionResult = {
100-
data?: ?{[key: string]: mixed};
101100
errors?: Array<GraphQLError>;
101+
data?: ?{[key: string]: mixed};
102102
};
103103

104104
/**
@@ -147,7 +147,7 @@ export function execute(
147147
if (!context.errors.length) {
148148
return { data };
149149
}
150-
return { data, errors: context.errors };
150+
return { errors: context.errors, data };
151151
});
152152
}
153153

‎yarn.lock‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,10 @@ [email protected]:
309309
version "6.13.0"
310310
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
311311

312+
[email protected]:
313+
version "6.13.0"
314+
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
315+
312316
babel-plugin-syntax-class-properties@^6.8.0:
313317
version "6.13.0"
314318
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
@@ -927,9 +931,9 @@ [email protected]:
927931
version "4.1.1"
928932
resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.1.tgz#ef285c87039b67beb3bbd227f5b0eed4fb376b87"
929933

930-
eslint-plugin-flowtype@2.32.1:
931-
version "2.32.1"
932-
resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.32.1.tgz#bbee185dedf97e5f63ec975cdcddd199bd2a2501"
934+
eslint-plugin-flowtype@2.33.0:
935+
version "2.33.0"
936+
resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.33.0.tgz#b2783814ed2ddcf729953b8f65ff73c90cabee4b"
933937
dependencies:
934938
lodash "^4.15.0"
935939

@@ -1103,9 +1107,9 @@ flat-cache@^1.2.1:
11031107
graceful-fs "^4.1.2"
11041108
write "^0.2.1"
11051109

1106-
flow-bin@0.45.0:
1107-
version "0.45.0"
1108-
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.45.0.tgz#009dd0f577a3f665c74ca8be827ae8c2dd8fd6b5"
1110+
flow-bin@0.46.0:
1111+
version "0.46.0"
1112+
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.46.0.tgz#06ad7fe19dddb1042264438064a2a32fee12b872"
11091113

11101114
for-in@^0.1.5:
11111115
version "0.1.6"
@@ -1522,7 +1526,7 @@ istanbul@^0.4.0:
15221526
which "^1.1.1"
15231527
wordwrap "^1.0.0"
15241528

1525-
iterall@^1.0.0:
1529+
iterall@^1.1.0:
15261530
version "1.1.1"
15271531
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.1.tgz#f7f0af11e9a04ec6426260f5019d9fcca4d50214"
15281532

@@ -1733,9 +1737,9 @@ [email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
17331737
dependencies:
17341738
minimist "0.0.8"
17351739

1736-
mocha@3.3.0:
1737-
version "3.3.0"
1738-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.3.0.tgz#d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5"
1740+
mocha@3.4.1:
1741+
version "3.4.1"
1742+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.1.tgz#a3802b4aa381934cacb38de70cf771621da8f9af"
17391743
dependencies:
17401744
browser-stdout "1.3.0"
17411745
commander "2.9.0"

0 commit comments

Comments
 (0)