Skip to content

Commit acbb0ae

Browse files
authored
Merge pull request #5782 from remotion-dev/upgrade-bun
2 parents 6793785 + bf62089 commit acbb0ae

Some content is hidden

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

57 files changed

+13680
-34131
lines changed

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The **package name** for each folder is `@remotion/[folder-name]`, except for th
66

77
## Build instructions
88

9-
- `pnpm` is the package manager for the project.
9+
- `bun` is the package manager for the project.
1010
- To build the project after you made changes, run `bunx turbo make --filter="[package-name]"` and only include the package you are working on. Refer to package naming convention above. For example, the command to build the package in `packages/shapes` is `bunx turbo make --filter="@remotion/shapes"`.
1111
- After making code changes, run `bunx prettier --experimental-cli src --write` to format the code. Do not run the formatted on the docs.
1212

.github/workflows/changelog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@main
13-
- uses: oven-sh/setup-bun@v2.0.1
13+
- uses: oven-sh/setup-bun@v2.0.2
1414
with:
15-
bun-version: 1.1.9
15+
bun-version: 1.3.0
1616
- name: Push changelog
1717
env:
1818
DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}

.github/workflows/copilot-setup-steps.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@ jobs:
1616
steps:
1717
- name: Checkout code
1818
uses: actions/checkout@v4
19-
- uses: pnpm/action-setup@v3
20-
with:
21-
version: "8.10.2"
2219
- name: Set up Node.js
2320
uses: actions/setup-node@v4
2421
with:
2522
node-version: 20
26-
cache: "pnpm"
27-
- uses: oven-sh/setup-bun@v2.0.1
23+
- uses: oven-sh/setup-bun@v2.0.2
2824
with:
29-
bun-version: 1.2.10
25+
bun-version: 1.3.0
3026
- name: Cache turbo build setup
3127
uses: actions/cache@v4
3228
with:
@@ -35,6 +31,6 @@ jobs:
3531
restore-keys: |
3632
${{ runner.os }}-turbo-
3733
- name: Install
38-
run: pnpm i --frozen-lockfile
34+
run: bun i
3935
- name: Build
40-
run: pnpm run build
36+
run: bun run build

.github/workflows/push.yml

Lines changed: 19 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,17 @@ jobs:
1515
name: Lambda integration
1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: pnpm/action-setup@v3
19-
with:
20-
version: "8.10.2"
2118
- uses: actions/setup-node@v4
2219
with:
2320
node-version: 20
24-
cache: "pnpm"
25-
- uses: oven-sh/setup-bun@v2.0.1
21+
- uses: oven-sh/setup-bun@v2.0.2
2622
with:
27-
bun-version: 1.2.10
23+
bun-version: 1.3.0
2824
- name: Install
29-
run: pnpm i --frozen-lockfile
30-
- name: Cache turbo build setup
31-
uses: actions/cache@v4
32-
with:
33-
path: .turbo
34-
key: ${{ runner.os }}-turbo-${{ github.sha }}
35-
restore-keys: |
36-
${{ runner.os }}-turbo-
25+
run: bun i
3726
- name: Test Lambda IT
3827
run: |
39-
pnpm run testlambda
28+
bun run testlambda
4029
- name: IT tests
4130
timeout-minutes: 10
4231
run: |
@@ -50,25 +39,14 @@ jobs:
5039
name: Webcodecs tests
5140
steps:
5241
- uses: actions/checkout@v4
53-
- uses: pnpm/action-setup@v3
54-
with:
55-
version: "8.10.2"
5642
- uses: actions/setup-node@v4
5743
with:
5844
node-version: 20
59-
cache: "pnpm"
60-
- uses: oven-sh/setup-bun@v2.0.1
45+
- uses: oven-sh/setup-bun@v2.0.2
6146
with:
62-
bun-version: 1.2.10
47+
bun-version: 1.3.0
6348
- name: Install
64-
run: pnpm i --frozen-lockfile
65-
- name: Cache turbo build setup
66-
uses: actions/cache@v4
67-
with:
68-
path: .turbo
69-
key: ${{ runner.os }}-turbo-${{ github.sha }}
70-
restore-keys: |
71-
${{ runner.os }}-turbo-
49+
run: bun i
7250
- name: Install deps
7351
run: cd packages/webcodecs && bunx playwright install --with-deps
7452
- name: Test Webcodecs
@@ -79,24 +57,14 @@ jobs:
7957
name: SSR integration
8058
steps:
8159
- uses: actions/checkout@v4
82-
- uses: pnpm/action-setup@v3
83-
with:
84-
version: "8.10.2"
85-
- name: Cache turbo build setup
86-
uses: actions/cache/restore@v4
87-
with:
88-
path: .turbo
89-
key: |
90-
${{ runner.os }}-turbo-
9160
- uses: actions/setup-node@v4
9261
with:
9362
node-version: 16
94-
cache: "pnpm"
95-
- uses: oven-sh/setup-bun@v2.0.1
63+
- uses: oven-sh/setup-bun@v2.0.2
9664
with:
97-
bun-version: 1.2.10
65+
bun-version: 1.3.0
9866
- name: Install
99-
run: pnpm i --frozen-lockfile
67+
run: bun i
10068
- name: Setup Python
10169
uses: actions/setup-python@v4
10270
with:
@@ -109,45 +77,29 @@ jobs:
10977
with:
11078
php-version: "8.4"
11179
- run: pip install pylint boto3 pytest
112-
- name: Turbo Cache
113-
uses: actions/cache@v4
114-
with:
115-
path: |
116-
node_modules/.cache/turbo
117-
key: ts-${{ runner.os }}-node16-v3
11880
- name: Test SSR
11981
timeout-minutes: 8
12082
run: |
121-
pnpm run testssr
83+
bun run testssr
12284
lint:
12385
runs-on: ubuntu-latest
12486
name: Linting + Formatting
12587
steps:
12688
- uses: actions/checkout@v4
127-
- uses: pnpm/action-setup@v3
128-
with:
129-
version: "8.10.2"
130-
- name: Cache turbo build setup
131-
uses: actions/cache/restore@v4
132-
with:
133-
path: .turbo
134-
key: |
135-
${{ runner.os }}-turbo-
13689
- uses: actions/setup-node@v4
13790
with:
13891
node-version: 20
139-
cache: "pnpm"
140-
- uses: oven-sh/setup-bun@v2.0.1
92+
- uses: oven-sh/setup-bun@v2.0.2
14193
with:
142-
bun-version: 1.2.10
94+
bun-version: 1.3.0
14395
- name: Install
144-
run: pnpm i --frozen-lockfile
96+
run: bun i
14597
env:
14698
CI: true
14799
- name: Perform stylecheck
148100
timeout-minutes: 10
149101
run: |
150-
pnpm run stylecheck
102+
bun run stylecheck
151103
build:
152104
name: Build Node ${{ matrix.node_version }} on ${{ matrix.os }}
153105
runs-on: ${{ matrix.os }}
@@ -165,26 +117,15 @@ jobs:
165117
node_version: 20.5
166118
steps:
167119
- uses: actions/checkout@v4
168-
- uses: pnpm/action-setup@v3
169-
with:
170-
version: "8.10.2"
171120
- uses: actions/setup-node@v4
172121
with:
173122
node-version: ${{ matrix.node_version }}
174-
cache: "pnpm"
175-
- name: Cache turbo build setup
176-
uses: actions/cache@v4
177-
with:
178-
path: .turbo
179-
key: ${{ runner.os }}-turbo-${{ github.sha }}
180-
restore-keys: |
181-
${{ runner.os }}-turbo-
182-
- uses: oven-sh/setup-bun@v2.0.1
123+
- uses: oven-sh/setup-bun@v2.0.2
183124
with:
184-
bun-version: 1.2.10
125+
bun-version: 1.3.0
185126
- name: Install
186-
run: pnpm i --frozen-lockfile
127+
run: bun i
187128
- name: Build & Test
188129
timeout-minutes: 30
189130
run: |
190-
pnpm run ci
131+
bun run ci

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ coverage
88
.cache
99
packages/example/out
1010
.env
11-
.pnpm-debug.log
1211
.vscode/taskmarks.json
1312
.turbo
1413
.vercel

0 commit comments

Comments
 (0)