@remotion/bundler 4.0.0-fastlambda.8 → 4.0.0-lambda.1

package/dist/routes.js

@@ -0,0 +1,122 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRoutes = exports.handleFavicon = exports.handleOpenInEditor = exports.handleFileSource = exports.handleProjectInfo = exports.handleFallback = exports.handleUpdate = void 0;
+const fs_1 = require("fs");
+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 project_info_1 = require("./project-info");
+const static_preview_1 = require("./static-preview");
+const update_available_1 = require("./update-available");
+const handleUpdate = async (_, response) => {
+    const data = await (0, update_available_1.isUpdateAvailableWithTimeout)();
+    response.setHeader('content-type', 'application/json');
+    response.writeHead(200);
+    response.end(JSON.stringify(data));
+};
+exports.handleUpdate = handleUpdate;
+const editorGuess = (0, open_in_editor_1.guessEditor)();
+const handleFallback = async (hash, _, response) => {
+    const edit = await editorGuess;
+    const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit[0]);
+    response.setHeader('content-type', 'text/html');
+    response.writeHead(200);
+    response.end((0, static_preview_1.indexHtml)(hash, '/', displayName));
+};
+exports.handleFallback = handleFallback;
+const handleProjectInfo = async (_, response) => {
+    const data = await (0, project_info_1.getProjectInfo)();
+    response.setHeader('content-type', 'application/json');
+    response.writeHead(200);
+    response.end(JSON.stringify(data));
+};
+exports.handleProjectInfo = handleProjectInfo;
+const handleFileSource = async (search, _, response) => {
+    if (!search.startsWith('?')) {
+        throw new Error('query must start with ?');
+    }
+    const query = new url_1.URLSearchParams(search);
+    const f = query.get('f');
+    if (typeof f !== 'string') {
+        throw new Error('must pass `f` parameter');
+    }
+    const data = await (0, get_file_source_1.getFileSource)(decodeURIComponent(f));
+    response.writeHead(200);
+    response.write(data);
+    return response.end();
+};
+exports.handleFileSource = handleFileSource;
+const handleOpenInEditor = async (req, res) => {
+    try {
+        const b = await new Promise((_resolve) => {
+            let data = '';
+            req.on('data', (chunk) => {
+                data += chunk;
+            });
+            req.on('end', () => {
+                _resolve(data.toString());
+            });
+        });
+        const body = JSON.parse(b);
+        if (!('stack' in body)) {
+            throw new TypeError('Need to pass stack');
+        }
+        const stack = body.stack;
+        const guess = await editorGuess;
+        const didOpen = await (0, open_in_editor_1.launchEditor)({
+            colNumber: stack.originalColumnNumber,
+            editor: guess[0],
+            fileName: path_1.default.resolve(process.cwd(), stack.originalFileName),
+            lineNumber: stack.originalLineNumber,
+            vsCodeNewWindow: false,
+        });
+        res.setHeader('content-type', 'application/json');
+        res.writeHead(200);
+        res.end(JSON.stringify({
+            success: didOpen,
+        }));
+    }
+    catch (err) {
+        res.setHeader('content-type', 'application/json');
+        res.writeHead(200);
+        res.end(JSON.stringify({
+            success: false,
+        }));
+    }
+};
+exports.handleOpenInEditor = handleOpenInEditor;
+const handleFavicon = (_, response) => {
+    const filePath = path_1.default.join(__dirname, '..', 'web', 'favicon.png');
+    const stat = (0, fs_1.statSync)(filePath);
+    response.writeHead(200, {
+        'Content-Type': 'image/png',
+        'Content-Length': stat.size,
+    });
+    const readStream = (0, fs_1.createReadStream)(filePath);
+    readStream.pipe(response);
+};
+exports.handleFavicon = handleFavicon;
+const handleRoutes = (hash, request, response) => {
+    const url = new URL(request.url, 'http://localhost');
+    if (url.pathname === '/api/update') {
+        return (0, exports.handleUpdate)(request, response);
+    }
+    if (url.pathname === '/api/project-info') {
+        return (0, exports.handleProjectInfo)(request, response);
+    }
+    if (url.pathname === '/api/file-source') {
+        return (0, exports.handleFileSource)(url.search, request, response);
+    }
+    if (url.pathname === '/api/open-in-editor') {
+        return (0, exports.handleOpenInEditor)(request, response);
+    }
+    if (url.pathname === '/remotion.png') {
+        return (0, exports.handleFavicon)(request, response);
+    }
+    return (0, exports.handleFallback)(hash, request, response);
+};
+exports.handleRoutes = handleRoutes;

package/dist/serve-static.d.ts

@@ -0,0 +1,26 @@
+/*!
+ * serve-static
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+import { IncomingMessage, ServerResponse } from 'http';
+/**
+ * @param {string} root
+ * @param {object} [options]
+ * @return {function}
+ * @public
+ */
+export declare const serveStatic: (root: string, options: {
+    cacheControl: true;
+    dotfiles: 'allow';
+    etag: true;
+    extensions: false;
+    fallthrough: false;
+    immutable: false;
+    index: false;
+    lastModified: true;
+    maxAge: 0;
+    redirect: true;
+}) => (req: IncomingMessage, res: ServerResponse) => void;

package/dist/serve-static.js

@@ -0,0 +1,72 @@
+"use strict";
+/*!
+ * serve-static
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serveStatic = void 0;
+const path_1 = require("path");
+const send = require('send');
+/**
+ * @param {string} root
+ * @param {object} [options]
+ * @return {function}
+ * @public
+ */
+const serveStatic = (root, options) => {
+    if (!root) {
+        throw new TypeError('root path required');
+    }
+    if (typeof root !== 'string') {
+        throw new TypeError('root path must be a string');
+    }
+    // copy options object
+    const opts = Object.create(options || null);
+    // headers listener
+    const { setHeaders } = opts;
+    if (setHeaders && typeof setHeaders !== 'function') {
+        throw new TypeError('option setHeaders must be function');
+    }
+    // setup options for send
+    opts.maxage = opts.maxage || opts.maxAge || 0;
+    opts.root = (0, path_1.resolve)(root);
+    return function (req, res) {
+        if (req.method !== 'GET' && req.method !== 'HEAD') {
+            // method not allowed
+            res.statusCode = 405;
+            res.setHeader('Allow', 'GET, HEAD');
+            res.setHeader('Content-Length', '0');
+            res.end();
+            return;
+        }
+        let path = new URL(req.url, 'http://localhost').pathname;
+        // make sure redirect occurs at mount
+        if (path === '/' && path.substr(-1) !== '/') {
+            path = '';
+        }
+        // create send stream
+        const stream = send(req, path, opts);
+        // add directory handler
+        stream.on('directory', () => {
+            res.writeHead(500);
+            res.write('Is a directory');
+            res.end();
+        });
+        // add headers listener
+        if (setHeaders) {
+            stream.on('headers', setHeaders);
+        }
+        // forward errors
+        stream.on('error', (err) => {
+            res.writeHead(500);
+            res.write(err.toString());
+            res.end();
+        });
+        // pipe
+        stream.pipe(res);
+    };
+};
+exports.serveStatic = serveStatic;

package/dist/setup-environment.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const remotion_1 = require("remotion");
 remotion_1.Internals.setupEnvVariables();
-remotion_1.Internals.setupInitialFrame();
 remotion_1.Internals.setupPuppeteerTimeout();
 remotion_1.Internals.CSSUtils.injectCSS(`
   .css-reset * {

package/dist/start-server-pure.d.ts

@@ -0,0 +1,8 @@
+import { WebpackOverrideFn } from 'remotion';
+export declare const startServerPure: (entry: string, userDefinedComponent: string, options?: {
+    webpackOverride?: WebpackOverrideFn;
+    inputProps?: object;
+    envVariables?: Record<string, string>;
+    port: number | null;
+    maxTimelineTracks?: number;
+}) => Promise<number>;

package/dist/start-server-pure.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startServerPure = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = __importDefault(require("fs"));
+const http_1 = __importDefault(require("http"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const remotion_1 = require("remotion");
+const webpack_1 = __importDefault(require("webpack"));
+const dev_middleware_1 = require("./dev-middleware");
+const get_port_1 = require("./get-port");
+const hot_middleware_1 = require("./hot-middleware");
+const routes_1 = require("./routes");
+const webpack_config_1 = require("./webpack-config");
+const startServerPure = async (entry, userDefinedComponent, options) => {
+    var _a, _b, _c, _d, _e;
+    const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
+    const config = (0, webpack_config_1.webpackConfig)({
+        entry,
+        userDefinedComponent,
+        outDir: tmpDir,
+        environment: 'development',
+        webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : remotion_1.Internals.getWebpackOverrideFn(),
+        inputProps: (_b = options === null || options === void 0 ? void 0 : options.inputProps) !== null && _b !== void 0 ? _b : {},
+        envVariables: (_c = options === null || options === void 0 ? void 0 : options.envVariables) !== null && _c !== void 0 ? _c : {},
+        maxTimelineTracks: (_d = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _d !== void 0 ? _d : 15,
+    });
+    const compiler = (0, webpack_1.default)(config);
+    const hash = `/static-${crypto_1.default.randomBytes(6).toString('hex')}`;
+    /**
+     * TODO: Put static server
+     */
+    const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler);
+    const whm = (0, hot_middleware_1.webpackHotMiddleware)(compiler);
+    const server = http_1.default.createServer((request, response) => {
+        new Promise((resolve) => {
+            wdmMiddleware(request, response, () => {
+                resolve();
+            });
+        })
+            .then(() => {
+            return new Promise((resolve) => {
+                whm(request, response, () => {
+                    resolve();
+                });
+            });
+        })
+            .then(() => {
+            (0, routes_1.handleRoutes)(hash, request, response);
+        })
+            .catch((err) => {
+            response.setHeader('content-type', 'application/json');
+            response.writeHead(500);
+            response.end(JSON.stringify({
+                err: err.message,
+            }));
+        });
+    });
+    const desiredPort = (_e = options === null || options === void 0 ? void 0 : options.port) !== null && _e !== void 0 ? _e : undefined;
+    const port = await (0, get_port_1.getDesiredPort)(desiredPort, 3000, 3100);
+    server.listen(port);
+    return port;
+};
+exports.startServerPure = startServerPure;

package/dist/start-server.d.ts

@@ -1,8 +1,8 @@
 import { WebpackOverrideFn } from 'remotion';
 export declare const startServer: (entry: string, userDefinedComponent: string, options?: {
-    webpackOverride?: WebpackOverrideFn | undefined;
-    inputProps?: object | undefined;
-    envVariables?: Record<string, string> | undefined;
-    port?: number | undefined;
-    maxTimelineTracks?: number | undefined;
-} | undefined) => Promise<number>;
+    webpackOverride?: WebpackOverrideFn;
+    inputProps?: object;
+    envVariables?: Record<string, string>;
+    port: number | null;
+    maxTimelineTracks?: number;
+}) => Promise<number>;

package/dist/start-server.js

@@ -51,7 +51,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
     }));
     app.use((0, dev_middleware_1.wdm)(compiler));
     app.use((0, hot_middleware_1.webpackHotMiddleware)(compiler));
-    app.get('/api/update', (req, res) => {
+    app.get('/api/update', (_req, res) => {
         (0, update_available_1.isUpdateAvailableWithTimeout)()
             .then((data) => {
             res.json(data);
@@ -62,7 +62,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
             });
         });
     });
-    app.get('/api/project-info', (req, res) => {
+    app.get('/api/project-info', (_req, res) => {
         (0, project_info_1.getProjectInfo)()
             .then((data) => {
             res.json(data);
@@ -115,7 +115,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
             });
         }
     });
-    app.use('favicon.png', (req, res) => {
+    app.use('favicon.png', (_req, res) => {
         res.sendFile(path_1.default.join(__dirname, '..', 'web', 'favicon.png'));
     });
     const edit = await editorGuess;
@@ -124,7 +124,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
         res.set('content-type', 'text/html');
         res.end((0, static_preview_1.indexHtml)(hash, '/', displayName));
     });
-    const desiredPort = (_e = options === null || options === void 0 ? void 0 : options.port) !== null && _e !== void 0 ? _e : remotion_1.Internals.getServerPort();
+    const desiredPort = (_e = options === null || options === void 0 ? void 0 : options.port) !== null && _e !== void 0 ? _e : undefined;
     const port = await (0, get_port_1.getDesiredPort)(desiredPort, 3000, 3100);
     app.listen(port);
     return port;

package/dist/static-server.js

@@ -0,0 +1 @@
+"use strict";

package/dist/webpack-config.d.ts

@@ -1,5 +1,5 @@
 import { WebpackConfiguration, WebpackOverrideFn } from 'remotion';
-export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, inputProps, envVariables, maxTimelineTracks, }: {
+export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, inputProps, envVariables, maxTimelineTracks, entryPoints, }: {
     entry: string;
     userDefinedComponent: string;
     outDir: string;
@@ -10,4 +10,5 @@ export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, envi
     inputProps: object;
     envVariables: Record<string, string>;
     maxTimelineTracks: number;
+    entryPoints: string[];
 }) => WebpackConfiguration;

package/dist/webpack-config.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -23,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackConfig = void 0;
-const path_1 = __importDefault(require("path"));
 const react_dom_1 = __importDefault(require("react-dom"));
 const remotion_1 = require("remotion");
 const webpack_1 = __importStar(require("webpack"));
@@ -46,7 +49,7 @@ const esbuildLoaderOptions = {
 function truthy(value) {
     return Boolean(value);
 }
-const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpackOverride = (f) => f, onProgressUpdate, enableCaching = remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED, inputProps, envVariables, maxTimelineTracks, }) => {
+const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpackOverride = (f) => f, onProgressUpdate, enableCaching = remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED, inputProps, envVariables, maxTimelineTracks, entryPoints, }) => {
     return webpackOverride({
         optimization: {
             minimize: false,
@@ -72,16 +75,14 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             ? 'cheap-module-source-map'
             : 'cheap-module-source-map',
         entry: [
-            require.resolve('./setup-environment'),
-            environment === 'development'
-                ? require.resolve('./hot-middleware/client')
-                : null,
+            // Fast Refresh must come first,
+            // because setup-environment imports ReactDOM.
+            // If React DOM is imported before Fast Refresh, Fast Refresh does not work
             environment === 'development'
                 ? require.resolve('./fast-refresh/runtime.js')
                 : null,
-            environment === 'development'
-                ? require.resolve('./error-overlay/entry-basic.js')
-                : null,
+            require.resolve('./setup-environment'),
+            ...entryPoints,
             userDefinedComponent,
             require.resolve('../react-shim.js'),
             entry,
@@ -112,11 +113,6 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             devtoolModuleFilenameTemplate: '[resource-path]',
             assetModuleFilename: environment === 'development' ? '[path][name][ext]' : '[hash][ext]',
         },
-        devServer: {
-            contentBase: path_1.default.resolve(__dirname, '..', 'web'),
-            historyApiFallback: true,
-            hot: true,
-        },
         resolve: {
             extensions: ['.ts', '.tsx', '.js', '.jsx'],
             alias: {
@@ -175,14 +171,8 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
                             : null,
                     ].filter(truthy),
                 },
-                {
-                    test: /\.js$/,
-                    enforce: 'pre',
-                    use: [require.resolve('source-map-loader')],
-                },
             ],
         },
-        ignoreWarnings: [/Failed to parse source map/],
     });
 };
 exports.webpackConfig = webpackConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/bundler",
-	"version": "4.0.0-fastlambda.8+64cb75673",
+	"version": "4.0.0-lambda.1+5a0913230",
 	"description": "Bundler for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -12,7 +12,6 @@
 	},
 	"scripts": {
 		"lint": "eslint src --ext ts,tsx",
-		"test": "jest",
 		"build": "tsc -d",
 		"watch": "tsc -w"
 	},
@@ -26,15 +25,8 @@
 	"dependencies": {
 		"css-loader": "5.2.7",
 		"esbuild": "0.14.19",
-		"execa": "5.1.1",
-		"express": "4.17.1",
-		"memfs": "3.4.0",
-		"mime-types": "2.1.34",
 		"react-refresh": "0.9.0",
-		"remotion": "4.0.0-fastlambda.8+64cb75673",
-		"semver": "7.3.4",
-		"source-map": "0.6.1",
-		"source-map-loader": "3.0.0",
+		"remotion": "4.0.0-lambda.1+5a0913230",
 		"style-loader": "2.0.0",
 		"webpack": "5.72.0"
 	},
@@ -44,13 +36,9 @@
 	},
 	"devDependencies": {
 		"@jonny/eslint-config": "3.0.259",
-		"@types/express": "^4.17.7",
-		"@types/jest": "^27.4.0",
-		"@types/mime-types": "^2.1.1",
 		"@types/node": "^16.7.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
-		"@types/semver": "^7.3.4",
 		"@types/webpack-env": "^1.16.0",
 		"@typescript-eslint/eslint-plugin": "5.18.0",
 		"@typescript-eslint/parser": "5.18.0",
@@ -58,13 +46,11 @@
 		"eslint-plugin-10x": "1.5.2",
 		"eslint-plugin-react": "7.29.4",
 		"eslint-plugin-react-hooks": "4.4.0",
-		"jest": "^27.2.4",
 		"prettier": "^2.0.5",
 		"prettier-plugin-organize-imports": "^2.3.4",
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0",
-		"ts-jest": "^27.0.5",
-		"typescript": "^4.5.5"
+		"typescript": "^4.7.0"
 	},
 	"keywords": [
 		"remotion",
@@ -77,5 +63,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "64cb756734b43bfdfae52544d40255c31a4a51c3"
+	"gitHead": "5a091323018b016b7c05adcd4d3d2a5c9df292a8"
 }