@remotion/cli 4.0.77 → 4.0.81

package/dist/studio.js

@@ -1,50 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.studioCommand = void 0;
-const node_crypto_1 = __importDefault(require("node:crypto"));
-const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
-const better_opn_1 = require("./better-opn");
-const chalk_1 = require("./chalk");
+const studio_1 = require("@remotion/studio");
 const config_1 = require("./config");
+const number_of_shared_audio_tags_1 = require("./config/number-of-shared-audio-tags");
 const convert_entry_point_to_serve_url_1 = require("./convert-entry-point-to-serve-url");
 const entry_point_1 = require("./entry-point");
 const get_env_1 = require("./get-env");
 const get_input_props_1 = require("./get-input-props");
-const get_network_address_1 = require("./get-network-address");
+const get_render_defaults_1 = require("./get-render-defaults");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
-const get_absolute_public_dir_1 = require("./preview-server/get-absolute-public-dir");
-const live_events_1 = require("./preview-server/live-events");
-const public_folder_1 = require("./preview-server/public-folder");
-const start_server_1 = require("./preview-server/start-server");
-const server_ready_comment_1 = require("./server-ready-comment");
-const watch_root_file_1 = require("./watch-root-file");
-const noop = () => undefined;
-const getShouldOpenBrowser = () => {
-    var _a;
-    // Minimist quirk: Adding `--no-open` flag will result in {['no-open']: false, open: true}
-    // @ts-expect-error
-    if (parse_command_line_1.parsedCli.open === false) {
-        return {
-            shouldOpenBrowser: false,
-            reasonForBrowserDecision: '--no-open specified',
-        };
-    }
-    if (((_a = process.env.BROWSER) !== null && _a !== void 0 ? _a : '').toLowerCase() === 'none') {
-        return {
-            shouldOpenBrowser: false,
-            reasonForBrowserDecision: 'env BROWSER=none was set',
-        };
-    }
-    if (config_1.ConfigInternals.getShouldOpenBrowser() === false) {
-        return { shouldOpenBrowser: false, reasonForBrowserDecision: 'Config file' };
-    }
-    return { shouldOpenBrowser: true, reasonForBrowserDecision: 'default' };
-};
+const queue_1 = require("./render-queue/queue");
 const getPort = () => {
     if (parse_command_line_1.parsedCli.port) {
         return parse_command_line_1.parsedCli.port;
@@ -56,6 +23,7 @@ const getPort = () => {
     return null;
 };
 const studioCommand = async (remotionRoot, args, logLevel) => {
+    var _a;
     const { file, reason } = (0, entry_point_1.findEntryPoint)(args, remotionRoot, logLevel);
     log_1.Log.verbose({ indent: false, logLevel }, 'Entry point:', file, 'reason:', reason);
     if (!file) {
@@ -67,7 +35,7 @@ const studioCommand = async (remotionRoot, args, logLevel) => {
     const desiredPort = getPort();
     const fullEntryPath = (0, convert_entry_point_to_serve_url_1.convertEntryPointToServeUrl)(file);
     let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
-        (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+        studio_1.StudioInternals.waitForLiveEventsListener().then((listener) => {
             inputProps = newProps;
             listener.sendEventToClient({
                 type: 'new-input-props',
@@ -76,7 +44,7 @@ const studioCommand = async (remotionRoot, args, logLevel) => {
         });
     }, logLevel);
     let envVariables = (0, get_env_1.getEnvironmentVariables)((newEnvVariables) => {
-        (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+        studio_1.StudioInternals.waitForLiveEventsListener().then((listener) => {
             envVariables = newEnvVariables;
             listener.sendEventToClient({
                 type: 'new-env-variables',
@@ -84,74 +52,34 @@ const studioCommand = async (remotionRoot, args, logLevel) => {
             });
         });
     }, logLevel);
-    const publicDir = (0, get_absolute_public_dir_1.getAbsolutePublicDir)({
-        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
-        remotionRoot,
-    });
-    const hash = node_crypto_1.default.randomBytes(6).toString('hex');
-    const outputHashPrefix = '/outputs-';
-    const outputHash = `${outputHashPrefix}${hash}`;
-    const staticHashPrefix = '/static-';
-    const staticHash = `${staticHashPrefix}${hash}`;
-    (0, public_folder_1.initPublicFolderWatch)({
-        publicDir,
-        remotionRoot,
-        onUpdate: () => {
-            (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
-                const files = (0, public_folder_1.getFiles)();
-                listener.sendEventToClient({
-                    type: 'new-public-folder',
-                    files,
-                    folderExists: files.length > 0
-                        ? publicDir
-                        : (0, node_fs_1.existsSync)(publicDir)
-                            ? publicDir
-                            : null,
-                });
-            });
-        },
-        staticHash,
-    });
-    (0, watch_root_file_1.watchRootFile)(remotionRoot);
-    const { port, liveEventsServer } = await (0, start_server_1.startServer)({
-        entry: node_path_1.default.resolve(__dirname, 'previewEntry.js'),
-        userDefinedComponent: fullEntryPath,
+    const maxTimelineTracks = config_1.ConfigInternals.getMaxTimelineTracks();
+    const keyboardShortcutsEnabled = config_1.ConfigInternals.getKeyboardShortcutsEnabled();
+    await studio_1.StudioInternals.startStudio({
+        browserArgs: parse_command_line_1.parsedCli['browser-args'],
+        browserFlag: parse_command_line_1.parsedCli.browser,
+        logLevel,
+        configValueShouldOpenBrowser: config_1.ConfigInternals.getShouldOpenBrowser(),
+        fullEntryPath,
         getCurrentInputProps: () => inputProps,
         getEnvVariables: () => envVariables,
-        port: desiredPort,
-        maxTimelineTracks: config_1.ConfigInternals.getMaxTimelineTracks(),
+        desiredPort,
+        keyboardShortcutsEnabled,
+        maxTimelineTracks,
         remotionRoot,
-        keyboardShortcutsEnabled: config_1.ConfigInternals.getKeyboardShortcutsEnabled(),
-        publicDir,
+        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
         webpackOverride: config_1.ConfigInternals.getWebpackOverrideFn(),
         poll: config_1.ConfigInternals.getWebpackPolling(),
-        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
-        staticHash,
-        staticHashPrefix,
-        outputHash,
-        outputHashPrefix,
-        logLevel,
+        getRenderDefaults: get_render_defaults_1.getRenderDefaults,
+        getRenderQueue: queue_1.getRenderQueue,
+        numberOfAudioTags: (_a = parse_command_line_1.parsedCli['number-of-shared-audio-tags']) !== null && _a !== void 0 ? _a : (0, number_of_shared_audio_tags_1.getNumberOfSharedAudioTags)(),
+        queueMethods: {
+            addJob: queue_1.addJob,
+            cancelJob: queue_1.cancelJob,
+            removeJob: queue_1.removeJob,
+        },
+        // Minimist quirk: Adding `--no-open` flag will result in {['no-open']: false, open: true}
+        // @ts-expect-error
+        parsedCliOpen: parse_command_line_1.parsedCli.open,
     });
-    (0, live_events_1.setLiveEventsListener)(liveEventsServer);
-    const networkAddress = (0, get_network_address_1.getNetworkAddress)();
-    if (networkAddress) {
-        (0, server_ready_comment_1.setServerReadyComment)(`Local: ${chalk_1.chalk.underline(`http://localhost:${port}`)}, Network: ${chalk_1.chalk.underline(`http://${networkAddress}:${port}`)}`);
-    }
-    else {
-        (0, server_ready_comment_1.setServerReadyComment)(`http://localhost:${port}`);
-    }
-    (0, server_ready_comment_1.printServerReadyComment)('Server ready');
-    const { reasonForBrowserDecision, shouldOpenBrowser } = getShouldOpenBrowser();
-    if (shouldOpenBrowser) {
-        await (0, better_opn_1.openBrowser)({
-            url: `http://localhost:${port}`,
-            browserArgs: parse_command_line_1.parsedCli['browser-args'],
-            browserFlag: parse_command_line_1.parsedCli.browser,
-        });
-    }
-    else {
-        log_1.Log.verbose({ indent: false, logLevel }, `Not opening browser, reason: ${reasonForBrowserDecision}`);
-    }
-    await new Promise(noop);
 };
 exports.studioCommand = studioCommand;

package/dist/upgrade.js

@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgrade = void 0;
 const renderer_1 = require("@remotion/renderer");
+const studio_1 = require("@remotion/studio");
 const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./config");
-const get_latest_remotion_version_1 = require("./get-latest-remotion-version");
 const list_of_remotion_packages_1 = require("./list-of-remotion-packages");
 const log_1 = require("./log");
-const get_package_manager_1 = require("./preview-server/get-package-manager");
 const getUpgradeCommand = ({ manager, packages, version, }) => {
     const pkgList = packages.map((p) => `${p}@${version}`);
     const commands = {
@@ -35,12 +34,12 @@ const upgrade = async (remotionRoot, packageManager, version) => {
         log_1.Log.info('Upgrading to specified version: ' + version);
     }
     else {
-        targetVersion = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
+        targetVersion = await studio_1.StudioInternals.getLatestRemotionVersion();
         log_1.Log.info('Newest Remotion version is', targetVersion);
     }
-    const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot, packageManager);
+    const manager = studio_1.StudioInternals.getPackageManager(remotionRoot, packageManager);
     if (manager === 'unknown') {
-        throw new Error(`No lockfile was found in your project (one of ${get_package_manager_1.lockFilePaths
+        throw new Error(`No lockfile was found in your project (one of ${studio_1.StudioInternals.lockFilePaths
             .map((p) => p.path)
             .join(', ')}). Install dependencies using your favorite manager!`);
     }

package/dist/user-passed-output-location.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputLocation = exports.getUserPassedOutputLocation = void 0;
+const studio_1 = require("@remotion/studio");
 const config_1 = require("./config");
-const get_default_out_name_1 = require("./get-default-out-name");
 const parse_command_line_1 = require("./parse-command-line");
 const getUserPassedOutputLocation = (args, uiPassedOutName) => {
     var _a, _b;
@@ -16,7 +16,7 @@ const getOutputLocation = ({ compositionId, defaultExtension, args, type, output
         typeof parse_command_line_1.parsedCli.output !== 'undefined') {
         throw new Error('Both an output flag (--output) and an output location as a positional argument were passed. Please choose only one of the ways.');
     }
-    return ((_a = (0, exports.getUserPassedOutputLocation)(args, outputLocationFromUi)) !== null && _a !== void 0 ? _a : (0, get_default_out_name_1.getDefaultOutLocation)({
+    return ((_a = (0, exports.getUserPassedOutputLocation)(args, outputLocationFromUi)) !== null && _a !== void 0 ? _a : studio_1.StudioInternals.getDefaultOutLocation({
         compositionName: compositionId,
         defaultExtension,
         type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cli",
-  "version": "4.0.77",
+  "version": "4.0.81",
   "description": "CLI for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -29,17 +29,14 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "dotenv": "9.0.2",
-    "memfs": "3.4.3",
     "minimist": "1.2.6",
-    "open": "^8.4.2",
-    "prompts": "2.4.1",
-    "semver": "7.5.3",
-    "source-map": "0.6.1",
-    "@remotion/bundler": "4.0.77",
-    "@remotion/media-utils": "4.0.77",
-    "@remotion/player": "4.0.77",
-    "@remotion/renderer": "4.0.77",
-    "remotion": "4.0.77"
+    "prompts": "2.4.2",
+    "@remotion/bundler": "4.0.81",
+    "@remotion/media-utils": "4.0.81",
+    "@remotion/player": "4.0.81",
+    "@remotion/renderer": "4.0.81",
+    "remotion": "4.0.81",
+    "@remotion/studio": "4.0.81"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -54,7 +51,6 @@
     "@types/react": "18.0.26",
     "@types/prettier": "^2.7.2",
     "@types/react-dom": "18.0.11",
-    "@types/semver": "^7.3.4",
     "eslint": "8.42.0",
     "eslint-plugin-10x": "1.5.2",
     "eslint-plugin-react": "7.32.2",
@@ -65,8 +61,8 @@
     "react-dom": "18.2.0",
     "vitest": "0.31.1",
     "zod": "^3.22.3",
-    "@remotion/zod-types": "4.0.77",
-    "@remotion/tailwind": "4.0.77"
+    "@remotion/zod-types": "4.0.81",
+    "@remotion/tailwind": "4.0.81"
   },
   "keywords": [
     "remotion",

package/styles/styles.css

@@ -1,123 +0,0 @@
-html {
-	--remotion-cli-internals-blue: #0b84f3;
-}
-
-body {
-	overscroll-behavior-y: none;
-	overscroll-behavior-x: none;
-	/* Override Chakra UI position: relative on body */
-	position: static !important;
-}
-
-.remotion-splitter {
-	user-select: none;
-}
-
-.remotion-splitter-horizontal {
-	transform: scaleY(2);
-	background: linear-gradient(
-		to bottom,
-		transparent 25%,
-		black 25%,
-		black 75%,
-		transparent
-	);
-}
-
-.remotion-splitter-horizontal:hover,
-.remotion-splitter-horizontal.remotion-splitter-active {
-	background: linear-gradient(
-		to bottom,
-		var(--remotion-cli-internals-blue),
-		var(--remotion-cli-internals-blue)
-	);
-}
-
-.remotion-splitter-vertical {
-	transform: scaleX(2);
-	background: linear-gradient(
-		to right,
-		transparent 25%,
-		black 25%,
-		black 75%,
-		transparent
-	);
-}
-
-.remotion-splitter-vertical:hover,
-.remotion-splitter-vertical.remotion-splitter-active {
-	background: linear-gradient(
-		to right,
-		var(--remotion-cli-internals-blue),
-		var(--remotion-cli-internals-blue)
-	);
-}
-
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-	-webkit-appearance: none;
-	margin: 0;
-}
-
-input:focus,
-textarea:focus,
-button:focus,
-a:focus {
-	outline: none;
-	box-shadow:
-		inset 1px 1px #555,
-		inset -1px -1px #555,
-		inset 1px -1px #555,
-		inset -1px 1px #555;
-	border-radius: 0 !important;
-}
-
-input[type='color'].__remotion_color_picker::-webkit-color-swatch-wrapper {
-	padding: 0;
-}
-input[type='color'].__remotion_color_picker::-webkit-color-swatch {
-	border: none;
-}
-
-.__remotion_thumb,
-.__remotion_thumb::-webkit-slider-thumb {
-	-webkit-appearance: none;
-	-webkit-tap-highlight-color: transparent;
-}
-
-.__remotion_thumb {
-	pointer-events: none;
-	position: absolute;
-	height: 0;
-	outline: none;
-	top: 15.5px;
-	width: 221px;
-	margin-left: -2px;
-	z-index: 2;
-}
-
-/* For Firefox browsers */
-.__remotion_thumb::-moz-range-thumb {
-	border: 1px solid black;
-	border-radius: 2px;
-	cursor: pointer;
-	height: 37px;
-	width: 10px;
-	pointer-events: all;
-	border-color: black;
-	background-color: white;
-	position: relative;
-}
-
-/* For Chrome browsers */
-.__remotion_thumb::-webkit-slider-thumb {
-	border: 1px solid black;
-	border-radius: 2px;
-	cursor: pointer;
-	height: 39px;
-	width: 10px;
-	pointer-events: all;
-	border-color: black;
-	background-color: white;
-	position: relative;
-}

package/types/global.d.ts

@@ -1,4 +0,0 @@
-declare module 'better-opn' {
-	const open: (url: string) => void;
-	export = open;
-}