Skip to content

Commit 97cd10b

Browse files
leebyronleebyron
committed
Merge branch 'master' into readme-minor-edit
Conflicts: README.md
2 parents 60c9448 + b68c406 commit 97cd10b

File tree

3 files changed

+270
-271
lines changed

3 files changed

+270
-271
lines changed

‎.eslintrc

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
{
2+
"parser": "babel-eslint",
3+
"arrowFunctions": true,
4+
"blockBindings": true,
5+
"classes": true,
6+
"defaultParams": true,
7+
"destructuring": true,
8+
"forOf": true,
9+
"generators": true,
10+
"modules": true,
11+
"objectLiteralComputedProperties": true,
12+
"objectLiteralShorthandMethods": true,
13+
"objectLiteralShorthandProperties": true,
14+
"spread": true,
15+
"templateStrings": true,
16+
"env": {
17+
"node": true,
18+
"es6": true
19+
},
20+
"rules": {
21+
"comma-dangle": 0,
22+
"no-cond-assign": 2,
23+
"no-console": 0,
24+
"no-constant-condition": 2,
25+
"no-control-regex": 0,
26+
"no-debugger": 0,
27+
"no-dupe-args": 2,
28+
"no-dupe-keys": 2,
29+
"no-duplicate-case": 2,
30+
"no-empty": 2,
31+
"no-empty-class": 2,
32+
"no-ex-assign": 2,
33+
"no-extra-boolean-cast": 2,
34+
"no-extra-parens": 0,
35+
"no-extra-semi": 2,
36+
"no-func-assign": 2,
37+
"no-inner-declarations": [
38+
2,
39+
"functions"
40+
],
41+
"no-invalid-regexp": 2,
42+
"no-irregular-whitespace": 2,
43+
"no-negated-in-lhs": 2,
44+
"no-obj-calls": 2,
45+
"no-regex-spaces": 2,
46+
"no-reserved-keys": 0,
47+
"no-sparse-arrays": 2,
48+
"no-unreachable": 2,
49+
"use-isnan": 2,
50+
"valid-jsdoc": 0,
51+
"valid-typeof": 2,
52+
"block-scoped-var": 0,
53+
"complexity": 0,
54+
"consistent-return": 0,
55+
"curly": [
56+
2,
57+
"all"
58+
],
59+
"default-case": 0,
60+
"dot-notation": 0,
61+
"eqeqeq": 2,
62+
"guard-for-in": 2,
63+
"no-alert": 2,
64+
"no-caller": 2,
65+
"no-div-regex": 2,
66+
"no-empty-label": 2,
67+
"no-eq-null": 0,
68+
"no-eval": 2,
69+
"no-extend-native": 2,
70+
"no-extra-bind": 2,
71+
"no-fallthrough": 2,
72+
"no-floating-decimal": 2,
73+
"no-implied-eval": 2,
74+
"no-iterator": 2,
75+
"no-labels": 0,
76+
"no-lone-blocks": 0,
77+
"no-loop-func": 0,
78+
"no-multi-spaces": 2,
79+
"no-multi-str": 2,
80+
"no-native-reassign": 0,
81+
"no-new": 2,
82+
"no-new-func": 0,
83+
"no-new-wrappers": 2,
84+
"no-octal": 2,
85+
"no-octal-escape": 2,
86+
"no-param-reassign": 2,
87+
"no-process-env": 0,
88+
"no-proto": 2,
89+
"no-redeclare": 2,
90+
"no-return-assign": 2,
91+
"no-script-url": 2,
92+
"no-self-compare": 0,
93+
"no-sequences": 2,
94+
"no-throw-literal": 2,
95+
"no-unused-expressions": 2,
96+
"no-void": 2,
97+
"no-warning-comments": 0,
98+
"no-with": 2,
99+
"radix": 2,
100+
"vars-on-top": 0,
101+
"wrap-iife": 2,
102+
"yoda": [
103+
2,
104+
"never",
105+
{
106+
"exceptRange": true
107+
}
108+
],
109+
"strict": 0,
110+
"no-catch-shadow": 2,
111+
"no-delete-var": 2,
112+
"no-label-var": 2,
113+
"no-shadow": 2,
114+
"no-shadow-restricted-names": 2,
115+
"no-undef": 2,
116+
"no-undef-init": 2,
117+
"no-undefined": 0,
118+
"no-unused-vars": [
119+
2,
120+
{
121+
"vars": "all",
122+
"args": "after-used"
123+
}
124+
],
125+
"no-use-before-define": 0,
126+
"handle-callback-err": [
127+
2,
128+
"error"
129+
],
130+
"no-mixed-requires": [
131+
2,
132+
true
133+
],
134+
"no-new-require": 2,
135+
"no-path-concat": 2,
136+
"no-process-exit": 0,
137+
"no-restricted-modules": 0,
138+
"no-sync": 2,
139+
"indent": [
140+
2,
141+
2,
142+
{
143+
"indentSwitchCase": true
144+
}
145+
],
146+
"brace-style": [
147+
2,
148+
"1tbs",
149+
{
150+
"allowSingleLine": true
151+
}
152+
],
153+
"camelcase": [
154+
2,
155+
{
156+
"properties": "always"
157+
}
158+
],
159+
"comma-spacing": 0,
160+
"comma-style": [
161+
2,
162+
"last"
163+
],
164+
"consistent-this": 0,
165+
"eol-last": 2,
166+
"func-names": 0,
167+
"func-style": 0,
168+
"key-spacing": [
169+
2,
170+
{
171+
"beforeColon": false,
172+
"afterColon": true
173+
}
174+
],
175+
"max-nested-callbacks": 0,
176+
"new-cap": 0,
177+
"new-parens": 2,
178+
"newline-after-var": 0,
179+
"no-array-constructor": 2,
180+
"no-inline-comments": 0,
181+
"no-lonely-if": 2,
182+
"no-mixed-spaces-and-tabs": 2,
183+
"no-multiple-empty-lines": 0,
184+
"no-nested-ternary": 0,
185+
"no-new-object": 2,
186+
"no-spaced-func": 2,
187+
"no-ternary": 0,
188+
"no-trailing-spaces": 2,
189+
"no-underscore-dangle": 0,
190+
"no-wrap-func": 2,
191+
"one-var": [
192+
2,
193+
"never"
194+
],
195+
"operator-assignment": [
196+
2,
197+
"always"
198+
],
199+
"padded-blocks": 0,
200+
"quote-props": [
201+
2,
202+
"as-needed"
203+
],
204+
"quotes": [
205+
2,
206+
"single"
207+
],
208+
"semi": [
209+
2,
210+
"always"
211+
],
212+
"semi-spacing": [
213+
2,
214+
{
215+
"before": false,
216+
"after": true
217+
}
218+
],
219+
"sort-vars": 0,
220+
"space-after-keywords": [
221+
2,
222+
"always"
223+
],
224+
"space-before-blocks": [
225+
2,
226+
"always"
227+
],
228+
"space-before-function-paren": [
229+
2,
230+
{
231+
"anonymous": "always",
232+
"named": "never"
233+
}
234+
],
235+
"space-in-brackets": 0,
236+
"space-in-parens": 0,
237+
"space-infix-ops": [
238+
2,
239+
{
240+
"int32Hint": false
241+
}
242+
],
243+
"space-return-throw-case": [
244+
2,
245+
"always"
246+
],
247+
"space-unary-ops": [
248+
2,
249+
{
250+
"words": true,
251+
"nonwords": false
252+
}
253+
],
254+
"spaced-line-comment": [
255+
2,
256+
"always"
257+
],
258+
"wrap-regex": 0,
259+
"no-var": 0,
260+
"max-len": 80
261+
}
262+
}

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ on complex application data models.
66

77
## Technical Preview Contents
88

9-
This technical preview contains a [draft specification for GraphQL](https://github.com/facebook/graphql)
10-
and a reference implementation in JavaScript that implements that draft,
11-
GraphQL.js.
9+
This technical preview contains a [draft specification for GraphQL]
10+
(https://github.com/facebook/graphql) and a reference implementation in
11+
JavaScript that implements that draft, GraphQL.js.
1212

13-
The reference implemention provides base libraries in JavaScript that would
13+
The reference implementation provides base libraries in JavaScript that would
1414
provide the basis for full GraphQL implementations and tools. It is not a fully
1515
standalone GraphQL server that a client developer could use to start
1616
manipulating and querying data. Most importantly, it provides no mapping to a
1717
functioning, production-ready backend. The only “backend” we have targeted for
1818
this early preview are in-memory stubs in test cases.
1919

20-
We are releasing this now because after GraphQL was first discussed publically,
20+
We are releasing this now because after GraphQL was first discussed publicly,
2121
many engineers used this information to implement the parts of the system that
22-
we discussed publically. We want to support those engineers by providing both a
22+
we discussed publicly. We want to support those engineers by providing both a
2323
formal specification and a reference implementation for the system as a whole.
2424

2525
To that end, the target audience is not the client developer, but those who have
@@ -49,7 +49,7 @@ Install GraphQL.js from npm
4949
npm install graphql
5050
```
5151

52-
GraphQL.js provides two important capabilites: building a type schema, and
52+
GraphQL.js provides two important capabilities: building a type schema, and
5353
serving queries against that type schema.
5454

5555
First, build a GraphQL type schema which maps to your code base.

0 commit comments

Comments
 (0)