Skip to content

build(repo): implement workspace catalogs #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electric-gizzard merged 6 commits into from
Oct 20, 2025
Merged

build(repo): implement workspace catalogs #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78795ab
chore(flox): specify vim as editor
electric-gizzard Oct 18, 2025
6f81f72
chore(flox): upgrade bun to 1.3.0
electric-gizzard Oct 18, 2025
3ebe380
chore(repo): implement workspace catalogs
electric-gizzard Oct 18, 2025
65244cc
chore(repo): update bun types
electric-gizzard Oct 19, 2025
cfb742c
chore: add empty changeset
electric-gizzard Oct 19, 2025
df4061e
chore(flox): clean workspace before installing deps
electric-gizzard Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/clean-phones-hide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
79 changes: 41 additions & 38 deletions .flox/env/manifest.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
"install": {
"bun": {
"pkg-path": "bun",
"version": "1.2.4"
"version": "1.3.0"
}
},
"vars": {
"EDITOR": "vim"
},
"hook": {
"on-activate": " echo \"📦 Installing dependencies...\"\n bun install --frozen-lockfile\n\n echo -e \"\\n🚀 Development Commands\"\n echo -e \"- Run all tasks\\t\\t\\033[34mbun dev\\033[0m\"\n echo -e \"- Start playground app\\t\\033[34mbun dev:playground\\033[0m\"\n"
"on-activate": " echo \"🧼 Cleaning workspace...\"\n shopt -s globstar # enable recursive globbing\n rm -rf **/dist **/node_modules\n\n echo -e \"\\n📦 Installing dependencies...\"\n bun install --frozen-lockfile\n\n echo -e \"\\n🚀 Done!\"\n\n echo -e \"\\n💻 Development Commands\"\n echo -e \"- Run all tasks\\t\\t\\033[34mbun dev\\033[0m\"\n echo -e \"- Start playground app\\t\\033[34mbun dev:playground\\033[0m\"\n"
},
"options": {
"systems": [
Expand All @@ -24,28 +27,28 @@
{
"attr_path": "bun",
"broken": false,
"derivation": "/nix/store/wg3z94w845nfnk9228fwdd4sdrpp7mi4-bun-1.2.4.drv",
"derivation": "/nix/store/aq1n7qzh8xjvj1wdwpmkwvwncnwv8jm4-bun-1.3.0.drv",
"description": "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one",
"install_id": "bun",
"license": "[ MIT, LGPL-2.1-only ]",
"locked_url": "https://github.com/flox/nixpkgs?rev=6607cf789e541e7873d40d3a8f7815ea92204f32",
"name": "bun-1.2.4",
"locked_url": "https://github.com/flox/nixpkgs?rev=544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"name": "bun-1.3.0",
"pname": "bun",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev_count": 767267,
"rev_date": "2025-03-13T07:39:42Z",
"scrape_date": "2025-03-14T00:31:05Z",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev_count": 878042,
"rev_date": "2025-10-15T10:27:37Z",
"scrape_date": "2025-10-17T03:45:06.401542Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "1.2.4",
"version": "1.3.0",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/z2xy2nycxvrxywsfcqig9r5ki8qqqy7q-bun-1.2.4"
"out": "/nix/store/dccx7km0mm6shf1zizx760drifjbg1yr-bun-1.3.0"
},
"system": "aarch64-darwin",
"group": "toplevel",
Expand All @@ -54,28 +57,28 @@
{
"attr_path": "bun",
"broken": false,
"derivation": "/nix/store/69vrvcl3mz1nx8jns96daaljvmdjsg70-bun-1.2.4.drv",
"derivation": "/nix/store/pwiz9qji7rxb9lv6d760ylzq191yxck8-bun-1.3.0.drv",
"description": "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one",
"install_id": "bun",
"license": "[ MIT, LGPL-2.1-only ]",
"locked_url": "https://github.com/flox/nixpkgs?rev=6607cf789e541e7873d40d3a8f7815ea92204f32",
"name": "bun-1.2.4",
"locked_url": "https://github.com/flox/nixpkgs?rev=544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"name": "bun-1.3.0",
"pname": "bun",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev_count": 767267,
"rev_date": "2025-03-13T07:39:42Z",
"scrape_date": "2025-03-14T00:31:05Z",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev_count": 878042,
"rev_date": "2025-10-15T10:27:37Z",
"scrape_date": "2025-10-17T04:18:54.283178Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "1.2.4",
"version": "1.3.0",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/csfwkhrpa17i5fwvwky554x7a71skmwc-bun-1.2.4"
"out": "/nix/store/wficmrz9bcj6rdx45jh86b2vznx0pdyb-bun-1.3.0"
},
"system": "aarch64-linux",
"group": "toplevel",
Expand All @@ -84,28 +87,28 @@
{
"attr_path": "bun",
"broken": false,
"derivation": "/nix/store/cx1nn8gyj745hr3l2wjbkdychqfnrrxy-bun-1.2.4.drv",
"derivation": "/nix/store/hzmsxssc2n0ch1h2008bwwi6nwmfy79p-bun-1.3.0.drv",
"description": "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one",
"install_id": "bun",
"license": "[ MIT, LGPL-2.1-only ]",
"locked_url": "https://github.com/flox/nixpkgs?rev=6607cf789e541e7873d40d3a8f7815ea92204f32",
"name": "bun-1.2.4",
"locked_url": "https://github.com/flox/nixpkgs?rev=544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"name": "bun-1.3.0",
"pname": "bun",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev_count": 767267,
"rev_date": "2025-03-13T07:39:42Z",
"scrape_date": "2025-03-14T00:31:05Z",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev_count": 878042,
"rev_date": "2025-10-15T10:27:37Z",
"scrape_date": "2025-10-17T04:51:46.301153Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "1.2.4",
"version": "1.3.0",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/2wf7fzkdvqdhgg366cmw4cxkx8aqr9ha-bun-1.2.4"
"out": "/nix/store/n6jj18368id7h071j5i1zs26whgmc38y-bun-1.3.0"
},
"system": "x86_64-darwin",
"group": "toplevel",
Expand All @@ -114,28 +117,28 @@
{
"attr_path": "bun",
"broken": false,
"derivation": "/nix/store/knf0fab2kp2si87mhml524p51lqrn9zc-bun-1.2.4.drv",
"derivation": "/nix/store/69h7318dn0b18qf2gjm1waf9jvhja5ni-bun-1.3.0.drv",
"description": "Incredibly fast JavaScript runtime, bundler, transpiler and package manager – all in one",
"install_id": "bun",
"license": "[ MIT, LGPL-2.1-only ]",
"locked_url": "https://github.com/flox/nixpkgs?rev=6607cf789e541e7873d40d3a8f7815ea92204f32",
"name": "bun-1.2.4",
"locked_url": "https://github.com/flox/nixpkgs?rev=544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"name": "bun-1.3.0",
"pname": "bun",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"rev_count": 767267,
"rev_date": "2025-03-13T07:39:42Z",
"scrape_date": "2025-03-14T00:31:05Z",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev_count": 878042,
"rev_date": "2025-10-15T10:27:37Z",
"scrape_date": "2025-10-17T05:27:14.958813Z",
"stabilities": [
"staging",
"unstable"
],
"unfree": false,
"version": "1.2.4",
"version": "1.3.0",
"outputs_to_install": [
"out"
],
"outputs": {
"out": "/nix/store/mhjlyx3f8x8xcrw7x1y1r3sqslkpjria-bun-1.2.4"
"out": "/nix/store/xcl91nw8b1zihm32cwxrqdvaakdnip75-bun-1.3.0"
},
"system": "x86_64-linux",
"group": "toplevel",
Expand Down
15 changes: 12 additions & 3 deletions .flox/env/manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,23 @@ version = 1

[install]
bun.pkg-path = "bun"
bun.version = "1.2.4"
bun.version = "1.3.0"

[vars]
EDITOR = "vim"

[hook]
on-activate = '''
echo "📦 Installing dependencies..."
echo "🧼 Cleaning workspace..."
shopt -s globstar # enable recursive globbing
rm -rf **/dist **/node_modules

echo -e "\n📦 Installing dependencies..."
bun install --frozen-lockfile

echo -e "\n🚀 Development Commands"
echo -e "\n🚀 Done!"

echo -e "\n💻 Development Commands"
echo -e "- Run all tasks\t\t\033[34mbun dev\033[0m"
echo -e "- Start playground app\t\033[34mbun dev:playground\033[0m"
'''
Expand Down
2 changes: 1 addition & 1 deletion apps/playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"next": "15.1.3"
},
"devDependencies": {
"typescript": "^5",
"typescript": "catalog:code",
"@types/node": "^20",
"@types/react": "^19",
"@types/react-dom": "^19",
Expand Down
47 changes: 26 additions & 21 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 18 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
{
"name": "@byteslice/monorepo",
"private": true,
"workspaces": [
"packages/**",
"apps/**"
],
"workspaces": {
"packages": [
"apps/**",
"packages/**"
],
"catalogs": {
"build": {
"tsup": "8.2.4"
},
"code": {
"typescript": "5.5.4"
},
"types": {
"@types/bun": "1.2.23"
}
}
},
"scripts": {
"build:packages": "turbo run build --filter './packages/*'",
"ci:publish": "bun run build:packages && changeset publish && git push --follow-tags",
Expand All @@ -26,5 +39,5 @@
"sort-package-json": "2.10.1",
"turbo": "2.2.3"
},
"packageManager": "bun@1.2.4"
"packageManager": "bun@1.3.0"
}
6 changes: 3 additions & 3 deletions packages/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
},
"devDependencies": {
"@tsconfig/create-react-app": "2.0.5",
"@types/bun": "1.1.14",
"tsup": "8.2.4",
"typescript": "5.5.4"
"@types/bun": "catalog:types",
"tsup": "catalog:build",
"typescript": "catalog:code"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/result/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
},
"devDependencies": {
"@tsconfig/node20": "20.1.4",
"@types/bun": "1.1.14",
"tsup": "8.2.4",
"typescript": "5.5.4"
"@types/bun": "catalog:types",
"tsup": "catalog:build",
"typescript": "catalog:code"
},
"publishConfig": {
"access": "public"
Expand Down