fix(build): prefer installed dependencies over Pantry

Author: chrisbbreuer

storage/framework/core/tsconfig.build.json

@@ -29,7 +29,9 @@
       "@stacksjs/storage/*": ["./storage/src/*"],
       "@stacksjs/*": ["./*/src"],
       "ts-pantry": ["../../../node_modules/ts-pantry"],
-      "*": ["../../../pantry/*"]
+      // Bun uses these paths while building and running source. Prefer the
+      // installed dependency graph; Pantry remains a fallback for its installs.
+      "*": ["../../../node_modules/*", "../../../pantry/*"]
     },
     "resolveJsonModule": true,
     "types": ["bun"],

storage/framework/core/tsconfig.json

@@ -41,11 +41,11 @@
       "Notifications/*": ["../../../app/Notifications/*"],
       "~/*": ["../../../*"],
       "@/*": ["../../../resources/*"],
-      // Fallback for third-party packages: Pantry installs the dependency graph
-      // into `pantry/` rather than `node_modules/`. It is listed last so it only
-      // applies to specifiers that none of the mappings above matched.
+      // Prefer installed third-party dependencies over a possibly older Pantry
+      // tree. Bun applies these mappings at runtime as well as during builds.
+      // Pantry-only installs still resolve through the second candidate.
       "ts-pantry": ["../../../node_modules/ts-pantry"],
-      "*": ["../../../pantry/*"]
+      "*": ["../../../node_modules/*", "../../../pantry/*"]
     },
     // `dtsx` emits the published `.d.ts` files, not tsc - these two only
     // describe intent for editors and for anyone running tsc by hand. The base

storage/framework/tsconfig.framework.json

@@ -38,18 +38,10 @@
       "~/*": ["../../*"],
       "@/*": ["../../resources/*"],
       "ts-pantry": ["../../node_modules/ts-pantry"],
-      /*
-       * Types come from the copy that actually runs.
-       *
-       * The `*` fallback below resolves to `pantry/`, which mirrors the
-       * PUBLISHED framework's dependency graph - it pins ts-cloud ^0.11.4 and
-       * carries 0.11.5. Bun resolves `node_modules` at runtime, where the
-       * declared ^0.12.9 is installed, so the two trees disagreed about what
-       * this package exports and the typecheck was checking against a version
-       * no code runs.
-       */
+      // Types and runtime imports must prefer installed dependencies over an
+      // older Pantry graph. Keep Pantry available for Pantry-only installs.
       "@stacksjs/ts-cloud": ["../../node_modules/@stacksjs/ts-cloud"],
-      "*": ["../../pantry/*"]
+      "*": ["../../node_modules/*", "../../pantry/*"]
     }
   },
   "include": [

tests/dependency-resolution.test.ts

@@ -0,0 +1,61 @@
+import { expect, it } from 'bun:test'
+import { copyFileSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+
+const root = join(import.meta.dir, '..')
+const configs = [
+  'storage/framework/tsconfig.base.json',
+  'storage/framework/tsconfig.framework.json',
+  'storage/framework/core/tsconfig.json',
+  'storage/framework/core/tsconfig.build.json',
+]
+
+it.each([
+  '../tsconfig.build.json',
+  '../tsconfig.json',
+  '../../tsconfig.framework.json',
+])('prefers installed dependencies with %s and retains the Pantry fallback', async (extendsPath) => {
+  const directory = mkdtempSync(join(tmpdir(), 'stacks-dependency-resolution-'))
+  const entry = join(directory, 'storage/framework/core/example/src/index.ts')
+  function write(path: string, contents: string): void {
+    mkdirSync(dirname(path), { recursive: true })
+    writeFileSync(path, contents)
+  }
+  async function run(...args: string[]): Promise<string> {
+    const proc = Bun.spawn([process.execPath, `--config=${join(directory, 'bunfig.toml')}`, ...args], {
+      cwd: directory,
+      stdout: 'pipe',
+      stderr: 'pipe',
+    })
+    const [output, errors, code] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited])
+    if (code !== 0) throw new Error(errors)
+    return output.trim()
+  }
+  try {
+    for (const config of configs) {
+      const destination = join(directory, config)
+      mkdirSync(dirname(destination), { recursive: true })
+      copyFileSync(join(root, config), destination)
+    }
+    write(join(directory, 'bunfig.toml'), '# Isolated dependency-resolution fixture\n')
+    write(join(directory, 'storage/framework/core/example/tsconfig.json'), JSON.stringify({ extends: extendsPath }))
+    write(entry, "import version from 'fixture-dependency'\nconsole.log(version)\n")
+    for (const [tree, version] of [['node_modules', 'installed'], ['pantry', 'pantry']] as const) {
+      const dependency = join(directory, tree, 'fixture-dependency')
+      write(join(dependency, 'package.json'), JSON.stringify({ name: 'fixture-dependency', type: 'module', exports: './index.ts' }))
+      write(join(dependency, 'index.ts'), `export default '${version}'\n`)
+    }
+
+    for (const expected of ['installed', 'pantry']) {
+      expect(await run(entry)).toBe(expected)
+      const bundle = join(directory, 'bundle.js')
+      await run('build', entry, '--target=bun', '--outfile', bundle)
+      expect(await run(bundle)).toBe(expected)
+      rmSync(join(directory, 'node_modules'), { recursive: true, force: true })
+    }
+  }
+  finally {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})