🎥 Make videos programmatically with React
Internal: Use local Remotion packages in ./new
JonnyBurgere508be0ef60d
diff --git a/new b/newindex d7669062f3..90332c050a 100755--- a/new+++ b/new@@ -1,8 +1,16 @@#!/usr/bin/env bunimport {randomUUID} from 'node:crypto';-import {cpSync, mkdirSync, readFileSync} from 'node:fs';+import {+ cpSync,+ existsSync,+ mkdirSync,+ readFileSync,+ readdirSync,+ writeFileSync,+} from 'node:fs';import {basename, dirname, join, relative} from 'node:path';+import {pathToFileURL} from 'node:url';import {addTailwindRootCss,addTailwindToConfig,@@ -11,6 +19,7 @@ import {createPublicFolder} from './packages/create-video/src/create-public-foldimport {patchPackageJson} from './packages/create-video/src/patch-package-json';import {patchReadmeMd} from './packages/create-video/src/patch-readme';import {FEATURED_TEMPLATES} from './packages/create-video/src/templates';+import {localPackageRootKey} from './packages/studio-server/src/helpers/get-local-package-override';const repositoryRoot = import.meta.dir;const agentPluginRoot = join(repositoryRoot, 'packages', 'agent-plugin');@@ -91,6 +100,50 @@ patchPackageJson({addTailwind: true,});+const localPackageOverrides: Record<string, string> = {};+const packagesRoot = join(repositoryRoot, 'packages');+for (const directory of readdirSync(packagesRoot)) {+ const packageDirectory = join(packagesRoot, directory);+ const packageJsonPath = join(packageDirectory, 'package.json');+ if (!existsSync(packageJsonPath)) {+ continue;+ }++ const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));+ if (+ packageJson.private ||+ (packageJson.name !== 'remotion' &&+ !packageJson.name?.startsWith('@remotion/'))+ ) {+ continue;+ }++ localPackageOverrides[packageJson.name] = pathToFileURL(+ packageDirectory,+ ).href;+}++const projectPackageJsonPath = join(projectRoot, 'package.json');+const projectPackageJson = JSON.parse(+ readFileSync(projectPackageJsonPath, 'utf8'),+);+for (const dependencyType of ['dependencies', 'devDependencies'] as const) {+ for (const dependency of Object.keys(+ projectPackageJson[dependencyType] ?? {},+ )) {+ const localPackageOverride = localPackageOverrides[dependency];+ if (localPackageOverride) {+ projectPackageJson[dependencyType][dependency] = localPackageOverride;+ }+ }+}++projectPackageJson[localPackageRootKey] = repositoryRoot;+writeFileSync(+ projectPackageJsonPath,+ JSON.stringify(projectPackageJson, null, 2),+);+const gitInit = Bun.spawnSync(['git', 'init', '--quiet'], {cwd: projectRoot,stderr: 'inherit',@@ -123,20 +176,6 @@ run(console.log('\nInstalling npm dependencies...');run(['npm', 'i'], projectRoot);-console.log('\nLinking the freshly built Remotion packages...');-run(- [- 'npm',- 'link',- '--no-save',- join(repositoryRoot, 'packages', 'core'),- join(repositoryRoot, 'packages', 'cli'),- join(repositoryRoot, 'packages', 'eslint-config-flat'),- join(repositoryRoot, 'packages', 'tailwind-v4'),- ],- projectRoot,-);-if (gitInit.exitCode === 0) {Bun.spawnSync(['git', 'add', '--all'], {cwd: projectRoot});Bun.spawnSync(diff --git a/packages/cli/src/add.ts b/packages/cli/src/add.tsindex 9c49c19450..1553c13281 100644--- a/packages/cli/src/add.ts+++ b/packages/cli/src/add.ts@@ -161,6 +161,14 @@ export const addCommand = async ({return `${pkg}@${EXTRA_PACKAGES[pkg]}`;}+ const localPackageOverride = StudioServerInternals.getLocalPackageOverride({+ remotionRoot,+ packageName: pkg,+ });+ if (localPackageOverride !== null) {+ return `${pkg}@${localPackageOverride}`;+ }+return `${pkg}@${targetVersion}`;});diff --git a/packages/studio-server/src/helpers/get-local-package-override.ts b/packages/studio-server/src/helpers/get-local-package-override.tsnew file mode 100644index 0000000000..04f9a534ae--- /dev/null+++ b/packages/studio-server/src/helpers/get-local-package-override.ts@@ -0,0 +1,52 @@+import fs from 'node:fs';+import path from 'node:path';+import {pathToFileURL} from 'node:url';++export const localPackageRootKey = '_remotionInternalPackageRoot';++export const getLocalPackageOverride = ({+ remotionRoot,+ packageName,+}: {+ remotionRoot: string;+ packageName: string;+}): string | null => {+ const packageJsonPath = path.join(remotionRoot, 'package.json');+ if (!fs.existsSync(packageJsonPath)) {+ return null;+ }++ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));+ const localPackageRoot = packageJson[localPackageRootKey];+ if (typeof localPackageRoot !== 'string') {+ return null;+ }++ const packagesRoot = path.join(localPackageRoot, 'packages');+ if (!fs.existsSync(packagesRoot)) {+ return null;+ }++ for (const directory of fs.readdirSync(packagesRoot)) {+ const packageDirectory = path.join(packagesRoot, directory);+ const candidatePackageJsonPath = path.join(+ packageDirectory,+ 'package.json',+ );+ if (!fs.existsSync(candidatePackageJsonPath)) {+ continue;+ }++ const candidatePackageJson = JSON.parse(+ fs.readFileSync(candidatePackageJsonPath, 'utf-8'),+ );+ if (+ candidatePackageJson.name === packageName &&+ !candidatePackageJson.private+ ) {+ return pathToFileURL(packageDirectory).href;+ }+ }++ return null;+};diff --git a/packages/studio-server/src/index.ts b/packages/studio-server/src/index.tsindex 560de19c9a..afc64ef757 100644--- a/packages/studio-server/src/index.ts+++ b/packages/studio-server/src/index.ts@@ -44,6 +44,10 @@ import {getInstalledDependencies,getInstalledDependenciesWithVersions,} from './helpers/get-installed-dependencies';+import {+ getLocalPackageOverride,+ localPackageRootKey,+} from './helpers/get-local-package-override';import {getInstallCommand} from './helpers/install-command';import {getPackageManagerSpawnOptions} from './helpers/package-manager-spawn-options';import {@@ -93,6 +97,8 @@ export const StudioServerInternals = {getInstalledDependencies,getInstalledDependenciesWithVersions,getInstallCommand,+ getLocalPackageOverride,+ localPackageRootKey,getPackageManagerSpawnOptions,addCompletedClientRender,getCompletedClientRenders,diff --git a/packages/studio-server/src/preview-server/routes/install-dependency.ts b/packages/studio-server/src/preview-server/routes/install-dependency.tsindex bf22f958a9..0ca9d12ee3 100644--- a/packages/studio-server/src/preview-server/routes/install-dependency.ts+++ b/packages/studio-server/src/preview-server/routes/install-dependency.ts@@ -8,6 +8,7 @@ import {type PackageInstallSpec,} from '@remotion/studio-shared';import {VERSION} from 'remotion/version';+import {getLocalPackageOverride} from '../../helpers/get-local-package-override';import {getInstallCommand} from '../../helpers/install-command';import {getPackageManagerSpawnOptions} from '../../helpers/package-manager-spawn-options';import type {ApiHandler} from '../api-types';@@ -85,7 +86,15 @@ export const handleInstallPackage = async ({}}- const packagesWithVersions = dependencies.map(getPackageInstallSpec);+ const packagesWithVersions = dependencies.map((dependency) => {+ const localPackageOverride = getLocalPackageOverride({+ remotionRoot,+ packageName: dependency.name,+ });+ return localPackageOverride === null+ ? getPackageInstallSpec(dependency)+ : `${dependency.name}@${localPackageOverride}`;+ });const command = getInstallCommand({manager: manager.manager,packages: packagesWithVersions,