diff --git a/README.md b/README.md index e25e8a890e5..60674e72971 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ # GraphQL Server for Express, Connect, Hapi, Koa, Restify and AWS Lambda -[![npm version](https://badge.fury.io/js/graphql-server-core.svg)](https://badge.fury.io/js/graphql-server-core) -[![Build Status](https://travis-ci.org/apollographql/graphql-server.svg?branch=master)](https://travis-ci.org/apollographql/graphql-server) -[![Coverage Status](https://coveralls.io/repos/github/apollographql/graphql-server/badge.svg?branch=master)](https://coveralls.io/github/apollographql/graphql-server?branch=master) +[![npm version](https://badge.fury.io/js/apollo-server-core.svg)](https://badge.fury.io/js/apollo-server-core) +[![Build Status](https://travis-ci.org/apollographql/apollo-server.svg?branch=master)](https://travis-ci.org/apollographql/apollo-server) +[![Coverage Status](https://coveralls.io/repos/github/apollographql/apollo-server/badge.svg?branch=master)](https://coveralls.io/github/apollographql/apollo-server?branch=master) [![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](http://www.apollodata.com/#slack) -GraphQL Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi, Koa and Restify. +Apollo Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi, Koa and Restify. ## Principles -GraphQL Server is built with the following principles in mind: +Apollo Server is built with the following principles in mind: -* **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 +* **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 -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! +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! ## Getting started -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). +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). ### Installation -Just run `npm install --save graphql-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 @@ -40,7 +40,7 @@ where variant is one of the following: ```js import express from 'express'; import bodyParser from 'body-parser'; -import { graphqlExpress } from 'graphql-server-express'; +import { graphqlExpress } from 'apollo-server-express'; const myGraphQLSchema = // ... define or import your schema here! const PORT = 3000; @@ -57,7 +57,7 @@ app.listen(PORT); ```js import connect from 'connect'; import bodyParser from 'body-parser'; -import { graphqlConnect } from 'graphql-server-express'; +import { graphqlConnect } from 'apollo-server-express'; import http from 'http'; const PORT = 3000; @@ -77,7 +77,7 @@ Now with the Hapi plugins `graphqlHapi` and `graphiqlHapi` you can pass a route ```js import hapi from 'hapi'; -import { graphqlHapi } from 'graphql-server-hapi'; +import { graphqlHapi } from 'apollo-server-hapi'; const server = new hapi.Server(); @@ -115,7 +115,7 @@ server.start((err) => { import koa from 'koa'; // koa@2 import koaRouter from 'koa-router'; // koa-router@next import koaBody from 'koa-bodyparser'; // koa-bodyparser@next -import { graphqlKoa } from 'graphql-server-koa'; +import { graphqlKoa } from 'apollo-server-koa'; const app = new koa(); const router = new koaRouter(); @@ -135,12 +135,12 @@ app.listen(PORT); ### Restify ```js import restify from 'restify'; -import { graphqlRestify, graphiqlRestify } from 'graphql-server-restify'; +import { graphqlRestify, graphiqlRestify } from 'apollo-server-restify'; const PORT = 3000; const server = restify.createServer({ - title: 'GraphQL Server' + title: 'Apollo Server' }); const graphQLOptions = { schema: myGraphQLSchema }; @@ -161,7 +161,7 @@ server.listen(PORT, () => console.log(`Listening on ${PORT}`)); Lambda function should be run with Node.js v4.3. Requires an API Gateway with Lambda Proxy Integration. ```js -var server = require("graphql-server-lambda"); +var server = require("apollo-server-lambda"); exports.handler = server.graphqlLambda({ schema: myGraphQLSchema }); ``` @@ -171,14 +171,14 @@ exports.handler = server.graphqlLambda({ schema: myGraphQLSchema }); Requires the [Micro](https://github.com/zeit/micro) module ```js -const server = require("graphql-server-micro"); +const server = require("apollo-server-micro"); module.exports = server.microGraphql({ schema: myGraphQLSchema }); ``` ## Options -GraphQL Server can be configured with an options object with the the following fields: +Apollo 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 @@ -208,28 +208,28 @@ graphqlOptions = { ## Differences to express-graphql -GraphQL Server and express-graphql are more or less the same thing (GraphQL middleware for Node.js), but there are a few key differences: +Apollo 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, GraphQL Server supports Express, Connect, Hapi, Koa and Restify. -* 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. +* express-graphql works with Express and Connect, Apollo Server supports Express, Connect, Hapi, Koa and Restify. +* 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. * Includes an `OperationStore` to easily manage whitelisting * Built with TypeScript -Despite express-graphql being a reference implementation, GraphQL Server is actually easier to understand and more modular than express-graphql. +Despite express-graphql being a reference implementation, Apollo Server is actually easier to understand and more modular than express-graphql. -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. +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. ### application/graphql requests -express-graphql supports the `application/graphql` Content-Type for requests, which is an alternative to `application/json` request with only the query part sent as text. In the same way that we use `bodyParser.json` to parse `application/json` requests for graphql-server, we can use `bodyParser.text` plus one extra step in order to also parse `application/graphql` requests. Here's an example for express: +express-graphql supports the `application/graphql` Content-Type for requests, which is an alternative to `application/json` request with only the query part sent as text. In the same way that we use `bodyParser.json` to parse `application/json` requests for apollo-server, we can use `bodyParser.text` plus one extra step in order to also parse `application/graphql` requests. Here's an example for express: ```js import express from 'express'; import bodyParser from 'body-parser'; -import { graphqlExpress } from 'graphql-server-express'; +import { graphqlExpress } from 'apollo-server-express'; const myGraphQLSchema = // ... define or import your schema here! @@ -249,25 +249,25 @@ express()   .listen(3000); ``` -## GraphQL Server Development +## Apollo Server Development -If you want to develop GraphQL Server locally you must follow the following instructions: +If you want to develop Apollo Server locally you must follow the following instructions: * Fork this repository -* Install the GraphQL Server project in your computer +* Install the Apollo Server project in your computer ``` -git clone https://github.com/[your-user]/graphql-server -cd graphql-server +git clone https://github.com/[your-user]/apollo-server +cd apollo-server npm install -cd packages/graphql-server-/ +cd packages/apollo-server-/ npm link ``` -* Install your local GraphQL Server in other App +* Install your local Apollo Server in other App ``` cd ~/myApp -npm link graphql-server- +npm link apollo-server- ``` diff --git a/lerna.json b/lerna.json index de2e80272b0..201709c6cf4 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "lerna": "2.0.0", "version": "1.0.1", "changelog": { - "repo": "apollostack/graphql-server", + "repo": "apollographql/apollo-server", "labels": { "tag: breaking change": ":boom: Breaking Change", "tag: new feature": ":rocket: New Feature", diff --git a/package.json b/package.json index 946d719612a..bdab706f3e2 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "git+https://github.com/apollostack/graphql-server.git" + "url": "git+https://github.com/apollographql/apollo-server.git" }, "scripts": { "compile": "lerna exec -- npm run compile", diff --git a/packages/graphql-server-core/.npmignore b/packages/apollo-server-core/.npmignore similarity index 100% rename from packages/graphql-server-core/.npmignore rename to packages/apollo-server-core/.npmignore diff --git a/packages/graphql-server-core/README.md b/packages/apollo-server-core/README.md similarity index 100% rename from packages/graphql-server-core/README.md rename to packages/apollo-server-core/README.md diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json new file mode 100644 index 00000000000..45d4506d5ea --- /dev/null +++ b/packages/apollo-server-core/package.json @@ -0,0 +1,42 @@ +{ + "name": "apollo-server-core", + "version": "1.0.0", + "description": "Core engine for Apollo GraphQL server", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-core" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "devDependencies": { + "@types/fibers": "0.0.29", + "@types/graphql": "^0.9.0", + "fibers": "1.0.15", + "meteor-promise": "^0.8.2" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/graphql-server-core/src/graphqlOptions.ts b/packages/apollo-server-core/src/graphqlOptions.ts similarity index 100% rename from packages/graphql-server-core/src/graphqlOptions.ts rename to packages/apollo-server-core/src/graphqlOptions.ts diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts new file mode 100644 index 00000000000..3e10213ef9c --- /dev/null +++ b/packages/apollo-server-core/src/index.ts @@ -0,0 +1,4 @@ +export { runQuery, LogFunction, LogMessage, LogStep, LogAction } from './runQuery'; +export { runHttpQuery, HttpQueryRequest, HttpQueryError } from './runHttpQuery'; +export { default as GraphQLOptions, resolveGraphqlOptions } from './graphqlOptions'; + diff --git a/packages/graphql-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts similarity index 100% rename from packages/graphql-server-core/src/runHttpQuery.ts rename to packages/apollo-server-core/src/runHttpQuery.ts diff --git a/packages/graphql-server-core/src/runQuery.test.ts b/packages/apollo-server-core/src/runQuery.test.ts similarity index 100% rename from packages/graphql-server-core/src/runQuery.test.ts rename to packages/apollo-server-core/src/runQuery.test.ts diff --git a/packages/graphql-server-core/src/runQuery.ts b/packages/apollo-server-core/src/runQuery.ts similarity index 100% rename from packages/graphql-server-core/src/runQuery.ts rename to packages/apollo-server-core/src/runQuery.ts diff --git a/packages/graphql-server-integration-testsuite/tsconfig.json b/packages/apollo-server-core/tsconfig.json similarity index 100% rename from packages/graphql-server-integration-testsuite/tsconfig.json rename to packages/apollo-server-core/tsconfig.json diff --git a/packages/graphql-server-express/.npmignore b/packages/apollo-server-express/.npmignore similarity index 100% rename from packages/graphql-server-express/.npmignore rename to packages/apollo-server-express/.npmignore diff --git a/packages/graphql-server-express/README.md b/packages/apollo-server-express/README.md similarity index 94% rename from packages/graphql-server-express/README.md rename to packages/apollo-server-express/README.md index 651371b7144..25896e251ec 100644 --- a/packages/graphql-server-express/README.md +++ b/packages/apollo-server-express/README.md @@ -25,7 +25,7 @@ Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](. ```js import express from 'express'; import bodyParser from 'body-parser'; -import { graphqlExpress } from 'graphql-server-express'; +import { graphqlExpress } from 'apollo-server-express'; const myGraphQLSchema = // ... define or import your schema here! const PORT = 3000; @@ -42,7 +42,7 @@ app.listen(PORT); ```js import connect from 'connect'; import bodyParser from 'body-parser'; -import { graphqlConnect } from 'graphql-server-express'; +import { graphqlConnect } from 'apollo-server-express'; import http from 'http'; const PORT = 3000; diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json new file mode 100644 index 00000000000..3fda2596b45 --- /dev/null +++ b/packages/apollo-server-express/package.json @@ -0,0 +1,55 @@ +{ + "name": "apollo-server-express", + "version": "1.0.0", + "description": "Production-ready Node.js GraphQL server for Express and Connect", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/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/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "@types/body-parser": "1.16.3", + "@types/connect": "^3.4.30", + "@types/express": "^4.0.35", + "@types/multer": "0.0.33", + "body-parser": "^1.17.2", + "connect": "^3.6.2", + "connect-query": "^1.0.0", + "express": "^4.15.3", + "apollo-server-integration-testsuite": "^1.0.0", + "multer": "^1.3.0" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/express": "^4.0.35", + "@types/graphql": "^0.9.1" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/graphql-server-express/src/apolloServerHttp.test.ts b/packages/apollo-server-express/src/apolloServerHttp.test.ts similarity index 100% rename from packages/graphql-server-express/src/apolloServerHttp.test.ts rename to packages/apollo-server-express/src/apolloServerHttp.test.ts diff --git a/packages/graphql-server-express/src/connectApollo.test.ts b/packages/apollo-server-express/src/connectApollo.test.ts similarity index 87% rename from packages/graphql-server-express/src/connectApollo.test.ts rename to packages/apollo-server-express/src/connectApollo.test.ts index b55f7d72adf..351471f2aa2 100644 --- a/packages/graphql-server-express/src/connectApollo.test.ts +++ b/packages/apollo-server-express/src/connectApollo.test.ts @@ -3,7 +3,7 @@ import * as bodyParser from 'body-parser'; import { graphqlConnect, graphiqlConnect } from './connectApollo'; import 'mocha'; -import testSuite, { schema as Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema as Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createConnectApp(options: CreateAppOptions = {}) { const app = connect(); diff --git a/packages/graphql-server-express/src/connectApollo.ts b/packages/apollo-server-express/src/connectApollo.ts similarity index 100% rename from packages/graphql-server-express/src/connectApollo.ts rename to packages/apollo-server-express/src/connectApollo.ts diff --git a/packages/graphql-server-express/src/expressApollo.test.ts b/packages/apollo-server-express/src/expressApollo.test.ts similarity index 87% rename from packages/graphql-server-express/src/expressApollo.test.ts rename to packages/apollo-server-express/src/expressApollo.test.ts index 1477c52321a..c0b68dd41e7 100644 --- a/packages/graphql-server-express/src/expressApollo.test.ts +++ b/packages/apollo-server-express/src/expressApollo.test.ts @@ -1,9 +1,9 @@ import * as express from 'express'; import * as bodyParser from 'body-parser'; import { graphqlExpress, graphiqlExpress } from './expressApollo'; -import testSuite, { schema as Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema as Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; import { expect } from 'chai'; -import { GraphQLOptions } from 'graphql-server-core'; +import { GraphQLOptions } from 'apollo-server-core'; import 'mocha'; function createApp(options: CreateAppOptions = {}) { diff --git a/packages/graphql-server-express/src/expressApollo.ts b/packages/apollo-server-express/src/expressApollo.ts similarity index 94% rename from packages/graphql-server-express/src/expressApollo.ts rename to packages/apollo-server-express/src/expressApollo.ts index 02264584fed..41474bc7a09 100644 --- a/packages/graphql-server-express/src/expressApollo.ts +++ b/packages/apollo-server-express/src/expressApollo.ts @@ -1,7 +1,7 @@ import * as express from 'express'; import * as url from 'url'; -import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; +import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; export interface ExpressGraphQLOptionsFunction { (req?: express.Request, res?: express.Response): GraphQLOptions | Promise; diff --git a/packages/apollo-server-express/src/index.ts b/packages/apollo-server-express/src/index.ts new file mode 100644 index 00000000000..b963c6c0fd3 --- /dev/null +++ b/packages/apollo-server-express/src/index.ts @@ -0,0 +1,12 @@ +export { + ExpressGraphQLOptionsFunction, + ExpressHandler, + ExpressGraphiQLOptionsFunction, + graphqlExpress, + graphiqlExpress, +} from './expressApollo'; + +export { + graphqlConnect, + 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..915a719df65 --- /dev/null +++ b/packages/apollo-server-express/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-hapi/.npmignore b/packages/apollo-server-hapi/.npmignore similarity index 100% rename from packages/graphql-server-hapi/.npmignore rename to packages/apollo-server-hapi/.npmignore diff --git a/packages/graphql-server-hapi/README.md b/packages/apollo-server-hapi/README.md similarity index 97% rename from packages/graphql-server-hapi/README.md rename to packages/apollo-server-hapi/README.md index 24bcb6c42b0..db1e0bef201 100644 --- a/packages/graphql-server-hapi/README.md +++ b/packages/apollo-server-hapi/README.md @@ -24,7 +24,7 @@ With the Hapi plugins `graphqlHapi` and `graphiqlHapi` you can pass a route obje ```js import hapi from 'hapi'; -import { graphqlHapi } from 'graphql-server-hapi'; +import { graphqlHapi } from 'apollo-server-hapi'; const server = new hapi.Server(); diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json new file mode 100644 index 00000000000..731083ab7da --- /dev/null +++ b/packages/apollo-server-hapi/package.json @@ -0,0 +1,50 @@ +{ + "name": "apollo-server-hapi", + "version": "1.0.0", + "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/apollographql/apollo-server/tree/master/packages/apollo-server-hapi" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Hapi", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "boom": "^5.1.0", + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "@types/boom": "4.3.2", + "@types/graphql": "^0.9.1", + "@types/hapi": "^16.1.4", + "apollo-server-integration-testsuite": "^1.0.0", + "hapi": "^16.4.3" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.1", + "@types/hapi": "^16.1.2" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/graphql-server-hapi/src/hapiApollo.test.ts b/packages/apollo-server-hapi/src/hapiApollo.test.ts similarity index 95% rename from packages/graphql-server-hapi/src/hapiApollo.test.ts rename to packages/apollo-server-hapi/src/hapiApollo.test.ts index db4908fa6d9..74862d5163c 100644 --- a/packages/graphql-server-hapi/src/hapiApollo.test.ts +++ b/packages/apollo-server-hapi/src/hapiApollo.test.ts @@ -2,7 +2,7 @@ import * as hapi from 'hapi'; import { graphqlHapi, graphiqlHapi } from './hapiApollo'; import 'mocha'; -import testSuite, { schema as Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema as Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createApp(options: CreateAppOptions) { const server = new hapi.Server(); diff --git a/packages/graphql-server-hapi/src/hapiApollo.ts b/packages/apollo-server-hapi/src/hapiApollo.ts similarity index 95% rename from packages/graphql-server-hapi/src/hapiApollo.ts rename to packages/apollo-server-hapi/src/hapiApollo.ts index f8b83bcc1af..7ba03e42fdc 100644 --- a/packages/graphql-server-hapi/src/hapiApollo.ts +++ b/packages/apollo-server-hapi/src/hapiApollo.ts @@ -1,7 +1,7 @@ import * as Boom from 'boom'; import { Server, Response, Request, ReplyNoContinue } from 'hapi'; -import * as GraphiQL from 'graphql-server-module-graphiql'; -import { GraphQLOptions, runHttpQuery, HttpQueryError } from 'graphql-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; +import { GraphQLOptions, runHttpQuery, HttpQueryError } 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..8c964266b67 --- /dev/null +++ b/packages/apollo-server-hapi/src/index.ts @@ -0,0 +1,6 @@ +export { IRegister, + HapiOptionsFunction, + HapiPluginOptions, + HapiGraphiQLOptionsFunction, + HapiGraphiQLPluginOptions, + graphqlHapi, 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..915a719df65 --- /dev/null +++ b/packages/apollo-server-hapi/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-integration-testsuite/.npmignore b/packages/apollo-server-integration-testsuite/.npmignore similarity index 100% rename from packages/graphql-server-integration-testsuite/.npmignore rename to packages/apollo-server-integration-testsuite/.npmignore diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json similarity index 61% rename from packages/graphql-server-integration-testsuite/package.json rename to packages/apollo-server-integration-testsuite/package.json index cc047295c9b..bb326cd33ce 100644 --- a/packages/graphql-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -1,5 +1,5 @@ { - "name": "graphql-server-integration-testsuite", + "name": "apollo-server-integration-testsuite", "private": true, "version": "1.0.0", "description": "Apollo Server Integrations testsuite", @@ -10,19 +10,19 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-integration-testsuite" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-integration-testsuite" }, "keywords": [], "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0", - "graphql-server-module-operation-store": "^1.0.0", + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0", + "apollo-server-module-operation-store": "^1.0.0", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.0" }, diff --git a/packages/graphql-server-integration-testsuite/src/index.ts b/packages/apollo-server-integration-testsuite/src/index.ts similarity index 99% rename from packages/graphql-server-integration-testsuite/src/index.ts rename to packages/apollo-server-integration-testsuite/src/index.ts index c5e4083ec97..6236948081c 100644 --- a/packages/graphql-server-integration-testsuite/src/index.ts +++ b/packages/apollo-server-integration-testsuite/src/index.ts @@ -17,9 +17,9 @@ import { // tslint:disable-next-line const request = require('supertest-as-promised'); -import { GraphQLOptions } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; -import { OperationStore } from 'graphql-server-module-operation-store'; +import { GraphQLOptions } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; +import { OperationStore } from 'apollo-server-module-operation-store'; const queryType = new GraphQLObjectType({ name: 'QueryType', diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/apollo-server-integration-testsuite/tsconfig.json new file mode 100644 index 00000000000..915a719df65 --- /dev/null +++ b/packages/apollo-server-integration-testsuite/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-koa/.npmignore b/packages/apollo-server-koa/.npmignore similarity index 100% rename from packages/graphql-server-koa/.npmignore rename to packages/apollo-server-koa/.npmignore diff --git a/packages/graphql-server-koa/README.md b/packages/apollo-server-koa/README.md similarity index 97% rename from packages/graphql-server-koa/README.md rename to packages/apollo-server-koa/README.md index 1076fe9bdd5..a119e876511 100644 --- a/packages/graphql-server-koa/README.md +++ b/packages/apollo-server-koa/README.md @@ -24,7 +24,7 @@ Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](. import koa from 'koa'; // koa@2 import koaRouter from 'koa-router'; // koa-router@next import koaBody from 'koa-bodyparser'; // koa-bodyparser@next -import { graphqlKoa } from 'graphql-server-koa'; +import { graphqlKoa } from 'apollo-server-koa'; const app = new koa(); const router = new koaRouter(); diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json new file mode 100644 index 00000000000..085505c1507 --- /dev/null +++ b/packages/apollo-server-koa/package.json @@ -0,0 +1,51 @@ +{ + "name": "apollo-server-koa", + "version": "1.0.0", + "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/apollographql/apollo-server/tree/master/packages/apollo-server-koa" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Koa", + "Server", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "@types/koa": "^2.0.39", + "@types/koa-bodyparser": "^3.0.23", + "@types/koa-router": "^7.0.22", + "apollo-server-integration-testsuite": "^1.0.0", + "koa": "^2.2.0", + "koa-bodyparser": "^4.2.0", + "koa-router": "^7.2.0" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.1", + "@types/koa": "^2.0.39" + }, + "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..52bfe4f8703 --- /dev/null +++ b/packages/apollo-server-koa/src/index.ts @@ -0,0 +1,7 @@ +export { + KoaGraphQLOptionsFunction, + KoaHandler, + KoaGraphiQLOptionsFunction, + graphqlKoa, + graphiqlKoa, +} from './koaApollo'; diff --git a/packages/graphql-server-koa/src/koaApollo.test.ts b/packages/apollo-server-koa/src/koaApollo.test.ts similarity index 89% rename from packages/graphql-server-koa/src/koaApollo.test.ts rename to packages/apollo-server-koa/src/koaApollo.test.ts index fb064f9e9f6..1345ccc4bd2 100644 --- a/packages/graphql-server-koa/src/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 { graphqlKoa, graphiqlKoa } from './koaApollo'; -import { GraphQLOptions } from 'graphql-server-core'; +import { GraphQLOptions } from 'apollo-server-core'; import { expect } from 'chai'; import * as http from 'http'; -import testSuite, { schema as Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema as Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createApp(options: CreateAppOptions = {}) { const app = new koa(); diff --git a/packages/graphql-server-koa/src/koaApollo.ts b/packages/apollo-server-koa/src/koaApollo.ts similarity index 92% rename from packages/graphql-server-koa/src/koaApollo.ts rename to packages/apollo-server-koa/src/koaApollo.ts index 974563d59cf..f1d3c5f59ea 100644 --- a/packages/graphql-server-koa/src/koaApollo.ts +++ b/packages/apollo-server-koa/src/koaApollo.ts @@ -1,6 +1,6 @@ import * as koa from 'koa'; -import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; +import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; export interface KoaGraphQLOptionsFunction { (ctx: koa.Context): GraphQLOptions | Promise; diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/apollo-server-koa/tsconfig.json new file mode 100644 index 00000000000..ce8c383b204 --- /dev/null +++ b/packages/apollo-server-koa/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "types": [] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-lambda/.npmignore b/packages/apollo-server-lambda/.npmignore similarity index 100% rename from packages/graphql-server-lambda/.npmignore rename to packages/apollo-server-lambda/.npmignore diff --git a/packages/graphql-server-lambda/README.md b/packages/apollo-server-lambda/README.md similarity index 100% rename from packages/graphql-server-lambda/README.md rename to packages/apollo-server-lambda/README.md diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json new file mode 100644 index 00000000000..dc990c1d7e3 --- /dev/null +++ b/packages/apollo-server-lambda/package.json @@ -0,0 +1,43 @@ +{ + "name": "apollo-server-lambda", + "version": "1.0.0", + "description": "Production-ready Node.js GraphQL server for AWS Lambda", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Server", + "Lambda", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "@types/aws-lambda": "0.0.10", + "@types/graphql": "^0.9.1", + "apollo-server-integration-testsuite": "^1.0.0" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-lambda/src/index.ts b/packages/apollo-server-lambda/src/index.ts new file mode 100755 index 00000000000..4b5e47610e3 --- /dev/null +++ b/packages/apollo-server-lambda/src/index.ts @@ -0,0 +1,8 @@ +export { + LambdaHandler, + IHeaders, + LambdaGraphQLOptionsFunction, + LambdaGraphiQLOptionsFunction, + graphqlLambda, + graphiqlLambda, +} from './lambdaApollo'; diff --git a/packages/graphql-server-lambda/src/lambdaApollo.test.ts b/packages/apollo-server-lambda/src/lambdaApollo.test.ts similarity index 92% rename from packages/graphql-server-lambda/src/lambdaApollo.test.ts rename to packages/apollo-server-lambda/src/lambdaApollo.test.ts index a723848e777..d286dd45192 100755 --- a/packages/graphql-server-lambda/src/lambdaApollo.test.ts +++ b/packages/apollo-server-lambda/src/lambdaApollo.test.ts @@ -1,7 +1,7 @@ import { graphqlLambda, graphiqlLambda } from './lambdaApollo'; -import testSuite, { schema as Schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema as Schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; import { expect } from 'chai'; -import { GraphQLOptions } from 'graphql-server-core'; +import { GraphQLOptions } from 'apollo-server-core'; import 'mocha'; import * as url from 'url'; diff --git a/packages/graphql-server-lambda/src/lambdaApollo.ts b/packages/apollo-server-lambda/src/lambdaApollo.ts similarity index 96% rename from packages/graphql-server-lambda/src/lambdaApollo.ts rename to packages/apollo-server-lambda/src/lambdaApollo.ts index b477c485f36..85360aa8cc3 100755 --- a/packages/graphql-server-lambda/src/lambdaApollo.ts +++ b/packages/apollo-server-lambda/src/lambdaApollo.ts @@ -1,6 +1,6 @@ import * as lambda from 'aws-lambda'; -import { GraphQLOptions, runHttpQuery } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; +import { GraphQLOptions, runHttpQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; export interface LambdaGraphQLOptionsFunction { (event: any, context: lambda.Context): GraphQLOptions | Promise; diff --git a/packages/apollo-server-lambda/tsconfig.json b/packages/apollo-server-lambda/tsconfig.json new file mode 100644 index 00000000000..dcab1f88b17 --- /dev/null +++ b/packages/apollo-server-lambda/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ], + "types": [ + "@types/node" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-micro/.npmignore b/packages/apollo-server-micro/.npmignore similarity index 100% rename from packages/graphql-server-micro/.npmignore rename to packages/apollo-server-micro/.npmignore diff --git a/packages/graphql-server-micro/README.md b/packages/apollo-server-micro/README.md similarity index 100% rename from packages/graphql-server-micro/README.md rename to packages/apollo-server-micro/README.md diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json new file mode 100644 index 00000000000..caf54e3ace1 --- /dev/null +++ b/packages/apollo-server-micro/package.json @@ -0,0 +1,48 @@ +{ + "name": "apollo-server-micro", + "version": "1.0.0", + "description": "Production-ready Node.js GraphQL server for Micro", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Micro", + "Server", + "Javascript" + ], + "author": "Nick Nance ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "apollo-server-integration-testsuite": "^1.0.0", + "micro": "^7.3.3", + "microrouter": "^2.1.1" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1", + "micro": "^7.3.3" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.1", + "@types/micro": "^7.3.0" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-micro/src/index.ts b/packages/apollo-server-micro/src/index.ts new file mode 100644 index 00000000000..84c6c4b7710 --- /dev/null +++ b/packages/apollo-server-micro/src/index.ts @@ -0,0 +1,6 @@ +export { + MicroGraphQLOptionsFunction, + MicroGraphiQLOptionsFunction, + microGraphql, + microGraphiql, +} from './microApollo'; diff --git a/packages/graphql-server-micro/src/microApollo.test.ts b/packages/apollo-server-micro/src/microApollo.test.ts similarity index 93% rename from packages/graphql-server-micro/src/microApollo.test.ts rename to packages/apollo-server-micro/src/microApollo.test.ts index 5eaaf6d9d1e..7b32befc4d5 100644 --- a/packages/graphql-server-micro/src/microApollo.test.ts +++ b/packages/apollo-server-micro/src/microApollo.test.ts @@ -3,7 +3,7 @@ import 'mocha'; import micro, { send } from 'micro'; import { router, get, post, put, patch, del, head, options as opts } from 'microrouter'; -import testSuite, { schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; function createApp(options: CreateAppOptions) { diff --git a/packages/graphql-server-micro/src/microApollo.ts b/packages/apollo-server-micro/src/microApollo.ts similarity index 93% rename from packages/graphql-server-micro/src/microApollo.ts rename to packages/apollo-server-micro/src/microApollo.ts index bffedb99f29..fd6fb62659b 100644 --- a/packages/graphql-server-micro/src/microApollo.ts +++ b/packages/apollo-server-micro/src/microApollo.ts @@ -1,5 +1,5 @@ -import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; +import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; import { createError, json, RequestHandler } from 'micro'; import * as url from 'url'; import {IncomingMessage, ServerResponse} from 'http'; diff --git a/packages/apollo-server-micro/tsconfig.json b/packages/apollo-server-micro/tsconfig.json new file mode 100644 index 00000000000..915a719df65 --- /dev/null +++ b/packages/apollo-server-micro/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-module-graphiql/.npmignore b/packages/apollo-server-module-graphiql/.npmignore similarity index 100% rename from packages/graphql-server-module-graphiql/.npmignore rename to packages/apollo-server-module-graphiql/.npmignore diff --git a/packages/graphql-server-module-graphiql/README.md b/packages/apollo-server-module-graphiql/README.md similarity index 100% rename from packages/graphql-server-module-graphiql/README.md rename to packages/apollo-server-module-graphiql/README.md diff --git a/packages/apollo-server-module-graphiql/package.json b/packages/apollo-server-module-graphiql/package.json new file mode 100644 index 00000000000..e72705e0351 --- /dev/null +++ b/packages/apollo-server-module-graphiql/package.json @@ -0,0 +1,32 @@ +{ + "name": "apollo-server-module-graphiql", + "version": "1.0.0", + "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/apollographql/apollo-server/tree/master/packages/apollo-server-module-graphiql" + }, + "keywords": [ + "GraphQL", + "GraphiQL", + "Apollo", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": {}, + "devDependencies": {}, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-module-graphiql/src/index.ts b/packages/apollo-server-module-graphiql/src/index.ts new file mode 100644 index 00000000000..e809997e9b9 --- /dev/null +++ b/packages/apollo-server-module-graphiql/src/index.ts @@ -0,0 +1,2 @@ +export { GraphiQLData, renderGraphiQL } from './renderGraphiQL'; +export { resolveGraphiQLString } from './resolveGraphiQLString'; diff --git a/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts b/packages/apollo-server-module-graphiql/src/renderGraphiQL.ts similarity index 100% rename from packages/graphql-server-module-graphiql/src/renderGraphiQL.ts rename to packages/apollo-server-module-graphiql/src/renderGraphiQL.ts diff --git a/packages/graphql-server-module-graphiql/src/resolveGraphiQLString.ts b/packages/apollo-server-module-graphiql/src/resolveGraphiQLString.ts similarity index 100% rename from packages/graphql-server-module-graphiql/src/resolveGraphiQLString.ts rename to packages/apollo-server-module-graphiql/src/resolveGraphiQLString.ts diff --git a/packages/apollo-server-module-graphiql/tsconfig.json b/packages/apollo-server-module-graphiql/tsconfig.json new file mode 100644 index 00000000000..915a719df65 --- /dev/null +++ b/packages/apollo-server-module-graphiql/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-module-operation-store/.npmignore b/packages/apollo-server-module-operation-store/.npmignore similarity index 100% rename from packages/graphql-server-module-operation-store/.npmignore rename to packages/apollo-server-module-operation-store/.npmignore diff --git a/packages/graphql-server-module-operation-store/README.md b/packages/apollo-server-module-operation-store/README.md similarity index 100% rename from packages/graphql-server-module-operation-store/README.md rename to packages/apollo-server-module-operation-store/README.md diff --git a/packages/apollo-server-module-operation-store/package.json b/packages/apollo-server-module-operation-store/package.json new file mode 100644 index 00000000000..86d2a2d06e5 --- /dev/null +++ b/packages/apollo-server-module-operation-store/package.json @@ -0,0 +1,36 @@ +{ + "name": "apollo-server-module-operation-store", + "version": "1.0.0", + "description": "Persisted operation store module for Apollo GraphQL Servers", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-module-operation-store" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Operation Store", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.1" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-module-operation-store/src/index.ts b/packages/apollo-server-module-operation-store/src/index.ts new file mode 100644 index 00000000000..7c10b8aeba0 --- /dev/null +++ b/packages/apollo-server-module-operation-store/src/index.ts @@ -0,0 +1 @@ +export { OperationStore } from './operationStore'; diff --git a/packages/graphql-server-module-operation-store/src/operationStore.test.ts b/packages/apollo-server-module-operation-store/src/operationStore.test.ts similarity index 100% rename from packages/graphql-server-module-operation-store/src/operationStore.test.ts rename to packages/apollo-server-module-operation-store/src/operationStore.test.ts diff --git a/packages/graphql-server-module-operation-store/src/operationStore.ts b/packages/apollo-server-module-operation-store/src/operationStore.ts similarity index 100% rename from packages/graphql-server-module-operation-store/src/operationStore.ts rename to packages/apollo-server-module-operation-store/src/operationStore.ts diff --git a/packages/apollo-server-module-operation-store/tsconfig.json b/packages/apollo-server-module-operation-store/tsconfig.json new file mode 100644 index 00000000000..915a719df65 --- /dev/null +++ b/packages/apollo-server-module-operation-store/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "typeRoots": [ + "node_modules/@types" + ] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-restify/.npmignore b/packages/apollo-server-restify/.npmignore similarity index 100% rename from packages/graphql-server-restify/.npmignore rename to packages/apollo-server-restify/.npmignore diff --git a/packages/graphql-server-restify/README.md b/packages/apollo-server-restify/README.md similarity index 96% rename from packages/graphql-server-restify/README.md rename to packages/apollo-server-restify/README.md index 407d89918ec..46355fc527c 100644 --- a/packages/graphql-server-restify/README.md +++ b/packages/apollo-server-restify/README.md @@ -22,7 +22,7 @@ Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](. ```js import restify from 'restify'; -import { graphqlRestify, graphiqlRestify } from 'graphql-server-restify'; +import { graphqlRestify, graphiqlRestify } from 'apollo-server-restify'; const PORT = 3000; diff --git a/packages/apollo-server-restify/package.json b/packages/apollo-server-restify/package.json new file mode 100644 index 00000000000..b11a73a9dd2 --- /dev/null +++ b/packages/apollo-server-restify/package.json @@ -0,0 +1,47 @@ +{ + "name": "apollo-server-restify", + "version": "1.0.0", + "description": "Production-ready Node.js GraphQL server for Restify", + "main": "dist/index.js", + "scripts": { + "compile": "tsc", + "prepublish": "npm run compile" + }, + "repository": { + "type": "git", + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-restify" + }, + "keywords": [ + "GraphQL", + "Apollo", + "Server", + "Restify", + "Javascript" + ], + "author": "Jonas Helfer ", + "license": "MIT", + "bugs": { + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0", + "apollo-server-module-graphiql": "^1.0.0" + }, + "devDependencies": { + "@types/restify": "^4.3.2", + "apollo-server-integration-testsuite": "^1.0.0", + "restify": "^4.3.0" + }, + "peerDependencies": { + "graphql": "^0.9.0 || ^0.10.1" + }, + "optionalDependencies": { + "@types/graphql": "^0.9.1", + "@types/restify": "^4.3.2" + }, + "typings": "dist/index.d.ts", + "typescript": { + "definition": "dist/index.d.ts" + } +} diff --git a/packages/apollo-server-restify/src/index.ts b/packages/apollo-server-restify/src/index.ts new file mode 100644 index 00000000000..88ee3195d62 --- /dev/null +++ b/packages/apollo-server-restify/src/index.ts @@ -0,0 +1,7 @@ +export { + RestifyGraphQLOptionsFunction, + RestifyHandler, + RestifyGraphiQLOptionsFunction, + graphqlRestify, + graphiqlRestify, +} from './restifyApollo'; diff --git a/packages/graphql-server-restify/src/restifyApollo.test.ts b/packages/apollo-server-restify/src/restifyApollo.test.ts similarity index 90% rename from packages/graphql-server-restify/src/restifyApollo.test.ts rename to packages/apollo-server-restify/src/restifyApollo.test.ts index 57f61dad2c7..769d246cb2e 100644 --- a/packages/graphql-server-restify/src/restifyApollo.test.ts +++ b/packages/apollo-server-restify/src/restifyApollo.test.ts @@ -1,9 +1,9 @@ import 'mocha'; import * as restify from 'restify'; import { graphiqlRestify, graphqlRestify } from './restifyApollo'; -import testSuite, { schema, CreateAppOptions } from 'graphql-server-integration-testsuite'; +import testSuite, { schema, CreateAppOptions } from 'apollo-server-integration-testsuite'; import { expect } from 'chai'; -import { GraphQLOptions } from 'graphql-server-core'; +import { GraphQLOptions } from 'apollo-server-core'; function createApp(options: CreateAppOptions = {}) { const server = restify.createServer({ diff --git a/packages/graphql-server-restify/src/restifyApollo.ts b/packages/apollo-server-restify/src/restifyApollo.ts similarity index 95% rename from packages/graphql-server-restify/src/restifyApollo.ts rename to packages/apollo-server-restify/src/restifyApollo.ts index e3b859b02b4..da1c15d11c6 100644 --- a/packages/graphql-server-restify/src/restifyApollo.ts +++ b/packages/apollo-server-restify/src/restifyApollo.ts @@ -1,7 +1,7 @@ import * as restify from 'restify'; import * as url from 'url'; -import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'graphql-server-core'; -import * as GraphiQL from 'graphql-server-module-graphiql'; +import { GraphQLOptions, HttpQueryError, runHttpQuery } from 'apollo-server-core'; +import * as GraphiQL from 'apollo-server-module-graphiql'; export interface RestifyGraphQLOptionsFunction { (req?: restify.Request, res?: restify.Response): GraphQLOptions | Promise; diff --git a/packages/apollo-server-restify/tsconfig.json b/packages/apollo-server-restify/tsconfig.json new file mode 100644 index 00000000000..ce8c383b204 --- /dev/null +++ b/packages/apollo-server-restify/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "types": [] + }, + "exclude": [ + "node_modules", + "dist" + ] +} diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 8fac5e673fa..ce17aa18ed7 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-core" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-core" }, "keywords": [ "GraphQL", @@ -20,20 +20,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", - "devDependencies": { - "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.0", - "fibers": "1.0.15", - "meteor-promise": "^0.8.2" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.0" + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-core": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-core/src/index.ts b/packages/graphql-server-core/src/index.ts index 3e10213ef9c..e9f9484692e 100644 --- a/packages/graphql-server-core/src/index.ts +++ b/packages/graphql-server-core/src/index.ts @@ -1,4 +1 @@ -export { runQuery, LogFunction, LogMessage, LogStep, LogAction } from './runQuery'; -export { runHttpQuery, HttpQueryRequest, HttpQueryError } from './runHttpQuery'; -export { default as GraphQLOptions, resolveGraphqlOptions } from './graphqlOptions'; - +export * from 'apollo-server-core'; diff --git a/packages/graphql-server-core/tsconfig.json b/packages/graphql-server-core/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-core/tsconfig.json +++ b/packages/graphql-server-core/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index dd0e75b8c89..28aba2c2d18 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-express" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-express" }, "keywords": [ "GraphQL", @@ -22,31 +22,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "@types/body-parser": "1.16.3", - "@types/connect": "^3.4.30", - "@types/express": "^4.0.35", - "@types/multer": "0.0.33", - "body-parser": "^1.17.2", - "connect": "^3.6.2", - "connect-query": "^1.0.0", - "express": "^4.15.3", - "graphql-server-integration-testsuite": "^1.0.0", - "multer": "^1.3.0" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/express": "^4.0.35", - "@types/graphql": "^0.9.1" + "apollo-server-express": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/src/index.ts b/packages/graphql-server-express/src/index.ts index b963c6c0fd3..71eeaaa6d17 100644 --- a/packages/graphql-server-express/src/index.ts +++ b/packages/graphql-server-express/src/index.ts @@ -1,12 +1 @@ -export { - ExpressGraphQLOptionsFunction, - ExpressHandler, - ExpressGraphiQLOptionsFunction, - graphqlExpress, - graphiqlExpress, -} from './expressApollo'; - -export { - graphqlConnect, - graphiqlConnect, -} from './connectApollo'; +export * from 'apollo-server-express'; diff --git a/packages/graphql-server-express/tsconfig.json b/packages/graphql-server-express/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-express/tsconfig.json +++ b/packages/graphql-server-express/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index af70cd39323..79604bd0299 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-hapi" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-hapi" }, "keywords": [ "GraphQL", @@ -21,27 +21,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "boom": "^5.1.0", - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "@types/boom": "4.3.2", - "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.4", - "graphql-server-integration-testsuite": "^1.0.0", - "hapi": "^16.4.3" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.2" + "apollo-server-hapi": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-hapi/src/index.ts b/packages/graphql-server-hapi/src/index.ts index 8c964266b67..5cd1572cc76 100644 --- a/packages/graphql-server-hapi/src/index.ts +++ b/packages/graphql-server-hapi/src/index.ts @@ -1,6 +1 @@ -export { IRegister, - HapiOptionsFunction, - HapiPluginOptions, - HapiGraphiQLOptionsFunction, - HapiGraphiQLPluginOptions, - graphqlHapi, graphiqlHapi } from './hapiApollo'; +export * from 'apollo-server-hapi'; diff --git a/packages/graphql-server-hapi/tsconfig.json b/packages/graphql-server-hapi/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-hapi/tsconfig.json +++ b/packages/graphql-server-hapi/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index 02e9b5a08dd..1b1c790d989 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-koa" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-koa" }, "keywords": [ "GraphQL", @@ -21,28 +21,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "@types/koa": "^2.0.39", - "@types/koa-bodyparser": "^3.0.23", - "@types/koa-router": "^7.0.22", - "graphql-server-integration-testsuite": "^1.0.0", - "koa": "^2.2.0", - "koa-bodyparser": "^4.2.0", - "koa-router": "^7.2.0" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.1", - "@types/koa": "^2.0.39" + "apollo-server-koa": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-koa/src/index.ts b/packages/graphql-server-koa/src/index.ts index 52bfe4f8703..09bb0a301f9 100644 --- a/packages/graphql-server-koa/src/index.ts +++ b/packages/graphql-server-koa/src/index.ts @@ -1,7 +1 @@ -export { - KoaGraphQLOptionsFunction, - KoaHandler, - KoaGraphiQLOptionsFunction, - graphqlKoa, - graphiqlKoa, -} from './koaApollo'; +export * from 'apollo-server-koa'; diff --git a/packages/graphql-server-koa/tsconfig.json b/packages/graphql-server-koa/tsconfig.json index ce8c383b204..95f3dcb8085 100644 --- a/packages/graphql-server-koa/tsconfig.json +++ b/packages/graphql-server-koa/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "types": [] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index a87c511ffdb..917e821c559 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-lambda" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-lambda" }, "keywords": [ "GraphQL", @@ -21,20 +21,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "@types/aws-lambda": "0.0.10", - "@types/graphql": "^0.9.1", - "graphql-server-integration-testsuite": "^1.0.0" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" + "apollo-server-lambda": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/src/index.ts b/packages/graphql-server-lambda/src/index.ts old mode 100755 new mode 100644 index 4b5e47610e3..4d6f2465495 --- a/packages/graphql-server-lambda/src/index.ts +++ b/packages/graphql-server-lambda/src/index.ts @@ -1,8 +1 @@ -export { - LambdaHandler, - IHeaders, - LambdaGraphQLOptionsFunction, - LambdaGraphiQLOptionsFunction, - graphqlLambda, - graphiqlLambda, -} from './lambdaApollo'; +export * from 'apollo-server-lambda'; diff --git a/packages/graphql-server-lambda/tsconfig.json b/packages/graphql-server-lambda/tsconfig.json index dcab1f88b17..95f3dcb8085 100644 --- a/packages/graphql-server-lambda/tsconfig.json +++ b/packages/graphql-server-lambda/tsconfig.json @@ -2,13 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ], - "types": [ - "@types/node" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index a5122fb42fd..9827a64071d 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-micro" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-micro" }, "keywords": [ "GraphQL", @@ -21,25 +21,11 @@ "author": "Nick Nance ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "graphql-server-integration-testsuite": "^1.0.0", - "micro": "^7.3.3", - "microrouter": "^2.1.1" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1", - "micro": "^7.3.3" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.1", - "@types/micro": "^7.3.0" + "apollo-server-micro": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-micro/src/index.ts b/packages/graphql-server-micro/src/index.ts index 84c6c4b7710..034e9c25f5c 100644 --- a/packages/graphql-server-micro/src/index.ts +++ b/packages/graphql-server-micro/src/index.ts @@ -1,6 +1 @@ -export { - MicroGraphQLOptionsFunction, - MicroGraphiQLOptionsFunction, - microGraphql, - microGraphiql, -} from './microApollo'; +export * from 'apollo-server-micro'; diff --git a/packages/graphql-server-micro/tsconfig.json b/packages/graphql-server-micro/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-micro/tsconfig.json +++ b/packages/graphql-server-micro/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-module-graphiql/package.json b/packages/graphql-server-module-graphiql/package.json index c1752398a8f..37cbe3c8563 100644 --- a/packages/graphql-server-module-graphiql/package.json +++ b/packages/graphql-server-module-graphiql/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-graphiql" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-module-graphiql" }, "keywords": [ "GraphQL", @@ -20,11 +20,12 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" + }, + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-module-graphiql": "^1.0.0" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", - "dependencies": {}, - "devDependencies": {}, "typings": "dist/index.d.ts", "typescript": { "definition": "dist/index.d.ts" diff --git a/packages/graphql-server-module-graphiql/src/index.ts b/packages/graphql-server-module-graphiql/src/index.ts index e809997e9b9..cafcbae4c6b 100644 --- a/packages/graphql-server-module-graphiql/src/index.ts +++ b/packages/graphql-server-module-graphiql/src/index.ts @@ -1,2 +1 @@ -export { GraphiQLData, renderGraphiQL } from './renderGraphiQL'; -export { resolveGraphiQLString } from './resolveGraphiQLString'; +export * from 'apollo-server-module-graphiql'; diff --git a/packages/graphql-server-module-graphiql/tsconfig.json b/packages/graphql-server-module-graphiql/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-module-graphiql/tsconfig.json +++ b/packages/graphql-server-module-graphiql/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json index 72b18f46c9b..cbde364b124 100644 --- a/packages/graphql-server-module-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-operation-store" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-module-operation-store" }, "keywords": [ "GraphQL", @@ -20,14 +20,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.1" + "homepage": "https://github.com/apollographql/apollo-server#readme", + "dependencies": { + "apollo-server-module-operation-store": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-module-operation-store/src/index.ts b/packages/graphql-server-module-operation-store/src/index.ts index 7c10b8aeba0..77d4e9a0d16 100644 --- a/packages/graphql-server-module-operation-store/src/index.ts +++ b/packages/graphql-server-module-operation-store/src/index.ts @@ -1 +1 @@ -export { OperationStore } from './operationStore'; +export * from 'apollo-server-module-operation-store'; diff --git a/packages/graphql-server-module-operation-store/tsconfig.json b/packages/graphql-server-module-operation-store/tsconfig.json index 915a719df65..95f3dcb8085 100644 --- a/packages/graphql-server-module-operation-store/tsconfig.json +++ b/packages/graphql-server-module-operation-store/tsconfig.json @@ -2,10 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "typeRoots": [ - "node_modules/@types" - ] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index 32a80f7f0ae..41046c6bc64 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-restify" + "url": "https://github.com/apollographql/apollo-server/tree/master/packages/graphql-server-restify" }, "keywords": [ "GraphQL", @@ -21,24 +21,11 @@ "author": "Jonas Helfer ", "license": "MIT", "bugs": { - "url": "https://github.com/apollostack/graphql-server/issues" + "url": "https://github.com/apollographql/apollo-server/issues" }, - "homepage": "https://github.com/apollostack/graphql-server#readme", + "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "graphql-server-core": "^1.0.0", - "graphql-server-module-graphiql": "^1.0.0" - }, - "devDependencies": { - "@types/restify": "^4.3.2", - "graphql-server-integration-testsuite": "^1.0.0", - "restify": "^4.3.0" - }, - "peerDependencies": { - "graphql": "^0.9.0 || ^0.10.1" - }, - "optionalDependencies": { - "@types/graphql": "^0.9.1", - "@types/restify": "^4.3.2" + "apollo-server-restify": "^1.0.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-restify/src/index.ts b/packages/graphql-server-restify/src/index.ts index 88ee3195d62..174888cb4d2 100644 --- a/packages/graphql-server-restify/src/index.ts +++ b/packages/graphql-server-restify/src/index.ts @@ -1,7 +1 @@ -export { - RestifyGraphQLOptionsFunction, - RestifyHandler, - RestifyGraphiQLOptionsFunction, - graphqlRestify, - graphiqlRestify, -} from './restifyApollo'; +export * from 'apollo-server-restify'; diff --git a/packages/graphql-server-restify/tsconfig.json b/packages/graphql-server-restify/tsconfig.json index ce8c383b204..95f3dcb8085 100644 --- a/packages/graphql-server-restify/tsconfig.json +++ b/packages/graphql-server-restify/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "./src", - "outDir": "./dist", - "types": [] + "outDir": "./dist" }, "exclude": [ "node_modules", diff --git a/test/tests.js b/test/tests.js index a6d277dacdb..4bb8811e001 100644 --- a/test/tests.js +++ b/test/tests.js @@ -2,16 +2,16 @@ const NODE_VERSION = process.version.split('.'); const NODE_MAJOR_VERSION = parseInt(NODE_VERSION[0].replace(/^v/, '')); process.env.NODE_ENV = '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'); -(NODE_MAJOR_VERSION >= 6) && require('../packages/graphql-server-micro/dist/microApollo.test'); -(NODE_MAJOR_VERSION >= 7) && require('../packages/graphql-server-koa/dist/koaApollo.test'); -require('../packages/graphql-server-lambda/dist/lambdaApollo.test'); -require('../packages/graphql-server-express/dist/apolloServerHttp.test'); +require('../packages/apollo-server-core/dist/runQuery.test.js'); +require('../packages/apollo-server-module-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'); +(NODE_MAJOR_VERSION >= 6) && require('../packages/apollo-server-micro/dist/microApollo.test'); +(NODE_MAJOR_VERSION >= 7) && require('../packages/apollo-server-koa/dist/koaApollo.test'); +require('../packages/apollo-server-lambda/dist/lambdaApollo.test'); +require('../packages/apollo-server-express/dist/apolloServerHttp.test'); // XXX: Running restify last as it breaks http. // for more info: https://github.com/restify/node-restify/issues/700 -require('../packages/graphql-server-restify/dist/restifyApollo.test'); +require('../packages/apollo-server-restify/dist/restifyApollo.test');