Skip to content

Commit cdb9df3

Browse files
add lock files + update
1 parent 8092da8 commit cdb9df3

File tree

6 files changed

+101
-6
lines changed

6 files changed

+101
-6
lines changed

packages/data-context/src/data/ProjectLifecycleManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export class ProjectLifecycleManager {
199199
return 'pnpm'
200200
}
201201

202-
if (fs.existsSync(path.join(projectRoot, 'bun.lockb'))) {
202+
if (fs.existsSync(path.join(projectRoot, 'bun.lock'))) {
203203
return 'bun'
204204
}
205205

system-tests/lib/dep-installer/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ async function getLockFilename (dir: string) {
8686
const hasYarnLock = !!await fs.stat(path.join(dir, 'yarn.lock')).catch(() => false)
8787
const hasNpmLock = !!await fs.stat(path.join(dir, 'package-lock.json')).catch(() => false)
8888
const hasPnpmLock = !!await fs.stat(path.join(dir, 'pnpm-lock.yaml')).catch(() => false)
89-
const hasBunLock = !!await fs.stat(path.join(dir, 'bun.lockb')).catch(() => false)
89+
const hasBunLock = !!await fs.stat(path.join(dir, 'bun.lock')).catch(() => false)
9090

9191
const lockfileCount = [hasYarnLock, hasNpmLock, hasPnpmLock, hasBunLock].filter(Boolean).length
9292

9393
if (lockfileCount > 1) {
9494
throw new Error(`The example project at '${dir}' has conflicting lockfiles. Only use one package manager's lockfile per project.`)
9595
}
9696

97-
if (hasBunLock) return 'bun.lockb'
97+
if (hasBunLock) return 'bun.lock'
9898

9999
if (hasPnpmLock) return 'pnpm-lock.yaml'
100100

@@ -210,7 +210,7 @@ export async function scaffoldProjectNodeModules ({
210210
const lockFilename = await getLockFilename(projectDir)
211211
const hasYarnLock = lockFilename === 'yarn.lock'
212212
const hasPnpmLock = lockFilename === 'pnpm-lock.yaml'
213-
const hasBunLock = lockFilename === 'bun.lockb'
213+
const hasBunLock = lockFilename === 'bun.lock'
214214

215215
// 1. Ensure there is a cache directory set up for this test project's `node_modules`.
216216
await ensureCacheDir(cacheNodeModulesDir)
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"lockfileVersion": 1,
3+
"workspaces": {
4+
"": {
5+
"name": "bun-component-testing",
6+
"dependencies": {
7+
"react": "^18.2.0",
8+
"react-dom": "^18.2.0",
9+
},
10+
"devDependencies": {
11+
"@types/react": "^18.2.0",
12+
"@types/react-dom": "^18.2.0",
13+
"typescript": "^5.6.3",
14+
},
15+
},
16+
},
17+
"packages": {
18+
"@types/prop-types": ["@types/prop-types@15.7.15", "", {}, "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw=="],
19+
20+
"@types/react": ["@types/react@18.3.24", "", { "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" } }, "sha512-0dLEBsA1kI3OezMBF8nSsb7Nk19ZnsyE1LLhB8r27KbgU5H4pvuqZLdtE+aUkJVoXgTVuA+iLIwmZ0TuK4tx6A=="],
21+
22+
"@types/react-dom": ["@types/react-dom@18.3.7", "", { "peerDependencies": { "@types/react": "^18.0.0" } }, "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ=="],
23+
24+
"csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
25+
26+
"js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="],
27+
28+
"loose-envify": ["loose-envify@1.4.0", "", { "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, "bin": { "loose-envify": "cli.js" } }, "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="],
29+
30+
"react": ["react@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="],
31+
32+
"react-dom": ["react-dom@18.3.1", "", { "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" }, "peerDependencies": { "react": "^18.3.1" } }, "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw=="],
33+
34+
"scheduler": ["scheduler@0.23.2", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ=="],
35+
36+
"typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
37+
}
38+
}

system-tests/projects/bun-component-testing/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"react-dom": "^18.2.0"
77
},
88
"devDependencies": {
9-
"@cypress/react": "0.0.0-development",
10-
"@cypress/webpack-dev-server": "0.0.0-development",
119
"@types/react": "^18.2.0",
1210
"@types/react-dom": "^18.2.0",
1311
"typescript": "^5.6.3"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"lockfileVersion": 1,
3+
"workspaces": {
4+
"": {
5+
"name": "bun-with-deps",
6+
"dependencies": {
7+
"lodash": "^4.17.21",
8+
},
9+
"devDependencies": {
10+
"@types/lodash": "^4.14.225",
11+
"typescript": "^5.6.3",
12+
},
13+
},
14+
},
15+
"packages": {
16+
"@types/lodash": ["@types/lodash@4.17.20", "", {}, "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA=="],
17+
18+
"lodash": ["lodash@4.17.21", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="],
19+
20+
"typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
21+
}
22+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"lockfileVersion": 1,
3+
"workspaces": {
4+
"": {
5+
"name": "bun-workspace",
6+
"devDependencies": {
7+
"typescript": "^5.6.3",
8+
},
9+
},
10+
"packages/app": {
11+
"name": "@bun-workspace/app",
12+
"version": "0.0.0-test",
13+
"dependencies": {
14+
"@bun-workspace/shared": "workspace:*",
15+
},
16+
"devDependencies": {
17+
"typescript": "^5.6.3",
18+
},
19+
},
20+
"packages/shared": {
21+
"name": "@bun-workspace/shared",
22+
"version": "0.0.0-test",
23+
"dependencies": {
24+
"lodash": "^4.17.21",
25+
},
26+
},
27+
},
28+
"packages": {
29+
"@bun-workspace/app": ["@bun-workspace/app@workspace:packages/app"],
30+
31+
"@bun-workspace/shared": ["@bun-workspace/shared@workspace:packages/shared"],
32+
33+
"lodash": ["lodash@4.17.21", "", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="],
34+
35+
"typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
36+
}
37+
}

0 commit comments

Comments
 (0)