@remotion/cli 4.0.0-fastlambda.9 → 4.0.0-offthread.22

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.
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.listCompositionsCommand = void 0;
7
7
  const renderer_1 = require("@remotion/renderer");
8
8
  const path_1 = __importDefault(require("path"));
9
+ const get_cli_options_1 = require("./get-cli-options");
9
10
  const get_config_file_name_1 = require("./get-config-file-name");
10
11
  const log_1 = require("./log");
11
12
  const parse_command_line_1 = require("./parse-command-line");
@@ -33,8 +34,16 @@ const listCompositionsCommand = async () => {
33
34
  }
34
35
  const fullPath = path_1.default.join(process.cwd(), file);
35
36
  (0, get_config_file_name_1.loadConfig)();
37
+ const { browserExecutable, ffmpegExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'get-compositions' });
36
38
  const bundled = await (0, setup_cache_1.bundleOnCli)(fullPath, ['bundling']);
37
- const compositions = await (0, renderer_1.getCompositions)(bundled);
39
+ const compositions = await (0, renderer_1.getCompositions)(bundled, {
40
+ browserExecutable,
41
+ ffmpegExecutable,
42
+ chromiumOptions,
43
+ envVariables,
44
+ inputProps,
45
+ timeoutInMilliseconds: puppeteerTimeout,
46
+ });
38
47
  log_1.Log.info();
39
48
  log_1.Log.info('The following compositions are available:');
40
49
  log_1.Log.info();
@@ -2,7 +2,7 @@ import { ChromiumOptions } from '@remotion/renderer';
2
2
  import { BrowserExecutable, FrameRange } from 'remotion';
3
3
  export declare const getCliOptions: (options: {
4
4
  isLambda: boolean;
5
- type: 'still' | 'series';
5
+ type: 'still' | 'series' | 'get-compositions';
6
6
  }) => Promise<{
7
7
  puppeteerTimeout: number;
8
8
  parallelism: number | null;
@@ -124,7 +124,7 @@ const getCliOptions = async (options) => {
124
124
  frameRange,
125
125
  isLambda: options.isLambda,
126
126
  });
127
- const outputFile = options.isLambda
127
+ const outputFile = options.isLambda || options.type === 'get-compositions'
128
128
  ? null
129
129
  : (0, get_filename_1.getOutputFilename)({
130
130
  codec,
package/dist/index.d.ts CHANGED
@@ -27,7 +27,7 @@ export declare const CliInternals: {
27
27
  loadConfigFile: (configFileName: string, isJavascript: boolean) => Promise<string | null>;
28
28
  getCliOptions: (options: {
29
29
  isLambda: boolean;
30
- type: "still" | "series";
30
+ type: "still" | "series" | "get-compositions";
31
31
  }) => Promise<{
32
32
  puppeteerTimeout: number;
33
33
  parallelism: number | null;
package/dist/render.js CHANGED
@@ -37,7 +37,7 @@ const render = async () => {
37
37
  }
38
38
  log_1.Log.verbose('Browser executable: ', browserExecutable);
39
39
  await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
40
- ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
40
+ ffmpegExecutable,
41
41
  });
42
42
  const browserInstance = (0, renderer_1.openBrowser)(browser, {
43
43
  browserExecutable,
@@ -53,7 +53,32 @@ const render = async () => {
53
53
  const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
54
54
  ? fullPath
55
55
  : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
56
- const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(urlOrBundle);
56
+ const downloadDir = renderer_1.RenderInternals.makeAssetsDownloadTmpDir();
57
+ const onDownload = (src) => {
58
+ const id = Math.random();
59
+ const download = {
60
+ id,
61
+ name: src,
62
+ progress: 0,
63
+ };
64
+ downloads.push(download);
65
+ updateRenderProgress();
66
+ return ({ percent }) => {
67
+ download.progress = percent;
68
+ updateRenderProgress();
69
+ };
70
+ };
71
+ const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer({
72
+ webpackConfigOrServeUrl: urlOrBundle,
73
+ downloadDir,
74
+ onDownload,
75
+ onError: (err) => {
76
+ log_1.Log.error('Error occurred:');
77
+ log_1.Log.error(err);
78
+ process.exit(1);
79
+ },
80
+ ffmpegExecutable,
81
+ });
57
82
  const puppeteerInstance = await browserInstance;
58
83
  const comps = await (0, renderer_1.getCompositions)(serveUrl, {
59
84
  inputProps,
@@ -150,6 +175,7 @@ const render = async () => {
150
175
  timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
151
176
  chromiumOptions,
152
177
  scale,
178
+ ffmpegExecutable,
153
179
  });
154
180
  renderedDoneIn = Date.now() - startTime;
155
181
  updateRenderProgress();
@@ -183,20 +209,7 @@ const render = async () => {
183
209
  proResProfile,
184
210
  quality,
185
211
  serveUrl,
186
- onDownload: (src) => {
187
- const id = Math.random();
188
- const download = {
189
- id,
190
- name: src,
191
- progress: 0,
192
- };
193
- downloads.push(download);
194
- updateRenderProgress();
195
- return ({ percent }) => {
196
- download.progress = percent;
197
- updateRenderProgress();
198
- };
199
- },
212
+ onDownload,
200
213
  dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
201
214
  onStart: ({ frameCount }) => {
202
215
  totalFrames = frameCount;
package/dist/still.js CHANGED
@@ -33,7 +33,7 @@ const still = async () => {
33
33
  log_1.Log.verbose('Output file has a PNG extension, therefore setting the image format to PNG.');
34
34
  remotion_1.Config.Rendering.setImageFormat('png');
35
35
  }
36
- const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
36
+ const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, ffmpegExecutable, overwrite, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
37
37
  log_1.Log.verbose('Browser executable: ', browserExecutable);
38
38
  if (imageFormat === 'none') {
39
39
  log_1.Log.error('No image format was selected - this is probably an error in Remotion - please post your command on Github Issues for help.');
@@ -63,7 +63,20 @@ const still = async () => {
63
63
  const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
64
64
  ? Promise.resolve(fullPath)
65
65
  : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
66
- const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
66
+ const downloadDir = renderer_1.RenderInternals.makeAssetsDownloadTmpDir();
67
+ const onDownload = (src) => {
68
+ log_1.Log.info('Downloading ', src);
69
+ };
70
+ const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer({
71
+ downloadDir,
72
+ onDownload,
73
+ onError: (err) => {
74
+ log_1.Log.error(err);
75
+ process.exit(1);
76
+ },
77
+ ffmpegExecutable,
78
+ webpackConfigOrServeUrl: await urlOrBundle,
79
+ });
67
80
  const puppeteerInstance = await browserInstance;
68
81
  const comps = await (0, renderer_1.getCompositions)(serveUrl, {
69
82
  inputProps,
@@ -92,6 +105,9 @@ const still = async () => {
92
105
  chromiumOptions,
93
106
  timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
94
107
  scale,
108
+ ffmpegExecutable,
109
+ browserExecutable,
110
+ overwrite,
95
111
  });
96
112
  const closeBrowserPromise = puppeteerInstance.close();
97
113
  closeServer().catch((err) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@remotion/cli",
3
- "version": "4.0.0-fastlambda.9+8c78f400e",
3
+ "version": "4.0.0-offthread.22+0c1f87dbc",
4
4
  "description": "CLI for Remotion",
5
5
  "main": "dist/index.js",
6
6
  "sideEffects": false,
@@ -23,16 +23,16 @@
23
23
  "author": "Jonny Burger <jonny@remotion.dev>",
24
24
  "license": "SEE LICENSE IN LICENSE.md",
25
25
  "dependencies": {
26
- "@remotion/bundler": "4.0.0-fastlambda.9+8c78f400e",
27
- "@remotion/media-utils": "4.0.0-fastlambda.9+8c78f400e",
28
- "@remotion/player": "4.0.0-fastlambda.9+8c78f400e",
29
- "@remotion/renderer": "4.0.0-fastlambda.9+8c78f400e",
26
+ "@remotion/bundler": "4.0.0-offthread.22+0c1f87dbc",
27
+ "@remotion/media-utils": "4.0.0-offthread.22+0c1f87dbc",
28
+ "@remotion/player": "4.0.0-offthread.22+0c1f87dbc",
29
+ "@remotion/renderer": "4.0.0-offthread.22+0c1f87dbc",
30
30
  "better-opn": "2.1.1",
31
31
  "chalk": "4.1.2",
32
32
  "dotenv": "9.0.2",
33
33
  "execa": "5.1.1",
34
34
  "minimist": "1.2.6",
35
- "remotion": "4.0.0-fastlambda.9+8c78f400e",
35
+ "remotion": "4.0.0-offthread.22+0c1f87dbc",
36
36
  "semver": "7.3.5",
37
37
  "webpack": "5.72.0"
38
38
  },
@@ -72,5 +72,5 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "8c78f400e8fd0f5038b1874d8884f58cbacf966b"
75
+ "gitHead": "0c1f87dbc03f756647d542172cbd3c067c19154a"
76
76
  }