feat(uploads): replace apollo-upload-server v5 with graphql-upload v8

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Allow an optional function to resolve the `rootValue`, passing the `DocumentNode` AST to determine the value. [PR #1555](https://github.com/apollographql/apollo-server/pull/1555)
 - Follow-up on the work in [PR #1516](https://github.com/apollographql/apollo-server/pull/1516) to also fix missing insertion cursor/caret when a custom GraphQL configuration is specified which doesn't specify its own `cursorShape` property. [PR #1607](https://github.com/apollographql/apollo-server/pull/1607)
+- Migrate [@apollographql/apollo-upload-server](https://github.com/apollographql/apollo-upload-server) to [graphql-upload](https://github.com/jaydenseric/graphql-upload) to fix [#1509](https://github.com/apollographql/apollo-server/issues/1509) and [1703](https://github.com/apollographql/apollo-server/issues/1703)
 
 ### v2.1.0
 

docs/source/whats-new.md

@@ -246,7 +246,7 @@ const resolvers = {
   Mutation: {
     singleUpload: (parent, args) => {
       return args.file.then(file => {
-        //Contents of Upload scalar: https://github.com/jaydenseric/apollo-upload-server#upload-scalar
+        //Contents of Upload scalar: https://github.com/jaydenseric/graphql-upload#class-graphqlupload
         //file.stream is a node stream that contains the contents of the uploaded file
         //node stream api: https://nodejs.org/api/stream.html
         return file;

packages/apollo-server-core/package.json

@@ -29,7 +29,6 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@apollographql/apollo-upload-server": "^5.0.3",
     "@types/ws": "^5.1.2",
     "apollo-cache-control": "file:../apollo-cache-control",
     "apollo-datasource": "file:../apollo-datasource",
@@ -42,6 +41,7 @@
     "graphql-subscriptions": "^0.5.8",
     "graphql-tag": "^2.9.2",
     "graphql-tools": "^3.0.4",
+    "graphql-upload": "^8.0.0",
     "hash.js": "^1.1.3",
     "lodash": "^4.17.10",
     "subscriptions-transport-ws": "^0.9.11",

packages/apollo-server-core/src/ApolloServer.ts

@@ -176,9 +176,7 @@ export class ApolloServerBase {
       );
 
       if (this.uploadsConfig) {
-        const {
-          GraphQLUpload,
-        } = require('@apollographql/apollo-upload-server');
+        const { GraphQLUpload } = require('graphql-upload');
         if (resolvers && !resolvers.Upload) {
           resolvers.Upload = GraphQLUpload;
         }

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 '@apollographql/apollo-upload-server';
+import { GraphQLUpload as UploadScalar } from 'graphql-upload';
 export const GraphQLUpload = UploadScalar as GraphQLScalarType;

packages/apollo-server-core/src/types.ts

@@ -61,7 +61,7 @@ export interface Config
   extensions?: Array<() => GraphQLExtension>;
   persistedQueries?: PersistedQueryOptions | false;
   subscriptions?: Partial<SubscriptionServerOptions> | string | false;
-  //https://github.com/jaydenseric/apollo-upload-server#options
+  //https://github.com/jaydenseric/graphql-upload#type-uploadoptions
   uploads?: boolean | FileUploadOptions;
   playground?: PlaygroundConfig;
 }

packages/apollo-server-core/src/types/apollo-upload-server.d.ts

@@ -1,4 +1,4 @@
-declare module '@apollographql/apollo-upload-server' {
+declare module 'graphql-upload' {
   import { GraphQLScalarType } from 'graphql';
 
   export const GraphQLUpload: GraphQLScalarType;
@@ -20,8 +20,11 @@ declare module '@apollographql/apollo-upload-server' {
 
   export type Request = any;
 
+  export type Response = any;
+
   export function processRequest(
     request: Request,
+    response: Response,
     options?: ApolloUploadOptions,
   ): Promise<any>;
 }

packages/apollo-server-express/package.json

@@ -31,7 +31,6 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@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",
@@ -43,6 +42,7 @@
     "cors": "^2.8.4",
     "graphql-subscriptions": "^0.5.8",
     "graphql-tools": "^3.0.4",
+    "graphql-upload": "^8.0.0",
     "type-is": "^1.6.16"
   },
   "devDependencies": {

packages/apollo-server-express/src/ApolloServer.ts

@@ -16,7 +16,7 @@ import typeis from 'type-is';
 
 import { graphqlExpress } from './expressApollo';
 
-import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';
+import { processRequest as processFileUploads } from 'graphql-upload';
 
 export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core';
 
@@ -45,7 +45,7 @@ const fileUploadMiddleware = (
 ) => {
   // Note: we use typeis directly instead of via req.is for connect support.
   if (typeis(req, ['multipart/form-data'])) {
-    processFileUploads(req, uploadsConfig)
+    processFileUploads(req, res, uploadsConfig)
       .then(body => {
         req.body = body;
         next();

packages/apollo-server-hapi/package.json

@@ -30,13 +30,13 @@
     "node": ">=8"
   },
   "dependencies": {
-    "@apollographql/apollo-upload-server": "^5.0.3",
     "@apollographql/graphql-playground-html": "^1.6.0",
     "accept": "^3.0.2",
     "apollo-server-core": "file:../apollo-server-core",
     "boom": "^7.1.0",
     "graphql-subscriptions": "^0.5.8",
-    "graphql-tools": "^3.0.4"
+    "graphql-tools": "^3.0.4",
+    "graphql-upload": "^8.0.0"
   },
   "devDependencies": {
     "apollo-server-integration-testsuite": "file:../apollo-server-integration-testsuite"

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 '@apollographql/apollo-upload-server';
+import { processRequest as processFileUploads } from 'graphql-upload';
 
 import { graphqlHapi } from './hapiApollo';
 
@@ -19,7 +19,11 @@ function handleFileUploads(uploadsConfig: FileUploadOptions) {
   return async (request: hapi.Request) => {
     if (request.mime === 'multipart/form-data') {
       Object.defineProperty(request, 'payload', {
-        value: await processFileUploads(request, uploadsConfig),
+        value: await processFileUploads(
+          request,
+          request.response,
+          uploadsConfig,
+        ),
         writable: false,
       });
     }

packages/apollo-server-koa/package.json

@@ -30,7 +30,6 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@apollographql/apollo-upload-server": "^5.0.3",
     "@apollographql/graphql-playground-html": "^1.6.0",
     "@koa/cors": "^2.2.1",
     "@types/accepts": "^1.3.5",
@@ -43,6 +42,7 @@
     "apollo-server-core": "file:../apollo-server-core",
     "graphql-subscriptions": "^0.5.8",
     "graphql-tools": "^3.0.4",
+    "graphql-upload": "^8.0.0",
     "koa": "2.5.3",
     "koa-bodyparser": "^3.0.0",
     "koa-router": "^7.4.0",

packages/apollo-server-koa/src/ApolloServer.ts

@@ -12,7 +12,7 @@ import typeis from 'type-is';
 
 import { graphqlKoa } from './koaApollo';
 
-import { processRequest as processFileUploads } from '@apollographql/apollo-upload-server';
+import { processRequest as processFileUploads } from 'graphql-upload';
 
 export { GraphQLOptions, GraphQLExtension } from 'apollo-server-core';
 import { GraphQLOptions, FileUploadOptions } from 'apollo-server-core';
@@ -32,7 +32,11 @@ const fileUploadMiddleware = (
 ) => async (ctx: Koa.Context, next: Function) => {
   if (typeis(ctx.req, ['multipart/form-data'])) {
     try {
-      ctx.request.body = await processFileUploads(ctx.req, uploadsConfig);
+      ctx.request.body = await processFileUploads(
+        ctx.req,
+        ctx.res,
+        uploadsConfig,
+      );
       return next();
     } catch (error) {
       if (error.status && error.expose) ctx.status = error.status;

packages/apollo-server-micro/package.json

@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "@apollographql/apollo-upload-server": "^5.0.3",
     "@apollographql/graphql-playground-html": "^1.6.0",
     "accept": "^3.0.2",
     "apollo-server-core": "file:../apollo-server-core",
+    "graphql-upload": "^8.0.0",
     "micro": "^9.3.2"
   },
   "devDependencies": {