create-video 3.2.22 → 3.2.23-ensure-ffmpeg.123

package/LICENSE.md

@@ -1,34 +1,34 @@
 # Remotion License
 
-Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion create videos for free (even commercial), while a company license is required for for-profit organisations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
+Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion to create videos for free (even commercial), while a company license is required for for-profit organizations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
 
 - [Free license](#free-license)
 - [Company license](#company-license)
 
 ## Free license
 
-Copyright © 2022 [Jonny Burger](https://jonny.io)
+Copyright © 2022 [Remotion](https://www.remotion.dev/)
 
 ### Eligibility
 
 You are eligible to use Remotion for free if you are:
 
 - an individual
-- a for-profit organisation with up to 3 employees
-- a non-profit or not-for-profit organisation
+- a for-profit organization with up to 3 employees
+- a non-profit or not-for-profit organization
 - evaluating whether Remotion is a good fit, and are not yet using it in a commercial way
 
 ### Allowed use cases
 
-Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify and the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
+Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
 
 ### Disallowed use cases
 
-It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, sublicensing your own derivate of Remotion.
+It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, or sublicensing your own derivate of Remotion.
 
 ### Warranty notice
 
-The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
+The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
 
 ### Support
 
@@ -36,6 +36,6 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 ## Company license
 
-You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support.
+You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
 Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.

package/dist/init.js

@@ -114,10 +114,10 @@ const init = async () => {
     await (0, open_in_editor_flow_1.openInEditorFlow)(projectRoot);
     log_1.Log.info('Get started by running');
     log_1.Log.info(chalk_1.default.blueBright(`cd ${folderName}`));
-    log_1.Log.info(chalk_1.default.blueBright((0, pkg_managers_1.getStartCommand)(pkgManager)));
+    log_1.Log.info(chalk_1.default.blueBright((0, pkg_managers_1.getDevCommand)(pkgManager, selectedTemplate)));
     log_1.Log.info('');
     log_1.Log.info('To render a video, run');
-    log_1.Log.info(chalk_1.default.blueBright((0, pkg_managers_1.getRenderCommand)(pkgManager)));
+    log_1.Log.info(chalk_1.default.blueBright((0, pkg_managers_1.getRenderCommandForTemplate)(pkgManager, selectedTemplate)));
     log_1.Log.info('');
     log_1.Log.info('Docs to get you started:', chalk_1.default.underline('https://www.remotion.dev/docs/the-fundamentals'));
     log_1.Log.info('Enjoy Remotion!');

package/dist/patch-package-json.js

@@ -14,6 +14,9 @@ exports.listOfRemotionPackages = [
     '@remotion/skia',
     '@remotion/lottie',
     '@remotion/media-utils',
+    '@remotion/motion-blur',
+    '@remotion/google-fonts',
+    '@remotion/noise',
     '@remotion/paths',
     '@remotion/babel-loader',
     '@remotion/lambda',

package/dist/patch-readme.js

@@ -22,8 +22,8 @@ const patchReadmeMd = (projectRoot, packageManager) => {
         if (c.startsWith('npm run build')) {
             return (0, pkg_managers_1.getRenderCommand)(packageManager);
         }
-        if (c.startsWith('npm run upgrade')) {
-            return (0, pkg_managers_1.getUpgradeCommand)(packageManager);
+        if (c.startsWith('npm run ')) {
+            return (0, pkg_managers_1.getRunCommand)(packageManager) + c.replace('npm run', '');
         }
         return c;
     })

package/dist/pkg-managers.d.ts

@@ -1,6 +1,9 @@
+import type { Template } from './templates';
 export declare type PackageManager = 'npm' | 'yarn' | 'pnpm';
 export declare const selectPackageManager: () => PackageManager;
 export declare const getInstallCommand: (manager: PackageManager) => "yarn" | "npm i" | "pnpm i" | undefined;
+export declare const getDevCommand: (manager: PackageManager, template: Template) => string | undefined;
+export declare const getRenderCommandForTemplate: (manager: PackageManager, template: Template) => string | undefined;
 export declare const getStartCommand: (manager: PackageManager) => "npm start" | "yarn start" | "pnpm start" | undefined;
 export declare const getRenderCommand: (manager: PackageManager) => "npm run build" | "yarn build" | "pnpm build" | undefined;
-export declare const getUpgradeCommand: (manager: PackageManager) => "npm run upgrade" | "yarn run upgrade" | "pnpm run upgrade" | undefined;
+export declare const getRunCommand: (manager: PackageManager) => "npm run" | "yarn run" | "pnpm run";

package/dist/pkg-managers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpgradeCommand = exports.getRenderCommand = exports.getStartCommand = exports.getInstallCommand = exports.selectPackageManager = void 0;
+exports.getRunCommand = exports.getRenderCommand = exports.getStartCommand = exports.getRenderCommandForTemplate = exports.getDevCommand = exports.getInstallCommand = exports.selectPackageManager = void 0;
 const path_1 = __importDefault(require("path"));
 const shouldUseYarn = () => {
     var _a, _b;
@@ -47,6 +47,23 @@ const getInstallCommand = (manager) => {
     }
 };
 exports.getInstallCommand = getInstallCommand;
+const getDevCommand = (manager, template) => {
+    if (template.cliId === 'remix') {
+        return `${(0, exports.getRunCommand)(manager)} dev`;
+    }
+    return (0, exports.getStartCommand)(manager);
+};
+exports.getDevCommand = getDevCommand;
+const getRenderCommandForTemplate = (manager, template) => {
+    if (template.cliId === 'remix') {
+        return `${(0, exports.getRunCommand)(manager)} remotion:render`;
+    }
+    if (template.cliId === 'still') {
+        return `${(0, exports.getRunCommand)(manager)} render`;
+    }
+    return (0, exports.getRenderCommand)(manager);
+};
+exports.getRenderCommandForTemplate = getRenderCommandForTemplate;
 const getStartCommand = (manager) => {
     if (manager === 'npm') {
         return `npm start`;
@@ -71,15 +88,16 @@ const getRenderCommand = (manager) => {
     }
 };
 exports.getRenderCommand = getRenderCommand;
-const getUpgradeCommand = (manager) => {
+const getRunCommand = (manager) => {
     if (manager === 'npm') {
-        return `npm run upgrade`;
+        return `npm run`;
     }
     if (manager === 'yarn') {
-        return `yarn run upgrade`;
+        return `yarn run`;
     }
     if (manager === 'pnpm') {
-        return `pnpm run upgrade`;
+        return `pnpm run`;
     }
+    throw new TypeError('unknown package manager');
 };
-exports.getUpgradeCommand = getUpgradeCommand;
+exports.getRunCommand = getRunCommand;

package/dist/templates.d.ts

@@ -1,3 +1,18 @@
+declare type DynamicTemplate = {
+    type: 'video';
+    promoVideo: {
+        muxId: string;
+        width: number;
+        height: number;
+    };
+} | {
+    type: 'image';
+    promoBanner: {
+        src: string;
+        width: number;
+        height: number;
+    };
+};
 export declare type Template = {
     shortName: string;
     description: string;
@@ -5,11 +20,8 @@ export declare type Template = {
     repoName: string;
     homePageLabel: string;
     longerDescription: string;
-    promoVideo: {
-        muxId: string;
-        width: number;
-        height: number;
-    };
-    cliId: string;
-};
+    cliId: 'hello-world' | 'javascript' | 'blank' | 'remix' | 'three' | 'still' | 'tts' | 'audiogram' | 'skia' | 'tailwind';
+    defaultBranch: string;
+} & DynamicTemplate;
 export declare const FEATURED_TEMPLATES: Template[];
+export {};

package/dist/templates.js

@@ -15,10 +15,12 @@ exports.FEATURED_TEMPLATES = [
             width: 1920,
         },
         cliId: 'hello-world',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'JavaScript',
-        shortName: 'Hello World (Javascript)',
+        shortName: 'Hello World (JavaScript)',
         org: 'remotion-dev',
         repoName: 'template-helloworld-javascript',
         description: 'The default starter template in plain JS',
@@ -29,6 +31,8 @@ exports.FEATURED_TEMPLATES = [
             height: 1080,
         },
         cliId: 'javascript',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'Blank',
@@ -43,6 +47,24 @@ exports.FEATURED_TEMPLATES = [
             height: 720,
         },
         cliId: 'blank',
+        type: 'video',
+        defaultBranch: 'main',
+    },
+    {
+        homePageLabel: 'Remix',
+        shortName: 'Remix',
+        org: 'florentpergoud',
+        repoName: 'remotion-remix-template',
+        description: 'Remotion + Remix Starter Kit',
+        longerDescription: 'A software-as-a-service starter kit which has the Remotion Player and rendering via Remotion Lambda built-in. Built with remix.run.',
+        promoBanner: {
+            width: 1280,
+            height: 720,
+            src: '/img/remix-template.png',
+        },
+        cliId: 'remix',
+        type: 'image',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: '3D',
@@ -57,6 +79,8 @@ exports.FEATURED_TEMPLATES = [
             height: 720,
         },
         cliId: 'three',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'Stills',
@@ -71,6 +95,8 @@ exports.FEATURED_TEMPLATES = [
             width: 1200,
         },
         cliId: 'still',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'TTS',
@@ -85,6 +111,8 @@ exports.FEATURED_TEMPLATES = [
             height: 1080,
         },
         cliId: 'tts',
+        type: 'video',
+        defaultBranch: 'master',
     },
     {
         homePageLabel: 'Audiogram',
@@ -99,6 +127,8 @@ exports.FEATURED_TEMPLATES = [
             width: 1080,
         },
         cliId: 'audiogram',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'Skia',
@@ -113,6 +143,8 @@ exports.FEATURED_TEMPLATES = [
             width: 1920,
         },
         cliId: 'skia',
+        type: 'video',
+        defaultBranch: 'main',
     },
     {
         homePageLabel: 'Tailwind',
@@ -127,5 +159,7 @@ exports.FEATURED_TEMPLATES = [
             width: 1280,
         },
         cliId: 'tailwind',
+        type: 'video',
+        defaultBranch: 'main',
     },
 ];

package/dist/test/validate-templates.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/validate-templates.test.js

@@ -0,0 +1,94 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const got_1 = __importDefault(require("got"));
+const vitest_1 = require("vitest");
+const templates_1 = require("../templates");
+const getFileForTemplate = (template, file) => {
+    return `https://raw.githubusercontent.com/${template.org}/${template.repoName}/${template.defaultBranch}/${file}`;
+};
+for (const template of templates_1.FEATURED_TEMPLATES) {
+    (0, vitest_1.test)(template.shortName + ' should have a valid package.json', async () => {
+        var _a, _b;
+        const packageLockJson = getFileForTemplate(template, 'package.json');
+        const res = await (0, got_1.default)(packageLockJson, {
+            throwHttpErrors: false,
+        });
+        (0, vitest_1.expect)(res.statusCode).toBe(200);
+        const body = JSON.parse(res.body);
+        if (!template.shortName.includes('Remix')) {
+            (0, vitest_1.expect)(body.scripts.build).toMatch(/render/);
+            (0, vitest_1.expect)(body.scripts.build).not.toContain('index');
+        }
+        (0, vitest_1.expect)(body.dependencies.remotion).toMatch(/^\^3/);
+        (0, vitest_1.expect)(body.dependencies['@remotion/cli']).toMatch(/^\^3/);
+        (0, vitest_1.expect)(body.dependencies.react).toMatch(/^\^?18/);
+        (0, vitest_1.expect)(body.dependencies['react-dom']).toMatch(/^\^?18/);
+        (0, vitest_1.expect)(body.devDependencies.prettier).toMatch(/^\^?2/);
+        (0, vitest_1.expect)(body.devDependencies.eslint).toMatch(/^\^?8/);
+        const eitherPluginOrConfig = ((_a = body.devDependencies['@remotion/eslint-config']) === null || _a === void 0 ? void 0 : _a.match(/^\^3/)) ||
+            ((_b = body.devDependencies['@remotion/eslint-plugin']) === null || _b === void 0 ? void 0 : _b.match(/^\^3/));
+        (0, vitest_1.expect)(eitherPluginOrConfig).toBeTruthy();
+        if (!template.shortName.includes('JavaScript')) {
+            (0, vitest_1.expect)(body.devDependencies.typescript).toMatch(/^\^?4/);
+        }
+    });
+    (0, vitest_1.test)(template.shortName + ' should not have a package-lock.json', async () => {
+        const packageLockJson = getFileForTemplate(template, 'package-lock.json');
+        const res = await (0, got_1.default)(packageLockJson, {
+            throwHttpErrors: false,
+        });
+        (0, vitest_1.expect)(res.statusCode).toBe(404);
+    });
+    (0, vitest_1.test)(template.shortName + ' should not have a yarn.lock', async () => {
+        const packageLockJson = getFileForTemplate(template, 'yarn.lock');
+        const res = await (0, got_1.default)(packageLockJson, {
+            throwHttpErrors: false,
+        });
+        (0, vitest_1.expect)(res.statusCode).toBe(404);
+    });
+    (0, vitest_1.test)(template.shortName + ' should not have a pnpm-lock.yaml', async () => {
+        const packageLockJson = getFileForTemplate(template, 'pnpm-lock.yaml');
+        const res = await (0, got_1.default)(packageLockJson, {
+            throwHttpErrors: false,
+        });
+        (0, vitest_1.expect)(res.statusCode).toBe(404);
+    });
+    (0, vitest_1.test)(template.shortName + ' should not have a standard entry point', async () => {
+        const { contents, entryPoint } = await findFile([
+            getFileForTemplate(template, 'src/index.ts'),
+            getFileForTemplate(template, 'src/index.js'),
+            getFileForTemplate(template, 'remotion/index.ts'),
+            getFileForTemplate(template, 'app/remotion/index.ts'),
+        ]);
+        (0, vitest_1.expect)(entryPoint).toBeTruthy();
+        (0, vitest_1.expect)(contents).toMatch(/RemotionRoot/);
+    });
+    (0, vitest_1.test)(template.shortName + ' should not have a standard Root file', async () => {
+        const { contents, entryPoint } = await findFile([
+            getFileForTemplate(template, 'src/Root.tsx'),
+            getFileForTemplate(template, 'src/Root.jsx'),
+            getFileForTemplate(template, 'remotion/Root.tsx'),
+            getFileForTemplate(template, 'app/remotion/Root.tsx'),
+        ]);
+        (0, vitest_1.expect)(entryPoint).toBeTruthy();
+        (0, vitest_1.expect)(contents).toMatch(/export const RemotionRoot/);
+    });
+}
+const findFile = async (options) => {
+    let entryPoint = null;
+    let contents = null;
+    for (const point of options) {
+        const res = await (0, got_1.default)(point, {
+            throwHttpErrors: false,
+        });
+        if (res.statusCode === 200) {
+            entryPoint = point;
+            contents = res.body;
+            break;
+        }
+    }
+    return { entryPoint, contents };
+};

package/package.json

@@ -1,14 +1,13 @@
 {
 	"name": "create-video",
-	"version": "3.2.22",
+	"version": "3.2.23-ensure-ffmpeg.123+3ffa18f9e",
 	"description": "",
 	"main": "dist/index.js",
 	"bin": {
 		"create-video": "bin.js"
 	},
 	"files": [
-		"dist",
-		"_template"
+		"dist"
 	],
 	"scripts": {
 		"build": "tsc -d",
@@ -30,10 +29,12 @@
 		"@types/node": "^16.7.5",
 		"@types/prompts": "^2.0.12",
 		"@types/tar": "6.1.1",
-		"eslint": "8.13.0",
+		"eslint": "8.25.0",
+		"got": "^11",
 		"prettier": "2.6.2",
 		"prettier-plugin-organize-imports": "^2.3.4",
-		"typescript": "^4.7.0"
+		"typescript": "^4.7.0",
+		"vitest": "0.24.3"
 	},
-	"gitHead": "1c35638566717760bb394e0748b088cea15faff4"
+	"gitHead": "3ffa18f9eafd4322373c51c92816c671b92e3258"
 }