@remotion/cli 3.2.1 → 3.2.4

package/dist/editor/components/Notifications/ServerDisconnected.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const serverDisconnectedRef: React.RefObject<{
+    setServerDisconnected: () => void;
+}>;
+export declare const ServerDisconnected: React.FC;

package/dist/editor/components/Notifications/ServerDisconnected.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServerDisconnected = exports.serverDisconnectedRef = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const container = {
+    position: 'fixed',
+    justifyContent: 'flex-end',
+    alignItems: 'flex-start',
+    display: 'flex',
+    width: '100%',
+    height: '100%',
+    flexDirection: 'column',
+    padding: 30,
+    pointerEvents: 'none',
+    backgroundColor: 'transparent',
+    fontFamily: 'SF Pro, Arial, Helvetica, sans-serif',
+};
+const message = {
+    backgroundColor: '#e74c3c',
+    color: 'white',
+    paddingLeft: 20,
+    paddingRight: 20,
+    paddingTop: 12,
+    paddingBottom: 12,
+    borderRadius: 4,
+    boxShadow: '0 2px 4px rgba(0, 0, 0, 0.4)',
+    lineHeight: 1.5,
+};
+const inlineCode = {
+    fontSize: 16,
+    fontFamily: 'monospace',
+};
+exports.serverDisconnectedRef = (0, react_1.createRef)();
+let pageIsGoingToReload = false;
+window.addEventListener('beforeunload', () => {
+    pageIsGoingToReload = true;
+});
+const ServerDisconnected = () => {
+    const [serverDisconnected, setServerDisconnected] = (0, react_1.useState)(false);
+    (0, react_1.useImperativeHandle)(exports.serverDisconnectedRef, () => {
+        return {
+            setServerDisconnected: () => {
+                setServerDisconnected(true);
+            },
+        };
+    }, []);
+    if (!serverDisconnected) {
+        return null;
+    }
+    if (pageIsGoingToReload) {
+        return null;
+    }
+    return ((0, jsx_runtime_1.jsx)("div", { style: container, className: "css-reset", children: (0, jsx_runtime_1.jsxs)("div", { style: message, children: ["The preview server has disconnected. ", (0, jsx_runtime_1.jsx)("br", {}), window.remotion_previewServerCommand ? ((0, jsx_runtime_1.jsxs)("span", { children: ["Run", ' ', (0, jsx_runtime_1.jsx)("code", { style: inlineCode, children: window.remotion_previewServerCommand }), ' ', "to run it again."] })) : ((0, jsx_runtime_1.jsx)("span", { children: "Fast refresh will not work." }))] }) }));
+};
+exports.ServerDisconnected = ServerDisconnected;

package/dist/editor/helpers/colors.d.ts

@@ -12,4 +12,4 @@ export declare const TIMELINE_BACKGROUND = "#111";
 export declare const getBackgroundFromHoverState: ({ selected, hovered, }: {
     selected: boolean;
     hovered: boolean;
-}) => "hsla(0, 0%, 100%, 0.15)" | "hsla(0, 0%, 100%, 0.25)" | "rgba(255, 255, 255, 0.06)" | "transparent";
+}) => "transparent" | "hsla(0, 0%, 100%, 0.15)" | "hsla(0, 0%, 100%, 0.25)" | "rgba(255, 255, 255, 0.06)";

package/dist/event-source.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openEventSource = void 0;
+const ServerDisconnected_1 = require("./editor/components/Notifications/ServerDisconnected");
 let source = null;
 const openEventSource = () => {
     source = new EventSource('/events');
@@ -10,5 +11,10 @@ const openEventSource = () => {
             window.location.reload();
         }
     });
+    source.addEventListener('error', () => {
+        var _a;
+        // Display an error message that the preview server has disconnected.
+        (_a = ServerDisconnected_1.serverDisconnectedRef.current) === null || _a === void 0 ? void 0 : _a.setServerDisconnected();
+    });
 };
 exports.openEventSource = openEventSource;

package/dist/preview-server/error-overlay/react-overlay/listen-to-runtime-errors.js

@@ -31,7 +31,15 @@ const crashWithFrames = (crash) => (error) => {
     var _a;
     const didHookOrderChange = error.message.startsWith('Rendered fewer hooks') ||
         error.message.startsWith('Rendered more hooks');
-    if (didHookOrderChange) {
+    const key = 'remotion.lastCrashBecauseOfHooks';
+    const previousCrashWasBecauseOfHooks = window.localStorage.getItem(key);
+    // When rendering conditional hooks, refreshing does not help.
+    // So we only refresh once.
+    const justRefreshedBecauseOfHooks = previousCrashWasBecauseOfHooks
+        ? Date.now() - Number(previousCrashWasBecauseOfHooks) < 5000
+        : false;
+    window.localStorage.setItem('remotion.lastCrashBecauseOfHooks', String(Date.now()));
+    if (didHookOrderChange && !justRefreshedBecauseOfHooks) {
         // eslint-disable-next-line no-console
         console.log('Hook order changed. Reloading app...');
         window.location.reload();

package/dist/preview-server/error-overlay/remotion-overlay/Button.js

@@ -26,6 +26,6 @@ const Button = ({ children, onClick, disabled, style }) => {
             ...(style !== null && style !== void 0 ? style : {}),
         };
     }, [style]);
-    return ((0, jsx_runtime_1.jsx)("button", { style: combined, type: "button", disabled: disabled, onClick: onClick, children: (0, jsx_runtime_1.jsx)("div", { style: buttonContainer, children: children }) }));
+    return ((0, jsx_runtime_1.jsx)("button", { style: combined, type: "button", disabled: disabled, onClick: onClick, children: (0, jsx_runtime_1.jsx)("div", { className: "css-reset", style: buttonContainer, children: children }) }));
 };
 exports.Button = Button;

package/dist/preview-server/error-overlay/remotion-overlay/CodeFrame.js

@@ -13,6 +13,8 @@ const lineNumber = {
     paddingLeft: 10,
     paddingRight: 12,
     marginRight: 12,
+    color: 'inherit',
+    fontSize: 14,
 };
 const CodeFrame = ({ source, lineNumberWidth }) => {
     return ((0, jsx_runtime_1.jsx)("div", { style: frame, children: source.map((s, j) => {

package/dist/preview-server/error-overlay/remotion-overlay/ErrorMessage.js

@@ -16,9 +16,11 @@ const container = {
     marginBottom: 15,
 };
 const messageContainer = {
+    overflow: 'hidden',
+};
+const textContainer = {
     fontSize,
     lineHeight,
-    overflow: 'hidden',
 };
 const moreLine = {
     width: '100%',
@@ -62,6 +64,6 @@ const ErrorMessage = ({ message }) => {
     const toggle = (0, react_1.useCallback)(() => {
         setExpanded((e) => !e);
     }, []);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)("div", { style: style, children: (0, jsx_runtime_1.jsx)("div", { ref: ref, children: message }) }), errorLines !== null && errorLines > maxLines ? ((0, jsx_runtime_1.jsx)("div", { style: moreLine, children: (0, jsx_runtime_1.jsx)("button", { type: "button", onClick: toggle, style: moreButton, children: (0, jsx_runtime_1.jsx)(carets_1.CaretDown, { invert: expanded }) }) })) : null] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: container, children: [(0, jsx_runtime_1.jsx)("div", { style: style, children: (0, jsx_runtime_1.jsx)("div", { ref: ref, style: textContainer, children: message }) }), errorLines !== null && errorLines > maxLines ? ((0, jsx_runtime_1.jsx)("div", { style: moreLine, children: (0, jsx_runtime_1.jsx)("button", { type: "button", onClick: toggle, style: moreButton, children: (0, jsx_runtime_1.jsx)(carets_1.CaretDown, { invert: expanded }) }) })) : null] }));
 };
 exports.ErrorMessage = ErrorMessage;

package/dist/preview-server/error-overlay/remotion-overlay/ErrorTitle.js

@@ -32,6 +32,6 @@ const spacer = {
     width: 5,
 };
 const ErrorTitle = ({ name, message, symbolicating }) => {
-    return ((0, jsx_runtime_1.jsxs)("div", { style: title, children: [(0, jsx_runtime_1.jsxs)("div", { style: left, children: [(0, jsx_runtime_1.jsx)("span", { style: errName, children: name }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsxs)("div", { style: row, children: [symbolicating ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Symbolicating_1.Symbolicating, {}), (0, jsx_runtime_1.jsx)("div", { style: spacer })] })) : null, (0, jsx_runtime_1.jsx)(ErrorMessage_1.ErrorMessage, { message: message })] })] }), (0, react_overlay_1.didUnmountReactApp)() ? null : (0, jsx_runtime_1.jsx)(DismissButton_1.DismissButton, {})] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { style: title, className: "css-reset", children: [(0, jsx_runtime_1.jsxs)("div", { style: left, children: [(0, jsx_runtime_1.jsx)("span", { style: errName, children: name }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsxs)("div", { style: row, children: [symbolicating ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Symbolicating_1.Symbolicating, {}), (0, jsx_runtime_1.jsx)("div", { style: spacer })] })) : null, (0, jsx_runtime_1.jsx)(ErrorMessage_1.ErrorMessage, { message: message })] })] }), (0, react_overlay_1.didUnmountReactApp)() ? null : (0, jsx_runtime_1.jsx)(DismissButton_1.DismissButton, {})] }));
 };
 exports.ErrorTitle = ErrorTitle;

package/dist/preview-server/error-overlay/remotion-overlay/StackFrame.js

@@ -10,6 +10,7 @@ const format_location_1 = require("./format-location");
 const location = {
     color: 'rgba(255, 255, 255, 0.6)',
     fontFamily: 'monospace',
+    fontSize: 14,
 };
 const header = {
     paddingLeft: 14,
@@ -28,6 +29,7 @@ const left = {
 };
 const fnName = {
     fontSize: 14,
+    lineHeight: 1.5,
     marginBottom: 3,
 };
 const StackElement = ({ s, lineNumberWidth, isFirst, defaultFunctionName }) => {
@@ -41,7 +43,7 @@ const StackElement = ({ s, lineNumberWidth, isFirst, defaultFunctionName }) => {
     const toggleCodeFrame = (0, react_1.useCallback)(() => {
         setShowCodeFrame((f) => !f);
     }, []);
-    return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("div", { style: header, children: [(0, jsx_runtime_1.jsxs)("div", { style: left, children: [(0, jsx_runtime_1.jsx)("div", { style: fnName, children: (_a = s.originalFunctionName) !== null && _a !== void 0 ? _a : defaultFunctionName }), s.originalFileName ? ((0, jsx_runtime_1.jsxs)("div", { style: location, children: [(0, format_location_1.formatLocation)(s.originalFileName), ":", s.originalLineNumber] })) : null] }), s.originalScriptCode && s.originalScriptCode.length > 0 ? ((0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: toggleCodeFrame, children: showCodeFrame ? (0, jsx_runtime_1.jsx)(carets_1.CaretDown, { invert: false }) : (0, jsx_runtime_1.jsx)(carets_1.CaretRight, {}) })) : null] }), (0, jsx_runtime_1.jsx)("div", { children: s.originalScriptCode &&
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "css-reset", children: [(0, jsx_runtime_1.jsxs)("div", { style: header, children: [(0, jsx_runtime_1.jsxs)("div", { style: left, children: [(0, jsx_runtime_1.jsx)("div", { style: fnName, children: (_a = s.originalFunctionName) !== null && _a !== void 0 ? _a : defaultFunctionName }), s.originalFileName ? ((0, jsx_runtime_1.jsxs)("div", { style: location, children: [(0, format_location_1.formatLocation)(s.originalFileName), ":", s.originalLineNumber] })) : null] }), s.originalScriptCode && s.originalScriptCode.length > 0 ? ((0, jsx_runtime_1.jsx)(Button_1.Button, { onClick: toggleCodeFrame, children: showCodeFrame ? (0, jsx_runtime_1.jsx)(carets_1.CaretDown, { invert: false }) : (0, jsx_runtime_1.jsx)(carets_1.CaretRight, {}) })) : null] }), (0, jsx_runtime_1.jsx)("div", { children: s.originalScriptCode &&
                     s.originalScriptCode.length > 0 &&
                     showCodeFrame ? ((0, jsx_runtime_1.jsx)(CodeFrame_1.CodeFrame, { lineNumberWidth: lineNumberWidth, source: s.originalScriptCode })) : null })] }));
 };

package/dist/preview-server/get-package-manager.d.ts

@@ -3,6 +3,7 @@ declare type LockfilePath = {
     manager: PackageManager;
     path: string;
     installCommand: string;
+    startCommand: string;
 };
 export declare const lockFilePaths: LockfilePath[];
 export declare const getPackageManager: (remotionRoot: string) => LockfilePath | 'unknown';

package/dist/preview-server/get-package-manager.js

@@ -7,16 +7,23 @@ exports.getPackageManager = exports.lockFilePaths = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 exports.lockFilePaths = [
-    { path: 'package-lock.json', manager: 'npm', installCommand: 'npm i' },
+    {
+        path: 'package-lock.json',
+        manager: 'npm',
+        installCommand: 'npm i',
+        startCommand: 'npm start',
+    },
     {
         path: 'yarn.lock',
         manager: 'yarn',
         installCommand: 'yarn add',
+        startCommand: 'yarn start',
     },
     {
         path: 'pnpm-lock.yaml',
         manager: 'pnpm',
         installCommand: 'pnpm i',
+        startCommand: 'pnpm start',
     },
 ];
 const getPackageManager = (remotionRoot) => {

package/dist/preview-server/routes.js

@@ -10,6 +10,7 @@ const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const get_file_source_1 = require("./error-overlay/react-overlay/utils/get-file-source");
 const open_in_editor_1 = require("./error-overlay/react-overlay/utils/open-in-editor");
+const get_package_manager_1 = require("./get-package-manager");
 const project_info_1 = require("./project-info");
 const serve_static_1 = require("./serve-static");
 const update_available_1 = require("./update-available");
@@ -29,12 +30,14 @@ const handleFallback = async ({ remotionRoot, hash, response, getCurrentInputPro
     const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit ? edit.command : null);
     response.setHeader('content-type', 'text/html');
     response.writeHead(200);
+    const packageManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
     response.end(bundler_1.BundlerInternals.indexHtml({
         staticHash: hash,
         baseDir: '/',
         editorName: displayName,
         inputProps: getCurrentInputProps(),
         remotionRoot,
+        previewServerCommand: packageManager === 'unknown' ? null : packageManager.startCommand,
     }));
 };
 const handleProjectInfo = async (remotionRoot, _, response) => {

package/dist/previewEntry.js

@@ -9,13 +9,19 @@ const client_1 = __importDefault(require("react-dom/client"));
 const remotion_1 = require("remotion");
 require("../styles/styles.css");
 const Editor_1 = require("./editor/components/Editor");
+const ServerDisconnected_1 = require("./editor/components/Notifications/ServerDisconnected");
 const event_source_1 = require("./event-source");
 remotion_1.Internals.CSSUtils.injectCSS(remotion_1.Internals.CSSUtils.makeDefaultCSS(null, '#1f2428'));
+const getServerDisconnectedDomElement = () => {
+    return document.getElementById('server-disconnected-overlay');
+};
 const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }));
 if (client_1.default.createRoot) {
     client_1.default.createRoot(remotion_1.Internals.getPreviewDomElement()).render(content);
+    client_1.default.createRoot(getServerDisconnectedDomElement()).render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}));
 }
 else {
     client_1.default.render((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }), remotion_1.Internals.getPreviewDomElement());
+    client_1.default.render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}), getServerDisconnectedDomElement());
 }
 (0, event_source_1.openEventSource)();

package/dist/upgrade.js

@@ -41,6 +41,7 @@ const upgrade = async (remotionRoot) => {
         '@remotion/media-utils',
         '@remotion/babel-loader',
         '@remotion/lambda',
+        '@remotion/player',
         '@remotion/preload',
         '@remotion/three',
         '@remotion/gif',

package/dist/versions.js

@@ -21,6 +21,7 @@ const packages = [
     '@remotion/babel-loader',
     '@remotion/lambda',
     '@remotion/preload',
+    '@remotion/player',
     '@remotion/three',
     '@remotion/gif',
     'remotion',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.2.1",
+	"version": "3.2.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.2.1",
-		"@remotion/media-utils": "3.2.1",
-		"@remotion/player": "3.2.1",
-		"@remotion/renderer": "3.2.1",
+		"@remotion/bundler": "3.2.4",
+		"@remotion/media-utils": "3.2.4",
+		"@remotion/player": "3.2.4",
+		"@remotion/renderer": "3.2.4",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.2.1",
+		"remotion": "3.2.4",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0c4f0e1fdd423b882bf3dbc48b50037f9d5251c8"
+	"gitHead": "ee420b99227e0e5bcf093c108e3695f5d46e3658"
 }