@remotion/cli 3.0.26 → 3.0.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/event-source-events.d.ts +6 -0
- package/dist/event-source-events.js +2 -0
- package/dist/event-source.d.ts +1 -0
- package/dist/event-source.js +14 -0
- package/dist/get-cli-options.js +1 -1
- package/dist/get-input-props.d.ts +1 -1
- package/dist/get-input-props.js +10 -1
- package/dist/preview-server/live-events.d.ts +8 -0
- package/dist/preview-server/live-events.js +37 -0
- package/dist/preview-server/routes.d.ts +4 -1
- package/dist/preview-server/routes.js +7 -4
- package/dist/preview-server/start-server.d.ts +7 -3
- package/dist/preview-server/start-server.js +15 -7
- package/dist/preview.js +28 -3
- package/dist/previewEntry.js +2 -0
- package/dist/setup-cache.js +3 -3
- package/package.json +7 -7
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const openEventSource: () => void;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.openEventSource = void 0;
|
|
4
|
+
let source = null;
|
|
5
|
+
const openEventSource = () => {
|
|
6
|
+
source = new EventSource('/events');
|
|
7
|
+
source.addEventListener('message', (event) => {
|
|
8
|
+
const newEvent = JSON.parse(event.data);
|
|
9
|
+
if (newEvent.type === 'new-input-props') {
|
|
10
|
+
window.location.reload();
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
};
|
|
14
|
+
exports.openEventSource = openEventSource;
|
package/dist/get-cli-options.js
CHANGED
|
@@ -159,7 +159,7 @@ const getCliOptions = async (options) => {
|
|
|
159
159
|
shouldOutputImageSequence,
|
|
160
160
|
codec,
|
|
161
161
|
overwrite: remotion_1.Internals.getShouldOverwrite(),
|
|
162
|
-
inputProps: (0, get_input_props_1.getInputProps)(),
|
|
162
|
+
inputProps: (0, get_input_props_1.getInputProps)(() => undefined),
|
|
163
163
|
envVariables: await (0, get_env_1.getEnvironmentVariables)(),
|
|
164
164
|
quality: remotion_1.Internals.getQuality(),
|
|
165
165
|
absoluteOutputFile: outputFile
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const getInputProps: () => object;
|
|
1
|
+
export declare const getInputProps: (onUpdate: (newProps: object) => void) => object;
|
package/dist/get-input-props.js
CHANGED
|
@@ -9,7 +9,7 @@ const os_1 = __importDefault(require("os"));
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const log_1 = require("./log");
|
|
11
11
|
const parse_command_line_1 = require("./parse-command-line");
|
|
12
|
-
const getInputProps = () => {
|
|
12
|
+
const getInputProps = (onUpdate) => {
|
|
13
13
|
if (!parse_command_line_1.parsedCli.props) {
|
|
14
14
|
return {};
|
|
15
15
|
}
|
|
@@ -17,6 +17,15 @@ const getInputProps = () => {
|
|
|
17
17
|
try {
|
|
18
18
|
if (fs_1.default.existsSync(jsonFile)) {
|
|
19
19
|
const rawJsonData = fs_1.default.readFileSync(jsonFile, 'utf-8');
|
|
20
|
+
fs_1.default.watchFile(jsonFile, { interval: 100 }, () => {
|
|
21
|
+
try {
|
|
22
|
+
onUpdate(JSON.parse(fs_1.default.readFileSync(jsonFile, 'utf-8')));
|
|
23
|
+
log_1.Log.info(`Updated input props from ${jsonFile}.`);
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
log_1.Log.error(`${jsonFile} contains invalid JSON. Did not apply new input props.`);
|
|
27
|
+
}
|
|
28
|
+
});
|
|
20
29
|
return JSON.parse(rawJsonData);
|
|
21
30
|
}
|
|
22
31
|
return JSON.parse(parse_command_line_1.parsedCli.props);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import type { IncomingMessage, ServerResponse } from 'http';
|
|
3
|
+
import type { EventSourceEvent } from '../event-source-events';
|
|
4
|
+
export declare type LiveEventsServer = {
|
|
5
|
+
sendEventToClient: (event: EventSourceEvent) => void;
|
|
6
|
+
router: (request: IncomingMessage, response: ServerResponse) => void;
|
|
7
|
+
};
|
|
8
|
+
export declare const makeLiveEventsRouter: () => LiveEventsServer;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeLiveEventsRouter = void 0;
|
|
4
|
+
const serializeMessage = (message) => {
|
|
5
|
+
return `data: ${JSON.stringify(message)}\n\n`;
|
|
6
|
+
};
|
|
7
|
+
const makeLiveEventsRouter = () => {
|
|
8
|
+
let clients = [];
|
|
9
|
+
const router = (request, response) => {
|
|
10
|
+
const headers = {
|
|
11
|
+
'content-type': 'text/event-stream',
|
|
12
|
+
connection: 'keep-alive',
|
|
13
|
+
'cache-control': 'no-cache',
|
|
14
|
+
};
|
|
15
|
+
response.writeHead(200, headers);
|
|
16
|
+
response.write(serializeMessage({ type: 'init' }));
|
|
17
|
+
const clientId = String(Math.random());
|
|
18
|
+
const newClient = {
|
|
19
|
+
id: clientId,
|
|
20
|
+
response,
|
|
21
|
+
};
|
|
22
|
+
clients.push(newClient);
|
|
23
|
+
request.on('close', () => {
|
|
24
|
+
clients = clients.filter((client) => client.id !== clientId);
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
const sendEventToClient = (event) => {
|
|
28
|
+
clients.forEach((client) => {
|
|
29
|
+
client.response.write(serializeMessage(event));
|
|
30
|
+
});
|
|
31
|
+
};
|
|
32
|
+
return {
|
|
33
|
+
sendEventToClient,
|
|
34
|
+
router,
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
exports.makeLiveEventsRouter = makeLiveEventsRouter;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'http';
|
|
2
|
-
|
|
2
|
+
import type { LiveEventsServer } from './live-events';
|
|
3
|
+
export declare const handleRoutes: ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, }: {
|
|
3
4
|
hash: string;
|
|
4
5
|
hashPrefix: string;
|
|
5
6
|
request: IncomingMessage;
|
|
6
7
|
response: ServerResponse;
|
|
8
|
+
liveEventsServer: LiveEventsServer;
|
|
9
|
+
getCurrentInputProps: () => object;
|
|
7
10
|
}) => void | Promise<void>;
|
|
@@ -24,12 +24,12 @@ const static404 = (response) => {
|
|
|
24
24
|
response.writeHead(404);
|
|
25
25
|
response.end('The static/ prefix has been changed, this URL is no longer valid.');
|
|
26
26
|
};
|
|
27
|
-
const handleFallback = async (hash, _, response) => {
|
|
27
|
+
const handleFallback = async (hash, _, response, getCurrentInputProps) => {
|
|
28
28
|
const edit = await editorGuess;
|
|
29
29
|
const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit[0]);
|
|
30
30
|
response.setHeader('content-type', 'text/html');
|
|
31
31
|
response.writeHead(200);
|
|
32
|
-
response.end(bundler_1.BundlerInternals.indexHtml(hash, '/', displayName));
|
|
32
|
+
response.end(bundler_1.BundlerInternals.indexHtml(hash, '/', displayName, getCurrentInputProps()));
|
|
33
33
|
};
|
|
34
34
|
const handleProjectInfo = async (_, response) => {
|
|
35
35
|
const data = await (0, project_info_1.getProjectInfo)();
|
|
@@ -99,7 +99,7 @@ const handleFavicon = (_, response) => {
|
|
|
99
99
|
const readStream = (0, fs_1.createReadStream)(filePath);
|
|
100
100
|
readStream.pipe(response);
|
|
101
101
|
};
|
|
102
|
-
const handleRoutes = ({ hash, hashPrefix, request, response, }) => {
|
|
102
|
+
const handleRoutes = ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, }) => {
|
|
103
103
|
const url = new URL(request.url, 'http://localhost');
|
|
104
104
|
if (url.pathname === '/api/update') {
|
|
105
105
|
return handleUpdate(request, response);
|
|
@@ -116,6 +116,9 @@ const handleRoutes = ({ hash, hashPrefix, request, response, }) => {
|
|
|
116
116
|
if (url.pathname === '/remotion.png') {
|
|
117
117
|
return handleFavicon(request, response);
|
|
118
118
|
}
|
|
119
|
+
if (url.pathname === '/events') {
|
|
120
|
+
return liveEventsServer.router(request, response);
|
|
121
|
+
}
|
|
119
122
|
if (url.pathname.startsWith(hash)) {
|
|
120
123
|
const root = path_1.default.join(process.cwd(), 'public');
|
|
121
124
|
return (0, serve_static_1.serveStatic)(root, hash, request, response);
|
|
@@ -123,6 +126,6 @@ const handleRoutes = ({ hash, hashPrefix, request, response, }) => {
|
|
|
123
126
|
if (url.pathname.startsWith(hashPrefix)) {
|
|
124
127
|
return static404(response);
|
|
125
128
|
}
|
|
126
|
-
return handleFallback(hash, request, response);
|
|
129
|
+
return handleFallback(hash, request, response, getCurrentInputProps);
|
|
127
130
|
};
|
|
128
131
|
exports.handleRoutes = handleRoutes;
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import type { WebpackOverrideFn } from 'remotion';
|
|
2
|
-
|
|
2
|
+
import type { LiveEventsServer } from './live-events';
|
|
3
|
+
export declare const startServer: (entry: string, userDefinedComponent: string, options: {
|
|
3
4
|
webpackOverride?: WebpackOverrideFn;
|
|
4
|
-
|
|
5
|
+
getCurrentInputProps: () => object;
|
|
5
6
|
envVariables?: Record<string, string>;
|
|
6
7
|
port: number | null;
|
|
7
8
|
maxTimelineTracks?: number;
|
|
8
|
-
}) => Promise<
|
|
9
|
+
}) => Promise<{
|
|
10
|
+
port: number;
|
|
11
|
+
liveEventsServer: LiveEventsServer;
|
|
12
|
+
}>;
|
|
@@ -14,9 +14,10 @@ const path_1 = __importDefault(require("path"));
|
|
|
14
14
|
const remotion_1 = require("remotion");
|
|
15
15
|
const dev_middleware_1 = require("./dev-middleware");
|
|
16
16
|
const hot_middleware_1 = require("./hot-middleware");
|
|
17
|
+
const live_events_1 = require("./live-events");
|
|
17
18
|
const routes_1 = require("./routes");
|
|
18
19
|
const startServer = async (entry, userDefinedComponent, options) => {
|
|
19
|
-
var _a, _b, _c, _d
|
|
20
|
+
var _a, _b, _c, _d;
|
|
20
21
|
const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
|
|
21
22
|
const config = bundler_1.BundlerInternals.webpackConfig({
|
|
22
23
|
entry,
|
|
@@ -24,9 +25,8 @@ const startServer = async (entry, userDefinedComponent, options) => {
|
|
|
24
25
|
outDir: tmpDir,
|
|
25
26
|
environment: 'development',
|
|
26
27
|
webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : remotion_1.Internals.getWebpackOverrideFn(),
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
maxTimelineTracks: (_d = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _d !== void 0 ? _d : 15,
|
|
28
|
+
envVariables: (_b = options === null || options === void 0 ? void 0 : options.envVariables) !== null && _b !== void 0 ? _b : {},
|
|
29
|
+
maxTimelineTracks: (_c = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _c !== void 0 ? _c : 15,
|
|
30
30
|
entryPoints: [
|
|
31
31
|
require.resolve('./hot-middleware/client'),
|
|
32
32
|
require.resolve('./error-overlay/entry-basic.js'),
|
|
@@ -37,6 +37,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
|
|
|
37
37
|
const hash = `${hashPrefix}${crypto_1.default.randomBytes(6).toString('hex')}`;
|
|
38
38
|
const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler);
|
|
39
39
|
const whm = (0, hot_middleware_1.webpackHotMiddleware)(compiler);
|
|
40
|
+
const liveEventsServer = (0, live_events_1.makeLiveEventsRouter)();
|
|
40
41
|
const server = http_1.default.createServer((request, response) => {
|
|
41
42
|
new Promise((resolve) => {
|
|
42
43
|
wdmMiddleware(request, response, () => {
|
|
@@ -51,7 +52,14 @@ const startServer = async (entry, userDefinedComponent, options) => {
|
|
|
51
52
|
});
|
|
52
53
|
})
|
|
53
54
|
.then(() => {
|
|
54
|
-
(0, routes_1.handleRoutes)({
|
|
55
|
+
(0, routes_1.handleRoutes)({
|
|
56
|
+
hash,
|
|
57
|
+
hashPrefix,
|
|
58
|
+
request,
|
|
59
|
+
response,
|
|
60
|
+
liveEventsServer,
|
|
61
|
+
getCurrentInputProps: options.getCurrentInputProps,
|
|
62
|
+
});
|
|
55
63
|
})
|
|
56
64
|
.catch((err) => {
|
|
57
65
|
response.setHeader('content-type', 'application/json');
|
|
@@ -61,9 +69,9 @@ const startServer = async (entry, userDefinedComponent, options) => {
|
|
|
61
69
|
}));
|
|
62
70
|
});
|
|
63
71
|
});
|
|
64
|
-
const desiredPort = (
|
|
72
|
+
const desiredPort = (_d = options === null || options === void 0 ? void 0 : options.port) !== null && _d !== void 0 ? _d : undefined;
|
|
65
73
|
const port = await renderer_1.RenderInternals.getDesiredPort(desiredPort, 3000, 3100);
|
|
66
74
|
server.listen(port);
|
|
67
|
-
return port;
|
|
75
|
+
return { port, liveEventsServer };
|
|
68
76
|
};
|
|
69
77
|
exports.startServer = startServer;
|
package/dist/preview.js
CHANGED
|
@@ -14,6 +14,22 @@ const log_1 = require("./log");
|
|
|
14
14
|
const parse_command_line_1 = require("./parse-command-line");
|
|
15
15
|
const start_server_1 = require("./preview-server/start-server");
|
|
16
16
|
const noop = () => undefined;
|
|
17
|
+
let liveEventsListener = null;
|
|
18
|
+
const waiters = [];
|
|
19
|
+
const setLiveEventsListener = (listener) => {
|
|
20
|
+
liveEventsListener = listener;
|
|
21
|
+
waiters.forEach((w) => w(listener));
|
|
22
|
+
};
|
|
23
|
+
const waitForLiveEventsListener = () => {
|
|
24
|
+
if (liveEventsListener) {
|
|
25
|
+
return Promise.resolve(liveEventsListener);
|
|
26
|
+
}
|
|
27
|
+
return new Promise((resolve) => {
|
|
28
|
+
waiters.push((list) => {
|
|
29
|
+
resolve(list);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
};
|
|
17
33
|
const previewCommand = async () => {
|
|
18
34
|
const file = parse_command_line_1.parsedCli._[1];
|
|
19
35
|
if (!file) {
|
|
@@ -25,14 +41,23 @@ const previewCommand = async () => {
|
|
|
25
41
|
const { port: desiredPort } = parse_command_line_1.parsedCli;
|
|
26
42
|
const fullPath = path_1.default.join(process.cwd(), file);
|
|
27
43
|
await (0, initialize_render_cli_1.initializeRenderCli)('preview');
|
|
28
|
-
|
|
44
|
+
let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
|
|
45
|
+
waitForLiveEventsListener().then((listener) => {
|
|
46
|
+
inputProps = newProps;
|
|
47
|
+
listener.sendEventToClient({
|
|
48
|
+
type: 'new-input-props',
|
|
49
|
+
newProps,
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
});
|
|
29
53
|
const envVariables = await (0, get_env_1.getEnvironmentVariables)();
|
|
30
|
-
const port = await (0, start_server_1.startServer)(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
|
|
31
|
-
inputProps,
|
|
54
|
+
const { port, liveEventsServer } = await (0, start_server_1.startServer)(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
|
|
55
|
+
getCurrentInputProps: () => inputProps,
|
|
32
56
|
envVariables,
|
|
33
57
|
port: desiredPort,
|
|
34
58
|
maxTimelineTracks: remotion_1.Internals.getMaxTimelineTracks(),
|
|
35
59
|
});
|
|
60
|
+
setLiveEventsListener(liveEventsServer);
|
|
36
61
|
(0, better_opn_1.default)(`http://localhost:${port}`);
|
|
37
62
|
await new Promise(noop);
|
|
38
63
|
};
|
package/dist/previewEntry.js
CHANGED
|
@@ -8,6 +8,7 @@ const client_1 = __importDefault(require("react-dom/client"));
|
|
|
8
8
|
const remotion_1 = require("remotion");
|
|
9
9
|
require("../styles/styles.css");
|
|
10
10
|
const Editor_1 = require("./editor/components/Editor");
|
|
11
|
+
const event_source_1 = require("./event-source");
|
|
11
12
|
remotion_1.Internals.CSSUtils.injectCSS(remotion_1.Internals.CSSUtils.makeDefaultCSS(null, '#1f2428'));
|
|
12
13
|
const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }));
|
|
13
14
|
if (client_1.default.createRoot) {
|
|
@@ -16,3 +17,4 @@ if (client_1.default.createRoot) {
|
|
|
16
17
|
else {
|
|
17
18
|
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());
|
|
18
19
|
}
|
|
20
|
+
(0, event_source_1.openEventSource)();
|
package/dist/setup-cache.js
CHANGED
|
@@ -9,10 +9,10 @@ const progress_bar_1 = require("./progress-bar");
|
|
|
9
9
|
const bundleOnCli = async (fullPath, steps) => {
|
|
10
10
|
var _a;
|
|
11
11
|
const shouldCache = remotion_1.Internals.getWebpackCaching();
|
|
12
|
-
const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production'
|
|
12
|
+
const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production');
|
|
13
13
|
if (cacheExistedBefore && !shouldCache) {
|
|
14
14
|
log_1.Log.info('🧹 Cache disabled but found. Deleting... ');
|
|
15
|
-
await bundler_1.BundlerInternals.clearCache('production'
|
|
15
|
+
await bundler_1.BundlerInternals.clearCache('production');
|
|
16
16
|
}
|
|
17
17
|
const bundleStartTime = Date.now();
|
|
18
18
|
const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
|
|
@@ -32,7 +32,7 @@ const bundleOnCli = async (fullPath, steps) => {
|
|
|
32
32
|
doneIn: Date.now() - bundleStartTime,
|
|
33
33
|
}) + '\n');
|
|
34
34
|
log_1.Log.verbose('Bundled under', bundled);
|
|
35
|
-
const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production'
|
|
35
|
+
const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production');
|
|
36
36
|
if (cacheExistedAfter && !cacheExistedBefore) {
|
|
37
37
|
log_1.Log.info('⚡️ Cached bundle. Subsequent renders will be faster.');
|
|
38
38
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/cli",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.27",
|
|
4
4
|
"description": "CLI for Remotion",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -23,15 +23,15 @@
|
|
|
23
23
|
"author": "Jonny Burger <jonny@remotion.dev>",
|
|
24
24
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@remotion/bundler": "3.0.
|
|
27
|
-
"@remotion/media-utils": "3.0.
|
|
28
|
-
"@remotion/player": "3.0.
|
|
29
|
-
"@remotion/renderer": "3.0.
|
|
26
|
+
"@remotion/bundler": "3.0.27",
|
|
27
|
+
"@remotion/media-utils": "3.0.27",
|
|
28
|
+
"@remotion/player": "3.0.27",
|
|
29
|
+
"@remotion/renderer": "3.0.27",
|
|
30
30
|
"better-opn": "2.1.1",
|
|
31
31
|
"dotenv": "9.0.2",
|
|
32
32
|
"memfs": "3.4.3",
|
|
33
33
|
"minimist": "1.2.6",
|
|
34
|
-
"remotion": "3.0.
|
|
34
|
+
"remotion": "3.0.27",
|
|
35
35
|
"semver": "7.3.5",
|
|
36
36
|
"source-map": "0.6.1"
|
|
37
37
|
},
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "16f54241ee403a938c1af372bebc4ac83a4a24f0"
|
|
77
77
|
}
|