feat: update graphql-upload

mercurius-js · Jun 13, 2022 · ef93932 · ef93932
1 parent 1e4a472
commit ef93932
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 163 deletions.
diff --git a/index.ts b/index.ts
@@ -1,5 +1,5 @@
 import fp from 'fastify-plugin'
-import { processRequest, UploadOptions } from 'graphql-upload'
+import processRequest, { ProcessRequestOptions } from 'graphql-upload/processRequest.js'
 
 import type { FastifyPluginCallback } from 'fastify'
 
@@ -9,7 +9,7 @@ declare module 'fastify' {
   }
 }
 
-const mercuriusGQLUpload: FastifyPluginCallback<UploadOptions> = (
+const mercuriusGQLUpload: FastifyPluginCallback<ProcessRequestOptions> = (
   fastify,
   options,
   done

diff --git a/package.json b/package.json
@@ -32,9 +32,8 @@
     "test": "tap --ts --100 test/*.test.ts"
   },
   "dependencies": {
-    "@types/graphql-upload": "^8.0.11",
     "fastify-plugin": "^3.0.1",
-    "graphql-upload": "^13.0.0"
+    "graphql-upload": "^15.0.1"
   },
   "devDependencies": {
     "@types/node": "^16.11.39",
@@ -50,6 +49,6 @@
     "typescript": "^4.7.3"
   },
   "peerDependencies": {
-    "graphql": "0.13.1 - 16"
+    "graphql": "^16.3.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/build-server.ts b/test/build-server.ts
@@ -1,6 +1,6 @@
 import fastify from 'fastify'
 import GQL from 'mercurius'
-import { GraphQLUpload } from 'graphql-upload'
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import mercuriusGQLUpload from '../index'
 
 const schema = /* GraphQL */ `

diff --git a/tsconfig.json b/tsconfig.json
@@ -64,7 +64,11 @@
 
     /* Advanced Options */
     "skipLibCheck": true /* Skip type checking of declaration files. */,
-    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+    "forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
+
+    /* https://github.com/jaydenseric/graphql-upload/issues/282#issuecomment-1142691771 */
+    "allowJs": true,
+    "maxNodeModuleJsDepth": 10
   },
   "include": ["index.ts"]
 }