fixes

Author: mydea

dev-packages/e2e-tests/test-applications/node-esbuild/assert.mjs

@@ -17,7 +17,7 @@
  * @module
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -47,6 +47,27 @@ function run(name, { withImport = false } = {}) {
 
 const graphqlSpanCount = result => result.spans.filter(s => s.origin === GRAPHQL_ORIGIN).length;
 
+// Guards the build config, not just its runtime output. The span assertions below can pass by
+// accident when the externalization knob is a no-op (e.g. a Vite SSR build externalizes deps by
+// default, so a mis-set toggle silently ships an external graphql in every variant while the counts
+// still come out right). Assert the bundle SHAPE instead: an inlined build carries graphql's own
+// source (its exported `GraphQLSchema`) and has no bare `graphql` import left; an external build
+// keeps the bare `graphql` import/require and never inlines that source. Bundler-agnostic — matches
+// ESM `from 'graphql'` and CJS `require('graphql')` alike.
+const GRAPHQL_BARE_REFERENCE = /(?:from|require\()\s*['"]graphql['"]/;
+const GRAPHQL_SOURCE_MARKER = 'GraphQLSchema';
+
+function assertBundleShape(name, { inlined }) {
+  const bundle = readFileSync(entryPath(name), 'utf8');
+  const hasBareReference = GRAPHQL_BARE_REFERENCE.test(bundle);
+  const hasGraphqlSource = bundle.includes(GRAPHQL_SOURCE_MARKER);
+  if (inlined) {
+    check(!hasBareReference && hasGraphqlSource, `${name}: graphql is inlined into the bundle`);
+  } else {
+    check(hasBareReference && !hasGraphqlSource, `${name}: graphql is kept external to the bundle`);
+  }
+}
+
 const scenarios = {
   plain: run('plain'),
   plugin: run('plugin'),
@@ -68,6 +89,11 @@ for (const [label, result] of Object.entries(scenarios)) {
   check(result.data?.hello === 'world', `${label}: graphql query works`);
 }
 
+assertBundleShape('plain', { inlined: true });
+assertBundleShape('plugin', { inlined: true });
+assertBundleShape('plain-external', { inlined: false });
+assertBundleShape('plugin-external', { inlined: false });
+
 check(oneSet > 0, 'plugin build (build-time) emits a set of graphql spans');
 check(graphqlSpanCount(scenarios.plain) === 0, 'plain build (no plugin, no --import) emits no graphql spans');
 check(

dev-packages/e2e-tests/test-applications/node-rolldown/assert.mjs

@@ -17,7 +17,7 @@
  * @module
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -47,6 +47,27 @@ function run(name, { withImport = false } = {}) {
 
 const graphqlSpanCount = result => result.spans.filter(s => s.origin === GRAPHQL_ORIGIN).length;
 
+// Guards the build config, not just its runtime output. The span assertions below can pass by
+// accident when the externalization knob is a no-op (e.g. a Vite SSR build externalizes deps by
+// default, so a mis-set toggle silently ships an external graphql in every variant while the counts
+// still come out right). Assert the bundle SHAPE instead: an inlined build carries graphql's own
+// source (its exported `GraphQLSchema`) and has no bare `graphql` import left; an external build
+// keeps the bare `graphql` import/require and never inlines that source. Bundler-agnostic — matches
+// ESM `from 'graphql'` and CJS `require('graphql')` alike.
+const GRAPHQL_BARE_REFERENCE = /(?:from|require\()\s*['"]graphql['"]/;
+const GRAPHQL_SOURCE_MARKER = 'GraphQLSchema';
+
+function assertBundleShape(name, { inlined }) {
+  const bundle = readFileSync(entryPath(name), 'utf8');
+  const hasBareReference = GRAPHQL_BARE_REFERENCE.test(bundle);
+  const hasGraphqlSource = bundle.includes(GRAPHQL_SOURCE_MARKER);
+  if (inlined) {
+    check(!hasBareReference && hasGraphqlSource, `${name}: graphql is inlined into the bundle`);
+  } else {
+    check(hasBareReference && !hasGraphqlSource, `${name}: graphql is kept external to the bundle`);
+  }
+}
+
 const scenarios = {
   plain: run('plain'),
   plugin: run('plugin'),
@@ -68,6 +89,11 @@ for (const [label, result] of Object.entries(scenarios)) {
   check(result.data?.hello === 'world', `${label}: graphql query works`);
 }
 
+assertBundleShape('plain', { inlined: true });
+assertBundleShape('plugin', { inlined: true });
+assertBundleShape('plain-external', { inlined: false });
+assertBundleShape('plugin-external', { inlined: false });
+
 check(oneSet > 0, 'plugin build (build-time) emits a set of graphql spans');
 check(graphqlSpanCount(scenarios.plain) === 0, 'plain build (no plugin, no --import) emits no graphql spans');
 check(

dev-packages/e2e-tests/test-applications/node-rollup/assert.mjs

@@ -17,7 +17,7 @@
  * @module
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -47,6 +47,27 @@ function run(name, { withImport = false } = {}) {
 
 const graphqlSpanCount = result => result.spans.filter(s => s.origin === GRAPHQL_ORIGIN).length;
 
+// Guards the build config, not just its runtime output. The span assertions below can pass by
+// accident when the externalization knob is a no-op (e.g. a Vite SSR build externalizes deps by
+// default, so a mis-set toggle silently ships an external graphql in every variant while the counts
+// still come out right). Assert the bundle SHAPE instead: an inlined build carries graphql's own
+// source (its exported `GraphQLSchema`) and has no bare `graphql` import left; an external build
+// keeps the bare `graphql` import/require and never inlines that source. Bundler-agnostic — matches
+// ESM `from 'graphql'` and CJS `require('graphql')` alike.
+const GRAPHQL_BARE_REFERENCE = /(?:from|require\()\s*['"]graphql['"]/;
+const GRAPHQL_SOURCE_MARKER = 'GraphQLSchema';
+
+function assertBundleShape(name, { inlined }) {
+  const bundle = readFileSync(entryPath(name), 'utf8');
+  const hasBareReference = GRAPHQL_BARE_REFERENCE.test(bundle);
+  const hasGraphqlSource = bundle.includes(GRAPHQL_SOURCE_MARKER);
+  if (inlined) {
+    check(!hasBareReference && hasGraphqlSource, `${name}: graphql is inlined into the bundle`);
+  } else {
+    check(hasBareReference && !hasGraphqlSource, `${name}: graphql is kept external to the bundle`);
+  }
+}
+
 const scenarios = {
   plain: run('plain'),
   plugin: run('plugin'),
@@ -68,6 +89,11 @@ for (const [label, result] of Object.entries(scenarios)) {
   check(result.data?.hello === 'world', `${label}: graphql query works`);
 }
 
+assertBundleShape('plain', { inlined: true });
+assertBundleShape('plugin', { inlined: true });
+assertBundleShape('plain-external', { inlined: false });
+assertBundleShape('plugin-external', { inlined: false });
+
 check(oneSet > 0, 'plugin build (build-time) emits a set of graphql spans');
 check(graphqlSpanCount(scenarios.plain) === 0, 'plain build (no plugin, no --import) emits no graphql spans');
 check(

dev-packages/e2e-tests/test-applications/node-vite/assert.mjs

@@ -17,7 +17,7 @@
  * @module
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -47,6 +47,27 @@ function run(name, { withImport = false } = {}) {
 
 const graphqlSpanCount = result => result.spans.filter(s => s.origin === GRAPHQL_ORIGIN).length;
 
+// Guards the build config, not just its runtime output. The span assertions below can pass by
+// accident when the externalization knob is a no-op (e.g. a Vite SSR build externalizes deps by
+// default, so a mis-set toggle silently ships an external graphql in every variant while the counts
+// still come out right). Assert the bundle SHAPE instead: an inlined build carries graphql's own
+// source (its exported `GraphQLSchema`) and has no bare `graphql` import left; an external build
+// keeps the bare `graphql` import/require and never inlines that source. Bundler-agnostic — matches
+// ESM `from 'graphql'` and CJS `require('graphql')` alike.
+const GRAPHQL_BARE_REFERENCE = /(?:from|require\()\s*['"]graphql['"]/;
+const GRAPHQL_SOURCE_MARKER = 'GraphQLSchema';
+
+function assertBundleShape(name, { inlined }) {
+  const bundle = readFileSync(entryPath(name), 'utf8');
+  const hasBareReference = GRAPHQL_BARE_REFERENCE.test(bundle);
+  const hasGraphqlSource = bundle.includes(GRAPHQL_SOURCE_MARKER);
+  if (inlined) {
+    check(!hasBareReference && hasGraphqlSource, `${name}: graphql is inlined into the bundle`);
+  } else {
+    check(hasBareReference && !hasGraphqlSource, `${name}: graphql is kept external to the bundle`);
+  }
+}
+
 const scenarios = {
   plain: run('plain'),
   plugin: run('plugin'),
@@ -68,6 +89,11 @@ for (const [label, result] of Object.entries(scenarios)) {
   check(result.data?.hello === 'world', `${label}: graphql query works`);
 }
 
+assertBundleShape('plain', { inlined: true });
+assertBundleShape('plugin', { inlined: true });
+assertBundleShape('plain-external', { inlined: false });
+assertBundleShape('plugin-external', { inlined: false });
+
 check(oneSet > 0, 'plugin build (build-time) emits a set of graphql spans');
 check(graphqlSpanCount(scenarios.plain) === 0, 'plain build (no plugin, no --import) emits no graphql spans');
 check(

dev-packages/e2e-tests/test-applications/node-vite/build.mjs

@@ -27,9 +27,17 @@ const makeSentryPlugin = () =>
     release: { create: false, finalize: false, inject: false },
   });
 
-function run(name, { external, plugins }) {
+function run(name, { graphqlExternal, plugins }) {
   return build({
     logLevel: 'silent',
+    // Whether graphql is inlined or external is governed by Vite's SSR externalization
+    // (`ssr.external` / `ssr.noExternal`), NOT `rollupOptions.external`: a Vite SSR build
+    // externalizes node_modules deps by default, so without an explicit `ssr.noExternal` graphql
+    // stays external no matter what `rollupOptions.external` says. Set it per-variant so the
+    // build-time (inlined) and runtime (external) paths are each genuinely exercised. For the
+    // `*-external` variants `ssr.external` also wins over the plugin's own `noExternal` force-bundle,
+    // so graphql is left for the runtime `--import` hook to transform as it loads from node_modules.
+    ssr: graphqlExternal ? { external: ['graphql'] } : { noExternal: ['graphql'] },
     build: {
       outDir: join(__dirname, 'dist', name),
       emptyOutDir: true,
@@ -40,20 +48,18 @@ function run(name, { external, plugins }) {
       // SSR build so the plugin's build-time transform applies (it only runs for server builds).
       ssr: join(__dirname, 'src', 'entry.mjs'),
       rollupOptions: {
-        // The `*-external` variants keep graphql out of the bundle, so it is resolved from node_modules
-        // at runtime and the `--import` hook can transform it as it loads.
-        external: external ? [...nodeExternals, 'graphql'] : nodeExternals,
+        external: nodeExternals,
         output: { entryFileNames: 'main.mjs', format: 'es' },
       },
     },
     plugins,
   });
 }
 
-await run('plain', { external: false, plugins: [] });
-await run('plugin', { external: false, plugins: [makeSentryPlugin()] });
-await run('plain-external', { external: true, plugins: [] });
-await run('plugin-external', { external: true, plugins: [makeSentryPlugin()] });
+await run('plain', { graphqlExternal: false, plugins: [] });
+await run('plugin', { graphqlExternal: false, plugins: [makeSentryPlugin()] });
+await run('plain-external', { graphqlExternal: true, plugins: [] });
+await run('plugin-external', { graphqlExternal: true, plugins: [makeSentryPlugin()] });
 
 // eslint-disable-next-line no-console
 console.log('built plain + plugin (inlined) and plain-external + plugin-external with vite');

dev-packages/e2e-tests/test-applications/node-webpack/assert.mjs

@@ -17,7 +17,7 @@
  * @module
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -47,6 +47,27 @@ function run(name, { withImport = false } = {}) {
 
 const graphqlSpanCount = result => result.spans.filter(s => s.origin === GRAPHQL_ORIGIN).length;
 
+// Guards the build config, not just its runtime output. The span assertions below can pass by
+// accident when the externalization knob is a no-op (e.g. a Vite SSR build externalizes deps by
+// default, so a mis-set toggle silently ships an external graphql in every variant while the counts
+// still come out right). Assert the bundle SHAPE instead: an inlined build carries graphql's own
+// source (its exported `GraphQLSchema`) and has no bare `graphql` import left; an external build
+// keeps the bare `graphql` import/require and never inlines that source. Bundler-agnostic — matches
+// ESM `from 'graphql'` and CJS `require('graphql')` alike.
+const GRAPHQL_BARE_REFERENCE = /(?:from|require\()\s*['"]graphql['"]/;
+const GRAPHQL_SOURCE_MARKER = 'GraphQLSchema';
+
+function assertBundleShape(name, { inlined }) {
+  const bundle = readFileSync(entryPath(name), 'utf8');
+  const hasBareReference = GRAPHQL_BARE_REFERENCE.test(bundle);
+  const hasGraphqlSource = bundle.includes(GRAPHQL_SOURCE_MARKER);
+  if (inlined) {
+    check(!hasBareReference && hasGraphqlSource, `${name}: graphql is inlined into the bundle`);
+  } else {
+    check(hasBareReference && !hasGraphqlSource, `${name}: graphql is kept external to the bundle`);
+  }
+}
+
 const scenarios = {
   plain: run('plain'),
   plugin: run('plugin'),
@@ -68,6 +89,11 @@ for (const [label, result] of Object.entries(scenarios)) {
   check(result.data?.hello === 'world', `${label}: graphql query works`);
 }
 
+assertBundleShape('plain', { inlined: true });
+assertBundleShape('plugin', { inlined: true });
+assertBundleShape('plain-external', { inlined: false });
+assertBundleShape('plugin-external', { inlined: false });
+
 check(oneSet > 0, 'plugin build (build-time) emits a set of graphql spans');
 check(graphqlSpanCount(scenarios.plain) === 0, 'plain build (no plugin, no --import) emits no graphql spans');
 check(