diff --git a/package-lock.json b/package-lock.json index 76d95b5a7cf..42c78c23d04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,17 @@ "version": "7.0.0-rc.1", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-rc.1.tgz", "integrity": "sha512-Nifv2kwP/nwR39cAOasNxzjYfpeuf/ZbZNtQz5eYxWTC9yHARU9wItFnAwz1GTZ62MU+AtSjzZPMbLK5Q9hmbg==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.12.0" + } + }, + "@babel/runtime-corejs2": { + "version": "7.0.0-rc.1", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.0.0-rc.1.tgz", + "integrity": "sha512-2QWAvXXu7r0zmgrXExWXnXh7vuarvjgsDB9qL4hN925dSRrrFZWXjiIQ+LB14753shjZkZ+4xLEJrO9hBKGwRA==", "requires": { + "core-js": "^2.5.7", "regenerator-runtime": "^0.12.0" } }, @@ -1697,6 +1707,7 @@ "apollo-server-core": { "version": "file:packages/apollo-server-core", "requires": { + "@apollographql/apollo-upload-server": "^5.0.3", "@types/ws": "^5.1.2", "apollo-cache-control": "file:packages/apollo-cache-control", "apollo-datasource": "file:packages/apollo-datasource", @@ -1705,7 +1716,6 @@ "apollo-server-env": "file:packages/apollo-server-env", "apollo-server-errors": "file:packages/apollo-server-errors", "apollo-tracing": "file:packages/apollo-tracing", - "apollo-upload-server": "^5.0.0", "graphql-extensions": "file:packages/graphql-extensions", "graphql-subscriptions": "^0.5.8", "graphql-tag": "^2.9.2", @@ -1716,6 +1726,15 @@ "ws": "^5.2.0" }, "dependencies": { + "@apollographql/apollo-upload-server": { + "version": "5.0.3", + "bundled": true, + "requires": { + "@babel/runtime-corejs2": "^7.0.0-rc.1", + "busboy": "^0.2.14", + "object-path": "^0.11.4" + } + }, "ws": { "version": "5.2.2", "bundled": true, @@ -1738,6 +1757,7 @@ "apollo-server-express": { "version": "file:packages/apollo-server-express", "requires": { + "@apollographql/apollo-upload-server": "^5.0.3", "@apollographql/graphql-playground-html": "^1.6.0", "@types/accepts": "^1.3.5", "@types/body-parser": "1.17.0", @@ -1745,24 +1765,45 @@ "@types/express": "4.16.0", "accepts": "^1.3.5", "apollo-server-core": "file:packages/apollo-server-core", - "apollo-upload-server": "^5.0.0", "body-parser": "^1.18.3", "cors": "^2.8.4", "graphql-subscriptions": "^0.5.8", "graphql-tools": "^3.0.4", "type-is": "^1.6.16" + }, + "dependencies": { + "@apollographql/apollo-upload-server": { + "version": "5.0.3", + "bundled": true, + "requires": { + "@babel/runtime-corejs2": "^7.0.0-rc.1", + "busboy": "^0.2.14", + "object-path": "^0.11.4" + } + } } }, "apollo-server-hapi": { "version": "file:packages/apollo-server-hapi", "requires": { + "@apollographql/apollo-upload-server": "^5.0.3", "@apollographql/graphql-playground-html": "^1.6.0", "accept": "^3.0.2", "apollo-server-core": "file:packages/apollo-server-core", - "apollo-upload-server": "^5.0.0", "boom": "^7.1.0", "graphql-subscriptions": "^0.5.8", "graphql-tools": "^3.0.4" + }, + "dependencies": { + "@apollographql/apollo-upload-server": { + "version": "5.0.3", + "bundled": true, + "requires": { + "@babel/runtime-corejs2": "^7.0.0-rc.1", + "busboy": "^0.2.14", + "object-path": "^0.11.4" + } + } } }, "apollo-server-integration-testsuite": { @@ -1774,6 +1815,7 @@ "apollo-server-koa": { "version": "file:packages/apollo-server-koa", "requires": { + "@apollographql/apollo-upload-server": "^5.0.3", "@apollographql/graphql-playground-html": "^1.6.0", "@koa/cors": "^2.2.1", "@types/accepts": "^1.3.5", @@ -1784,13 +1826,23 @@ "@types/koa__cors": "^2.2.1", "accepts": "^1.3.5", "apollo-server-core": "file:packages/apollo-server-core", - "apollo-upload-server": "^5.0.0", "graphql-subscriptions": "^0.5.8", "graphql-tools": "^3.0.4", "koa": "2.5.2", "koa-bodyparser": "^3.0.0", "koa-router": "^7.4.0", "type-is": "^1.6.16" + }, + "dependencies": { + "@apollographql/apollo-upload-server": { + "version": "5.0.3", + "bundled": true, + "requires": { + "@babel/runtime-corejs2": "^7.0.0-rc.1", + "busboy": "^0.2.14", + "object-path": "^0.11.4" + } + } } }, "apollo-server-lambda": { @@ -1805,11 +1857,22 @@ "apollo-server-micro": { "version": "file:packages/apollo-server-micro", "requires": { + "@apollographql/apollo-upload-server": "^5.0.3", "@apollographql/graphql-playground-html": "^1.6.0", "accept": "^3.0.2", "apollo-server-core": "file:packages/apollo-server-core", - "apollo-upload-server": "^5.0.0", "micro": "^9.3.2" + }, + "dependencies": { + "@apollographql/apollo-upload-server": { + "version": "5.0.3", + "bundled": true, + "requires": { + "@babel/runtime-corejs2": "^7.0.0-rc.1", + "busboy": "^0.2.14", + "object-path": "^0.11.4" + } + } } }, "apollo-tracing": { @@ -1851,16 +1914,6 @@ } } }, - "apollo-upload-server": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/apollo-upload-server/-/apollo-upload-server-5.0.0.tgz", - "integrity": "sha512-CzbHvMo/6TO5XrovzmV/ojTft17s9Cd+vKLGngChpB0UW1ObxKlNLlcXRLD+yt6Nec32/Kt209HmA31hnwxB/g==", - "requires": { - "@babel/runtime": "^7.0.0-beta.40", - "busboy": "^0.2.14", - "object-path": "^0.11.4" - } - }, "apollo-utilities": { "version": "1.0.18", "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.18.tgz", @@ -3304,8 +3357,7 @@ "core-js": { "version": "2.5.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", - "dev": true + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" }, "core-util-is": { "version": "1.0.2", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 75cdb5f6858..c506e9f59fa 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -37,7 +37,7 @@ "apollo-server-env": "file:../apollo-server-env", "apollo-server-errors": "file:../apollo-server-errors", "apollo-tracing": "file:../apollo-tracing", - "apollo-upload-server": "^5.0.0", + "@apollographql/apollo-upload-server": "^5.0.3", "graphql-extensions": "file:../graphql-extensions", "graphql-subscriptions": "^0.5.8", "graphql-tag": "^2.9.2", diff --git a/packages/apollo-server-core/src/ApolloServer.ts b/packages/apollo-server-core/src/ApolloServer.ts index 9e7290e878c..5828a111d0c 100644 --- a/packages/apollo-server-core/src/ApolloServer.ts +++ b/packages/apollo-server-core/src/ApolloServer.ts @@ -14,7 +14,7 @@ import { GraphQLExtension } from 'graphql-extensions'; import { EngineReportingAgent } from 'apollo-engine-reporting'; import { InMemoryLRUCache } from 'apollo-server-caching'; -import { GraphQLUpload } from 'apollo-upload-server'; +import { GraphQLUpload } from '@apollographql/apollo-upload-server'; import { SubscriptionServer, diff --git a/packages/apollo-server-core/src/index.ts b/packages/apollo-server-core/src/index.ts index 6e3e3d344c8..4362da28587 100644 --- a/packages/apollo-server-core/src/index.ts +++ b/packages/apollo-server-core/src/index.ts @@ -43,5 +43,5 @@ export const gql: ( ) => DocumentNode = gqlTag; import { GraphQLScalarType } from 'graphql'; -import { GraphQLUpload as UploadScalar } from 'apollo-upload-server'; +import { GraphQLUpload as UploadScalar } from '@apollographql/apollo-upload-server'; export const GraphQLUpload = UploadScalar as GraphQLScalarType; diff --git a/packages/apollo-server-core/src/types/apollo-upload-server.d.ts b/packages/apollo-server-core/src/types/apollo-upload-server.d.ts index 5276e91c8e3..e75c35ec2e2 100644 --- a/packages/apollo-server-core/src/types/apollo-upload-server.d.ts +++ b/packages/apollo-server-core/src/types/apollo-upload-server.d.ts @@ -1,4 +1,4 @@ -declare module 'apollo-upload-server' { +declare module '@apollographql/apollo-upload-server' { import { GraphQLScalarType } from 'graphql'; export const GraphQLUpload: GraphQLScalarType; diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 831ca1ffd31..e2a7790353c 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -38,7 +38,7 @@ "@types/express": "4.16.0", "accepts": "^1.3.5", "apollo-server-core": "file:../apollo-server-core", - "apollo-upload-server": "^5.0.0", + "@apollographql/apollo-upload-server": "^5.0.3", "body-parser": "^1.18.3", "cors": "^2.8.4", "graphql-subscriptions": "^0.5.8", diff --git a/packages/apollo-server-express/src/ApolloServer.ts b/packages/apollo-server-express/src/ApolloServer.ts index 7a73e952b29..c3504d655a4 100644 --- a/packages/apollo-server-express/src/ApolloServer.ts +++ b/packages/apollo-server-express/src/ApolloServer.ts @@ -16,7 +16,7 @@ import * as typeis from 'type-is'; import { graphqlExpress } from './expressApollo'; -import { processRequest as processFileUploads } from 'apollo-upload-server'; +import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server'; export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core'; diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 488097d6008..ea6a3f3507a 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -33,7 +33,7 @@ "@apollographql/graphql-playground-html": "^1.6.0", "accept": "^3.0.2", "apollo-server-core": "file:../apollo-server-core", - "apollo-upload-server": "^5.0.0", + "@apollographql/apollo-upload-server": "^5.0.3", "boom": "^7.1.0", "graphql-subscriptions": "^0.5.8", "graphql-tools": "^3.0.4" diff --git a/packages/apollo-server-hapi/src/ApolloServer.ts b/packages/apollo-server-hapi/src/ApolloServer.ts index 62515c4e0b0..cbb9e386d9c 100644 --- a/packages/apollo-server-hapi/src/ApolloServer.ts +++ b/packages/apollo-server-hapi/src/ApolloServer.ts @@ -4,7 +4,7 @@ import { renderPlaygroundPage, RenderPageOptions as PlaygroundRenderPageOptions, } from '@apollographql/graphql-playground-html'; -import { processRequest as processFileUploads } from 'apollo-upload-server'; +import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server'; import { graphqlHapi } from './hapiApollo'; diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index efaf474c6d3..288d6ea4539 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -40,7 +40,7 @@ "@types/koa__cors": "^2.2.1", "accepts": "^1.3.5", "apollo-server-core": "file:../apollo-server-core", - "apollo-upload-server": "^5.0.0", + "@apollographql/apollo-upload-server": "^5.0.3", "graphql-subscriptions": "^0.5.8", "graphql-tools": "^3.0.4", "koa": "2.5.2", diff --git a/packages/apollo-server-koa/src/ApolloServer.ts b/packages/apollo-server-koa/src/ApolloServer.ts index 4dcd86b1b51..1825ebe473e 100644 --- a/packages/apollo-server-koa/src/ApolloServer.ts +++ b/packages/apollo-server-koa/src/ApolloServer.ts @@ -12,7 +12,7 @@ import * as typeis from 'type-is'; import { graphqlKoa } from './koaApollo'; -import { processRequest as processFileUploads } from 'apollo-upload-server'; +import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server'; export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core'; import { GraphQLOptions, FileUploadOptions } from 'apollo-server-core'; diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 534839b8c5f..5fb6b91ec60 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -31,7 +31,7 @@ "@apollographql/graphql-playground-html": "^1.6.0", "accept": "^3.0.2", "apollo-server-core": "file:../apollo-server-core", - "apollo-upload-server": "^5.0.0", + "@apollographql/apollo-upload-server": "^5.0.3", "micro": "^9.3.2" } } diff --git a/packages/apollo-server-micro/src/ApolloServer.ts b/packages/apollo-server-micro/src/ApolloServer.ts index a69201610dc..1db04cf3f0f 100644 --- a/packages/apollo-server-micro/src/ApolloServer.ts +++ b/packages/apollo-server-micro/src/ApolloServer.ts @@ -1,5 +1,5 @@ import { ApolloServerBase, GraphQLOptions } from 'apollo-server-core'; -import { processRequest as processFileUploads } from 'apollo-upload-server'; +import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server'; import { ServerResponse } from 'http'; import { send } from 'micro'; import { renderPlaygroundPage } from '@apollographql/graphql-playground-html';