fix: record name on .bundler before calling bridge

Author: isaacs

packages/server-utils/src/orchestrion/bundler/webpack-loader.ts

@@ -15,7 +15,7 @@ interface LoaderContext {
 
 type LoaderFn = (this: LoaderContext, code: string, inputSourceMap?: unknown) => void;
 
-const upstreamLoader = codeTransformerLoaderImpl as unknown as LoaderFn;
+const upstreamLoader: LoaderFn = codeTransformerLoaderImpl;
 
 /**
  * The npm package name for a module path.
@@ -40,15 +40,18 @@ function packageNameFromPath(resourcePath: string): string | undefined {
 }
 
 /**
- * Announce a runtime-injected module the way the runtime `--import` hook does,
- * so the lazily-registered channel integrations subscribe. Appended to each
- * transformed module's code, it runs when that module loads.
+ * Announce a runtime-injected module the way the banner and runtime `--import`
+ * hook do, so the lazily-registered channel integrations subscribe. Appended to
+ * each transformed module's code, it runs when that module loads.
  */
 function onInjectSnippet(moduleName: string): string {
+  const name = JSON.stringify(moduleName);
   return (
     ';(function(){' +
-    'var g=globalThis.__SENTRY_ORCHESTRION__;' +
-    `if(g&&typeof g.onInject==='function')g.onInject(${JSON.stringify(moduleName)});` +
+    'var g=globalThis.__SENTRY_ORCHESTRION__=globalThis.__SENTRY_ORCHESTRION__||{};' +
+    'if(!Array.isArray(g.bundler))g.bundler=[];' +
+    `if(g.bundler.indexOf(${name})<0)g.bundler.push(${name});` +
+    `if(typeof g.onInject==='function')g.onInject(${name});` +
     '})();\n'
   );
 }

packages/server-utils/test/orchestrion/webpack-loader.test.ts

@@ -37,6 +37,22 @@ describe('orchestrion webpack/Turbopack loader', () => {
     expect(output).toContain('g.onInject("ioredis")');
   });
 
+  it('records the module on `.bundler` even when the bridge is not installed yet', () => {
+    const output = runLoader({ resourcePath: IOREDIS }, 'code') as string;
+    const snippet = output.slice('code;//transformed'.length);
+
+    // Bridge absent (early load): records `.bundler`, no throw.
+    const early: { __SENTRY_ORCHESTRION__?: { bundler?: string[]; onInject?: (name: string) => void } } = {};
+    new Function('globalThis', snippet)(early);
+    expect(early.__SENTRY_ORCHESTRION__?.bundler).toEqual(['ioredis']);
+
+    // Bridge present (loaded after init): records AND fires the bridge.
+    const injected: string[] = [];
+    const late = { __SENTRY_ORCHESTRION__: { onInject: (name: string) => injected.push(name) } };
+    new Function('globalThis', snippet)(late);
+    expect(injected).toEqual(['ioredis']);
+  });
+
   it('does not append when webpack runs the plugin banner (compilation present)', () => {
     const output = runLoader({ resourcePath: IOREDIS, _compilation: {} }, 'code');