Merge pull request #1 from graphql/master

Merge latest changes from HEAD: 0.4.3 -> 0.4.18

Author: sogko

.eslintrc

@@ -174,7 +174,7 @@
     "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
     "no-use-before-define": 0,
     "no-useless-call": 2,
-    "no-var": 0,
+    "no-var": 2,
     "no-void": 2,
     "no-warning-comments": 0,
     "no-with": 2,
@@ -184,7 +184,7 @@
     "operator-assignment": [2, "always"],
     "operator-linebreak": [2, "after"],
     "padded-blocks": 0,
-    "prefer-const": 0,
+    "prefer-const": 2,
     "prefer-reflect": 0,
     "prefer-spread": 0,
     "quote-props": [2, "as-needed"],

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 
 node_js:
+  - "stable"
+  - "4"
   - "iojs"
   - "0.12"
   - "0.10"

README.md

@@ -4,9 +4,16 @@ This is a technical preview of the JavaScript reference implementation for
 GraphQL, a query language created by Facebook for describing data requirements
 on complex application data models.
 
+[![npm version](https://badge.fury.io/js/graphql.svg)](http://badge.fury.io/js/graphql)
 [![Build Status](https://travis-ci.org/graphql/graphql-js.svg)](https://travis-ci.org/graphql/graphql-js)
 [![Coverage Status](https://coveralls.io/repos/graphql/graphql-js/badge.svg?branch=master)](https://coveralls.io/r/graphql/graphql-js?branch=master)
-[![Public Slack Discussion](https://graphql-slack.herokuapp.com/badge.svg)](https://graphql-slack.herokuapp.com/)
+
+See more complete documentation at http://graphql.org/ and
+http://graphql.org/docs/api-reference-graphql/.
+
+For questions, ask [Stack Overflow](http://stackoverflow.com/questions/tagged/graphql).
+
+For discussion, join [#graphql on Discord](http://join.reactiflux.com/).
 
 ## Technical Preview Contents
 

package.json

@@ -1,13 +1,14 @@
 {
   "name": "graphql",
-  "version": "0.4.3",
+  "version": "0.4.18",
   "description": "A Query Language and Runtime which can target any service.",
   "contributors": [
     "Lee Byron <[email protected]> (http://leebyron.com/)",
     "Nicholas Schrock <[email protected]>",
     "Daniel Schafer <[email protected]>"
   ],
   "license": "BSD-3-Clause",
+  "main": "index.js",
   "homepage": "https://github.com/graphql/graphql-js",
   "bugs": {
     "url": "https://github.com/graphql/graphql-js/issues"
@@ -19,19 +20,14 @@
   "options": {
     "mocha": "--require resources/mocha-bootload src/**/__tests__/**/*.js"
   },
-  "babel": {
-    "optional": [
-      "runtime",
-      "es7.asyncFunctions"
-    ]
-  },
   "scripts": {
     "test": "npm run lint && npm run check && npm run testonly",
     "testonly": "mocha $npm_package_options_mocha",
+    "t": "mocha --require resources/mocha-bootload",
     "lint": "eslint src",
     "check": "flow check",
-    "build": "babel src --ignore __tests__ --out-dir dist/ && cp package.json dist/",
-    "watch": "babel resources/watch.js | node",
+    "build": "babel src --optional runtime --ignore __tests__ --out-dir dist/ && cp package.json dist/",
+    "watch": "babel --optional runtime resources/watch.js | node",
     "cover": "babel-node node_modules/.bin/isparta cover --root src --report html node_modules/.bin/_mocha -- $npm_package_options_mocha",
     "cover:lcov": "babel-node node_modules/.bin/isparta cover --root src --report lcovonly node_modules/.bin/_mocha -- $npm_package_options_mocha",
     "preversion": ". ./resources/checkgit.sh && npm test",
@@ -43,17 +39,15 @@
   "devDependencies": {
     "babel": "5.8.21",
     "babel-core": "5.8.22",
-    "babel-eslint": "4.0.10",
-    "bluebird": "2.9.34",
-    "chai": "3.2.0",
-    "chai-subset": "1.0.1",
-    "coveralls": "2.11.3",
-    "eslint": "1.1.0",
+    "babel-eslint": "4.1.7",
+    "chai": "3.4.1",
+    "chai-subset": "1.1.0",
+    "coveralls": "2.11.4",
+    "eslint": "1.10.1",
     "eslint-plugin-babel": "^2.1.1",
-    "flow-bin": "0.14.0",
+    "flow-bin": "0.20.1",
     "isparta": "3.0.3",
-    "minimist": "1.1.3",
-    "mocha": "2.2.5",
-    "sane": "1.1.3"
+    "mocha": "2.3.4",
+    "sane": "1.3.0"
   }
 }

resources/prepublish.sh

@@ -21,4 +21,4 @@ fi;
 #
 #    var language = require('graphql/language');
 #
-babel src --ignore __tests__ --out-dir ./;
+babel --optional runtime src --ignore __tests__ --out-dir ./;

src/README.md

@@ -12,7 +12,6 @@ var GraphQL = require('graphql'); // CommonJS
 Each sub directory within is a sub-module of graphql-js:
 
 * `graphql/language`: Parse and operate on the GraphQL language.
-* `graphql/language/schema`: Parsing and operate on the GraphQL Schema language.
 * `graphql/type`: Define GraphQL types and schema.
 * `graphql/validation`: The Validation phase of fulfilling a GraphQL result.
 * `graphql/execution`: The Execution phase of fulfilling a GraphQL request.

src/__tests__/starWarsData.js

@@ -13,69 +13,69 @@
  * JSON objects in a more complex demo.
  */
 
-var luke = {
+const luke = {
   id: '1000',
   name: 'Luke Skywalker',
   friends: [ '1002', '1003', '2000', '2001' ],
   appearsIn: [ 4, 5, 6 ],
   homePlanet: 'Tatooine',
 };
 
-var vader = {
+const vader = {
   id: '1001',
   name: 'Darth Vader',
   friends: [ '1004' ],
   appearsIn: [ 4, 5, 6 ],
   homePlanet: 'Tatooine',
 };
 
-var han = {
+const han = {
   id: '1002',
   name: 'Han Solo',
   friends: [ '1000', '1003', '2001' ],
   appearsIn: [ 4, 5, 6 ],
 };
 
-var leia = {
+const leia = {
   id: '1003',
   name: 'Leia Organa',
   friends: [ '1000', '1002', '2000', '2001' ],
   appearsIn: [ 4, 5, 6 ],
   homePlanet: 'Alderaan',
 };
 
-var tarkin = {
+const tarkin = {
   id: '1004',
   name: 'Wilhuff Tarkin',
   friends: [ '1001' ],
   appearsIn: [ 4 ],
 };
 
-var humanData = {
+const humanData = {
   1000: luke,
   1001: vader,
   1002: han,
   1003: leia,
   1004: tarkin,
 };
 
-var threepio = {
+const threepio = {
   id: '2000',
   name: 'C-3PO',
   friends: [ '1000', '1002', '1003', '2001' ],
   appearsIn: [ 4, 5, 6 ],
   primaryFunction: 'Protocol',
 };
 
-var artoo = {
+const artoo = {
   id: '2001',
   name: 'R2-D2',
   friends: [ '1000', '1002', '1003' ],
   appearsIn: [ 4, 5, 6 ],
   primaryFunction: 'Astromech',
 };
 
-var droidData = {
+const droidData = {
   2000: threepio,
   2001: artoo,
 };