From 0c3ba9196401da992f72c8390269054304175c37 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Mon, 3 Oct 2016 23:13:08 +0300 Subject: [PATCH 01/11] chore(monorepo): refactor files locations and reference --- .npmignore | 4 - lerna.json | 16 ++++ package.json | 89 ++++--------------- packages/apollo-server-core/.npmignore | 5 ++ packages/apollo-server-core/package.json | 41 +++++++++ .../apollo-server-core/src}/apolloOptions.ts | 2 +- packages/apollo-server-core/src/index.ts | 2 + .../apollo-server-core/src}/runQuery.test.ts | 1 + .../apollo-server-core/src}/runQuery.ts | 0 packages/apollo-server-core/tsconfig.json | 26 ++++++ packages/apollo-server-express/.npmignore | 5 ++ packages/apollo-server-express/package.json | 51 +++++++++++ .../src/apolloServerHttp.test.ts | 5 +- .../src}/connectApollo.test.ts | 3 +- .../src}/connectApollo.ts | 0 .../src}/expressApollo.test.ts | 5 +- .../src}/expressApollo.ts | 7 +- packages/apollo-server-express/src/index.ts | 2 + packages/apollo-server-express/tsconfig.json | 26 ++++++ packages/apollo-server-graphiql/.npmignore | 5 ++ packages/apollo-server-graphiql/package.json | 32 +++++++ packages/apollo-server-graphiql/src/index.ts | 1 + .../src}/renderGraphiQL.ts | 0 .../apollo-server-graphiql/tsconfig.json | 10 ++- packages/apollo-server-hapi/.npmignore | 5 ++ packages/apollo-server-hapi/package.json | 46 ++++++++++ .../src}/hapiApollo.test.ts | 3 +- .../apollo-server-hapi/src}/hapiApollo.ts | 6 +- packages/apollo-server-hapi/src/index.ts | 5 ++ packages/apollo-server-hapi/tsconfig.json | 26 ++++++ .../.npmignore | 5 ++ .../package.json | 38 ++++++++ .../src/index.ts | 10 +-- .../tsconfig.json | 26 ++++++ packages/apollo-server-koa/.npmignore | 5 ++ packages/apollo-server-koa/package.json | 48 ++++++++++ packages/apollo-server-koa/src/index.ts | 1 + .../apollo-server-koa/src}/koaApollo.test.ts | 4 +- .../apollo-server-koa/src}/koaApollo.ts | 5 +- packages/apollo-server-koa/tsconfig.json | 26 ++++++ .../apollo-server-operation-store/.npmignore | 5 ++ .../package.json | 38 ++++++++ .../src/index.ts | 1 + .../src}/operationStore.test.ts | 2 + .../src}/operationStore.ts | 0 .../tsconfig.json | 26 ++++++ src/index.ts | 8 -- src/test/tests.ts | 15 ---- src/typings.d.ts | 1 - test/tests.js | 13 +++ typings.json | 1 - 51 files changed, 575 insertions(+), 132 deletions(-) delete mode 100644 .npmignore create mode 100644 lerna.json create mode 100644 packages/apollo-server-core/.npmignore create mode 100644 packages/apollo-server-core/package.json rename {src/integrations => packages/apollo-server-core/src}/apolloOptions.ts (95%) create mode 100644 packages/apollo-server-core/src/index.ts rename {src/core => packages/apollo-server-core/src}/runQuery.test.ts (99%) rename {src/core => packages/apollo-server-core/src}/runQuery.ts (100%) create mode 100644 packages/apollo-server-core/tsconfig.json create mode 100644 packages/apollo-server-express/.npmignore create mode 100644 packages/apollo-server-express/package.json rename src/test/testApolloServerHTTP.ts => packages/apollo-server-express/src/apolloServerHttp.test.ts (98%) rename {src/integrations => packages/apollo-server-express/src}/connectApollo.test.ts (85%) rename {src/integrations => packages/apollo-server-express/src}/connectApollo.ts (100%) rename {src/integrations => packages/apollo-server-express/src}/expressApollo.test.ts (87%) rename {src/integrations => packages/apollo-server-express/src}/expressApollo.ts (97%) create mode 100644 packages/apollo-server-express/src/index.ts create mode 100644 packages/apollo-server-express/tsconfig.json create mode 100644 packages/apollo-server-graphiql/.npmignore create mode 100644 packages/apollo-server-graphiql/package.json create mode 100644 packages/apollo-server-graphiql/src/index.ts rename {src/modules => packages/apollo-server-graphiql/src}/renderGraphiQL.ts (100%) rename tsconfig.json => packages/apollo-server-graphiql/tsconfig.json (64%) create mode 100644 packages/apollo-server-hapi/.npmignore create mode 100644 packages/apollo-server-hapi/package.json rename {src/integrations => packages/apollo-server-hapi/src}/hapiApollo.test.ts (89%) rename {src/integrations => packages/apollo-server-hapi/src}/hapiApollo.ts (97%) create mode 100644 packages/apollo-server-hapi/src/index.ts create mode 100644 packages/apollo-server-hapi/tsconfig.json create mode 100644 packages/apollo-server-integration-testsuite/.npmignore create mode 100644 packages/apollo-server-integration-testsuite/package.json rename src/integrations/integrations.test.ts => packages/apollo-server-integration-testsuite/src/index.ts (99%) create mode 100644 packages/apollo-server-integration-testsuite/tsconfig.json create mode 100644 packages/apollo-server-koa/.npmignore create mode 100644 packages/apollo-server-koa/package.json create mode 100644 packages/apollo-server-koa/src/index.ts rename {src/integrations => packages/apollo-server-koa/src}/koaApollo.test.ts (89%) rename {src/integrations => packages/apollo-server-koa/src}/koaApollo.ts (96%) create mode 100644 packages/apollo-server-koa/tsconfig.json create mode 100644 packages/apollo-server-operation-store/.npmignore create mode 100644 packages/apollo-server-operation-store/package.json create mode 100644 packages/apollo-server-operation-store/src/index.ts rename {src/modules => packages/apollo-server-operation-store/src}/operationStore.test.ts (99%) rename {src/modules => packages/apollo-server-operation-store/src}/operationStore.ts (100%) create mode 100644 packages/apollo-server-operation-store/tsconfig.json delete mode 100644 src/index.ts delete mode 100644 src/test/tests.ts delete mode 100644 src/typings.d.ts create mode 100644 test/tests.js delete mode 100644 typings.json diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 1bf5f567772..00000000000 --- a/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -src -test -coverage -resources diff --git a/lerna.json b/lerna.json new file mode 100644 index 00000000000..efc97ce2fae --- /dev/null +++ b/lerna.json @@ -0,0 +1,16 @@ +{ + "lerna": "2.0.0-beta.29", + "version": "0.3.2", + "changelog": { + "repo": "apollostack/apollo-server", + "labels": { + "tag: spec compliancy": ":eyeglasses: Spec Compliancy", + "tag: breaking change": ":boom: Breaking Change", + "tag: new feature": ":rocket: New Feature", + "tag: bug fix": ":bug: Bug Fix", + "tag: polish": ":nail_care: Polish", + "tag: documentation": "Documentation", + "tag: internal": ":house: Internal" + } + } +} diff --git a/package.json b/package.json index 8a70b7d1b45..aac5468d650 100644 --- a/package.json +++ b/package.json @@ -1,98 +1,41 @@ { - "name": "apollo-server", - "version": "0.3.2", - "description": "Production-ready Node.js GraphQL server for Express, Hapi, Koa", - "main": "dist/index.js", - "directories": { - "test": "test" + "private": true, + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/apollostack/apollo-server.git" }, "scripts": { - "compile": "tsc", - "typings": "typings install", + "compile": "lerna exec -- npm run compile", + "lint": "tslint ./packages/**/src/**/*.ts", + "prebootstrap": "npm install", + "bootstrap": "lerna bootstrap", "pretest": "npm run compile", "test": "npm run testonly --", "posttest": "npm run lint", - "lint": "tslint ./src/**/*.ts", - "watch": "tsc -w", - "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./dist/test/tests.js", - "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover _mocha -- --full-trace ./dist/test/tests.js", + "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./test/tests.js", + "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover _mocha -- --full-trace ./test/tests.js", "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info" }, - "repository": { - "type": "git", - "url": "git+https://github.com/apollostack/apollo-server.git" - }, - "keywords": [ - "GraphQL", - "Apollo", - "Hapi", - "Koa", - "Express", - "Javascript" - ], - "author": "Jonas Helfer ", - "license": "MIT", - "bugs": { - "url": "https://github.com/apollostack/apollo-proxy/issues" - }, - "homepage": "https://github.com/apollostack/apollo-proxy#readme", - "dependencies": { - "@types/body-parser": "0.0.33", - "@types/boom": "0.0.32", - "@types/chai": "^3.4.34", - "@types/connect": "^3.4.30", - "@types/cookies": "^0.5.30", - "@types/express": "^4.0.33", - "@types/express-serve-static-core": "^4.0.36", - "@types/fibers": "0.0.29", - "@types/hapi": "^13.0.35", - "@types/http-errors": "^1.3.29", - "@types/koa": "^2.0.33", - "@types/koa-bodyparser": "^3.0.19", - "@types/koa-router": "^7.0.21", - "@types/mime": "0.0.29", - "@types/multer": "0.0.32", - "@types/node": "^6.0.41", - "@types/serve-static": "^1.7.31", - "boom": "^4.0.0", - "http-errors": "^1.5.0", - "source-map-support": "^0.4.2", - "typed-graphql": "^1.0.2" - }, "devDependencies": { + "@types/chai": "^3.4.34", "@types/mocha": "^2.2.32", + "@types/node": "^6.0.42", "@types/sinon": "^1.16.31", "babel-cli": "^6.11.4", "babel-core": "^6.11.4", "babel-polyfill": "^6.9.1", "babel-preset-es2015": "^6.9.0", - "body-parser": "^1.15.2", "chai": "^3.5.0", - "connect": "^3.4.1", - "express": "^4.14.0", - "fibers": "^1.0.15", "graphql": "^0.7.0", - "hapi": "^15.0.3", "istanbul": "1.0.0-alpha.2", - "koa": "^2.0.0-alpha.4", - "koa-bodyparser": "^3.0.0", - "koa-router": "^7.0.1", - "meteor-promise": "^0.7.3", + "lerna": "^2.0.0-beta.29", "mocha": "^3.1.1", - "multer": "^1.1.0", "remap-istanbul": "^0.7.0", - "sinon": "^1.17.5", + "sinon": "^1.17.6", "supertest": "^2.0.0", "supertest-as-promised": "^4.0.0", "tslint": "^3.13.0", - "typescript": "^2.0.3", - "typings": "^1.3.2" - }, - "peerDependencies": { - "graphql": "^0.6.1 || ^0.7.0" - }, - "typings": "dist/index.d.ts", - "typescript": { - "definition": "dist/index.d.ts" + "typescript": "^2.0.3" } } diff --git a/packages/apollo-server-core/.npmignore b/packages/apollo-server-core/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-core/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json new file mode 100644 index 00000000000..3b2ac0754a3 --- /dev/null +++ b/packages/apollo-server-core/package.json @@ -0,0 +1,41 @@ +{ + "name": "apollo-server-core", + "version": "0.3.2", + "description": "Core engine ffor Apollo GraphQL server", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-core" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "typed-graphql": "^1.0.2" + }, + "devDependencies": { + "@types/fibers": "0.0.29", + "fibers": "^1.0.15", + "meteor-promise": "^0.7.3" + }, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/src/integrations/apolloOptions.ts b/packages/apollo-server-core/src/apolloOptions.ts similarity index 95% rename from src/integrations/apolloOptions.ts rename to packages/apollo-server-core/src/apolloOptions.ts index f51643603a2..ab83d1bf24b 100644 --- a/src/integrations/apolloOptions.ts +++ b/packages/apollo-server-core/src/apolloOptions.ts @@ -1,5 +1,5 @@ import { GraphQLSchema, ValidationRule } from 'graphql'; -import { LogFunction } from '../core/runQuery'; +import { LogFunction } from './runQuery'; /* * ExpressApolloOptions diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts new file mode 100644 index 00000000000..2827b717e9b --- /dev/null +++ b/packages/apollo-server-core/src/index.ts @@ -0,0 +1,2 @@ +export { runQuery, LogFunction, LogMessage, LogStep, LogAction } from './runQuery' +export { default as ApolloOptions} from './apolloOptions' diff --git a/src/core/runQuery.test.ts b/packages/apollo-server-core/src/runQuery.test.ts similarity index 99% rename from src/core/runQuery.test.ts rename to packages/apollo-server-core/src/runQuery.test.ts index da1620d949f..d227a0ddbce 100644 --- a/src/core/runQuery.test.ts +++ b/packages/apollo-server-core/src/runQuery.test.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import { stub } from 'sinon'; +import 'mocha'; import { GraphQLSchema, diff --git a/src/core/runQuery.ts b/packages/apollo-server-core/src/runQuery.ts similarity index 100% rename from src/core/runQuery.ts rename to packages/apollo-server-core/src/runQuery.ts diff --git a/packages/apollo-server-core/tsconfig.json b/packages/apollo-server-core/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-core/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/apollo-server-express/.npmignore b/packages/apollo-server-express/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-express/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json new file mode 100644 index 00000000000..dee7578db06 --- /dev/null +++ b/packages/apollo-server-express/package.json @@ -0,0 +1,51 @@ +{ + "name": "apollo-server-express", + "version": "0.3.2", + "description": "Production-ready Node.js GraphQL server for Express, Connect", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-express" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Server", + "Express", + "Connect", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "@types/express": "^4.0.33", + "apollo-server-core": "^0.3.2", + "apollo-server-graphiql": "^0.3.2" + }, + "devDependencies": { + "@types/body-parser": "0.0.33", + "@types/connect": "^3.4.30", + "@types/multer": "0.0.32", + "apollo-server-integration-testsuite": "^0.3.2", + "body-parser": "^1.15.2", + "connect": "^3.4.1", + "express": "^4.14.0", + "multer": "^1.2.0", + "typed-graphql": "^1.0.2" + }, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/src/test/testApolloServerHTTP.ts b/packages/apollo-server-express/src/apolloServerHttp.test.ts similarity index 98% rename from src/test/testApolloServerHTTP.ts rename to packages/apollo-server-express/src/apolloServerHttp.test.ts index 7c2f0f0c9fb..8c3016c2f63 100644 --- a/src/test/testApolloServerHTTP.ts +++ b/packages/apollo-server-express/src/apolloServerHttp.test.ts @@ -10,7 +10,7 @@ * sure apolloServer still works if used in the place of express-graphql. */ -import { apolloExpress } from '../integrations/expressApollo'; +import { apolloExpress } from './expressApollo'; /** * Copyright (c) 2015, Facebook, Inc. @@ -108,7 +108,6 @@ function promiseTo(fn) { }); } - describe('test harness', () => { it('expects to catch errors', async () => { @@ -272,7 +271,7 @@ describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => { expect(JSON.parse(response.text)).to.deep.equal({ data: { uploadFile: { - originalname: 'testApolloServerHTTP.js', + originalname: 'apolloServerHttp.test.js', mimetype: 'application/javascript' } } diff --git a/src/integrations/connectApollo.test.ts b/packages/apollo-server-express/src/connectApollo.test.ts similarity index 85% rename from src/integrations/connectApollo.test.ts rename to packages/apollo-server-express/src/connectApollo.test.ts index a901ed32f74..b9db82941ec 100644 --- a/src/integrations/connectApollo.test.ts +++ b/packages/apollo-server-express/src/connectApollo.test.ts @@ -1,8 +1,9 @@ import * as connect from 'connect'; import * as bodyParser from 'body-parser'; import { apolloConnect, graphiqlConnect } from './connectApollo'; +import 'mocha'; -import testSuite, { Schema, CreateAppOptions } from './integrations.test'; +import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createConnectApp(options: CreateAppOptions = {}) { const app = connect(); diff --git a/src/integrations/connectApollo.ts b/packages/apollo-server-express/src/connectApollo.ts similarity index 100% rename from src/integrations/connectApollo.ts rename to packages/apollo-server-express/src/connectApollo.ts diff --git a/src/integrations/expressApollo.test.ts b/packages/apollo-server-express/src/expressApollo.test.ts similarity index 87% rename from src/integrations/expressApollo.test.ts rename to packages/apollo-server-express/src/expressApollo.test.ts index 4d6ed0b0a79..c45afd577cf 100644 --- a/src/integrations/expressApollo.test.ts +++ b/packages/apollo-server-express/src/expressApollo.test.ts @@ -1,9 +1,10 @@ import * as express from 'express'; import * as bodyParser from 'body-parser'; import { apolloExpress, graphiqlExpress } from './expressApollo'; -import testSuite, { Schema, CreateAppOptions } from './integrations.test'; +import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; import { expect } from 'chai'; -import ApolloOptions from './apolloOptions'; +import { ApolloOptions } from 'apollo-server-core'; +import 'mocha'; function createApp(options: CreateAppOptions = {}) { const app = express(); diff --git a/src/integrations/expressApollo.ts b/packages/apollo-server-express/src/expressApollo.ts similarity index 97% rename from src/integrations/expressApollo.ts rename to packages/apollo-server-express/src/expressApollo.ts index f172fb3e84b..1acd530cb4c 100644 --- a/src/integrations/expressApollo.ts +++ b/packages/apollo-server-express/src/expressApollo.ts @@ -1,10 +1,8 @@ import * as express from 'express'; import * as graphql from 'graphql'; import * as url from 'url'; -import { runQuery } from '../core/runQuery'; - -import ApolloOptions from './apolloOptions'; -import * as GraphiQL from '../modules/renderGraphiQL'; +import { ApolloOptions, runQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-graphiql'; export interface ExpressApolloOptionsFunction { (req?: express.Request, res?: express.Response): ApolloOptions | Promise; @@ -149,7 +147,6 @@ export function graphiqlExpress(options: GraphiQL.GraphiQLData) { const variables = q.variables || '{}'; const operationName = q.operationName || ''; - const graphiQLString = GraphiQL.renderGraphiQL({ endpointURL: options.endpointURL, query: query || options.query, diff --git a/packages/apollo-server-express/src/index.ts b/packages/apollo-server-express/src/index.ts new file mode 100644 index 00000000000..c56ccc6cf99 --- /dev/null +++ b/packages/apollo-server-express/src/index.ts @@ -0,0 +1,2 @@ +export { ExpressApolloOptionsFunction, ExpressHandler, apolloExpress, graphiqlExpress } from './expressApollo'; +export { apolloConnect, graphiqlConnect } from './connectApollo'; diff --git a/packages/apollo-server-express/tsconfig.json b/packages/apollo-server-express/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-express/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/apollo-server-graphiql/.npmignore b/packages/apollo-server-graphiql/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-graphiql/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-graphiql/package.json b/packages/apollo-server-graphiql/package.json new file mode 100644 index 00000000000..7e878fb8efa --- /dev/null +++ b/packages/apollo-server-graphiql/package.json @@ -0,0 +1,32 @@ +{ + "name": "apollo-server-graphiql", + "version": "0.3.2", + "description": "GraphiQL renderer for Apollo GraphQL Server", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-graphiql" + }, + "keywords": [ + "GraphQL", + "GraphiQL", + "Apollo", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": {}, + "devDependencies": {}, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-graphiql/src/index.ts b/packages/apollo-server-graphiql/src/index.ts new file mode 100644 index 00000000000..2e958191e92 --- /dev/null +++ b/packages/apollo-server-graphiql/src/index.ts @@ -0,0 +1 @@ +export { GraphiQLData, renderGraphiQL } from './renderGraphiQL'; diff --git a/src/modules/renderGraphiQL.ts b/packages/apollo-server-graphiql/src/renderGraphiQL.ts similarity index 100% rename from src/modules/renderGraphiQL.ts rename to packages/apollo-server-graphiql/src/renderGraphiQL.ts diff --git a/tsconfig.json b/packages/apollo-server-graphiql/tsconfig.json similarity index 64% rename from tsconfig.json rename to packages/apollo-server-graphiql/tsconfig.json index 877ec8b8426..1107d54506b 100644 --- a/tsconfig.json +++ b/packages/apollo-server-graphiql/tsconfig.json @@ -8,9 +8,15 @@ "noImplicitAny": false, "rootDir": "./src", "outDir": "./dist", - "allowSyntheticDefaultImports": true, + "allowSyntheticDefaultImports": false, "pretty": true, - "removeComments": true + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "@types/node" + ] }, "exclude": [ "node_modules", diff --git a/packages/apollo-server-hapi/.npmignore b/packages/apollo-server-hapi/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-hapi/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json new file mode 100644 index 00000000000..f0550491d6d --- /dev/null +++ b/packages/apollo-server-hapi/package.json @@ -0,0 +1,46 @@ +{ + "name": "apollo-server-hapi", + "version": "0.3.2", + "description": "Production-ready Node.js GraphQL server for Hapi", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-hapi" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Hapi", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "@types/hapi": "^13.0.35", + "apollo-server-core": "^0.3.2", + "apollo-server-graphiql": "^0.3.2", + "boom": "^4.0.0", + "typed-graphql": "^1.0.2" + }, + "devDependencies": { + "@types/boom": "0.0.32", + "apollo-server-integration-testsuite": "^0.3.2", + "hapi": "^15.0.3" + }, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/src/integrations/hapiApollo.test.ts b/packages/apollo-server-hapi/src/hapiApollo.test.ts similarity index 89% rename from src/integrations/hapiApollo.test.ts rename to packages/apollo-server-hapi/src/hapiApollo.test.ts index 15ff92058eb..29f99a38ebf 100644 --- a/src/integrations/hapiApollo.test.ts +++ b/packages/apollo-server-hapi/src/hapiApollo.test.ts @@ -1,7 +1,8 @@ import * as hapi from 'hapi'; import { apolloHapi, graphiqlHapi, HapiPluginOptions } from './hapiApollo'; +import 'mocha'; -import testSuite, { Schema } from './integrations.test'; +import testSuite, { Schema } from 'apollo-server-integration-testsuite'; function createApp(createOptions: HapiPluginOptions) { const server = new hapi.Server(); diff --git a/src/integrations/hapiApollo.ts b/packages/apollo-server-hapi/src/hapiApollo.ts similarity index 97% rename from src/integrations/hapiApollo.ts rename to packages/apollo-server-hapi/src/hapiApollo.ts index 67e3eae5c16..0beaa36f7dc 100644 --- a/src/integrations/hapiApollo.ts +++ b/packages/apollo-server-hapi/src/hapiApollo.ts @@ -1,10 +1,8 @@ import * as Boom from 'boom'; import { Server, Request, IReply } from 'hapi'; import { GraphQLResult, formatError } from 'graphql'; -import * as GraphiQL from '../modules/renderGraphiQL'; -import { runQuery } from '../core/runQuery'; -import ApolloOptions from './apolloOptions'; - +import * as GraphiQL from 'apollo-server-graphiql'; +import { ApolloOptions, runQuery } from 'apollo-server-core'; export interface IRegister { (server: Server, options: any, next: any): void; diff --git a/packages/apollo-server-hapi/src/index.ts b/packages/apollo-server-hapi/src/index.ts new file mode 100644 index 00000000000..10051fa42df --- /dev/null +++ b/packages/apollo-server-hapi/src/index.ts @@ -0,0 +1,5 @@ +export { IRegister, + HapiOptionsFunction, + HapiPluginOptions, + GraphiQLPluginOptions, + apolloHapi, graphiqlHapi } from './hapiApollo'; diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/apollo-server-hapi/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-hapi/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/apollo-server-integration-testsuite/.npmignore b/packages/apollo-server-integration-testsuite/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-integration-testsuite/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json new file mode 100644 index 00000000000..01868d97312 --- /dev/null +++ b/packages/apollo-server-integration-testsuite/package.json @@ -0,0 +1,38 @@ +{ + "name": "apollo-server-integration-testsuite", + "private": true, + "version": "0.3.2", + "description": "Apollo Server Integrations testsuite", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-integration-testsuite" + }, + "keywords": [], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^0.3.2", + "apollo-server-graphiql": "^0.3.2", + "apollo-server-operation-store": "^0.3.2", + "supertest": "^2.0.0", + "supertest-as-promised": "^4.0.0", + "typed-graphql": "^1.0.2" + }, + "devDependencies": {}, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/src/integrations/integrations.test.ts b/packages/apollo-server-integration-testsuite/src/index.ts similarity index 99% rename from src/integrations/integrations.test.ts rename to packages/apollo-server-integration-testsuite/src/index.ts index 8ed6a0b7e93..861c0f830a8 100644 --- a/src/integrations/integrations.test.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import { stub } from 'sinon'; +import 'mocha'; import { GraphQLSchema, @@ -13,10 +14,9 @@ import { // tslint:disable-next-line const request = require('supertest-as-promised'); -import ApolloOptions from './apolloOptions'; - -import * as GraphiQL from '../modules/renderGraphiQL'; -import { OperationStore } from '../modules/operationStore'; +import { ApolloOptions } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-graphiql'; +import { OperationStore } from 'apollo-server-operation-store'; const QueryType = new GraphQLObjectType({ name: 'QueryType', @@ -177,7 +177,6 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); }); - it('can handle a basic request', () => { app = createApp(); const expected = { @@ -521,7 +520,6 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => { }); - describe('renderGraphiQL', () => { it('presents GraphiQL when accepting HTML', () => { app = createApp({graphiqlOptions: { diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/apollo-server-integration-testsuite/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-integration-testsuite/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/apollo-server-koa/.npmignore b/packages/apollo-server-koa/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-koa/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json new file mode 100644 index 00000000000..d395c5d6e76 --- /dev/null +++ b/packages/apollo-server-koa/package.json @@ -0,0 +1,48 @@ +{ + "name": "apollo-server-koa", + "version": "0.3.2", + "description": "Production-ready Node.js GraphQL server for Koa", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-koa" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Koa", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^0.3.2", + "apollo-server-graphiql": "^0.3.2", + "@types/koa": "^2.0.33", + "typed-graphql": "^1.0.2" + }, + "devDependencies": { + "@types/koa-bodyparser": "^3.0.19", + "@types/koa-router": "^7.0.21", + "apollo-server-integration-testsuite": "^0.3.2", + "koa": "^2.0.0-alpha.4", + "koa-bodyparser": "^3.0.0", + "koa-router": "^7.0.1" + }, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-koa/src/index.ts b/packages/apollo-server-koa/src/index.ts new file mode 100644 index 00000000000..26196548948 --- /dev/null +++ b/packages/apollo-server-koa/src/index.ts @@ -0,0 +1 @@ +export { KoaApolloOptionsFunction, KoaHandler, apolloKoa, graphiqlKoa } from './koaApollo'; diff --git a/src/integrations/koaApollo.test.ts b/packages/apollo-server-koa/src/koaApollo.test.ts similarity index 89% rename from src/integrations/koaApollo.test.ts rename to packages/apollo-server-koa/src/koaApollo.test.ts index af7953e03a6..16a3e3bca82 100644 --- a/src/integrations/koaApollo.test.ts +++ b/packages/apollo-server-koa/src/koaApollo.test.ts @@ -2,11 +2,11 @@ import * as koa from 'koa'; import * as koaRouter from 'koa-router'; import * as koaBody from 'koa-bodyparser'; import { apolloKoa, graphiqlKoa } from './koaApollo'; -import ApolloOptions from './apolloOptions'; +import { ApolloOptions } from 'apollo-server-core'; import { expect } from 'chai'; import * as http from 'http'; -import testSuite, { Schema, CreateAppOptions } from './integrations.test'; +import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createApp(options: CreateAppOptions = {}) { const app = new koa(); diff --git a/src/integrations/koaApollo.ts b/packages/apollo-server-koa/src/koaApollo.ts similarity index 96% rename from src/integrations/koaApollo.ts rename to packages/apollo-server-koa/src/koaApollo.ts index 2f42ecec42a..a6416457c6a 100644 --- a/src/integrations/koaApollo.ts +++ b/packages/apollo-server-koa/src/koaApollo.ts @@ -1,8 +1,7 @@ import * as koa from 'koa'; import * as graphql from 'graphql'; -import { runQuery } from '../core/runQuery'; -import ApolloOptions from './apolloOptions'; -import * as GraphiQL from '../modules/renderGraphiQL'; +import { ApolloOptions, runQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-graphiql'; export interface KoaApolloOptionsFunction { (ctx: koa.Context): ApolloOptions | Promise; diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/apollo-server-koa/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-koa/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/apollo-server-operation-store/.npmignore b/packages/apollo-server-operation-store/.npmignore new file mode 100644 index 00000000000..063364e2b5d --- /dev/null +++ b/packages/apollo-server-operation-store/.npmignore @@ -0,0 +1,5 @@ +* +!dist +!dist/**/* +dist/**/*.test.* +!package.json diff --git a/packages/apollo-server-operation-store/package.json b/packages/apollo-server-operation-store/package.json new file mode 100644 index 00000000000..d8593de6f60 --- /dev/null +++ b/packages/apollo-server-operation-store/package.json @@ -0,0 +1,38 @@ +{ + "name": "apollo-server-operation-store", + "version": "0.3.2", + "description": "Operation-Store module of apollo GraphQL Server", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-operation-store" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Operation Store", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollostack/apollo-server/issues" + }, + "homepage": "https://github.com/apollostack/apollo-server#readme", + "dependencies": { + "typed-graphql": "^1.0.2" + }, + "devDependencies": { + }, + "peerDependencies": { + "graphql": "^0.6.1 || ^0.7.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-operation-store/src/index.ts b/packages/apollo-server-operation-store/src/index.ts new file mode 100644 index 00000000000..7c10b8aeba0 --- /dev/null +++ b/packages/apollo-server-operation-store/src/index.ts @@ -0,0 +1 @@ +export { OperationStore } from './operationStore'; diff --git a/src/modules/operationStore.test.ts b/packages/apollo-server-operation-store/src/operationStore.test.ts similarity index 99% rename from src/modules/operationStore.test.ts rename to packages/apollo-server-operation-store/src/operationStore.test.ts index 8c27340ee7d..767b57ed772 100644 --- a/src/modules/operationStore.test.ts +++ b/packages/apollo-server-operation-store/src/operationStore.test.ts @@ -1,3 +1,5 @@ +import 'mocha'; + import { expect, } from 'chai'; diff --git a/src/modules/operationStore.ts b/packages/apollo-server-operation-store/src/operationStore.ts similarity index 100% rename from src/modules/operationStore.ts rename to packages/apollo-server-operation-store/src/operationStore.ts diff --git a/packages/apollo-server-operation-store/tsconfig.json b/packages/apollo-server-operation-store/tsconfig.json new file mode 100644 index 00000000000..400efae72bf --- /dev/null +++ b/packages/apollo-server-operation-store/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "moduleResolution": "node", + "sourceMap": true, + "declaration": true, + "noImplicitAny": false, + "rootDir": "./src", + "outDir": "./dist", + "allowSyntheticDefaultImports": false, + "pretty": true, + "removeComments": true, + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "typed-graphql", + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index 16297c72901..00000000000 --- a/src/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { runQuery, LogFunction, LogMessage, LogStep, LogAction } from './core/runQuery' -export { renderGraphiQL} from './modules/renderGraphiQL' -export { OperationStore } from './modules/operationStore' -export { apolloExpress, graphiqlExpress } from './integrations/expressApollo' -export { apolloHapi, graphiqlHapi, HapiPluginOptions, HapiOptionsFunction } from './integrations/hapiApollo' -export { apolloKoa, graphiqlKoa } from './integrations/koaApollo' -export { apolloConnect, graphiqlConnect } from './integrations/connectApollo' -export { default as ApolloOptions} from './integrations/apolloOptions' diff --git a/src/test/tests.ts b/src/test/tests.ts deleted file mode 100644 index 0752fcfb103..00000000000 --- a/src/test/tests.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* tslint:disable */ -import 'babel-polyfill' - -process.env.NODE_ENV = 'test'; - -declare function require(name: string); -require('source-map-support').install(); - -import '../core/runQuery.test'; -import '../modules/operationStore.test'; -import '../integrations/expressApollo.test'; -import '../integrations/connectApollo.test'; -import '../integrations/hapiApollo.test'; -import '../integrations/koaApollo.test'; -import './testApolloServerHTTP'; diff --git a/src/typings.d.ts b/src/typings.d.ts deleted file mode 100644 index f43cdb872c0..00000000000 --- a/src/typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/test/tests.js b/test/tests.js new file mode 100644 index 00000000000..1102f1ffb88 --- /dev/null +++ b/test/tests.js @@ -0,0 +1,13 @@ +/* tslint:disable */ +require('babel-polyfill'); + +process.env.NODE_ENV = 'test'; + +require('source-map-support').install(); +require('../packages/apollo-server-core/dist/runQuery.test.js'); +require('../packages/apollo-server-operation-store/dist/operationStore.test'); +require('../packages/apollo-server-express/dist/expressApollo.test'); +require('../packages/apollo-server-express/dist/connectApollo.test'); +require('../packages/apollo-server-hapi/dist/hapiApollo.test'); +require('../packages/apollo-server-koa/dist/koaApollo.test'); +require('../packages/apollo-server-express/dist/apolloServerHttp.test'); diff --git a/typings.json b/typings.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/typings.json +++ /dev/null @@ -1 +0,0 @@ -{} From 1e23da7e0adcb52363274f1b4f2dfa19f2f71b46 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 01:50:43 +0300 Subject: [PATCH 02/11] test: fix for bug in test (Unhandled exception) --- packages/apollo-server-express/src/apolloServerHttp.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-express/src/apolloServerHttp.test.ts b/packages/apollo-server-express/src/apolloServerHttp.test.ts index 8c3016c2f63..0ff5a9c5ced 100644 --- a/packages/apollo-server-express/src/apolloServerHttp.test.ts +++ b/packages/apollo-server-express/src/apolloServerHttp.test.ts @@ -267,7 +267,7 @@ describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => { }`) .attach('file', __filename); - req.then((response) => { + return req.then((response) => { expect(JSON.parse(response.text)).to.deep.equal({ data: { uploadFile: { From 63ae68419836f1c94717a3d93b882bc8b136ba84 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 02:05:51 +0300 Subject: [PATCH 03/11] chore: temporary lerna used until boostrap-dev patch is merged --- lerna.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index efc97ce2fae..ff55a5bdb32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "lerna": "2.0.0-beta.29", + "lerna": "2.0.0-beta.30", "version": "0.3.2", "changelog": { "repo": "apollostack/apollo-server", diff --git a/package.json b/package.json index aac5468d650..a676912709e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "chai": "^3.5.0", "graphql": "^0.7.0", "istanbul": "1.0.0-alpha.2", - "lerna": "^2.0.0-beta.29", + "lerna": "git://github.com/DxCx/lerna.git#bootstrap-dev-bin-pkg", "mocha": "^3.1.1", "remap-istanbul": "^0.7.0", "sinon": "^1.17.6", From 320fd0fbe20555746a9a51f9de7442031e879ba7 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 02:11:42 +0300 Subject: [PATCH 04/11] chore(package): update README.md after lerna is applied --- README.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fffa1d31bf6..6774eb3ccd4 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,18 @@ Apollo Server is super-easy to set up. Just npm-install apollo-server, write a G ### Installation -Just run `npm install --save apollo-server` and you're good to go! +Just run `npm install --save apollo-server-` and you're good to go! + +where variant is one of the following: + - express + - koa + - hapi ### Express ```js import express from 'express'; -import { apolloExpress } from 'apollo-server'; +import { apolloExpress } from 'apollo-server-express'; const myGraphQLSchema = // ... define or import your schema here! const PORT = 3000; @@ -47,7 +52,7 @@ app.listen(PORT); ```js import connect from 'connect'; import bodyParser from 'body-parser'; -import { apolloConnect } from 'apollo-server'; +import { apolloConnect } from 'apollo-server-express'; import http from 'http'; const PORT = 3000; @@ -66,7 +71,7 @@ Now with the Hapi plugins `apolloHapi` and `graphiqlHapi` you can pass a route o ```js import hapi from 'hapi'; -import { apolloHapi } from 'apollo-server'; +import { apolloHapi } from 'apollo-server-hapi'; const server = new hapi.Server(); @@ -103,7 +108,7 @@ server.start((err) => { ```js import koa from 'koa'; import koaRouter from 'koa-router'; -import { apolloKoa } from 'apollo-server'; +import { apolloKoa } from 'apollo-server-koa'; const app = new koa(); const router = new koaRouter(); @@ -174,10 +179,8 @@ If you want to develop apollo server locally you must follow the following instr ``` git clone https://github.com/[your-user]/apollo-server cd apollo-server -npm install -g typescript live-server -npm install -npm run typings -npm run compile +npm run bootstrap +cd packages/apollo-server-/ npm link ``` From a599b76db0fb57a275f637843a7c08d400019696 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 02:12:36 +0300 Subject: [PATCH 05/11] chore(travis): fix script after lerna is applied --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56c29d611ed..c3fc4c2a7ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ node_js: - "4" install: - npm install -g coveralls - - npm install - - npm run typings + - npm run bootstrap script: - npm test From ffe9c1e0a48215cf2d4f34ad492bbec655293f5e Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 02:32:12 +0300 Subject: [PATCH 06/11] chore(package): rename bootstrap script to postinstall --- .travis.yml | 2 +- README.md | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3fc4c2a7ae..df46e305a0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ node_js: - "4" install: - npm install -g coveralls - - npm run bootstrap + - npm install script: - npm test diff --git a/README.md b/README.md index 6774eb3ccd4..1f1e8aa70be 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ If you want to develop apollo server locally you must follow the following instr ``` git clone https://github.com/[your-user]/apollo-server cd apollo-server -npm run bootstrap +npm install cd packages/apollo-server-/ npm link ``` diff --git a/package.json b/package.json index a676912709e..75e700fb428 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "compile": "lerna exec -- npm run compile", "lint": "tslint ./packages/**/src/**/*.ts", "prebootstrap": "npm install", - "bootstrap": "lerna bootstrap", + "postinstall": "lerna bootstrap", "pretest": "npm run compile", "test": "npm run testonly --", "posttest": "npm run lint", From ab85949e49592e5e8b7f183da9d43ea2ee573303 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Wed, 5 Oct 2016 10:19:59 +0300 Subject: [PATCH 07/11] chore(package): fix coverage report --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75e700fb428..ba4fc3ad1e5 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "npm run testonly --", "posttest": "npm run lint", "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./test/tests.js", - "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover _mocha -- --full-trace ./test/tests.js", + "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover -x \"*.test.js\" _mocha -- --full-trace --reporter dot ./test/tests.js", "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info" }, "devDependencies": { From c29e08c70ae85add3d8f57359b7cdc5af17bbba5 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Thu, 6 Oct 2016 02:00:30 +0300 Subject: [PATCH 08/11] chore(travis): set to npm version 3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index df46e305a0f..ff5661d6ea4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ node_js: - "6" - "4" install: + - npm install -g npm@3 - npm install -g coveralls - npm install From 70d842f17d42e755681fa0b36ec1dff91ab82d6e Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Thu, 6 Oct 2016 11:01:12 +0300 Subject: [PATCH 09/11] chore(package): fix for coverage on node 4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba4fc3ad1e5..2cbc208e493 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "npm run testonly --", "posttest": "npm run lint", "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./test/tests.js", - "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover -x \"*.test.js\" _mocha -- --full-trace --reporter dot ./test/tests.js", + "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js", "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info" }, "devDependencies": { From 2219fb9a6025c27184a3890d26e3354584dc0cc6 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Thu, 6 Oct 2016 14:05:48 +0300 Subject: [PATCH 10/11] chore(package): move all @types as optionalDependencies for non-ts users --- packages/apollo-server-core/package.json | 8 +++++--- packages/apollo-server-express/package.json | 5 ++++- packages/apollo-server-hapi/package.json | 12 ++++++++---- .../apollo-server-integration-testsuite/package.json | 8 ++++++-- packages/apollo-server-koa/package.json | 12 ++++++++---- packages/apollo-server-operation-store/package.json | 8 +++++--- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 3b2ac0754a3..f3914cff707 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -23,17 +23,19 @@ "url": "https://github.com/apollostack/apollo-server/issues" }, "homepage": "https://github.com/apollostack/apollo-server#readme", - "dependencies": { - "typed-graphql": "^1.0.2" - }, + "dependencies": {}, "devDependencies": { "@types/fibers": "0.0.29", + "typed-graphql": "^1.0.2", "fibers": "^1.0.15", "meteor-promise": "^0.7.3" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "typed-graphql": "^1.0.2" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index dee7578db06..bf86647acf7 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -26,13 +26,13 @@ }, "homepage": "https://github.com/apollostack/apollo-server#readme", "dependencies": { - "@types/express": "^4.0.33", "apollo-server-core": "^0.3.2", "apollo-server-graphiql": "^0.3.2" }, "devDependencies": { "@types/body-parser": "0.0.33", "@types/connect": "^3.4.30", + "@types/express": "^4.0.33", "@types/multer": "0.0.32", "apollo-server-integration-testsuite": "^0.3.2", "body-parser": "^1.15.2", @@ -44,6 +44,9 @@ "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "@types/express": "^4.0.33" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index f0550491d6d..fbd523c1ef3 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -25,20 +25,24 @@ }, "homepage": "https://github.com/apollostack/apollo-server#readme", "dependencies": { - "@types/hapi": "^13.0.35", "apollo-server-core": "^0.3.2", "apollo-server-graphiql": "^0.3.2", - "boom": "^4.0.0", - "typed-graphql": "^1.0.2" + "boom": "^4.0.0" }, "devDependencies": { "@types/boom": "0.0.32", + "@types/hapi": "^13.0.35", "apollo-server-integration-testsuite": "^0.3.2", - "hapi": "^15.0.3" + "hapi": "^15.0.3", + "typed-graphql": "^1.0.2" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "@types/hapi": "^13.0.35", + "typed-graphql": "^1.0.2" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 01868d97312..d72e95028e6 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -24,13 +24,17 @@ "apollo-server-graphiql": "^0.3.2", "apollo-server-operation-store": "^0.3.2", "supertest": "^2.0.0", - "supertest-as-promised": "^4.0.0", + "supertest-as-promised": "^4.0.0" + }, + "devDependencies": { "typed-graphql": "^1.0.2" }, - "devDependencies": {}, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "typed-graphql": "^1.0.2" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index d395c5d6e76..5339621b45c 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -26,21 +26,25 @@ "homepage": "https://github.com/apollostack/apollo-server#readme", "dependencies": { "apollo-server-core": "^0.3.2", - "apollo-server-graphiql": "^0.3.2", - "@types/koa": "^2.0.33", - "typed-graphql": "^1.0.2" + "apollo-server-graphiql": "^0.3.2" }, "devDependencies": { + "@types/koa": "^2.0.33", "@types/koa-bodyparser": "^3.0.19", "@types/koa-router": "^7.0.21", "apollo-server-integration-testsuite": "^0.3.2", "koa": "^2.0.0-alpha.4", "koa-bodyparser": "^3.0.0", - "koa-router": "^7.0.1" + "koa-router": "^7.0.1", + "typed-graphql": "^1.0.2" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "@types/koa": "^2.0.33", + "typed-graphql": "^1.0.2" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/apollo-server-operation-store/package.json b/packages/apollo-server-operation-store/package.json index d8593de6f60..4d6aba1d3e1 100644 --- a/packages/apollo-server-operation-store/package.json +++ b/packages/apollo-server-operation-store/package.json @@ -23,14 +23,16 @@ "url": "https://github.com/apollostack/apollo-server/issues" }, "homepage": "https://github.com/apollostack/apollo-server#readme", - "dependencies": { - "typed-graphql": "^1.0.2" - }, + "dependencies": {}, "devDependencies": { + "typed-graphql": "^1.0.2" }, "peerDependencies": { "graphql": "^0.6.1 || ^0.7.0" }, + "optionalDependencies": { + "typed-graphql": "^1.0.2" + }, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" From 8df3383ecea8e17859452b67b99bacdedb6d8014 Mon Sep 17 00:00:00 2001 From: Hagai Cohen Date: Tue, 18 Oct 2016 09:36:07 +0300 Subject: [PATCH 11/11] chore(package): rename apollo-server to graphql-server Closes #163 --- README.md | 62 +++++++++---------- integrations.md | 6 +- lerna.json | 2 +- package.json | 2 +- .../.npmignore | 0 .../package.json | 8 +-- .../src/apolloOptions.ts | 0 .../src/index.ts | 0 .../src/runQuery.test.ts | 0 .../src/runQuery.ts | 0 .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 14 ++--- .../src/apolloServerHttp.test.ts | 0 .../src/connectApollo.test.ts | 2 +- .../src/connectApollo.ts | 0 .../src/expressApollo.test.ts | 4 +- .../src/expressApollo.ts | 4 +- .../src/index.ts | 0 .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 14 ++--- .../src/hapiApollo.test.ts | 2 +- .../src/hapiApollo.ts | 4 +- .../src/index.ts | 0 .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 14 ++--- .../src/index.ts | 6 +- .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 14 ++--- .../src/index.ts | 0 .../src/koaApollo.test.ts | 4 +- .../src/koaApollo.ts | 4 +- .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 8 +-- .../src/index.ts | 0 .../src/renderGraphiQL.ts | 0 .../tsconfig.json | 0 .../.npmignore | 0 .../package.json | 8 +-- .../src/index.ts | 0 .../src/operationStore.test.ts | 0 .../src/operationStore.ts | 0 .../tsconfig.json | 0 test/tests.js | 14 ++--- 48 files changed, 98 insertions(+), 98 deletions(-) rename packages/{apollo-server-core => graphql-server-core}/.npmignore (100%) rename packages/{apollo-server-core => graphql-server-core}/package.json (74%) rename packages/{apollo-server-core => graphql-server-core}/src/apolloOptions.ts (100%) rename packages/{apollo-server-core => graphql-server-core}/src/index.ts (100%) rename packages/{apollo-server-core => graphql-server-core}/src/runQuery.test.ts (100%) rename packages/{apollo-server-core => graphql-server-core}/src/runQuery.ts (100%) rename packages/{apollo-server-core => graphql-server-core}/tsconfig.json (100%) rename packages/{apollo-server-express => graphql-server-express}/.npmignore (100%) rename packages/{apollo-server-express => graphql-server-express}/package.json (70%) rename packages/{apollo-server-express => graphql-server-express}/src/apolloServerHttp.test.ts (100%) rename packages/{apollo-server-express => graphql-server-express}/src/connectApollo.test.ts (87%) rename packages/{apollo-server-express => graphql-server-express}/src/connectApollo.ts (100%) rename packages/{apollo-server-express => graphql-server-express}/src/expressApollo.test.ts (88%) rename packages/{apollo-server-express => graphql-server-express}/src/expressApollo.ts (97%) rename packages/{apollo-server-express => graphql-server-express}/src/index.ts (100%) rename packages/{apollo-server-express => graphql-server-express}/tsconfig.json (100%) rename packages/{apollo-server-graphiql => graphql-server-hapi}/.npmignore (100%) rename packages/{apollo-server-hapi => graphql-server-hapi}/package.json (67%) rename packages/{apollo-server-hapi => graphql-server-hapi}/src/hapiApollo.test.ts (91%) rename packages/{apollo-server-hapi => graphql-server-hapi}/src/hapiApollo.ts (98%) rename packages/{apollo-server-hapi => graphql-server-hapi}/src/index.ts (100%) rename packages/{apollo-server-hapi => graphql-server-hapi}/tsconfig.json (100%) rename packages/{apollo-server-hapi => graphql-server-integration-testsuite}/.npmignore (100%) rename packages/{apollo-server-integration-testsuite => graphql-server-integration-testsuite}/package.json (61%) rename packages/{apollo-server-integration-testsuite => graphql-server-integration-testsuite}/src/index.ts (99%) rename packages/{apollo-server-integration-testsuite => graphql-server-integration-testsuite}/tsconfig.json (100%) rename packages/{apollo-server-integration-testsuite => graphql-server-koa}/.npmignore (100%) rename packages/{apollo-server-koa => graphql-server-koa}/package.json (69%) rename packages/{apollo-server-koa => graphql-server-koa}/src/index.ts (100%) rename packages/{apollo-server-koa => graphql-server-koa}/src/koaApollo.test.ts (89%) rename packages/{apollo-server-koa => graphql-server-koa}/src/koaApollo.ts (96%) rename packages/{apollo-server-koa => graphql-server-koa}/tsconfig.json (100%) rename packages/{apollo-server-koa => graphql-server-module-graphiql}/.npmignore (100%) rename packages/{apollo-server-graphiql => graphql-server-module-graphiql}/package.json (65%) rename packages/{apollo-server-graphiql => graphql-server-module-graphiql}/src/index.ts (100%) rename packages/{apollo-server-graphiql => graphql-server-module-graphiql}/src/renderGraphiQL.ts (100%) rename packages/{apollo-server-graphiql => graphql-server-module-graphiql}/tsconfig.json (100%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/.npmignore (100%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/package.json (70%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/src/index.ts (100%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/src/operationStore.test.ts (100%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/src/operationStore.ts (100%) rename packages/{apollo-server-operation-store => graphql-server-module-operation-store}/tsconfig.json (100%) diff --git a/README.md b/README.md index 1f1e8aa70be..b2bf132d859 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ # GraphQL Server for Express, Connect, Hapi and Koa -[![npm version](https://badge.fury.io/js/apollo-server.svg)](https://badge.fury.io/js/apollo-server) -[![Build Status](https://travis-ci.org/apollostack/apollo-server.svg?branch=master)](https://travis-ci.org/apollostack/apollo-server) -[![Coverage Status](https://coveralls.io/repos/github/apollostack/apollo-server/badge.svg?branch=master)](https://coveralls.io/github/apollostack/apollo-server?branch=master) +[![npm version](https://badge.fury.io/js/graphql-server.svg)](https://badge.fury.io/js/graphql-server) +[![Build Status](https://travis-ci.org/apollostack/graphql-server.svg?branch=master)](https://travis-ci.org/apollostack/graphql-server) +[![Coverage Status](https://coveralls.io/repos/github/apollostack/graphql-server/badge.svg?branch=master)](https://coveralls.io/github/apollostack/graphql-server?branch=master) [![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](http://www.apollostack.com/#slack) -Apollo Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi and Koa. +GraphQL Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi and Koa. ## Principles -Apollo Server is built with the following principles in mind: +GraphQL Server is built with the following principles in mind: -* **By the community, for the community**: Apollo Server's development is driven by the needs of developers -* **Simplicity**: by keeping things simple, Apollo Server is easier to use, easier to contribute to, and more secure -* **Performance**: Apollo Server is well-tested and production-ready - no modifications needed +* **By the community, for the community**: GraphQL Server's development is driven by the needs of developers +* **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure +* **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed -Anyone is welcome to contribute to Apollo Server, just read [CONTRIBUTING.md](./CONTRIBUTING.md), take a look at the [roadmap](./ROADMAP.md) and make your first PR! +Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](./CONTRIBUTING.md), take a look at the [roadmap](./ROADMAP.md) and make your first PR! ## Getting started -Apollo Server is super-easy to set up. Just npm-install apollo-server, write a GraphQL schema, and then use one of the following snippets to get started. For more info, read the [Apollo Server docs](http://dev.apollodata.com/tools/apollo-server/index.html). +GraphQL Server is super-easy to set up. Just npm-install graphql-server-, write a GraphQL schema, and then use one of the following snippets to get started. For more info, read the [GraphQL Server docs](http://dev.apollodata.com/tools/graphql-server/index.html). ### Installation -Just run `npm install --save apollo-server-` and you're good to go! +Just run `npm install --save graphql-server-` and you're good to go! where variant is one of the following: - express @@ -36,7 +36,7 @@ where variant is one of the following: ```js import express from 'express'; -import { apolloExpress } from 'apollo-server-express'; +import { apolloExpress } from 'graphql-server-express'; const myGraphQLSchema = // ... define or import your schema here! const PORT = 3000; @@ -52,7 +52,7 @@ app.listen(PORT); ```js import connect from 'connect'; import bodyParser from 'body-parser'; -import { apolloConnect } from 'apollo-server-express'; +import { apolloConnect } from 'graphql-server-express'; import http from 'http'; const PORT = 3000; @@ -71,7 +71,7 @@ Now with the Hapi plugins `apolloHapi` and `graphiqlHapi` you can pass a route o ```js import hapi from 'hapi'; -import { apolloHapi } from 'apollo-server-hapi'; +import { apolloHapi } from 'graphql-server-hapi'; const server = new hapi.Server(); @@ -108,7 +108,7 @@ server.start((err) => { ```js import koa from 'koa'; import koaRouter from 'koa-router'; -import { apolloKoa } from 'apollo-server-koa'; +import { apolloKoa } from 'graphql-server-koa'; const app = new koa(); const router = new koaRouter(); @@ -124,7 +124,7 @@ app.listen(PORT); ## Options -Apollo Server can be configured with an options object with the the following fields: +GraphQL Server can be configured with an options object with the the following fields: * **schema**: the GraphQLSchema to be used * **context**: the context value passed to resolvers during GraphQL execution @@ -154,39 +154,39 @@ apolloOptions = { ## Differences to express-graphql -Apollo Server and express-graphql are more or less the same thing (GraphQL middleware for Node.js), but there are a few key differences: +GraphQL Server and express-graphql are more or less the same thing (GraphQL middleware for Node.js), but there are a few key differences: -* express-graphql works with Express and Connect, Apollo Server supports Express, Connect, Hapi and Koa. -* express-graphql's main goal is to be a minimal reference implementation, whereas Apollo Server's goal is to be a complete production-ready GraphQL server. -* Compared to express-graphql, Apollo Server has a simpler interface and supports exactly one way of passing queries. -* Apollo Server separates serving GraphiQL (GraphQL UI) from responding to GraphQL requests. -* express-graphql contains code for parsing HTTP request bodies, Apollo Server leaves that to standard packages like body-parser. +* express-graphql works with Express and Connect, GraphQL Server supports Express, Connect, Hapi and Koa. +* express-graphql's main goal is to be a minimal reference implementation, whereas GraphQL Server's goal is to be a complete production-ready GraphQL server. +* Compared to express-graphql, GraphQL Server has a simpler interface and supports exactly one way of passing queries. +* GraphQL Server separates serving GraphiQL (GraphQL UI) from responding to GraphQL requests. +* express-graphql contains code for parsing HTTP request bodies, GraphQL Server leaves that to standard packages like body-parser. * Includes an `OperationStore` to easily manage whitelisting * Built with TypeScript -Despite express-graphql being a reference implementation, Apollo Server is actually easier to understand and more modular than express-graphql. +Despite express-graphql being a reference implementation, GraphQL Server is actually easier to understand and more modular than express-graphql. -That said, Apollo Server is heavily inspired by express-graphql (it's the reference implementation after all). Rather than seeing the two as competing alternatives, we think that they both have separate roles in the GraphQL ecosystem: express-graphql is a reference implementation, and Apollo Server is a GraphQL server to be used in production and evolve quickly with the needs of the community. Over time, express-graphql can adopt those features of Apollo Server that have proven their worth and become established more widely. +That said, GraphQL Server is heavily inspired by express-graphql (it's the reference implementation after all). Rather than seeing the two as competing alternatives, we think that they both have separate roles in the GraphQL ecosystem: express-graphql is a reference implementation, and GraphQL Server is a GraphQL server to be used in production and evolve quickly with the needs of the community. Over time, express-graphql can adopt those features of GraphQL Server that have proven their worth and become established more widely. -## Apollo Server Development +## GraphQL Server Development If you want to develop apollo server locally you must follow the following instructions: * Fork this repository -* Install the Apollo Server project in your computer +* Install the GraphQL Server project in your computer ``` -git clone https://github.com/[your-user]/apollo-server -cd apollo-server +git clone https://github.com/[your-user]/graphql-server +cd graphql-server npm install -cd packages/apollo-server-/ +cd packages/graphql-server-/ npm link ``` -* Install your local Apollo Server in other App +* Install your local GraphQL Server in other App ``` cd ~/myApp -npm link apollo-server +npm link graphql-server- ``` diff --git a/integrations.md b/integrations.md index 96d98007921..33c46485025 100644 --- a/integrations.md +++ b/integrations.md @@ -8,7 +8,7 @@ An Express Middleware for the Apollo Server import * as graphql from "graphql"; import * as express from "express"; import * as bodyParser from "body-parser"; -import { graphqlHTTP, renderGraphiQL } from "apollo-server"; +import { apolloExpress, graphiqlExpress } from "graphql-server-express"; const port = 3000; const endpointURL = "/graphql"; @@ -24,8 +24,8 @@ const schema = new graphql.GraphQLSchema({ }); app.use(bodyParser.json()); -app.get("/", renderGraphiQL({endpointURL})); -app.post(endpointURL, graphqlHTTP({schema})); +app.get("/", graphiqlExpress({endpointURL})); +app.post(endpointURL, apolloExpress({schema})); app.listen(port, () => { console.log(`Server is listen on ${port}`); diff --git a/lerna.json b/lerna.json index ff55a5bdb32..0bdc4521ff4 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "lerna": "2.0.0-beta.30", "version": "0.3.2", "changelog": { - "repo": "apollostack/apollo-server", + "repo": "apollostack/graphql-server", "labels": { "tag: spec compliancy": ":eyeglasses: Spec Compliancy", "tag: breaking change": ":boom: Breaking Change", diff --git a/package.json b/package.json index 2cbc208e493..100e2f2a867 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "git+https://github.com/apollostack/apollo-server.git" + "url": "git+https://github.com/apollostack/graphql-server.git" }, "scripts": { "compile": "lerna exec -- npm run compile", diff --git a/packages/apollo-server-core/.npmignore b/packages/graphql-server-core/.npmignore similarity index 100% rename from packages/apollo-server-core/.npmignore rename to packages/graphql-server-core/.npmignore diff --git a/packages/apollo-server-core/package.json b/packages/graphql-server-core/package.json similarity index 74% rename from packages/apollo-server-core/package.json rename to packages/graphql-server-core/package.json index f3914cff707..f42e325d250 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-core", + "name": "graphql-server-core", "version": "0.3.2", "description": "Core engine ffor Apollo GraphQL server", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-core" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-core" }, "keywords": [ "GraphQL", @@ -20,9 +20,9 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": {}, "devDependencies": { "@types/fibers": "0.0.29", diff --git a/packages/apollo-server-core/src/apolloOptions.ts b/packages/graphql-server-core/src/apolloOptions.ts similarity index 100% rename from packages/apollo-server-core/src/apolloOptions.ts rename to packages/graphql-server-core/src/apolloOptions.ts diff --git a/packages/apollo-server-core/src/index.ts b/packages/graphql-server-core/src/index.ts similarity index 100% rename from packages/apollo-server-core/src/index.ts rename to packages/graphql-server-core/src/index.ts diff --git a/packages/apollo-server-core/src/runQuery.test.ts b/packages/graphql-server-core/src/runQuery.test.ts similarity index 100% rename from packages/apollo-server-core/src/runQuery.test.ts rename to packages/graphql-server-core/src/runQuery.test.ts diff --git a/packages/apollo-server-core/src/runQuery.ts b/packages/graphql-server-core/src/runQuery.ts similarity index 100% rename from packages/apollo-server-core/src/runQuery.ts rename to packages/graphql-server-core/src/runQuery.ts diff --git a/packages/apollo-server-core/tsconfig.json b/packages/graphql-server-core/tsconfig.json similarity index 100% rename from packages/apollo-server-core/tsconfig.json rename to packages/graphql-server-core/tsconfig.json diff --git a/packages/apollo-server-express/.npmignore b/packages/graphql-server-express/.npmignore similarity index 100% rename from packages/apollo-server-express/.npmignore rename to packages/graphql-server-express/.npmignore diff --git a/packages/apollo-server-express/package.json b/packages/graphql-server-express/package.json similarity index 70% rename from packages/apollo-server-express/package.json rename to packages/graphql-server-express/package.json index bf86647acf7..097cd1f5ff1 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-express", + "name": "graphql-server-express", "version": "0.3.2", "description": "Production-ready Node.js GraphQL server for Express, Connect", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-express" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-express" }, "keywords": [ "GraphQL", @@ -22,19 +22,19 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "apollo-server-core": "^0.3.2", - "apollo-server-graphiql": "^0.3.2" + "graphql-server-core": "^0.3.2", + "graphql-server-module-graphiql": "^0.3.2" }, "devDependencies": { "@types/body-parser": "0.0.33", "@types/connect": "^3.4.30", "@types/express": "^4.0.33", "@types/multer": "0.0.32", - "apollo-server-integration-testsuite": "^0.3.2", + "graphql-server-integration-testsuite": "^0.3.2", "body-parser": "^1.15.2", "connect": "^3.4.1", "express": "^4.14.0", diff --git a/packages/apollo-server-express/src/apolloServerHttp.test.ts b/packages/graphql-server-express/src/apolloServerHttp.test.ts similarity index 100% rename from packages/apollo-server-express/src/apolloServerHttp.test.ts rename to packages/graphql-server-express/src/apolloServerHttp.test.ts diff --git a/packages/apollo-server-express/src/connectApollo.test.ts b/packages/graphql-server-express/src/connectApollo.test.ts similarity index 87% rename from packages/apollo-server-express/src/connectApollo.test.ts rename to packages/graphql-server-express/src/connectApollo.test.ts index b9db82941ec..3e7377a2779 100644 --- a/packages/apollo-server-express/src/connectApollo.test.ts +++ b/packages/graphql-server-express/src/connectApollo.test.ts @@ -3,7 +3,7 @@ import * as bodyParser from 'body-parser'; import { apolloConnect, graphiqlConnect } from './connectApollo'; import 'mocha'; -import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; +import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; function createConnectApp(options: CreateAppOptions = {}) { const app = connect(); diff --git a/packages/apollo-server-express/src/connectApollo.ts b/packages/graphql-server-express/src/connectApollo.ts similarity index 100% rename from packages/apollo-server-express/src/connectApollo.ts rename to packages/graphql-server-express/src/connectApollo.ts diff --git a/packages/apollo-server-express/src/expressApollo.test.ts b/packages/graphql-server-express/src/expressApollo.test.ts similarity index 88% rename from packages/apollo-server-express/src/expressApollo.test.ts rename to packages/graphql-server-express/src/expressApollo.test.ts index c45afd577cf..cfcbf92b75c 100644 --- a/packages/apollo-server-express/src/expressApollo.test.ts +++ b/packages/graphql-server-express/src/expressApollo.test.ts @@ -1,9 +1,9 @@ import * as express from 'express'; import * as bodyParser from 'body-parser'; import { apolloExpress, graphiqlExpress } from './expressApollo'; -import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; +import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; import { expect } from 'chai'; -import { ApolloOptions } from 'apollo-server-core'; +import { ApolloOptions } from 'graphql-server-core'; import 'mocha'; function createApp(options: CreateAppOptions = {}) { diff --git a/packages/apollo-server-express/src/expressApollo.ts b/packages/graphql-server-express/src/expressApollo.ts similarity index 97% rename from packages/apollo-server-express/src/expressApollo.ts rename to packages/graphql-server-express/src/expressApollo.ts index 1acd530cb4c..4bcb666eab1 100644 --- a/packages/apollo-server-express/src/expressApollo.ts +++ b/packages/graphql-server-express/src/expressApollo.ts @@ -1,8 +1,8 @@ import * as express from 'express'; import * as graphql from 'graphql'; import * as url from 'url'; -import { ApolloOptions, runQuery } from 'apollo-server-core'; -import * as GraphiQL from 'apollo-server-graphiql'; +import { ApolloOptions, runQuery } from 'graphql-server-core'; +import * as GraphiQL from 'graphql-server-module-graphiql'; export interface ExpressApolloOptionsFunction { (req?: express.Request, res?: express.Response): ApolloOptions | Promise; diff --git a/packages/apollo-server-express/src/index.ts b/packages/graphql-server-express/src/index.ts similarity index 100% rename from packages/apollo-server-express/src/index.ts rename to packages/graphql-server-express/src/index.ts diff --git a/packages/apollo-server-express/tsconfig.json b/packages/graphql-server-express/tsconfig.json similarity index 100% rename from packages/apollo-server-express/tsconfig.json rename to packages/graphql-server-express/tsconfig.json diff --git a/packages/apollo-server-graphiql/.npmignore b/packages/graphql-server-hapi/.npmignore similarity index 100% rename from packages/apollo-server-graphiql/.npmignore rename to packages/graphql-server-hapi/.npmignore diff --git a/packages/apollo-server-hapi/package.json b/packages/graphql-server-hapi/package.json similarity index 67% rename from packages/apollo-server-hapi/package.json rename to packages/graphql-server-hapi/package.json index fbd523c1ef3..c9f3c202929 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-hapi", + "name": "graphql-server-hapi", "version": "0.3.2", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-hapi" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-hapi" }, "keywords": [ "GraphQL", @@ -21,18 +21,18 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "apollo-server-core": "^0.3.2", - "apollo-server-graphiql": "^0.3.2", + "graphql-server-core": "^0.3.2", + "graphql-server-module-graphiql": "^0.3.2", "boom": "^4.0.0" }, "devDependencies": { "@types/boom": "0.0.32", "@types/hapi": "^13.0.35", - "apollo-server-integration-testsuite": "^0.3.2", + "graphql-server-integration-testsuite": "^0.3.2", "hapi": "^15.0.3", "typed-graphql": "^1.0.2" }, diff --git a/packages/apollo-server-hapi/src/hapiApollo.test.ts b/packages/graphql-server-hapi/src/hapiApollo.test.ts similarity index 91% rename from packages/apollo-server-hapi/src/hapiApollo.test.ts rename to packages/graphql-server-hapi/src/hapiApollo.test.ts index 29f99a38ebf..5ca2ed76103 100644 --- a/packages/apollo-server-hapi/src/hapiApollo.test.ts +++ b/packages/graphql-server-hapi/src/hapiApollo.test.ts @@ -2,7 +2,7 @@ import * as hapi from 'hapi'; import { apolloHapi, graphiqlHapi, HapiPluginOptions } from './hapiApollo'; import 'mocha'; -import testSuite, { Schema } from 'apollo-server-integration-testsuite'; +import testSuite, { Schema } from 'graphql-server-integration-testsuite'; function createApp(createOptions: HapiPluginOptions) { const server = new hapi.Server(); diff --git a/packages/apollo-server-hapi/src/hapiApollo.ts b/packages/graphql-server-hapi/src/hapiApollo.ts similarity index 98% rename from packages/apollo-server-hapi/src/hapiApollo.ts rename to packages/graphql-server-hapi/src/hapiApollo.ts index 0beaa36f7dc..6334fb5d8d0 100644 --- a/packages/apollo-server-hapi/src/hapiApollo.ts +++ b/packages/graphql-server-hapi/src/hapiApollo.ts @@ -1,8 +1,8 @@ import * as Boom from 'boom'; import { Server, Request, IReply } from 'hapi'; import { GraphQLResult, formatError } from 'graphql'; -import * as GraphiQL from 'apollo-server-graphiql'; -import { ApolloOptions, runQuery } from 'apollo-server-core'; +import * as GraphiQL from 'graphql-server-module-graphiql'; +import { ApolloOptions, runQuery } from 'graphql-server-core'; export interface IRegister { (server: Server, options: any, next: any): void; diff --git a/packages/apollo-server-hapi/src/index.ts b/packages/graphql-server-hapi/src/index.ts similarity index 100% rename from packages/apollo-server-hapi/src/index.ts rename to packages/graphql-server-hapi/src/index.ts diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/graphql-server-hapi/tsconfig.json similarity index 100% rename from packages/apollo-server-hapi/tsconfig.json rename to packages/graphql-server-hapi/tsconfig.json diff --git a/packages/apollo-server-hapi/.npmignore b/packages/graphql-server-integration-testsuite/.npmignore similarity index 100% rename from packages/apollo-server-hapi/.npmignore rename to packages/graphql-server-integration-testsuite/.npmignore diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json similarity index 61% rename from packages/apollo-server-integration-testsuite/package.json rename to packages/graphql-server-integration-testsuite/package.json index d72e95028e6..07b4350c364 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/graphql-server-integration-testsuite/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-integration-testsuite", + "name": "graphql-server-integration-testsuite", "private": true, "version": "0.3.2", "description": "Apollo Server Integrations testsuite", @@ -10,19 +10,19 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-integration-testsuite" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-integration-testsuite" }, "keywords": [], "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "apollo-server-core": "^0.3.2", - "apollo-server-graphiql": "^0.3.2", - "apollo-server-operation-store": "^0.3.2", + "graphql-server-core": "^0.3.2", + "graphql-server-module-graphiql": "^0.3.2", + "graphql-server-module-operation-store": "^0.3.2", "supertest": "^2.0.0", "supertest-as-promised": "^4.0.0" }, diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/graphql-server-integration-testsuite/src/index.ts similarity index 99% rename from packages/apollo-server-integration-testsuite/src/index.ts rename to packages/graphql-server-integration-testsuite/src/index.ts index 861c0f830a8..bc026ca0100 100644 --- a/packages/apollo-server-integration-testsuite/src/index.ts +++ b/packages/graphql-server-integration-testsuite/src/index.ts @@ -14,9 +14,9 @@ import { // tslint:disable-next-line const request = require('supertest-as-promised'); -import { ApolloOptions } from 'apollo-server-core'; -import * as GraphiQL from 'apollo-server-graphiql'; -import { OperationStore } from 'apollo-server-operation-store'; +import { ApolloOptions } from 'graphql-server-core'; +import * as GraphiQL from 'graphql-server-module-graphiql'; +import { OperationStore } from 'graphql-server-module-operation-store'; const QueryType = new GraphQLObjectType({ name: 'QueryType', diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/graphql-server-integration-testsuite/tsconfig.json similarity index 100% rename from packages/apollo-server-integration-testsuite/tsconfig.json rename to packages/graphql-server-integration-testsuite/tsconfig.json diff --git a/packages/apollo-server-integration-testsuite/.npmignore b/packages/graphql-server-koa/.npmignore similarity index 100% rename from packages/apollo-server-integration-testsuite/.npmignore rename to packages/graphql-server-koa/.npmignore diff --git a/packages/apollo-server-koa/package.json b/packages/graphql-server-koa/package.json similarity index 69% rename from packages/apollo-server-koa/package.json rename to packages/graphql-server-koa/package.json index 5339621b45c..175f383ca9c 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-koa", + "name": "graphql-server-koa", "version": "0.3.2", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-koa" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-koa" }, "keywords": [ "GraphQL", @@ -21,18 +21,18 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "apollo-server-core": "^0.3.2", - "apollo-server-graphiql": "^0.3.2" + "graphql-server-core": "^0.3.2", + "graphql-server-module-graphiql": "^0.3.2" }, "devDependencies": { "@types/koa": "^2.0.33", "@types/koa-bodyparser": "^3.0.19", "@types/koa-router": "^7.0.21", - "apollo-server-integration-testsuite": "^0.3.2", + "graphql-server-integration-testsuite": "^0.3.2", "koa": "^2.0.0-alpha.4", "koa-bodyparser": "^3.0.0", "koa-router": "^7.0.1", diff --git a/packages/apollo-server-koa/src/index.ts b/packages/graphql-server-koa/src/index.ts similarity index 100% rename from packages/apollo-server-koa/src/index.ts rename to packages/graphql-server-koa/src/index.ts diff --git a/packages/apollo-server-koa/src/koaApollo.test.ts b/packages/graphql-server-koa/src/koaApollo.test.ts similarity index 89% rename from packages/apollo-server-koa/src/koaApollo.test.ts rename to packages/graphql-server-koa/src/koaApollo.test.ts index 16a3e3bca82..a4d024199a6 100644 --- a/packages/apollo-server-koa/src/koaApollo.test.ts +++ b/packages/graphql-server-koa/src/koaApollo.test.ts @@ -2,11 +2,11 @@ import * as koa from 'koa'; import * as koaRouter from 'koa-router'; import * as koaBody from 'koa-bodyparser'; import { apolloKoa, graphiqlKoa } from './koaApollo'; -import { ApolloOptions } from 'apollo-server-core'; +import { ApolloOptions } from 'graphql-server-core'; import { expect } from 'chai'; import * as http from 'http'; -import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; +import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; function createApp(options: CreateAppOptions = {}) { const app = new koa(); diff --git a/packages/apollo-server-koa/src/koaApollo.ts b/packages/graphql-server-koa/src/koaApollo.ts similarity index 96% rename from packages/apollo-server-koa/src/koaApollo.ts rename to packages/graphql-server-koa/src/koaApollo.ts index a6416457c6a..a1016a31b18 100644 --- a/packages/apollo-server-koa/src/koaApollo.ts +++ b/packages/graphql-server-koa/src/koaApollo.ts @@ -1,7 +1,7 @@ import * as koa from 'koa'; import * as graphql from 'graphql'; -import { ApolloOptions, runQuery } from 'apollo-server-core'; -import * as GraphiQL from 'apollo-server-graphiql'; +import { ApolloOptions, runQuery } from 'graphql-server-core'; +import * as GraphiQL from 'graphql-server-module-graphiql'; export interface KoaApolloOptionsFunction { (ctx: koa.Context): ApolloOptions | Promise; diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/graphql-server-koa/tsconfig.json similarity index 100% rename from packages/apollo-server-koa/tsconfig.json rename to packages/graphql-server-koa/tsconfig.json diff --git a/packages/apollo-server-koa/.npmignore b/packages/graphql-server-module-graphiql/.npmignore similarity index 100% rename from packages/apollo-server-koa/.npmignore rename to packages/graphql-server-module-graphiql/.npmignore diff --git a/packages/apollo-server-graphiql/package.json b/packages/graphql-server-module-graphiql/package.json similarity index 65% rename from packages/apollo-server-graphiql/package.json rename to packages/graphql-server-module-graphiql/package.json index 7e878fb8efa..f712d70a398 100644 --- a/packages/apollo-server-graphiql/package.json +++ b/packages/graphql-server-module-graphiql/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-graphiql", + "name": "graphql-server-module-graphiql", "version": "0.3.2", "description": "GraphiQL renderer for Apollo GraphQL Server", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-graphiql" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-graphiql" }, "keywords": [ "GraphQL", @@ -20,9 +20,9 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": {}, "devDependencies": {}, "typings": "dist/index.d.ts", diff --git a/packages/apollo-server-graphiql/src/index.ts b/packages/graphql-server-module-graphiql/src/index.ts similarity index 100% rename from packages/apollo-server-graphiql/src/index.ts rename to packages/graphql-server-module-graphiql/src/index.ts diff --git a/packages/apollo-server-graphiql/src/renderGraphiQL.ts b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts similarity index 100% rename from packages/apollo-server-graphiql/src/renderGraphiQL.ts rename to packages/graphql-server-module-graphiql/src/renderGraphiQL.ts diff --git a/packages/apollo-server-graphiql/tsconfig.json b/packages/graphql-server-module-graphiql/tsconfig.json similarity index 100% rename from packages/apollo-server-graphiql/tsconfig.json rename to packages/graphql-server-module-graphiql/tsconfig.json diff --git a/packages/apollo-server-operation-store/.npmignore b/packages/graphql-server-module-operation-store/.npmignore similarity index 100% rename from packages/apollo-server-operation-store/.npmignore rename to packages/graphql-server-module-operation-store/.npmignore diff --git a/packages/apollo-server-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json similarity index 70% rename from packages/apollo-server-operation-store/package.json rename to packages/graphql-server-module-operation-store/package.json index 4d6aba1d3e1..ed17d440d16 100644 --- a/packages/apollo-server-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -1,5 +1,5 @@ { - "name": "apollo-server-operation-store", + "name": "graphql-server-module-operation-store", "version": "0.3.2", "description": "Operation-Store module of apollo GraphQL Server", "main": "dist/index.js", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-operation-store" + "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-operation-store" }, "keywords": [ "GraphQL", @@ -20,9 +20,9 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/apollo-server/issues" + "url": "https://github.com/apollostack/graphql-server/issues" }, - "homepage": "https://github.com/apollostack/apollo-server#readme", + "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": {}, "devDependencies": { "typed-graphql": "^1.0.2" diff --git a/packages/apollo-server-operation-store/src/index.ts b/packages/graphql-server-module-operation-store/src/index.ts similarity index 100% rename from packages/apollo-server-operation-store/src/index.ts rename to packages/graphql-server-module-operation-store/src/index.ts diff --git a/packages/apollo-server-operation-store/src/operationStore.test.ts b/packages/graphql-server-module-operation-store/src/operationStore.test.ts similarity index 100% rename from packages/apollo-server-operation-store/src/operationStore.test.ts rename to packages/graphql-server-module-operation-store/src/operationStore.test.ts diff --git a/packages/apollo-server-operation-store/src/operationStore.ts b/packages/graphql-server-module-operation-store/src/operationStore.ts similarity index 100% rename from packages/apollo-server-operation-store/src/operationStore.ts rename to packages/graphql-server-module-operation-store/src/operationStore.ts diff --git a/packages/apollo-server-operation-store/tsconfig.json b/packages/graphql-server-module-operation-store/tsconfig.json similarity index 100% rename from packages/apollo-server-operation-store/tsconfig.json rename to packages/graphql-server-module-operation-store/tsconfig.json diff --git a/test/tests.js b/test/tests.js index 1102f1ffb88..be146790761 100644 --- a/test/tests.js +++ b/test/tests.js @@ -4,10 +4,10 @@ require('babel-polyfill'); process.env.NODE_ENV = 'test'; require('source-map-support').install(); -require('../packages/apollo-server-core/dist/runQuery.test.js'); -require('../packages/apollo-server-operation-store/dist/operationStore.test'); -require('../packages/apollo-server-express/dist/expressApollo.test'); -require('../packages/apollo-server-express/dist/connectApollo.test'); -require('../packages/apollo-server-hapi/dist/hapiApollo.test'); -require('../packages/apollo-server-koa/dist/koaApollo.test'); -require('../packages/apollo-server-express/dist/apolloServerHttp.test'); +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'); +require('../packages/graphql-server-express/dist/connectApollo.test'); +require('../packages/graphql-server-hapi/dist/hapiApollo.test'); +require('../packages/graphql-server-koa/dist/koaApollo.test'); +require('../packages/graphql-server-express/dist/apolloServerHttp.test');