From bf55ab66b0b3f25d21ce01ef0031e11eda75e38a Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Tue, 24 Jan 2017 14:33:31 +0200 Subject: [PATCH 1/3] chore(package): remove babel --- .babelrc | 3 --- package.json | 10 +++------- packages/graphql-server-core/tsconfig.json | 2 +- packages/graphql-server-express/tsconfig.json | 2 +- packages/graphql-server-hapi/tsconfig.json | 2 +- .../graphql-server-integration-testsuite/tsconfig.json | 2 +- packages/graphql-server-koa/tsconfig.json | 2 +- packages/graphql-server-module-graphiql/tsconfig.json | 2 +- .../tsconfig.json | 2 +- packages/graphql-server-restify/tsconfig.json | 2 +- test/tests.js | 3 --- 11 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 .babelrc diff --git a/.babelrc b/.babelrc deleted file mode 100644 index c13c5f627fd..00000000000 --- a/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015"] -} diff --git a/package.json b/package.json index b1306e4bfaf..94ec20a2cf1 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "pretest": "npm run compile", "test": "npm run testonly --", "posttest": "npm run lint", - "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace --timeout 5000 ./test/tests.js", - "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js", + "testonly": "mocha --reporter spec --full-trace --timeout 5000 ./test/tests.js", + "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --full-trace --reporter dot ./test/tests.js", "pretravis": "npm run compile", - "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace ./test/tests.js", + "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --full-trace ./test/tests.js", "posttravis": "npm run lint", "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info", "check-updates": "lerna exec ./node_modules/.bin/npm-check-updates -- -u" @@ -26,10 +26,6 @@ "@types/mocha": "^2.2.38", "@types/node": "^7.0.3", "@types/sinon": "^1.16.34", - "babel-cli": "^6.22.2", - "babel-core": "^6.22.1", - "babel-polyfill": "^6.22.0", - "babel-preset-es2015": "^6.22.0", "chai": "^3.5.0", "graphql": "^0.9.0", "istanbul": "1.0.0-alpha.2", diff --git a/packages/graphql-server-core/tsconfig.json b/packages/graphql-server-core/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-core/tsconfig.json +++ b/packages/graphql-server-core/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-express/tsconfig.json b/packages/graphql-server-express/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-express/tsconfig.json +++ b/packages/graphql-server-express/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-hapi/tsconfig.json b/packages/graphql-server-hapi/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-hapi/tsconfig.json +++ b/packages/graphql-server-hapi/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-integration-testsuite/tsconfig.json b/packages/graphql-server-integration-testsuite/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-integration-testsuite/tsconfig.json +++ b/packages/graphql-server-integration-testsuite/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-koa/tsconfig.json b/packages/graphql-server-koa/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-koa/tsconfig.json +++ b/packages/graphql-server-koa/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-module-graphiql/tsconfig.json b/packages/graphql-server-module-graphiql/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-module-graphiql/tsconfig.json +++ b/packages/graphql-server-module-graphiql/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-module-operation-store/tsconfig.json b/packages/graphql-server-module-operation-store/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-module-operation-store/tsconfig.json +++ b/packages/graphql-server-module-operation-store/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/packages/graphql-server-restify/tsconfig.json b/packages/graphql-server-restify/tsconfig.json index 1107d54506b..5870a601a73 100644 --- a/packages/graphql-server-restify/tsconfig.json +++ b/packages/graphql-server-restify/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es5", "module": "commonjs", "moduleResolution": "node", "sourceMap": true, diff --git a/test/tests.js b/test/tests.js index be143063a54..fd545d4ee49 100644 --- a/test/tests.js +++ b/test/tests.js @@ -1,6 +1,3 @@ -/* tslint:disable */ -require('babel-polyfill'); - process.env.NODE_ENV = 'test'; require('source-map-support').install(); From dd08c0e5c214cae88338ded8c2f25bfafe925594 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Tue, 24 Jan 2017 14:44:09 +0200 Subject: [PATCH 2/3] chore(package): fix es5 compilation for core & operation-store --- package.json | 1 + packages/graphql-server-core/package.json | 4 +++- packages/graphql-server-core/tsconfig.json | 3 ++- .../package.json | 4 +++- .../src/operationStore.test.ts | 2 +- .../src/operationStore.ts | 15 +++++++-------- .../tsconfig.json | 3 ++- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 94ec20a2cf1..cd032a103a5 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "@types/chai": "^3.4.34", + "@types/es6-shim": "^0.31.32", "@types/mocha": "^2.2.38", "@types/node": "^7.0.3", "@types/sinon": "^1.16.34", diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index adad174619d..58a6523587c 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -23,7 +23,9 @@ "url": "https://github.com/apollostack/graphql-server/issues" }, "homepage": "https://github.com/apollostack/graphql-server#readme", - "dependencies": {}, + "dependencies": { + "es6-shim": "^0.35.3" + }, "devDependencies": { "@types/fibers": "0.0.29", "@types/graphql": "^0.8.5", diff --git a/packages/graphql-server-core/tsconfig.json b/packages/graphql-server-core/tsconfig.json index 5870a601a73..187cb9e09dc 100644 --- a/packages/graphql-server-core/tsconfig.json +++ b/packages/graphql-server-core/tsconfig.json @@ -15,7 +15,8 @@ "node_modules/@types" ], "types": [ - "@types/node" + "@types/node", + "@types/es6-shim" ] }, "exclude": [ diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json index 2c4486fa2d3..1680e1c1db7 100644 --- a/packages/graphql-server-module-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -23,7 +23,9 @@ "url": "https://github.com/apollostack/graphql-server/issues" }, "homepage": "https://github.com/apollostack/graphql-server#readme", - "dependencies": {}, + "dependencies": { + "es6-shim": "^0.35.3" + }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0" }, diff --git a/packages/graphql-server-module-operation-store/src/operationStore.test.ts b/packages/graphql-server-module-operation-store/src/operationStore.test.ts index 90a37dfdfbd..776df390ac6 100644 --- a/packages/graphql-server-module-operation-store/src/operationStore.test.ts +++ b/packages/graphql-server-module-operation-store/src/operationStore.test.ts @@ -105,7 +105,7 @@ describe('operationStore', () => { `; const store = new OperationStore(schema); - return expect(() => store.put(query)).to.throw(/operationDefinition must contain only one definition/); + return expect(() => store.put(query)).to.throw(/OperationDefinitionNode must contain only one definition/); }); it('throws an error if there is no operationDefinition found', () => { diff --git a/packages/graphql-server-module-operation-store/src/operationStore.ts b/packages/graphql-server-module-operation-store/src/operationStore.ts index 282ebd15c09..efa1fbcff3a 100644 --- a/packages/graphql-server-module-operation-store/src/operationStore.ts +++ b/packages/graphql-server-module-operation-store/src/operationStore.ts @@ -3,11 +3,10 @@ import { validate, DocumentNode, GraphQLSchema, - OperationDefinition, + OperationDefinitionNode, + Kind, } from 'graphql'; -const OPERATION_DEFINITION: string = 'OperationDefinition'; - export class OperationStore { private storedOperations: Map; private schema: GraphQLSchema; @@ -18,8 +17,8 @@ export class OperationStore { } public put(operation: string | DocumentNode): void { - function isOperationDefinition(definition): definition is OperationDefinition { - return definition.kind === OPERATION_DEFINITION; + function isOperationDefinition(definition): definition is OperationDefinitionNode { + return definition.kind === Kind.OPERATION_DEFINITION; } function isString(definition): definition is string { @@ -28,12 +27,12 @@ export class OperationStore { const ast = isString(operation) ? parse(operation as string) : operation as DocumentNode; - const definitions = ast.definitions.filter(isOperationDefinition) as OperationDefinition[]; + const definitions = ast.definitions.filter(isOperationDefinition) as OperationDefinitionNode[]; if (definitions.length === 0) { - throw new Error('operationDefinition must contain at least one definition'); + throw new Error('OperationDefinitionNode must contain at least one definition'); } if (definitions.length > 1) { - throw new Error('operationDefinition must contain only one definition'); + throw new Error('OperationDefinitionNode must contain only one definition'); } const validationErrors = validate(this.schema, ast); diff --git a/packages/graphql-server-module-operation-store/tsconfig.json b/packages/graphql-server-module-operation-store/tsconfig.json index 5870a601a73..187cb9e09dc 100644 --- a/packages/graphql-server-module-operation-store/tsconfig.json +++ b/packages/graphql-server-module-operation-store/tsconfig.json @@ -15,7 +15,8 @@ "node_modules/@types" ], "types": [ - "@types/node" + "@types/node", + "@types/es6-shim" ] }, "exclude": [ From 571bba5a88284f02d5c658fb9171965ed8528247 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Tue, 24 Jan 2017 15:01:38 +0200 Subject: [PATCH 3/3] test(pacakge): remove source-map-support require which looks redundant --- test/tests.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/tests.js b/test/tests.js index fd545d4ee49..4a9e10078b5 100644 --- a/test/tests.js +++ b/test/tests.js @@ -1,6 +1,5 @@ process.env.NODE_ENV = 'test'; -require('source-map-support').install(); require('../packages/graphql-server-core/dist/runQuery.test.js'); require('../packages/graphql-server-module-operation-store/dist/operationStore.test'); require('../packages/graphql-server-express/dist/expressApollo.test');