fix(orchestrion): remove unused submodule paths, fix sourcemaps

Author: isaacs

packages/node/package.json

@@ -58,16 +58,6 @@
         "default": "./build/orchestrion/import-hook.mjs"
       }
     },
-    "./orchestrion/config": {
-      "import": {
-        "types": "./build/types/orchestrion/config.d.ts",
-        "default": "./build/esm/orchestrion/config.js"
-      },
-      "require": {
-        "types": "./build/types/orchestrion/config.d.ts",
-        "default": "./build/cjs/orchestrion/config.js"
-      }
-    },
     "./orchestrion/vite": {
       "import": {
         "types": "./build/types/orchestrion/bundler/vite.d.ts",

packages/node/rollup.npm.config.mjs

@@ -7,8 +7,8 @@ import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sent
 // also covers CJS-internal `require()` calls — no separate `--require` hook is
 // needed. We pass it through rollup only to copy it into `build/` at the path
 // the package.json `exports` map expects; `external: /.*/` keeps every import
-// (e.g. `@sentry/node/orchestrion/config`) as a runtime resolution against the
-// installed package.
+// (e.g. `@sentry-internal/server-utils/orchestrion/import-hook`) as a runtime
+// resolution against the installed package.
 const orchestrionRuntimeHooks = [
   defineConfig({
     input: 'src/orchestrion/runtime/import-hook.mjs',
@@ -22,18 +22,11 @@ export default [
   ...orchestrionRuntimeHooks,
   ...makeNPMConfigVariants(
     makeBaseNPMConfig({
-      // `src/orchestrion/config.ts` and `src/orchestrion/bundler/vite.ts` are
-      // loaded via dedicated subpath exports (`@sentry/node/orchestrion/config`,
-      // `@sentry/node/orchestrion/vite`) — neither is reachable from `src/index.ts`,
-      // so we list them as separate entrypoints to guarantee they end up in
-      // build/esm and build/cjs.
-      entrypoints: [
-        'src/index.ts',
-        'src/init.ts',
-        'src/preload.ts',
-        'src/orchestrion/config.ts',
-        'src/orchestrion/bundler/vite.ts',
-      ],
+      // `src/orchestrion/bundler/vite.ts` is loaded via the dedicated
+      // `@sentry/node/orchestrion/vite` subpath export and is not reachable from
+      // `src/index.ts`, so we list it as a separate entrypoint to guarantee it
+      // ends up in build/esm and build/cjs.
+      entrypoints: ['src/index.ts', 'src/init.ts', 'src/preload.ts', 'src/orchestrion/bundler/vite.ts'],
       packageSpecificConfig: {
         external: [/^@sentry\/opentelemetry/],
         output: {

packages/node/src/orchestrion/config.ts

@@ -4,12 +4,9 @@
   "include": ["src/**/*"],
 
   // The orchestrion runtime hooks are hand-written `.mjs` / `.cjs` files that
-  // self-reference `@sentry/node/orchestrion/config`. If tsc picks them up, it
-  // follows that subpath export back to `build/types/orchestrion/config.d.ts`,
-  // treats the .d.ts as an input, and then collides with the .d.ts it wants to
-  // emit from `src/orchestrion/config.ts`. Excluding them keeps tsc focused on
-  // the .ts sources — rollup copies these files through to `build/orchestrion/`
-  // unchanged.
+  // rollup copies through to `build/orchestrion/` unchanged. We exclude them so
+  // tsc doesn't try to type-check or emit declarations for them and stays
+  // focused on the `.ts` sources.
   "exclude": ["src/orchestrion/runtime/**/*.mjs", "src/orchestrion/runtime/**/*.cjs"],
 
   "compilerOptions": {

packages/node/tsconfig.json

@@ -5,10 +5,6 @@
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true,
-    "outDir": "build/types",
-    // Required so Node16 module resolution can disambiguate package self-references
-    // (`@sentry/node/orchestrion/config` from inside this package) against the
-    // package's `.` export. Without this tsc reports TS2209.
-    "rootDir": "src"
+    "outDir": "build/types"
   }
 }

packages/node/tsconfig.types.json

@@ -10,8 +10,7 @@
     "node": ">=18"
   },
   "files": [
-    "/build",
-    "/orchestrion.mjs"
+    "/build"
   ],
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -94,7 +93,8 @@
     "@apm-js-collab/code-transformer": "^0.13.0",
     "@apm-js-collab/code-transformer-bundler-plugins": "^0.3.0",
     "@apm-js-collab/tracing-hooks": "^0.8.0",
-    "@sentry/core": "10.56.0"
+    "@sentry/core": "10.56.0",
+    "magic-string": "~0.30.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1",

packages/server-utils/orchestrion.mjs

@@ -13,8 +13,9 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type UnknownPlugin = any;
 
-import { SENTRY_INSTRUMENTATIONS } from '../config';
 import codeTransformer from '@apm-js-collab/code-transformer-bundler-plugins/vite';
+import MagicString from 'magic-string';
+import { SENTRY_INSTRUMENTATIONS } from '../config';
 
 // `vite` types live in the package's ESM-only subpath; under Node16 module
 // resolution with TS treating @sentry/node as CJS, importing them produces a
@@ -78,9 +79,14 @@ function bundlerMarkerPlugin(): UnknownPlugin {
       // their additions.
       return { ssr: { noExternal: instrumentedModules } };
     },
-    renderChunk(code: string, chunk: { isEntry: boolean }): { code: string; map: null } | null {
+    renderChunk(code: string, chunk: { isEntry: boolean }): { code: string; map: unknown } | null {
       if (!chunk.isEntry) return null;
-      return { code: banner + code, map: null };
+      // Prepend via magic-string so the entry chunk's sourcemap stays aligned —
+      // returning `map: null` here would shift every mapping by the banner's
+      // line count and misattribute server stack traces.
+      const ms = new MagicString(code);
+      ms.prepend(banner);
+      return { code: ms.toString(), map: ms.generateMap({ hires: true }) };
     },
   };
 }