upgrade to pnpm v9 (#3249)

Co-authored-by: Valentin Cocaud <[email protected]>
dotansimha · May 27, 2024 · 7df6fb1 · 7df6fb1
1 parent 00cdff8
commit 7df6fb1
Show file tree

Hide file tree

Showing 5 changed files with 21,464 additions and 17,327 deletions.
diff --git a/examples/gcp-cloud-run/package.json b/examples/gcp-cloud-run/package.json
@@ -5,6 +5,7 @@
   "description": "",
   "author": "",
   "license": "MIT",
+  "private": true,
   "main": "src/index.js",
   "scripts": {
     "start": "node ."

diff --git a/package.json b/package.json
@@ -17,10 +17,10 @@
   ],
   "license": "MIT",
   "private": true,
-  "packageManager": "pnpm@8.6.1",
+  "packageManager": "pnpm@9.1.3",
   "engines": {
     "node": ">=18.0.0",
-    "pnpm": ">=8.6.1"
+    "pnpm": ">=9.1.3"
   },
   "keywords": [
     "graphql",

diff --git a/packages/plugins/sofa/src/index.ts b/packages/plugins/sofa/src/index.ts
@@ -1,3 +1,4 @@
+import { ExecutionArgs, ExecutionResult, SubscriptionArgs } from 'graphql';
 import { Plugin, YogaInitialContext, YogaServerInstance } from 'graphql-yoga';
 import { useSofa as createSofaHandler } from 'sofa-api';
 import { SofaHandler } from './types.js';
@@ -37,19 +38,75 @@ export function useSofa(config: SofaPluginConfig): Plugin {
           envelopedByContext.set(contextValue as YogaInitialContext, enveloped);
           return contextValue;
         },
-        execute(args) {
-          const enveloped = envelopedByContext.get(args.contextValue as YogaInitialContext);
+        execute(
+          ...args:
+            | [ExecutionArgs]
+            | [
+                schema: ExecutionArgs['schema'],
+                document: ExecutionArgs['document'],
+                rootValue?: ExecutionArgs['rootValue'],
+                contextValue?: ExecutionArgs['contextValue'],
+                variableValues?: ExecutionArgs['variableValues'],
+                operationName?: ExecutionArgs['operationName'],
+                fieldResolver?: ExecutionArgs['fieldResolver'],
+                typeResolver?: ExecutionArgs['typeResolver'],
+              ]
+        ): Promise<ExecutionResult> {
+          const executionArgs =
+            args.length === 1
+              ? args[0]
+              : {
+                  schema: args[0],
+                  document: args[1],
+                  rootValue: args[2],
+                  contextValue: args[3],
+                  variableValues: args[4],
+                  operationName: args[5],
+                  fieldResolver: args[6],
+                  typeResolver: args[7],
+                };
+          const enveloped = envelopedByContext.get(
+            executionArgs.contextValue as YogaInitialContext,
+          );
           if (!enveloped) {
             throw new TypeError('Illegal invocation.');
           }
-          return enveloped.execute(args);
+          return enveloped.execute(executionArgs);
         },
-        subscribe(args) {
-          const enveloped = envelopedByContext.get(args.contextValue as YogaInitialContext);
+        subscribe(
+          ...args:
+            | [SubscriptionArgs | ExecutionArgs]
+            | [
+                schema: SubscriptionArgs['schema'],
+                document: SubscriptionArgs['document'],
+                rootValue?: SubscriptionArgs['rootValue'],
+                contextValue?: SubscriptionArgs['contextValue'],
+                variableValues?: SubscriptionArgs['variableValues'],
+                operationName?: SubscriptionArgs['operationName'],
+                fieldResolver?: SubscriptionArgs['fieldResolver'],
+                subscribeFieldResolver?: SubscriptionArgs['subscribeFieldResolver'],
+              ]
+        ) {
+          const subscriptionArgs =
+            args.length === 1
+              ? args[0]
+              : {
+                  schema: args[0],
+                  document: args[1],
+                  rootValue: args[2],
+                  contextValue: args[3],
+                  variableValues: args[4],
+                  operationName: args[5],
+                  fieldResolver: args[6],
+                  subscribeFieldResolver: args[7],
+                };
+          const enveloped = envelopedByContext.get(
+            subscriptionArgs.contextValue as YogaInitialContext,
+          );
           if (!enveloped) {
             throw new TypeError('Illegal invocation.');
           }
-          return enveloped.subscribe(args);
+          return enveloped.subscribe(subscriptionArgs);
         },
       });
     },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/override-graphql-version.js b/scripts/override-graphql-version.js
@@ -21,7 +21,7 @@ fs.writeFileSync(pkgPath, JSON.stringify(pkg, undefined, '  ') + '\n');
 // disable apollo federation and sofa testing with <16 versions
 const graphql15AndLess = parseInt(graphqlVersion.split('.')[0]) <= 15;
 
-for (const testPath of [`examples/apollo-federation`, 'examples/sofa']) {
+for (const testPath of [`examples/apollo-federation`]) {
   if (graphql15AndLess) {
     // disable
     const testPathAbs = path.resolve(__dirname, '..', testPath, '__integration-tests__');