Merge branch 'main' into homepage-player

package.json

@@ -7,7 +7,7 @@
 		"test": "turbo run lint test --no-update-notifier",
 		"ts-build": "tsc -b --verbose",
 		"stylecheck": "turbo run lint formatting --no-update-notifier",
-		"build": "turbo run build --no-update-notifier",
+		"build": "turbo run make --no-update-notifier",
 		"build-docs": "turbo run build-docs --no-update-notifier",
 		"ci": "turbo run build test --concurrency=50% --no-update-notifier",
 		"watch": "tsc -b --verbose -w",
@@ -26,19 +26,19 @@
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.281",
-		"@types/bun": "1.0.12",
+		"@types/bun": "1.1.10",
 		"@types/react": "18.3.1",
 		"@types/react-dom": "18.3.0",
 		"eslint": "8.56.0",
 		"eslint-plugin-10x": "1.5.2",
 		"eslint-plugin-react": "7.32.2",
 		"eslint-plugin-react-hooks": "4.4.0",
-		"prettier": "3.2.5",
+		"prettier": "3.3.3",
 		"prettier-plugin-organize-imports": "3.2.4"
 	},
 	"dependencies": {
 		"turbo": "1.13.3",
-		"typescript": "5.3.3"
+		"typescript": "5.5.4"
 	},
 	"packageManager": "[email protected]"
 }

packages/animated-emoji/package.json

@@ -8,7 +8,7 @@
 	"scripts": {
 		"formatting": "prettier src --check",
 		"lint": "eslint src --ext ts,tsx",
-		"build": "bun --env-file=../.env.bundle bundle.ts",
+		"make": "bun --env-file=../.env.bundle bundle.ts",
 		"test": "bun test src"
 	},
 	"exports": {

packages/animation-utils/package.json

@@ -15,7 +15,7 @@
 	"scripts": {
 		"formatting": "prettier src --check",
 		"lint": "eslint src --ext ts,tsx",
-		"build": "bun --env-file=../.env.bundle bundle.ts",
+		"make": "bun --env-file=../.env.bundle bundle.ts",
 		"test": "bun test src"
 	},
 	"dependencies": {

packages/animation-utils/src/type.ts

@@ -114,9 +114,9 @@ type UnitNumberAndFunction = UnitNumberAndFunctions[0];
 
 export type {
 	AngleUnit,
+	ColorMatchers,
 	CSSPropertiesKey,
 	CSSPropertiesValue,
-	ColorMatchers,
 	LengthPercentageUnit,
 	LengthUnit,
 	Style,

packages/astro-example/src/components/Counter.tsx

@@ -1,31 +1,31 @@
-import "./Counter.css";
-import { Player } from "@remotion/player";
-import { Gif } from "@remotion/gif";
+import {Gif} from '@remotion/gif';
+import {Player} from '@remotion/player';
+import './Counter.css';
 
 const Comp: React.FC = () => {
-  return (
-    <div>
-      <Gif
-        src="https://media.giphy.com/media/xT0GqH01ZyKwd3aT3G/giphy.gif"
-        fit="cover"
-        height={200}
-        width={200}
-      />
-    </div>
-  );
+	return (
+		<div>
+			<Gif
+				src="https://media.giphy.com/media/xT0GqH01ZyKwd3aT3G/giphy.gif"
+				fit="cover"
+				height={200}
+				width={200}
+			/>
+		</div>
+	);
 };
 
 export default function Counter() {
-  return (
-    <>
-      <Player
-        component={Comp}
-        durationInFrames={100}
-        compositionWidth={400}
-        compositionHeight={400}
-        fps={30}
-        controls
-      ></Player>
-    </>
-  );
+	return (
+		<>
+			<Player
+				component={Comp}
+				durationInFrames={100}
+				compositionWidth={400}
+				compositionHeight={400}
+				fps={30}
+				controls
+			></Player>
+		</>
+	);
 }

packages/bundler/src/index.ts

@@ -20,10 +20,10 @@ export const BundlerInternals = {
 
 export type {GitSource} from '@remotion/studio-shared';
 export {
+	bundle,
 	BundleOptions,
 	LegacyBundleOptions,
 	MandatoryLegacyBundleOptions,
-	bundle,
 } from './bundle';
 export {WebpackConfiguration, WebpackOverrideFn} from './webpack-config';
 export {webpack};

packages/cli-autocomplete/package.json

@@ -12,6 +12,6 @@
 	},
 	"scripts": {
 		"formatting": "prettier src --check",
-		"build": "bun src/generate.ts"
+		"make": "bun src/generate.ts"
 	}
 }

packages/cli/src/render-queue/process-video.ts

@@ -77,8 +77,8 @@ export const processVideoJob = async ({
 		muted: job.type === 'video' ? job.muted : true,
 		enforceAudioTrack: job.type === 'video' ? job.enforceAudioTrack : false,
 		proResProfile:
-			job.type === 'video' ? job.proResProfile ?? undefined : undefined,
-		x264Preset: job.type === 'video' ? job.x264Preset ?? null : null,
+			job.type === 'video' ? (job.proResProfile ?? undefined) : undefined,
+		x264Preset: job.type === 'video' ? (job.x264Preset ?? null) : null,
 		pixelFormat: job.type === 'video' ? job.pixelFormat : 'yuv420p',
 		videoBitrate: job.type === 'video' ? job.videoBitrate : null,
 		encodingBufferSize: job.type === 'video' ? job.encodingBufferSize : null,

packages/cloudrun/package.json

@@ -8,7 +8,7 @@
 	"main": "dist/index.js",
 	"sideEffects": false,
 	"scripts": {
-		"build": "bun build.ts",
+		"make": "bun build.ts",
 		"buildContainer": "bun src/admin/bundle-renderLogic.ts",
 		"tarInstaller": "bun src/admin/bundle-installer.ts",
 		"lint": "eslint src --ext ts,tsx",

packages/cloudrun/src/api/get-buckets.ts

@@ -19,8 +19,8 @@ export const getRemotionStorageBuckets = async (
 		return {remotionBuckets: []};
 	}
 
-	let remotionBuckets = buckets.filter(
-		(b) => b.name?.startsWith(REMOTION_BUCKET_PREFIX),
+	let remotionBuckets = buckets.filter((b) =>
+		b.name?.startsWith(REMOTION_BUCKET_PREFIX),
 	);
 
 	if (region !== 'all regions') {

packages/cloudrun/src/api/upload-dir.ts

@@ -73,7 +73,7 @@ export const uploadDir = async ({
 									name: res,
 									size,
 								},
-						  ];
+							];
 				}),
 		);
 		return _files.flat(1);

packages/cloudrun/src/cli/commands/services/index.ts

@@ -4,10 +4,10 @@ import type {ServiceInfo} from '../../../api/get-service-info';
 import {BINARY_NAME} from '../../../shared/constants';
 import {quit} from '../../helpers/quit';
 import {Log} from '../../log';
-import {cloudRunDeploySubcommand, CLOUD_RUN_DEPLOY_SUBCOMMAND} from './deploy';
-import {servicesLsCommand, SERVICES_LS_SUBCOMMAND} from './ls';
-import {servicesRmCommand, SERVICES_RM_SUBCOMMAND} from './rm';
-import {servicesRmallCommand, SERVICES_RMALL_SUBCOMMAND} from './rmall';
+import {CLOUD_RUN_DEPLOY_SUBCOMMAND, cloudRunDeploySubcommand} from './deploy';
+import {SERVICES_LS_SUBCOMMAND, servicesLsCommand} from './ls';
+import {SERVICES_RM_SUBCOMMAND, servicesRmCommand} from './rm';
+import {SERVICES_RMALL_SUBCOMMAND, servicesRmallCommand} from './rmall';
 
 export const SERVICES_COMMAND = 'services';
 

packages/cloudrun/src/client.ts

@@ -6,11 +6,11 @@ export {getServiceInfo} from './api/get-service-info';
 export {getServices} from './api/get-services';
 export {getSites} from './api/get-sites';
 export {
-	renderMediaOnCloudrun,
 	RenderMediaOnCloudrunInput,
+	renderMediaOnCloudrun,
 } from './api/render-media-on-cloudrun';
 export {
-	renderStillOnCloudrun,
 	RenderStillOnCloudrunInput,
+	renderStillOnCloudrun,
 } from './api/render-still-on-cloudrun';
 export {speculateServiceName} from './api/speculate-service-name';

packages/cloudrun/src/index.ts

@@ -37,24 +37,24 @@ const getSites = deprecatedGetSites;
 
 export {
 	CloudrunInternals,
+	deleteService,
+	deleteSite,
 	deployService,
 	deploySite,
-	deleteSite,
-	deleteService,
-	getServices,
 	getOrCreateBucket,
-	renderMediaOnCloudrun,
-	renderStillOnCloudrun,
-	getServiceInfo,
 	getRegions,
+	getServiceInfo,
+	getServices,
 	getSites,
+	renderMediaOnCloudrun,
+	renderStillOnCloudrun,
 	speculateServiceName,
 	testPermissions,
 };
 export type {
-	GcpRegion,
 	DeployServiceInput,
 	DeployServiceOutput,
-	RenderMediaOnCloudrunOutput,
+	GcpRegion,
 	RenderMediaOnCloudrunInput,
+	RenderMediaOnCloudrunOutput,
 };

packages/convert/package.json

@@ -23,19 +23,19 @@
 		"@remotion/webcodecs": "workspace:*",
 		"@vercel/remix": "^2.11.2",
 		"class-variance-authority": "^0.7.0",
-		"clsx": "^2.1.1",
-		"isbot": "^4.1.0",
+		"clsx": "2.1.1",
+		"isbot": "4.1.0",
 		"lucide-react": "^0.439.0",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
-		"tailwind-merge": "^2.5.2",
+		"tailwind-merge": "2.5.2",
 		"tailwindcss-animate": "^1.0.7"
 	},
 	"devDependencies": {
 		"@remix-run/dev": "^2.11.2",
-		"autoprefixer": "^10.4.19",
-		"postcss": "^8.4.38",
-		"tailwindcss": "^3.4.4",
+		"autoprefixer": "10.4.20",
+		"postcss": "8.4.47",
+		"tailwindcss": "3.4.13",
 		"vite": "^5.4.6",
 		"vite-tsconfig-paths": "^4.2.1"
 	},

packages/core/package.json

@@ -13,7 +13,7 @@
 		"prepublishOnly": "bun ensure-correct-version.ts && cp ../../README.md .",
 		"lint": "eslint src --ext ts,tsx",
 		"test": "vitest --run",
-		"build": "bun --env-file=../.env.bundle bundle.ts"
+		"make": "bun --env-file=../.env.bundle bundle.ts"
 	},
 	"bugs": {
 		"url": "https://github.com/remotion-dev/remotion/issues"

packages/core/src/CompositionManager.tsx

@@ -233,15 +233,11 @@ export const CompositionManagerProvider: React.FC<{
 		[],
 	);
 
-	useImperativeHandle(
-		compositionsRef,
-		() => {
-			return {
-				getCompositions: () => currentcompositionsRef.current,
-			};
-		},
-		[],
-	);
+	useImperativeHandle(compositionsRef, () => {
+		return {
+			getCompositions: () => currentcompositionsRef.current,
+		};
+	}, []);
 
 	const composition = compositions.find((c) =>
 		canvasContent?.type === 'composition'

packages/core/src/EditorProps.tsx

@@ -67,16 +67,12 @@ export const EditorPropsProvider: React.FC<{
 		setProps({});
 	}, []);
 
-	useImperativeHandle(
-		editorPropsProviderRef,
-		() => {
-			return {
-				getProps: () => props,
-				setProps,
-			};
-		},
-		[props],
-	);
+	useImperativeHandle(editorPropsProviderRef, () => {
+		return {
+			getProps: () => props,
+			setProps,
+		};
+	}, [props]);
 
 	const ctx = useMemo((): EditorPropsContextType => {
 		return {props, updateProps, resetUnsaved};

packages/core/src/Img.tsx

@@ -56,13 +56,9 @@ const ImgRefForwarding: React.ForwardRefRenderFunction<
 		throw new Error('No "src" prop was passed to <Img>.');
 	}
 
-	useImperativeHandle(
-		ref,
-		() => {
-			return imageRef.current as HTMLImageElement;
-		},
-		[],
-	);
+	useImperativeHandle(ref, () => {
+		return imageRef.current as HTMLImageElement;
+	}, []);
 
 	const actualSrc = usePreload(src as string);