@remotion/cli 3.1.1 → 3.1.4

package/dist/editor/components/PlayPause.js

@@ -24,6 +24,7 @@ const PlayPause = ({ playbackRate, loop }) => {
     player_1.PlayerInternals.usePlayback({
         loop,
         playbackRate,
+        moveToBeginningWhenEnded: true,
     });
     const { playing, play, pause, pauseAndReturnToPlayStart, frameBack, seek, frameForward, isLastFrame, } = player_1.PlayerInternals.usePlayer();
     const isStill = (0, is_current_selected_still_1.useIsStill)();

package/dist/editor/state/render-frame.js

@@ -2,10 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderFrame = void 0;
 const renderFrame = (frame, fps) => {
-    const minutes = Math.floor(frame / fps / 60);
-    const remainingSec = frame - minutes * fps * 60;
+    const hours = Math.floor(frame / fps / 3600);
+    const remainingMinutes = frame - hours * fps * 3600;
+    const minutes = Math.floor(remainingMinutes / 60 / fps);
+    const remainingSec = frame - hours * fps * 3600 - minutes * fps * 60;
     const seconds = Math.floor(remainingSec / fps);
     const frameAfterSec = Math.round(frame % fps);
-    return `${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}.${String(frameAfterSec).padStart(2, '0')}`;
+    const hoursStr = String(hours);
+    const minutesStr = String(minutes).padStart(2, '0');
+    const secondsStr = String(seconds).padStart(2, '0');
+    const frameStr = String(frameAfterSec).padStart(2, '0');
+    if (hours > 0) {
+        return `${hoursStr}:${minutesStr}:${secondsStr}.${frameStr}`;
+    }
+    return `${minutesStr}:${secondsStr}.${frameStr}`;
 };
 exports.renderFrame = renderFrame;

package/dist/preview-server/error-overlay/react-overlay/utils/open-in-editor.d.ts

@@ -1,12 +1,16 @@
 declare const editorNames: readonly ["atom", "/Applications/Atom Beta.app/Contents/MacOS/Atom Beta", "brackets", "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl", "/Applications/Sublime Text Dev.app/Contents/SharedSupport/bin/subl", "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl", "code", "code-insiders", "vscodium", "/Applications/AppCode.app/Contents/MacOS/appcode", "/Applications/CLion.app/Contents/MacOS/clion", "/Applications/IntelliJ IDEA.app/Contents/MacOS/idea", "/Applications/PhpStorm.app/Contents/MacOS/phpstorm", "/Applications/PyCharm.app/Contents/MacOS/pycharm", "/Applications/PyCharm CE.app/Contents/MacOS/pycharm", "/Applications/RubyMine.app/Contents/MacOS/rubymine", "/Applications/WebStorm.app/Contents/MacOS/webstorm", "/Applications/GoLand.app/Contents/MacOS/goland", "/Applications/Rider.app/Contents/MacOS/rider", "mvim", "emacs", "gvim", "idea", "phpstorm", "pycharm", "rubymine", "sublime_text", "vim", "webstorm", "goland", "rider", "Brackets.exe", "Code.exe", "Code - Insiders.exe", "VSCodium.exe", "atom.exe", "sublime_text.exe", "notepad++.exe", "clion.exe", "clion64.exe", "idea.exe", "idea64.exe", "phpstorm.exe", "phpstorm64.exe", "pycharm.exe", "pycharm64.exe", "rubymine.exe", "rubymine64.exe", "webstorm.exe", "webstorm64.exe", "goland.exe", "goland64.exe", "rider.exe", "rider64.exe", "nano"];
-export declare const getDisplayNameForEditor: (editor: Editor | undefined) => string | null;
+export declare const getDisplayNameForEditor: (editor: Editor | null) => string | null;
 declare type Editor = typeof editorNames[number];
-export declare function guessEditor(): Promise<Editor[]>;
+declare type ProcessAndCommand = {
+    process: string;
+    command: Editor;
+};
+export declare function guessEditor(): Promise<ProcessAndCommand[]>;
 export declare function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }: {
     fileName: string;
     lineNumber: number;
     colNumber: number;
-    editor: Editor;
+    editor: ProcessAndCommand;
     vsCodeNewWindow: boolean;
 }): Promise<boolean>;
 export {};

package/dist/preview-server/error-overlay/react-overlay/utils/open-in-editor.js

@@ -321,7 +321,10 @@ async function guessEditor() {
             for (let i = 0; i < processNames.length; i++) {
                 const processName = processNames[i];
                 if (output.indexOf(processName) !== -1) {
-                    availableEditors.push(COMMON_EDITORS_OSX[processName]);
+                    availableEditors.push({
+                        process: processName,
+                        command: COMMON_EDITORS_OSX[processName],
+                    });
                 }
             }
             return availableEditors;
@@ -335,7 +338,10 @@ async function guessEditor() {
                 const processPath = runningProcesses[i].trim();
                 const processName = path_1.default.basename(processPath);
                 if (COMMON_EDITORS_WIN.indexOf(processName) !== -1) {
-                    availableEditors.push(processPath);
+                    availableEditors.push({
+                        process: processPath,
+                        command: processPath,
+                    });
                 }
             }
             return availableEditors;
@@ -349,7 +355,10 @@ async function guessEditor() {
             for (let i = 0; i < processNames.length; i++) {
                 const processName = processNames[i];
                 if (output.indexOf(processName) !== -1) {
-                    availableEditors.push(COMMON_EDITORS_LINUX[processName]);
+                    availableEditors.push({
+                        process: processName,
+                        command: COMMON_EDITORS_LINUX[processName],
+                    });
                 }
             }
             return availableEditors;
@@ -360,32 +369,42 @@ async function guessEditor() {
     }
     // Last resort, use old skool env vars
     if (process.env.VISUAL) {
-        return [process.env.VISUAL];
+        return [
+            {
+                process: process.env.VISUAL,
+                command: process.env.VISUAL,
+            },
+        ];
     }
     if (process.env.EDITOR) {
-        return [process.env.EDITOR];
+        return [
+            {
+                process: process.env.EDITOR,
+                command: process.env.EDITOR,
+            },
+        ];
     }
     return [];
 }
 exports.guessEditor = guessEditor;
 let _childProcess = null;
-function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }) {
+async function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }) {
     if (!fs_1.default.existsSync(fileName)) {
-        return Promise.resolve(false);
+        return false;
     }
     // Sanitize lineNumber to prevent malicious use on win32
     // via: https://github.com/nodejs/node/blob/c3bb4b1aa5e907d489619fb43d233c3336bfc03d/lib/child_process.js#L333
     // and it should be a positive integer
     if (!(Number.isInteger(lineNumber) && lineNumber > 0)) {
-        return Promise.resolve(false);
+        return false;
     }
     // colNumber is optional, but should be a positive integer too
     // default is 1
     if (!(Number.isInteger(colNumber) && colNumber > 0)) {
         colNumber = 1;
     }
-    if (editor.toLowerCase() === 'none') {
-        return Promise.resolve(false);
+    if (editor.command.toLowerCase() === 'none') {
+        return false;
     }
     if (process.platform === 'linux' &&
         fileName.startsWith('/mnt/') &&
@@ -412,30 +431,43 @@ function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow
             'consist only of alphanumeric characters (all languages), periods, ' +
             'dashes, slashes, and underscores.');
         log_1.Log.error();
-        return Promise.resolve(false);
+        return false;
     }
-    const shouldOpenVsCodeNewWindow = isVsCodeDerivative(editor) && vsCodeNewWindow;
+    const shouldOpenVsCodeNewWindow = isVsCodeDerivative(editor.command) && vsCodeNewWindow;
     const args = shouldOpenVsCodeNewWindow
         ? ['--new-window', fileName]
         : lineNumber
-            ? getArgumentsForLineNumber(editor, fileName, String(lineNumber), colNumber)
+            ? getArgumentsForLineNumber(editor.command, fileName, String(lineNumber), colNumber)
             : [fileName];
-    if (_childProcess && isTerminalEditor(editor)) {
+    if (_childProcess && isTerminalEditor(editor.command)) {
         // There's an existing editor process already and it's attached
         // to the terminal, so go kill it. Otherwise two separate editor
         // instances attach to the stdin/stdout which gets confusing.
         _childProcess.kill('SIGKILL');
     }
+    const isWin = os_1.default.platform() === 'win32';
+    const where = isWin ? 'where' : 'which';
+    const binaryToUse = await new Promise((resolve) => {
+        if (editor.command === editor.process) {
+            resolve(editor.command);
+            return;
+        }
+        child_process_1.default.exec(`${where} "${editor.command}"`, (err) => {
+            if (err) {
+                resolve(editor.process);
+            }
+            else {
+                resolve(editor.command);
+            }
+        });
+    });
     if (process.platform === 'win32') {
         // On Windows, launch the editor in a shell because spawn can only
         // launch .exe files.
-        _childProcess = child_process_1.default.spawn('cmd.exe', ['/C', editor].concat(args), { stdio: 'inherit' });
+        _childProcess = child_process_1.default.spawn('cmd.exe', ['/C', binaryToUse].concat(args), { stdio: 'inherit', detached: true });
     }
     else {
-        _childProcess = child_process_1.default.spawn(editor, args, {
-            stdio: 'inherit',
-            detached: true,
-        });
+        _childProcess = child_process_1.default.spawn(binaryToUse, args, { stdio: 'inherit' });
     }
     _childProcess.on('exit', (errorCode) => {
         _childProcess = null;
@@ -446,6 +478,6 @@ function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow
     _childProcess.on('error', (error) => {
         log_1.Log.error('Error opening file in editor', fileName, error.message);
     });
-    return Promise.resolve(true);
+    return true;
 }
 exports.launchEditor = launchEditor;

package/dist/preview-server/routes.js

@@ -25,8 +25,8 @@ const static404 = (response) => {
     response.end('The static/ prefix has been changed, this URL is no longer valid.');
 };
 const handleFallback = async (hash, _, response, getCurrentInputProps) => {
-    const edit = await editorGuess;
-    const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit[0]);
+    const [edit] = await editorGuess;
+    const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit ? edit.command : null);
     response.setHeader('content-type', 'text/html');
     response.writeHead(200);
     response.end(bundler_1.BundlerInternals.indexHtml(hash, '/', displayName, getCurrentInputProps()));

package/dist/preview-server/start-server.js

@@ -19,7 +19,7 @@ const routes_1 = require("./routes");
 const startServer = async (entry, userDefinedComponent, options) => {
     var _a, _b, _c, _d;
     const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
-    const config = bundler_1.BundlerInternals.webpackConfig({
+    const [, config] = bundler_1.BundlerInternals.webpackConfig({
         entry,
         userDefinedComponent,
         outDir: tmpDir,

package/dist/setup-cache.js

@@ -9,10 +9,26 @@ const progress_bar_1 = require("./progress-bar");
 const bundleOnCli = async ({ fullPath, steps, }) => {
     var _a;
     const shouldCache = remotion_1.Internals.getWebpackCaching();
-    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production');
-    if (cacheExistedBefore && !shouldCache) {
+    const onProgress = (progress) => {
+        bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+            progress: progress / 100,
+            steps,
+            doneIn: null,
+        }));
+    };
+    const options = {
+        enableCaching: shouldCache,
+        webpackOverride: (_a = remotion_1.Internals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : remotion_1.Internals.defaultOverrideFunction,
+    };
+    const [hash] = bundler_1.BundlerInternals.getConfig('', fullPath, onProgress, options);
+    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production', hash);
+    if (cacheExistedBefore !== 'does-not-exist' && !shouldCache) {
         log_1.Log.info('🧹 Cache disabled but found. Deleting... ');
-        await bundler_1.BundlerInternals.clearCache('production');
+        await bundler_1.BundlerInternals.clearCache();
+    }
+    if (cacheExistedBefore === 'other-exists' && shouldCache) {
+        log_1.Log.info('🧹 Webpack config change detected. Clearing cache... ');
+        await bundler_1.BundlerInternals.clearCache();
     }
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
@@ -22,19 +38,19 @@ const bundleOnCli = async ({ fullPath, steps, }) => {
             steps,
             doneIn: null,
         }));
-    }, {
-        enableCaching: shouldCache,
-        webpackOverride: (_a = remotion_1.Internals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : remotion_1.Internals.defaultOverrideFunction,
-    });
+    }, options);
     bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
         progress: 1,
         steps,
         doneIn: Date.now() - bundleStartTime,
     }) + '\n');
     log_1.Log.verbose('Bundled under', bundled);
-    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production');
-    if (cacheExistedAfter && !cacheExistedBefore) {
-        log_1.Log.info('⚡️ Cached bundle. Subsequent renders will be faster.');
+    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production', hash) === 'exists';
+    if (cacheExistedAfter) {
+        if (cacheExistedBefore === 'does-not-exist' ||
+            cacheExistedBefore === 'other-exists') {
+            log_1.Log.info('⚡️ Cached bundle. Subsequent renders will be faster.');
+        }
     }
     return bundled;
 };

package/dist/upgrade.js

@@ -41,6 +41,7 @@ const upgrade = async () => {
         '@remotion/cli',
         '@remotion/eslint-config',
         '@remotion/renderer',
+        '@remotion/skia',
         '@remotion/media-utils',
         '@remotion/babel-loader',
         '@remotion/lambda',

package/dist/versions.js

@@ -14,6 +14,7 @@ const packages = [
     '@remotion/cli',
     '@remotion/eslint-config',
     '@remotion/renderer',
+    '@remotion/skia',
     '@remotion/media-utils',
     '@remotion/babel-loader',
     '@remotion/lambda',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.1.1",
+	"version": "3.1.4",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -23,15 +23,15 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.1.1",
-		"@remotion/media-utils": "3.1.1",
-		"@remotion/player": "3.1.1",
-		"@remotion/renderer": "3.1.1",
+		"@remotion/bundler": "3.1.4",
+		"@remotion/media-utils": "3.1.4",
+		"@remotion/player": "3.1.4",
+		"@remotion/renderer": "3.1.4",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.1.1",
+		"remotion": "3.1.4",
 		"semver": "7.3.5",
 		"source-map": "0.6.1",
 		"vitest": "^0.18.0"
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "c48f9b57f744d40f9bf868c84b0f8e165ca5e679"
+	"gitHead": "cb662e72c635e5e70c5541d85e276ce2f4075099"
 }