Fix loading bun-types in development (#11110)

Co-authored-by: Jarred-Sumner <[email protected]>
oven-sh · May 16, 2024 · f58249e · f58249e
1 parent 6098fc5
commit f58249e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -38,6 +38,7 @@ jobs:
             bun.lockb
             test
             packages/bun-internal-test
+            packages/bun-types
       - name: Setup Environment
         shell: bash
         run: |

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -62,6 +62,7 @@
   "[javascriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
   },
+  "prettier.prettierPath": "./node_modules/prettier",
 
   // TypeScript
   "typescript.tsdk": "${workspaceFolder}/node_modules/typescript/lib",

diff --git a/Dockerfile b/Dockerfile
@@ -419,6 +419,7 @@ COPY package.json bun.lockb Makefile .gitmodules ${BUN_DIR}/
 COPY src/runtime ${BUN_DIR}/src/runtime
 COPY src/runtime.js src/runtime.bun.js ${BUN_DIR}/src/
 COPY packages/bun-error ${BUN_DIR}/packages/bun-error
+COPY packages/bun-types ${BUN_DIR}/packages/bun-types
 COPY src/fallback.ts ${BUN_DIR}/src/fallback.ts
 COPY src/api ${BUN_DIR}/src/api
 

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,6 +1,9 @@
 {
   "private": true,
   "name": "bun",
+  "workspaces": [
+    "./packages/bun-types"
+  ],
   "dependencies": {
     "@vscode/debugadapter": "^1.61.0",
     "esbuild": "^0.17.15",
@@ -15,10 +18,14 @@
     "typescript": "^5.0.2"
   },
   "devDependencies": {
+    "@types/bun": "^1.1.2",
     "@types/react": "^18.0.25",
     "@typescript-eslint/eslint-plugin": "^5.31.0",
     "@typescript-eslint/parser": "^5.31.0"
   },
+  "resolutions": {
+    "bun-types": "workspace:packages/bun-types"
+  },
   "scripts": {
     "setup": "./scripts/setup.sh",
     "bump": "bun ./scripts/bump.ts",

diff --git a/packages/bun-types/bun.d.ts b/packages/bun-types/bun.d.ts
@@ -4365,7 +4365,7 @@ declare module "bun" {
     In extends SpawnOptions.Writable = SpawnOptions.Writable,
     Out extends SpawnOptions.Readable = SpawnOptions.Readable,
     Err extends SpawnOptions.Readable = SpawnOptions.Readable,
-  > {
+  > extends AsyncDisposable {
     readonly stdin: SpawnOptions.WritableToIO<In>;
     readonly stdout: SpawnOptions.ReadableToIO<Out>;
     readonly stderr: SpawnOptions.ReadableToIO<Err>;