From c5346bf11ef6a5842157699ae06da29c2511a56c Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Wed, 15 Jan 2025 19:15:50 -0500
Subject: [PATCH] bun test lockfile support

---
 bun.lockb                | Bin 151446 -> 151446 bytes
 gdf.js                   |   4 ++--
 test/base/bun/Dockerfile |   2 +-
 test/base/bun/bun.lock   |  25 +++++++++++++++++++++++++
 test/base/bun/bun.lockb  | Bin 1279 -> 0 bytes
 5 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 test/base/bun/bun.lock
 delete mode 100755 test/base/bun/bun.lockb

diff --git a/bun.lockb b/bun.lockb
index dd856b3c6e7974d54bd405b2ad12419e848d125f..3fc21469e3f252fad4ae1cc4cdd3efcb17145172 100755
GIT binary patch
delta 362
zcmWN{yG{a87)9apS26@hNHi8UCdPtha8SHd>LVDCiwNEu1+NGyA~VbjP;m+qDa8nC
zVKN;ywpJF#$FMP$uHsA9PIkLvv^$3VDu0b|Oetj|iYZvyu;p_kBuWjz2R{M`>K|L8
zlZ(8Tu#9QUAdXqgVIB**@5rbgcVsyK&VIr(UQj>^t4JV?B(|}G95%3vJ#1ke8Dz1E
zJl3${eK;~E!8`gE4w~9<Wg^@oAMl8Kbalj)boP|2;S5(e#5Ky;$2pErhm8tuP{jd`
d(ZB_YxWoxc-nT2i0iP7&X3VrK@2e$mgMW8cI8y)s

delta 370
zcmWm2y-Px29L4eH*VKgwgf?*q*GNkzv#dWM($Zcu&6Zv*d(XPh%{`iYhCs&>!y1CS
zX<2KNL$viTG!%_}JMe*XPNim5YL<SKU)wXRlnNk-5sVs3OV@mA8IXSSr6pjuxZ8Nb
zGdg&|E1I~+1Ew*9I1-q}9Fj<39t&8+64J<E8Cm48f;?6cLRcvia>V0{FvbwYI3^Io
zB&OUqN4zq4NxwrK4cy=s*QmlV-xuOHLuHAl*4XRVz$Uh^jRJPCiz4>0j{_Xy2*)_V
aDM~oQIc#Y6qbxsty*>2*xbIieZv6on13YyA

diff --git a/gdf.js b/gdf.js
index c625ae9..aac9acb 100755
--- a/gdf.js
+++ b/gdf.js
@@ -594,7 +594,7 @@ export class GDF {
       'package-lock.json', '.npmrc',
       'pnpm-lock.yaml',
       'yarn.lock', '.yarnrc', '.yarnrc.yml',
-      'bun.lockb'
+      'bun.lockb', 'bun.lock'
     ]
 
     for (const file of files) {
@@ -612,7 +612,7 @@ export class GDF {
 
     const packageFiles = this.packageFiles
 
-    if (packageFiles.includes('bun.lockb')) {
+    if (packageFiles.includes('bun.lockb') || packageFiles.includes('bun.lock')) {
       this.#packager = 'bun'
     } else if (packageFiles.includes('pnpm-lock.yaml')) {
       this.#packager = 'pnpm'
diff --git a/test/base/bun/Dockerfile b/test/base/bun/Dockerfile
index f4932fb..c5b1bc6 100644
--- a/test/base/bun/Dockerfile
+++ b/test/base/bun/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y build-essential pkg-config python-is-python3
 
 # Install node modules
-COPY bun.lockb package.json ./
+COPY bun.lock package.json ./
 RUN bun install --ci
 
 # Copy application code
diff --git a/test/base/bun/bun.lock b/test/base/bun/bun.lock
new file mode 100644
index 0000000..0958e5e
--- /dev/null
+++ b/test/base/bun/bun.lock
@@ -0,0 +1,25 @@
+{
+  "lockfileVersion": 0,
+  "workspaces": {
+    "": {
+      "name": "bunserver",
+      "devDependencies": {
+        "bun-types": "latest",
+      },
+      "peerDependencies": {
+        "typescript": "^5.0.0",
+      },
+    },
+  },
+  "packages": {
+    "@types/node": ["@types/node@20.12.14", "", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-scnD59RpYD91xngrQQLGkE+6UrHUPzeKZWhhjBSa3HSkwjbQc38+q3RoIVEwxQGRw3M+j5hpNAM+lgV3cVormg=="],
+
+    "@types/ws": ["@types/ws@8.5.13", "", { "dependencies": { "@types/node": "*" } }, "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA=="],
+
+    "bun-types": ["bun-types@1.1.43", "", { "dependencies": { "@types/node": "~20.12.8", "@types/ws": "~8.5.10" } }, "sha512-W0wCtVH+bwFp7p3Zgs03CqxEDmXxEvmmUM/FBKgWIv9T8gyeotvIjIbHzuDScc2DphhRNtr7hJLCR5PspYL5qw=="],
+
+    "typescript": ["typescript@5.7.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw=="],
+
+    "undici-types": ["undici-types@5.26.5", "", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="],
+  }
+}
diff --git a/test/base/bun/bun.lockb b/test/base/bun/bun.lockb
deleted file mode 100755
index 7c1bf04031bb13008fa69e36129a46cc901f80c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1279
zcmY#Z)GsYA(of3F(@)JSQ%EY!;{sycoc!eMw9K4T-L(9o+{6;yG6OCq1_p-2UnRDV
ze~m0w+UE21>qu?5F7|j|Tkh(NSo<P_1$rq8`7A(1Kmbw;0vr$uPB%dLRWJo$J|_c1
zgD{W<qJQ0T7q-2lbE*1G`q>Vl*Gh~~9pq9li)4TXSOd)mnZpLeydVaV0AvQt9FP`N
z{y+YIlsXcNI~W-t<{}%-^3JA8PxeOT*Zlu(5gI0PS`$jRV-8iPUX*veaZo~9%I#tQ
zGF7EK+nvi6P7D6qCh;Zk#N>yQH@-?(^`TEgE7(sJ$)58_Y=+&=3}Aa$dFOQkV=yPN
zBo$ej7&fvyiBZqMZ~z*lSD-YPO>t4OUS?i#Nn%cp9xMUsg%qWx+9?<rC=_Q_rRJyU
zD3~ZD=47Vl<)?AM?D_W}0ziDQJD4FdEKr)urqtNT4yX}}5g_#jP<0kWs0Y~u(vtyI
zI|r^O+Q=-n)B@;KGq^p52&V$mHUrSX4f9nSbhKMjlLQ#!O!W-(3>X+-DIb>NIha7<
zUtGe#@C<4;j7ANi;?&%-)FM6Cijvf#yu_T~lA_GKbUOt@g!LA1>jj|sG95|-Lj>qj
zLo5yjX8z*TBA~$~l?AEA$wiq3C7|*E%*!Y#DJZtm*Dp#<&nzw}s?^IX$jvI&%P&gT
ahpW-oMX+@Z^vv`OjrB^>s~{0F_(%Xr=F_GC