diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5214109b3dd..12dcf05400c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -130,6 +130,7 @@ jobs: name: Build Node ${{ matrix.node_version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: include: - os: ubuntu-latest @@ -141,10 +142,6 @@ jobs: - os: ubuntu-latest node_version: 20.5 steps: - - name: Downgrade MinGW - run: | - choco install mingw --version=11.2.0 --allow-downgrade - if: matrix.os == 'windows-latest' - uses: actions/checkout@main - uses: actions/setup-node@v3 with: diff --git a/LICENSE.md b/LICENSE.md index 1100068dc0a..7874108757e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -7,7 +7,7 @@ Depending on the type of your legal entity, you are granted permission to use Re ## Free license -Copyright © 2023 [Remotion](https://www.remotion.dev/) +Copyright © 2023 [Remotion](https://www.remotion.dev) ### Eligibility @@ -36,6 +36,10 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord. ## Company license -You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)). +You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](https://www.remotion.dev/docs/support)). -Visit [remotion.pro](https://www.remotion.pro) for pricing and to buy a license. +Visit [remotion.pro](https://www.remotion.pro/license) for pricing and to buy a license. + +### FAQs + +Are you not sure whether you need a company license because of an edge case? Here are some [frequently asked questions](https://www.remotion.pro/faq). diff --git a/packages/astro-example/package.json b/packages/astro-example/package.json index 50a733791a8..c217d06df8f 100644 --- a/packages/astro-example/package.json +++ b/packages/astro-example/package.json @@ -2,7 +2,7 @@ "name": "@remotion/astro-example", "private": true, "type": "module", - "version": "4.0.48", + "version": "4.0.50", "scripts": { "dev": "astro dev", "start": "astro dev", diff --git a/packages/babel-loader/package.json b/packages/babel-loader/package.json index c01ae96eb77..dfe57ad9904 100644 --- a/packages/babel-loader/package.json +++ b/packages/babel-loader/package.json @@ -1,6 +1,6 @@ { "name": "@remotion/babel-loader", - "version": "4.0.48", + "version": "4.0.50", "description": "babel-loader polyfill for Remotion", "main": "dist/index.js", "scripts": { diff --git a/packages/bugs/api/[v].ts b/packages/bugs/api/[v].ts index 2c91da0edf7..4056c550417 100644 --- a/packages/bugs/api/[v].ts +++ b/packages/bugs/api/[v].ts @@ -7,6 +7,12 @@ type Bug = { }; const bugs: Bug[] = [ + { + title: "Broken Lambda", + description: "Lambda rendering fails with IPv6 error.", + link: "https://github.com/remotion-dev/remotion/pull/3019", + versions: ["4.0.49"], + }, { title: "OffthreadVideo could crash", description: diff --git a/packages/bugs/package.json b/packages/bugs/package.json index ed6f59962f3..1435506bac8 100644 --- a/packages/bugs/package.json +++ b/packages/bugs/package.json @@ -4,5 +4,5 @@ "@types/node": "^20.6.5" }, "private": true, - "version": "4.0.48" + "version": "4.0.50" } diff --git a/packages/bundler/package.json b/packages/bundler/package.json index b67a18977fb..f7fa7acc426 100644 --- a/packages/bundler/package.json +++ b/packages/bundler/package.json @@ -1,6 +1,6 @@ { "name": "@remotion/bundler", - "version": "4.0.48", + "version": "4.0.50", "description": "Bundler for Remotion", "main": "dist/index.js", "sideEffects": false, diff --git a/packages/cli-autocomplete/package.json b/packages/cli-autocomplete/package.json index d94c95ef132..42df9e0933d 100644 --- a/packages/cli-autocomplete/package.json +++ b/packages/cli-autocomplete/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/fig-autocomplete", "private": true, "devDependencies": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 8bfaa46353f..75ddd560de3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@remotion/cli", - "version": "4.0.48", + "version": "4.0.50", "description": "CLI for Remotion", "main": "dist/index.js", "sideEffects": false, diff --git a/packages/cli/src/editor/components/RenderModal/SchemaEditor/ZodSwitch.tsx b/packages/cli/src/editor/components/RenderModal/SchemaEditor/ZodSwitch.tsx index a10aeb2b035..68f604de21a 100644 --- a/packages/cli/src/editor/components/RenderModal/SchemaEditor/ZodSwitch.tsx +++ b/packages/cli/src/editor/components/RenderModal/SchemaEditor/ZodSwitch.tsx @@ -20,6 +20,7 @@ import {ZodObjectEditor} from './ZodObjectEditor'; import {ZodOptionalEditor} from './ZodOptionalEditor'; import {ZodStaticFileEditor} from './ZodStaticFileEditor'; import {ZodStringEditor} from './ZodStringEditor'; +import {ZodTextareaEditor} from './ZodTextareaEditor'; import {ZodUnionEditor} from './ZodUnionEditor'; export type UpdaterFunction = ( @@ -102,6 +103,28 @@ export const ZodSwitch: React.FC<{ ); } + if ( + zodTypes && + schema._def.description === + zodTypes.ZodZypesInternals.REMOTION_TEXTAREA_BRAND + ) { + return ( + } + jsonPath={jsonPath} + schema={schema} + onSave={onSave as UpdaterFunction} + defaultValue={defaultValue as string} + showSaveButton={showSaveButton} + onRemove={onRemove} + saving={saving} + saveDisabledByParent={saveDisabledByParent} + mayPad={mayPad} + /> + ); + } + return ( ; + onSave: UpdaterFunction; + onRemove: null | (() => void); + showSaveButton: boolean; + saving: boolean; + saveDisabledByParent: boolean; + mayPad: boolean; +}> = ({ + jsonPath, + value, + setValue, + showSaveButton, + defaultValue, + schema, + onSave, + onRemove, + saving, + saveDisabledByParent, + mayPad, +}) => { + const z = useZodIfPossible(); + if (!z) { + throw new Error('expected zod'); + } + + const zodTypes = useZodTypesIfPossible(); + if (!zodTypes) { + throw new Error('expected zod textarea'); + } + + const { + localValue, + onChange: setLocalValue, + reset, + } = useLocalState({ + schema, + setValue, + value, + defaultValue, + }); + + const onChange: React.ChangeEventHandler = useCallback( + (e) => { + setLocalValue(() => e.target.value, false, false); + }, + [setLocalValue], + ); + + const save = useCallback(() => { + onSave(() => value, false, false); + }, [onSave, value]); + + return ( +
+ +
+ + +
+
+ ); +}; diff --git a/packages/cli/src/editor/components/RenderModal/SchemaEditor/create-zod-values.ts b/packages/cli/src/editor/components/RenderModal/SchemaEditor/create-zod-values.ts index 2d44ae43bfa..5b4b8f00c9a 100644 --- a/packages/cli/src/editor/components/RenderModal/SchemaEditor/create-zod-values.ts +++ b/packages/cli/src/editor/components/RenderModal/SchemaEditor/create-zod-values.ts @@ -84,6 +84,14 @@ export const createZodValues = ( return '#ffffff'; } + if ( + zodTypes && + schema._def.description === + zodTypes.ZodZypesInternals.REMOTION_TEXTAREA_BRAND + ) { + return ''; + } + return createZodValues( (def as z.ZodEffectsDef).schema, zodRuntime, diff --git a/packages/cli/src/preview-server/start-server.ts b/packages/cli/src/preview-server/start-server.ts index 8f25f9297c9..5fabf946ba4 100644 --- a/packages/cli/src/preview-server/start-server.ts +++ b/packages/cli/src/preview-server/start-server.ts @@ -110,8 +110,10 @@ export const startServer = async (options: { const maxTries = 5; - // Default Node.js host, but explicity - const host = '0.0.0.0'; + const host = RenderInternals.isIpV6Supported() ? '::' : '0.0.0.0'; + const hostsToTry = RenderInternals.isIpV6Supported() + ? ['::', '::1'] + : ['0.0.0.0', '127.0.0.1']; for (let i = 0; i < maxTries; i++) { try { @@ -120,7 +122,7 @@ export const startServer = async (options: { desiredPort, from: 3000, to: 3100, - hostsToTry: ['127.0.0.1', '0.0.0.0'], + hostsToTry, }) .then(({port, didUsePort}) => { server.listen({ diff --git a/packages/cli/src/test/create-zod-values.test.ts b/packages/cli/src/test/create-zod-values.test.ts index c71c043bfb3..3245b124bf3 100644 --- a/packages/cli/src/test/create-zod-values.test.ts +++ b/packages/cli/src/test/create-zod-values.test.ts @@ -322,3 +322,10 @@ test('Should create a color', async () => { expect(createZodValues(zodTypes.zColor(), z, zodTypes)).toBe('#ffffff'); }); + +test('Should create a textarea', async () => { + const z = await getZ(); + const zodTypes = await getZodTypes(); + + expect(createZodValues(zodTypes.zTextarea(), z, zodTypes)).toBe(''); +}); diff --git a/packages/cloudrun/package.json b/packages/cloudrun/package.json index 5ee9ac6805b..35e8b265129 100644 --- a/packages/cloudrun/package.json +++ b/packages/cloudrun/package.json @@ -1,6 +1,6 @@ { "name": "@remotion/cloudrun", - "version": "4.0.48", + "version": "4.0.50", "description": "GCP Cloud Run alternative to lambda rendering", "main": "dist/index.js", "scripts": { diff --git a/packages/cloudrun/src/gcpInstaller/gcpInstaller.tar b/packages/cloudrun/src/gcpInstaller/gcpInstaller.tar index b3bc46eb126..d221ca94487 100644 Binary files a/packages/cloudrun/src/gcpInstaller/gcpInstaller.tar and b/packages/cloudrun/src/gcpInstaller/gcpInstaller.tar differ diff --git a/packages/compositor-darwin-arm64/compositor b/packages/compositor-darwin-arm64/compositor index d954e32b77b..95404762af5 100755 Binary files a/packages/compositor-darwin-arm64/compositor and b/packages/compositor-darwin-arm64/compositor differ diff --git a/packages/compositor-darwin-arm64/package.json b/packages/compositor-darwin-arm64/package.json index e3b2a25862a..858de8a3030 100644 --- a/packages/compositor-darwin-arm64/package.json +++ b/packages/compositor-darwin-arm64/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-darwin-arm64", "os": [ "darwin" diff --git a/packages/compositor-darwin-x64/compositor b/packages/compositor-darwin-x64/compositor index 2780e8e4b17..81e8919395f 100755 Binary files a/packages/compositor-darwin-x64/compositor and b/packages/compositor-darwin-x64/compositor differ diff --git a/packages/compositor-darwin-x64/package.json b/packages/compositor-darwin-x64/package.json index dca03acc43b..c689670a653 100644 --- a/packages/compositor-darwin-x64/package.json +++ b/packages/compositor-darwin-x64/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-darwin-x64", "os": [ "darwin" diff --git a/packages/compositor-linux-arm64-gnu/compositor b/packages/compositor-linux-arm64-gnu/compositor index db9a57b0ab6..1767c92cf57 100755 Binary files a/packages/compositor-linux-arm64-gnu/compositor and b/packages/compositor-linux-arm64-gnu/compositor differ diff --git a/packages/compositor-linux-arm64-gnu/package.json b/packages/compositor-linux-arm64-gnu/package.json index 653c8194c60..9b7657ccc7c 100644 --- a/packages/compositor-linux-arm64-gnu/package.json +++ b/packages/compositor-linux-arm64-gnu/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-linux-arm64-gnu", "os": [ "linux" diff --git a/packages/compositor-linux-arm64-musl/compositor b/packages/compositor-linux-arm64-musl/compositor index a205036d56a..adc30b4702d 100755 Binary files a/packages/compositor-linux-arm64-musl/compositor and b/packages/compositor-linux-arm64-musl/compositor differ diff --git a/packages/compositor-linux-arm64-musl/package.json b/packages/compositor-linux-arm64-musl/package.json index 9a5ebf77d01..c0edf06dffc 100644 --- a/packages/compositor-linux-arm64-musl/package.json +++ b/packages/compositor-linux-arm64-musl/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-linux-arm64-musl", "os": [ "linux" diff --git a/packages/compositor-linux-x64-gnu/compositor b/packages/compositor-linux-x64-gnu/compositor index 3d0894707d4..00711628b9f 100755 Binary files a/packages/compositor-linux-x64-gnu/compositor and b/packages/compositor-linux-x64-gnu/compositor differ diff --git a/packages/compositor-linux-x64-gnu/package.json b/packages/compositor-linux-x64-gnu/package.json index e04d8610b7c..0a6b0efa55d 100644 --- a/packages/compositor-linux-x64-gnu/package.json +++ b/packages/compositor-linux-x64-gnu/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-linux-x64-gnu", "os": [ "linux" diff --git a/packages/compositor-linux-x64-musl/compositor b/packages/compositor-linux-x64-musl/compositor index 839dd9b946a..0519dfb10a0 100755 Binary files a/packages/compositor-linux-x64-musl/compositor and b/packages/compositor-linux-x64-musl/compositor differ diff --git a/packages/compositor-linux-x64-musl/package.json b/packages/compositor-linux-x64-musl/package.json index 7cc543f679c..10c3097afb3 100644 --- a/packages/compositor-linux-x64-musl/package.json +++ b/packages/compositor-linux-x64-musl/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-linux-x64-musl", "os": [ "linux" diff --git a/packages/compositor-win32-x64-msvc/compositor.exe b/packages/compositor-win32-x64-msvc/compositor.exe index 6a55cb8beff..23340e28c72 100755 Binary files a/packages/compositor-win32-x64-msvc/compositor.exe and b/packages/compositor-win32-x64-msvc/compositor.exe differ diff --git a/packages/compositor-win32-x64-msvc/package.json b/packages/compositor-win32-x64-msvc/package.json index aede92c61e7..d7d4c4b3b79 100644 --- a/packages/compositor-win32-x64-msvc/package.json +++ b/packages/compositor-win32-x64-msvc/package.json @@ -1,5 +1,5 @@ { - "version": "4.0.48", + "version": "4.0.50", "name": "@remotion/compositor-win32-x64-msvc", "os": [ "win32" diff --git a/packages/core/package.json b/packages/core/package.json index d87b9570265..8b509f56b0c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "remotion", - "version": "4.0.48", + "version": "4.0.50", "description": "Render videos in React", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", diff --git a/packages/core/src/resolve-video-config.ts b/packages/core/src/resolve-video-config.ts index 416c2de2d46..58dbf2ce02c 100644 --- a/packages/core/src/resolve-video-config.ts +++ b/packages/core/src/resolve-video-config.ts @@ -125,6 +125,6 @@ export const resolveVideoConfig = ({ ...data, id: composition.id, defaultProps: composition.defaultProps ?? {}, - props: calculatedProm.props ?? composition.defaultProps ?? {}, + props: calculatedProm.props ?? fallbackProps, }; }; diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts index 9ec7e31ced3..b904a8f0fb3 100644 --- a/packages/core/src/version.ts +++ b/packages/core/src/version.ts @@ -1,2 +1,2 @@ // Automatically generated on publish -export const VERSION = '4.0.48'; +export const VERSION = '4.0.50'; diff --git a/packages/create-video/package.json b/packages/create-video/package.json index e931c691b67..2c012aee3f3 100644 --- a/packages/create-video/package.json +++ b/packages/create-video/package.json @@ -1,6 +1,6 @@ { "name": "create-video", - "version": "4.0.48", + "version": "4.0.50", "description": "", "main": "dist/index.js", "bin": { diff --git a/packages/discord-poster/package.json b/packages/discord-poster/package.json index 95cd5dc24e7..52b689a82ff 100644 --- a/packages/discord-poster/package.json +++ b/packages/discord-poster/package.json @@ -1,6 +1,6 @@ { "name": "@remotion/discord-poster", - "version": "4.0.48", + "version": "4.0.50", "license": "SEE LICENSE IN LICENSE.md", "type": "module", "scripts": { diff --git a/packages/docs/components/TableOfContents/zod-types.tsx b/packages/docs/components/TableOfContents/zod-types.tsx index 94cc87dc9cf..7022eea1d68 100644 --- a/packages/docs/components/TableOfContents/zod-types.tsx +++ b/packages/docs/components/TableOfContents/zod-types.tsx @@ -10,6 +10,10 @@ export const TableOfContents: React.FC = () => { {"zColor()"}
A Zod Type for colors
+ + {"zTextarea()"} +
A Zod Type for multiple-line text in a textarea
+
); diff --git a/packages/docs/docs/audio.md b/packages/docs/docs/audio.md index ce7117a465d..0a4eccf66b0 100644 --- a/packages/docs/docs/audio.md +++ b/packages/docs/docs/audio.md @@ -146,3 +146,14 @@ In the Remotion Studio, the volume will be limited to `1`, since the browser can - [Using audio](/docs/using-audio) - [Audio visualization](/docs/audio-visualization) - [`