Skip to content

Commit 62cc8c8

Browse files
authored
Merge branch 'main' into main
2 parents 432a343 + 74e4c49 commit 62cc8c8

File tree

2,001 files changed

+458982
-347333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,001 files changed

+458982
-347333
lines changed

.cursor/rules/commit-message-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ style(backend): run eslint --fix on src directory
112112

113113
## 10. Validation & Automation
114114

115-
- The `.husky/commit-msg` hook runs `pnpm exec commitlint --edit "$1"`.
115+
- The `.husky/commit-msg` hook runs `bun exec commitlint --edit "$1"`.
116116
- Any deviation from the rules aborts the commit **with guidance**.
117117
- Use `git commit --amend` to fix a rejected message.
118118

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ biome.json
6161

6262
# TypeScript and build configs at root (packages have their own)
6363
tsconfig.json
64+
6465
vitest.config.ts
66+
**/*.test.*
67+
**/*.spec.*
68+
**/*.README.md*
69+
**/_*
6570

6671
# Rust Cargo build artifacts (can be multiple hundreds of MB and are not needed in Docker)
6772
**/target/

.github/changeset-version.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const execAsync = promisify(exec);
88

99
// This script is used by the `release.yml` workflow to update the version of the packages being released.
1010
// The standard step is only to run `changeset version` but this does not update the package-lock.yaml file.
11-
// So we also run `pnpm install`, which does this update.
11+
// So we also run `bun install`, which does this update.
1212
// This is a workaround until this is handled automatically by `changeset version`.
1313
// See https://github.com/changesets/changesets/issues/421.
1414

@@ -17,8 +17,8 @@ const runChangesetVersion = async () => {
1717
console.log('Running changeset version...');
1818
await execAsync('npx changeset version');
1919

20-
console.log('Updating lockfile with pnpm install...');
21-
await execAsync('pnpm install --frozen-lockfile=false');
20+
console.log('Updating lockfile with bun install...');
21+
await execAsync('bun install --frozen-lockfile=false');
2222

2323
console.log('Changeset version completed successfully');
2424
} catch (error) {

.github/workflows/build_and_test.yaml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
os: [ubuntu-latest]
2323
node-version: [lts/*]
24-
pnpm-version: [10.17.1]
24+
bun-version: [1.3.0]
2525
runs-on: ${{ matrix.os }}
2626
steps:
2727
- name: ⬇️ Checkout
@@ -31,46 +31,41 @@ jobs:
3131
token: ${{ env.GITHUB_TOKEN }}
3232
fetch-depth: 0
3333

34-
- name: 🥡 Setup pnpm
35-
id: setup-pnpm
36-
uses: pnpm/action-setup@v4
34+
- name: 🥡 Setup bun
35+
id: setup-bun
36+
uses: oven-sh/setup-bun@v2
3737
with:
38-
version: ${{ matrix.pnpm-version }}
38+
version: ${{ matrix.bun-version }}
3939
run_install: false
4040

4141
- name: 🟢 Setup node
4242
id: setup-node
4343
uses: actions/setup-node@v4
4444
with:
4545
node-version: ${{ matrix.node-version }}
46-
cache: 'pnpm'
4746

48-
- name: 🎈 Get pnpm store directory
49-
id: get-pnpm-cache-dir
50-
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
51-
52-
- name: 🔆 Cache pnpm modules
47+
- name: 🔆 Cache bun modules
5348
uses: actions/cache@v4
54-
id: pnpm-cache
49+
id: bun-cache
5550
with:
56-
path: ${{ steps.get-pnpm-cache-dir.outputs.pnpm_cache_dir }}
57-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
51+
path: ~/.bun/install/cache
52+
key: ${{ runner.os }}-bun-store-${{ hashFiles('**/bun.lock*') }}
5853
restore-keys: |
59-
${{ runner.os }}-pnpm-store-
54+
${{ runner.os }}-bun-store-
6055
6156
- name: 🧩 Install Dependencies
6257
id: install-dependencies
63-
run: pnpm install --frozen-lockfile
58+
run: bun install --frozen-lockfile
6459

65-
- name: 📝 Run eslint
60+
- name: 📝 Run linter
6661
env:
6762
NODE_OPTIONS: '--max_old_space_size=4096'
68-
run: pnpm run lint-staged
63+
run: bun run lint-staged
6964

7065
- name: 🏗️ Build
7166
id: build-the-mono-repo
7267
run: |
73-
pnpm build:ci
68+
bun build:ci
7469
75-
# - name: 🧪 Test packages
76-
# run: npm test
70+
- name: 🧪 Test packages
71+
run: bun run test

.github/workflows/release.yaml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
node-version: [lts/*]
27-
pnpm-version: [10.17.1]
27+
bun-version: [1.3.0]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: ⬇️ Checkout
@@ -34,41 +34,36 @@ jobs:
3434
token: ${{ env.GITHUB_TOKEN }}
3535
fetch-depth: 0
3636

37-
- name: 🥡 Setup pnpm
38-
id: setup-pnpm
39-
uses: pnpm/action-setup@v4
37+
- name: 🥡 Setup bun
38+
id: setup-bun
39+
uses: oven-sh/setup-bun@v2
4040
with:
41-
version: ${{ matrix.pnpm-version }}
41+
version: ${{ matrix.bun-version }}
4242
run_install: false
4343

4444
- name: 🟢 Setup node
4545
id: setup-node
4646
uses: actions/setup-node@v4
4747
with:
4848
node-version: ${{ matrix.node-version }}
49-
cache: 'pnpm'
5049

51-
- name: 🎈 Get pnpm store directory
52-
id: get-pnpm-cache-dir
53-
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
54-
55-
- name: 🔆 Cache pnpm modules
50+
- name: 🔆 Cache bun modules
5651
uses: actions/cache@v4
57-
id: pnpm-cache
52+
id: bun-cache
5853
with:
59-
path: ${{ steps.get-pnpm-cache-dir.outputs.pnpm_cache_dir }}
60-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
54+
path: ~/.bun/install/cache
55+
key: ${{ runner.os }}-bun-store-${{ hashFiles('**/bun.lock*') }}
6156
restore-keys: |
62-
${{ runner.os }}-pnpm-store-
57+
${{ runner.os }}-bun-store-
6358
6459
- name: 🧩 Install Dependencies
6560
id: install-dependencies
66-
run: pnpm install --frozen-lockfile
61+
run: bun install --frozen-lockfile
6762

6863
- name: 🏗️ Build
6964
id: build-the-mono-repo
7065
run: |
71-
pnpm build:ci
66+
bun build:ci
7267
7368
- name: 🔍 Check for changesets
7469
id: check-changesets

.husky/commit-msg

100644100755
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# This loads nvm.sh and sets the correct PATH before running hook
2-
export NVM_DIR="$HOME/.nvm"
3-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
1+
#!/usr/bin/env sh
2+
# Validate commit message with commitlint
43

4+
# Add common bun installation paths to PATH
5+
export PATH="$HOME/.bun/bin:$PATH"
56

6-
# Validate commit message with commitlint
7-
if ! pnpm exec commitlint --edit "$1"; then
7+
if ! bun x commitlint --edit "$1"; then
88
echo "Commit message validation failed."
99
echo "Please use the Conventional Commits format:\n"
1010
echo " <type>(<scope>): <subject>\n"

.husky/pre-commit

100644100755
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# This loads nvm.sh and sets the correct PATH before running hook
2-
export NVM_DIR="$HOME/.nvm"
3-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
1+
#!/usr/bin/env sh
2+
# Run lint-staged with bun (monorepo uses bun)
43

5-
# Run lint-staged with pnpm (monorepo uses pnpm)
6-
npm run lint-staged --concurrent false
4+
# Add common bun installation paths to PATH
5+
export PATH="$HOME/.bun/bin:$PATH"
6+
7+
bun run lint-staged --concurrent false

.lintstagedrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc,yml,yaml}": [
3-
"biome check --write --no-errors-on-unmatched --files-ignore-unknown=true"
4-
],
3+
"biome check --write --no-errors-on-unmatched --files-ignore-unknown=true"
4+
],
5+
"**/package.json": ["prettier --write"],
56
"*.{md,mdx}": ["prettier --write"]
67
}

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ dictionaries
2525
storybook-static
2626

2727
# NPM
28-
*-lock.json
28+
*-lock.json

.prettierrc.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/prettierrc",
3+
"plugins": ["prettier-plugin-packagejson"],
4+
"includes": ["**/package.json", "**/*.md"],
35
"singleQuote": true,
46
"semi": true,
57
"tabWidth": 2,
@@ -15,6 +17,12 @@
1517
"singleQuote": false,
1618
"quoteProps": "preserve"
1719
}
20+
},
21+
{
22+
"files": "package.json",
23+
"options": {
24+
"plugins": ["prettier-plugin-packagejson"]
25+
}
1826
}
1927
]
2028
}

0 commit comments

Comments
 (0)