Skip to content

🎥 Make videos programmatically with React

Internal: Reject empty JavaScript in release tarballs

Jonny Burger69cb676fa552
diff --git a/packages/brand/src/AudioWaveformProgressComposition.tsx b/packages/brand/src/AudioWaveformProgressComposition.tsx
index a23c85becb..402026ddaf 100644
--- a/packages/brand/src/AudioWaveformProgressComposition.tsx
+++ b/packages/brand/src/AudioWaveformProgressComposition.tsx
@@ -1,17 +1,17 @@
-import { AudioWaveformProgress } from './waveform-progress.element';
-import { staticFile } from 'remotion';
import React from 'react';
+import {staticFile} from 'remotion';
+import {AudioWaveformProgress} from './waveform-progress.element';
export const AudioWaveformProgressComposition: React.FC = () => {
return (
- <>
- <AudioWaveformProgress
- audioSrc={staticFile('elements/audio-oscilloscope/remotion-made-this-picture-move.mp3')}
- durationInFrames={271}
- name="Voice Note"
- style={{ position: 'absolute' }}
- premountFor={30}
- />
- </>
+ <AudioWaveformProgress
+ audioSrc={staticFile(
+ 'elements/audio-oscilloscope/remotion-made-this-picture-move.mp3',
+ )}
+ durationInFrames={271}
+ name="Voice Note"
+ style={{position: 'absolute'}}
+ premountFor={30}
+ />
);
};
diff --git a/packages/brand/src/NewComposition.tsx b/packages/brand/src/NewComposition.tsx
index b465583537..5538f036dd 100644
--- a/packages/brand/src/NewComposition.tsx
+++ b/packages/brand/src/NewComposition.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import type React from 'react';
export const NewComposition: React.FC = () => {
return null;
diff --git a/publish.ts b/publish.ts
index 24ff421774..1773fc542c 100644
--- a/publish.ts
+++ b/publish.ts
@@ -2,10 +2,15 @@ import {
copyFileSync,
existsSync,
lstatSync,
+ mkdirSync,
+ mkdtempSync,
readdirSync,
readFileSync,
+ rmSync,
+ statSync,
unlinkSync,
} from 'node:fs';
+import {tmpdir} from 'node:os';
import path from 'node:path';
import {$} from 'bun';
import limit from 'p-limit';
@@ -15,20 +20,28 @@ import {shouldReleasePackage} from './packages/studio-shared/src/release-package
const p = limit(4);
const args = process.argv.slice(2);
const listOnly = args.includes('--list');
+const checkOnly = args.includes('--check');
const tagArg = args.find((arg) => arg.startsWith('--tag='));
const releaseTag = tagArg?.slice('--tag='.length) ?? null;
const onlyArg = args.find((arg) => arg.startsWith('--only='));
const onlyPackage = onlyArg?.slice('--only='.length) ?? null;
if (
- args.some((arg) => arg !== '--list' && arg !== tagArg && arg !== onlyArg) ||
- (listOnly && (releaseTag !== null || onlyPackage !== null)) ||
- (onlyPackage !== null && releaseTag === null) ||
+ args.some(
+ (arg) =>
+ arg !== '--list' &&
+ arg !== '--check' &&
+ arg !== tagArg &&
+ arg !== onlyArg,
+ ) ||
+ (listOnly && (checkOnly || releaseTag !== null || onlyPackage !== null)) ||
+ (checkOnly && releaseTag !== null) ||
+ (onlyPackage !== null && releaseTag === null && !checkOnly) ||
releaseTag === '' ||
onlyPackage === ''
) {
throw new Error(
- 'Usage: bun publish.ts [--list | --tag=<dist-tag> [--only=<package>]]',
+ 'Usage: bun publish.ts [--list | --check [--only=<package>] | --tag=<dist-tag> [--only=<package>]]',
);
}
@@ -47,7 +60,13 @@ const dirs = readdirSync('packages')
existsSync(path.join(process.cwd(), 'packages', dir, 'package.json')),
);
-const promises: Promise<unknown>[] = [];
+const packagesToPublish: {
+ dir: string;
+ name: string;
+ hasLicense: boolean;
+ hasTsgoBuild: boolean;
+ packagePath: string;
+}[] = [];
let foundOnlyPackage = false;
for (const dir of dirs) {
@@ -82,33 +101,135 @@ for (const dir of dirs) {
continue;
}
- promises.push(
- p(async () => {
- const licensePath = path.join(packagePath, 'LICENSE.md');
- const copiedLicense =
- packageJson.license?.includes('LICENSE.md') && !existsSync(licensePath);
-
- if (copiedLicense) {
- copyFileSync(path.join(process.cwd(), 'LICENSE.md'), licensePath);
- }
-
- try {
- if (releaseTag === null) {
- await $`bun publish --tolerate-republish`.cwd(packagePath);
- } else {
- await $`bun publish --tag=${releaseTag}`.cwd(packagePath);
- }
- } finally {
- if (copiedLicense) {
- unlinkSync(licensePath);
- }
- }
- }),
- );
+ packagesToPublish.push({
+ dir,
+ name: packageJson.name,
+ hasLicense: packageJson.license?.includes('LICENSE.md') === true,
+ hasTsgoBuild: packageJson.scripts?.make?.includes('tsgo -d') === true,
+ packagePath,
+ });
}
if (onlyPackage !== null && !foundOnlyPackage) {
throw new Error(`No releasable package named ${onlyPackage}`);
}
-await Promise.all(promises);
+if (!listOnly) {
+ const packedDir = mkdtempSync(path.join(tmpdir(), 'remotion-publish-'));
+ const validatedTarballs = new Map<string, string>();
+
+ try {
+ // Validate the exact archives that will be published. A successful tsgo build
+ // once left dist/render-queue/queue.js empty in @remotion/[email protected].
+ const preflightResults = await Promise.allSettled(
+ packagesToPublish
+ .filter(({hasTsgoBuild}) => hasTsgoBuild)
+ .map(({dir, name, hasLicense, packagePath}) =>
+ p(async () => {
+ const licensePath = path.join(packagePath, 'LICENSE.md');
+ const copiedLicense = hasLicense && !existsSync(licensePath);
+ const stagingDir = path.join(packedDir, dir);
+ mkdirSync(stagingDir);
+
+ if (copiedLicense) {
+ copyFileSync(path.join(process.cwd(), 'LICENSE.md'), licensePath);
+ }
+
+ try {
+ await $`bun pm pack --destination ${stagingDir} --quiet`.cwd(
+ packagePath,
+ );
+ const tarballName = readdirSync(stagingDir).find((file) =>
+ file.endsWith('.tgz'),
+ );
+ if (!tarballName) {
+ throw new Error(`No tarball created for ${name}`);
+ }
+
+ const tarball = path.join(stagingDir, tarballName);
+ await $`tar -xzf ${tarball} -C ${stagingDir}`.quiet();
+ const distDir = path.join(stagingDir, 'package', 'dist');
+ const jsFiles = existsSync(distDir)
+ ? readdirSync(distDir, {recursive: true}).filter((file) =>
+ file.endsWith('.js'),
+ )
+ : [];
+ if (jsFiles.length === 0) {
+ throw new Error(`No compiled JavaScript in ${name}`);
+ }
+
+ const emptyFiles = jsFiles.filter(
+ (file) => statSync(path.join(distDir, file)).size === 0,
+ );
+ if (emptyFiles.length > 0) {
+ throw new Error(
+ `Empty compiled JavaScript in ${name}: ${emptyFiles.join(', ')}`,
+ );
+ }
+
+ validatedTarballs.set(name, tarball);
+ } finally {
+ if (copiedLicense) {
+ unlinkSync(licensePath);
+ }
+ }
+ }),
+ ),
+ );
+ const preflightFailure = preflightResults.find(
+ (result) => result.status === 'rejected',
+ );
+ if (preflightFailure?.status === 'rejected') {
+ throw preflightFailure.reason;
+ }
+
+ if (checkOnly) {
+ console.log(`Validated ${validatedTarballs.size} compiled packages`);
+ } else {
+ const publishResults = await Promise.allSettled(
+ packagesToPublish.map(({name, hasLicense, packagePath}) =>
+ p(async () => {
+ const tarball = validatedTarballs.get(name);
+ const licensePath = path.join(packagePath, 'LICENSE.md');
+ const copiedLicense =
+ !tarball && hasLicense && !existsSync(licensePath);
+
+ if (copiedLicense) {
+ copyFileSync(path.join(process.cwd(), 'LICENSE.md'), licensePath);
+ }
+
+ try {
+ if (tarball) {
+ if (releaseTag === null) {
+ await $`bun publish ${tarball} --tolerate-republish`.cwd(
+ packagePath,
+ );
+ } else {
+ await $`bun publish ${tarball} --tag=${releaseTag}`.cwd(
+ packagePath,
+ );
+ }
+ } else if (releaseTag === null) {
+ await $`bun publish --tolerate-republish`.cwd(packagePath);
+ } else {
+ await $`bun publish --tag=${releaseTag}`.cwd(packagePath);
+ }
+ } finally {
+ if (copiedLicense) {
+ unlinkSync(licensePath);
+ }
+ }
+ }),
+ ),
+ );
+ const publishFailure = publishResults.find(
+ (result) => result.status === 'rejected',
+ );
+ if (publishFailure?.status === 'rejected') {
+ throw publishFailure.reason;
+ }
+ }
+ } finally {
+ rmSync(packedDir, {recursive: true, force: true});
+ }
+}