Skip to content

[pull] main from remotion-dev:main #1081

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
pull merged 2 commits into from
Sep 3, 2026
Merged

[pull] main from remotion-dev:main #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
222b6b3
Upgrade Zod to 4.5.4 (#11056)
samohovets Sep 3, 2026
0d37580
Fix displaying custom asset fields in Studio (#11057)
samohovets Sep 3, 2026
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
50 changes: 29 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.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"react-dom": "19.2.3",
"eslint": "9.19.0",
"prettier": "3.8.1",
"zod": "4.4.3",
"zod": "4.5.4",
"@types/react": "19.2.7",
"@types/react-dom": "19.2.3",
"@types/node": "20.12.14",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/extra-packages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const EXTRA_PACKAGES: Record<string, string> = {
'@mediabunny/aac-encoder': '1.55.5',
'@mediabunny/flac-encoder': '1.55.5',
'@mediabunny/prores': '1.55.5',
zod: '4.4.3',
zod: '4.5.4',
};

export const EXTRA_PACKAGES_DOCS: Record<string, string> = {
Expand Down
24 changes: 12 additions & 12 deletions packages/cli/src/test/catalog-utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ test('parsePnpmWorkspaceCatalog handles basic, quoted, scoped entries and stops
' - packages/*',
'catalog:',
' react: ^18.3.1',
' zod: 4.4.3',
' zod: 4.5.4',
' "react-dom": "^18.3.1"',
" typescript: '5.8.3'",
' "@remotion/core": 4.0.10',
Expand All @@ -81,7 +81,7 @@ test('parsePnpmWorkspaceCatalog handles basic, quoted, scoped entries and stops

const result = parsePnpmWorkspaceCatalog(richContent);
expect(result.react).toBe('^18.3.1');
expect(result.zod).toBe('4.4.3');
expect(result.zod).toBe('4.5.4');
expect(result['react-dom']).toBe('^18.3.1');
expect(result.typescript).toBe('5.8.3');
expect(result['@remotion/core']).toBe('4.0.10');
Expand All @@ -100,7 +100,7 @@ test('bun-style monorepo: finds workspace root, catalog source, and reads entrie
packages: ['packages/*'],
catalog: {
react: '^19.0.0',
zod: '4.4.3',
zod: '4.5.4',
},
},
}),
Expand All @@ -124,7 +124,7 @@ test('bun-style monorepo: finds workspace root, catalog source, and reads entrie

expect(getCatalogEntries(tmpDir)).toEqual({
react: '^19.0.0',
zod: '4.4.3',
zod: '4.5.4',
});
});

Expand All @@ -133,7 +133,7 @@ test('top-level catalog in package.json: finds catalog source and reads entries'
path.join(tmpDir, 'package.json'),
JSON.stringify({
name: 'my-monorepo',
catalog: {zod: '4.4.3'},
catalog: {zod: '4.5.4'},
}),
);

Expand All @@ -144,13 +144,13 @@ test('top-level catalog in package.json: finds catalog source and reads entries'
expect(source!.catalogKey).toBe('root');
}

expect(getCatalogEntries(tmpDir)).toEqual({zod: '4.4.3'});
expect(getCatalogEntries(tmpDir)).toEqual({zod: '4.5.4'});
});

test('pnpm monorepo: finds workspace root, catalog source, and reads entries', () => {
fs.writeFileSync(
path.join(tmpDir, 'pnpm-workspace.yaml'),
'packages:\n - packages/*\ncatalog:\n zod: 4.4.3\n react: ^19.0.0\n',
'packages:\n - packages/*\ncatalog:\n zod: 4.5.4\n react: ^19.0.0\n',
);

const subPkgDir = path.join(tmpDir, 'packages', 'my-app');
Expand All @@ -163,7 +163,7 @@ test('pnpm monorepo: finds workspace root, catalog source, and reads entries', (
expect(source!.type).toBe('pnpm-workspace');

expect(getCatalogEntries(tmpDir)).toEqual({
zod: '4.4.3',
zod: '4.5.4',
react: '^19.0.0',
});
});
Expand Down Expand Up @@ -193,7 +193,7 @@ test('updating catalog entries in bun-style package.json', () => {
packages: ['packages/*'],
catalog: {
react: '^18.0.0',
zod: '4.4.3',
zod: '4.5.4',
mediabunny: '1.34.4',
},
},
Expand Down Expand Up @@ -245,7 +245,7 @@ test('updating catalog entries in top-level package.json catalog', () => {
JSON.stringify(
{
name: 'my-monorepo',
catalog: {zod: '4.4.3', mediabunny: '1.34.4'},
catalog: {zod: '4.5.4', mediabunny: '1.34.4'},
},
null,
'\t',
Expand All @@ -263,7 +263,7 @@ test('updating catalog entries in top-level package.json catalog', () => {

const updated = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
expect(updated.catalog.mediabunny).toBe('1.35.0');
expect(updated.catalog.zod).toBe('4.4.3');
expect(updated.catalog.zod).toBe('4.5.4');
});

test('updating catalog entries in pnpm-workspace.yaml', () => {
Expand All @@ -275,7 +275,7 @@ test('updating catalog entries in pnpm-workspace.yaml', () => {
' - packages/*',
'catalog:',
' react: ^18.3.1',
' zod: 4.4.3',
' zod: 4.5.4',
' "react-dom": "^18.3.1"',
' "@aws-sdk/client-s3": 3.986.0',
'catalogs:',
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/test/upgrade-protocols.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ test('includes Remotion and extra packages that only exist in pnpm catalog entri
targetVersion: '4.0.462',
extraPackageVersions: {
mediabunny: '1.50.7',
zod: '4.4.3',
zod: '4.5.4',
},
});

Expand All @@ -149,7 +149,7 @@ test('uses the Mediabunny version for extension packages', () => {
expect(
resolveExtraPackageVersions({
mediabunny: '1.50.8',
zod: '4.4.3',
zod: '4.5.4',
}),
).toMatchObject({
mediabunny: '1.50.8',
Expand All @@ -159,7 +159,7 @@ test('uses the Mediabunny version for extension packages', () => {
'@mediabunny/aac-encoder': '1.50.8',
'@mediabunny/flac-encoder': '1.50.8',
'@mediabunny/prores': '1.50.8',
zod: '4.4.3',
zod: '4.5.4',
});
});

Expand All @@ -172,7 +172,7 @@ test('end-to-end: updates catalog in bun-style package.json and preserves catalo
workspaces: {
packages: ['packages/*'],
catalog: {
zod: '4.4.3',
zod: '4.5.4',
mediabunny: '1.34.4',
react: '19.2.3',
},
Expand Down Expand Up @@ -239,7 +239,7 @@ test('end-to-end: updates catalog in pnpm-workspace.yaml', () => {
'packages:',
' - packages/*',
'catalog:',
' zod: 4.4.3',
' zod: 4.5.4',
' mediabunny: 1.34.4',
' react: ^19.0.0',
'',
Expand Down
Loading
Loading