remove external option requirement for graphql with bundlers

rochdev · rochdev · commit d7e8fd259754 · 2025-11-26T13:39:32.000-05:00
diff --git a/integration-tests/appsec/iast-esbuild-cjs/esbuild.common-config.js b/integration-tests/appsec/iast-esbuild-cjs/esbuild.common-config.js
@@ -11,12 +11,6 @@ module.exports = {
   target: ['node18'],
   external: [
     '@datadog/native-iast-taint-tracking',
-    '@datadog/wasm-js-rewriter',
-
-    // required if you encounter graphql errors during the build step
-    // see https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling
-    'graphql/language/visitor',
-    'graphql/language/printer',
-    'graphql/utilities'
+    '@datadog/wasm-js-rewriter'
   ]
 }
diff --git a/integration-tests/appsec/iast-esbuild-esm/esbuild.common-config.mjs b/integration-tests/appsec/iast-esbuild-esm/esbuild.common-config.mjs
@@ -16,12 +16,6 @@ export default {
   target: ['node18'],
   external: [
     '@datadog/native-iast-taint-tracking',
-    '@datadog/wasm-js-rewriter',
-
-    // required if you encounter graphql errors during the build step
-    // see https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling
-    'graphql/language/visitor',
-    'graphql/language/printer',
-    'graphql/utilities'
+    '@datadog/wasm-js-rewriter'
   ]
 }
diff --git a/integration-tests/esbuild/build-and-test-koa.mjs b/integration-tests/esbuild/build-and-test-koa.mjs
@@ -20,11 +20,7 @@ try {
     platform: 'node',
     target: 'es2022',
     plugins: [ddPlugin],
-    external: [
-      'graphql/language/visitor',
-      'graphql/language/printer',
-      'graphql/utilities'
-    ]
+    external: []
   })
 
   // Verify instrumentation
diff --git a/integration-tests/esbuild/build-and-test-typescript.mjs b/integration-tests/esbuild/build-and-test-typescript.mjs
@@ -16,11 +16,7 @@ try {
     platform: 'node',
     target: 'es2022',
     plugins: [ddPlugin],
-    external: [
-      'graphql/language/visitor',
-      'graphql/language/printer',
-      'graphql/utilities'
-    ]
+    external: []
   })
   console.log('ok') // eslint-disable-line no-console
 } finally {
diff --git a/integration-tests/esbuild/build.esm-hono-output-cjs.mjs b/integration-tests/esbuild/build.esm-hono-output-cjs.mjs
@@ -22,11 +22,6 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
-
-  // required if you encounter graphql errors during the build step
-  'graphql/language/visitor',
-  'graphql/language/printer',
-  'graphql/utilities',
 ]
 
 esbuild.build({
diff --git a/integration-tests/esbuild/build.esm-hono-output-esm.mjs b/integration-tests/esbuild/build.esm-hono-output-esm.mjs
@@ -22,11 +22,6 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
-
-  // required if you encounter graphql errors during the build step
-  'graphql/language/visitor',
-  'graphql/language/printer',
-  'graphql/utilities',
 ]
 
 esbuild.build({
diff --git a/integration-tests/esbuild/build.esm-http-output-cjs.mjs b/integration-tests/esbuild/build.esm-http-output-cjs.mjs
@@ -22,11 +22,6 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
-
-  // required if you encounter graphql errors during the build step
-  'graphql/language/visitor',
-  'graphql/language/printer',
-  'graphql/utilities',
 ]
 
 esbuild.build({
diff --git a/integration-tests/esbuild/build.esm-http-output-esm.mjs b/integration-tests/esbuild/build.esm-http-output-esm.mjs
@@ -22,11 +22,6 @@ const external = [
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',
   '@datadog/native-iast-rewriter',
-
-  // required if you encounter graphql errors during the build step
-  'graphql/language/visitor',
-  'graphql/language/printer',
-  'graphql/utilities',
 ]
 
 esbuild.build({
diff --git a/packages/datadog-plugin-graphql/src/tools/transforms.js b/packages/datadog-plugin-graphql/src/tools/transforms.js
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const visitor_1 = require("graphql/language");
-const printer_1 = require("graphql/language");
-const utilities_1 = require("graphql/utilities");
+const visitor_1 = require("graphql");
+const printer_1 = require("graphql");
+const utilities_1 = require("graphql");
 const lodash_sortby_1 = __importDefault(require("lodash.sortby"));
 function hideLiterals(ast) {
     return visitor_1.visit(ast, {
diff --git a/packages/node_modules/graphql/LICENSE b/packages/node_modules/graphql/LICENSE
diff --git a/packages/node_modules/graphql/index.js b/packages/node_modules/graphql/index.js
diff --git a/packages/node_modules/graphql/language/index.js b/packages/node_modules/graphql/language/index.js
diff --git a/vendor/rspack.config.js b/vendor/rspack.config.js
@@ -7,14 +7,12 @@ const { dependencies } = require('./package.json')
 
 const include = new Set([
   ...Object.keys(dependencies),
-  'graphql/language',
   'mutexify/promise',
   'protobufjs/minimal', // peer dependency for `@datadog/sketches-js`
   'source-map/lib/util'
 ])
 
 const exclude = new Set([
-  'graphql', // we only use some internals to interact with the AST
   'mutexify' // we only ever use `mutexify/promise`
 ])
 

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,6 @@ module.exports = {`
`11`	`11`	`target: ['node18'],`
`12`	`12`	`external: [`
`13`	`13`	`'@datadog/native-iast-taint-tracking',`
`14`		`- '@datadog/wasm-js-rewriter',`
`15`		`-`
`16`		`- // required if you encounter graphql errors during the build step`
`17`		`- // see https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling`
`18`		`- 'graphql/language/visitor',`
`19`		`- 'graphql/language/printer',`
`20`		`- 'graphql/utilities'`
	`14`	`+ '@datadog/wasm-js-rewriter'`
`21`	`15`	`]`
`22`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,6 @@ export default {`
`16`	`16`	`target: ['node18'],`
`17`	`17`	`external: [`
`18`	`18`	`'@datadog/native-iast-taint-tracking',`
`19`		`- '@datadog/wasm-js-rewriter',`
`20`		`-`
`21`		`- // required if you encounter graphql errors during the build step`
`22`		`- // see https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling`
`23`		`- 'graphql/language/visitor',`
`24`		`- 'graphql/language/printer',`
`25`		`- 'graphql/utilities'`
	`19`	`+ '@datadog/wasm-js-rewriter'`
`26`	`20`	`]`
`27`	`21`	`}`