create-video 3.3.5 → 3.3.7

package/dist/init.js

@@ -54,6 +54,7 @@ const init = async () => {
     const latestRemotionVersionPromise = (0, latest_remotion_version_1.getLatestRemotionVersion)();
     const selectedTemplate = await (0, select_template_1.selectTemplate)();
     const pkgManager = (0, pkg_managers_1.selectPackageManager)();
+    const pkgManagerVersion = await (0, pkg_managers_1.getPackageManagerVersionOrNull)(pkgManager);
     try {
         await (0, degit_1.degit)({
             repoOrg: selectedTemplate.org,
@@ -66,6 +67,9 @@ const init = async () => {
             projectRoot,
             projectName: folderName,
             latestRemotionVersion: latestVersion,
+            packageManager: pkgManagerVersion
+                ? `${pkgManager}@${pkgManagerVersion}`
+                : null,
         });
     }
     catch (e) {

package/dist/patch-package-json.d.ts

@@ -1,6 +1,11 @@
+import type { PackageManager } from './pkg-managers';
 export declare const listOfRemotionPackages: string[];
-export declare const patchPackageJson: ({ projectRoot, projectName, latestRemotionVersion, }: {
+export declare const patchPackageJson: ({ projectRoot, projectName, latestRemotionVersion, packageManager, }: {
     projectRoot: string;
     projectName: string;
     latestRemotionVersion: string;
+    packageManager: `${PackageManager}@${string}` | null;
+}, { getPackageJson, setPackageJson, }?: {
+    getPackageJson?: ((filename: string) => string) | undefined;
+    setPackageJson?: ((filename: string, content: string) => void) | undefined;
 }) => void;

package/dist/patch-package-json.js

@@ -26,9 +26,9 @@ exports.listOfRemotionPackages = [
     '@remotion/gif',
     'remotion',
 ];
-const patchPackageJson = ({ projectRoot, projectName, latestRemotionVersion, }) => {
+const patchPackageJson = ({ projectRoot, projectName, latestRemotionVersion, packageManager, }, { getPackageJson = (filename) => fs_1.default.readFileSync(filename, 'utf-8'), setPackageJson = (filename, content) => fs_1.default.writeFileSync(filename, content), } = {}) => {
     const fileName = path_1.default.join(projectRoot, 'package.json');
-    const contents = fs_1.default.readFileSync(fileName, 'utf-8');
+    const contents = getPackageJson(fileName);
     const packageJson = JSON.parse(contents);
     const { name, dependencies, ...others } = packageJson;
     const newDependencies = Object.keys(dependencies)
@@ -45,7 +45,8 @@ const patchPackageJson = ({ projectRoot, projectName, latestRemotionVersion, })
         name: projectName,
         ...others,
         dependencies: newDependencies,
+        ...(packageManager ? { packageManager } : {}),
     }, undefined, 2);
-    fs_1.default.writeFileSync(fileName, newPackageJson);
+    setPackageJson(fileName, newPackageJson);
 };
 exports.patchPackageJson = patchPackageJson;

package/dist/pkg-managers.d.ts

@@ -7,3 +7,5 @@ export declare const getRenderCommandForTemplate: (manager: PackageManager, temp
 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 getRunCommand: (manager: PackageManager) => "npm run" | "yarn run" | "pnpm run";
+export declare const getPackageManagerVersion: (manager: PackageManager) => Promise<string>;
+export declare const getPackageManagerVersionOrNull: (manager: PackageManager) => Promise<string | null>;

package/dist/pkg-managers.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRunCommand = exports.getRenderCommand = exports.getStartCommand = exports.getRenderCommandForTemplate = exports.getDevCommand = exports.getInstallCommand = exports.selectPackageManager = void 0;
+exports.getPackageManagerVersionOrNull = exports.getPackageManagerVersion = exports.getRunCommand = exports.getRenderCommand = exports.getStartCommand = exports.getRenderCommandForTemplate = exports.getDevCommand = exports.getInstallCommand = exports.selectPackageManager = void 0;
+const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const shouldUseYarn = () => {
     var _a, _b;
@@ -101,3 +102,31 @@ const getRunCommand = (manager) => {
     throw new TypeError('unknown package manager');
 };
 exports.getRunCommand = getRunCommand;
+const getPackageManagerVersion = (manager) => {
+    const cmd = `${manager} -v`;
+    return new Promise((resolve, reject) => {
+        (0, child_process_1.exec)(cmd, (error, stdout, stderr) => {
+            if (error) {
+                reject(error);
+                return;
+            }
+            if (stderr) {
+                reject(stderr);
+                return;
+            }
+            resolve(stdout.trim());
+        });
+    });
+};
+exports.getPackageManagerVersion = getPackageManagerVersion;
+const getPackageManagerVersionOrNull = async (manager) => {
+    try {
+        const version = await (0, exports.getPackageManagerVersion)(manager);
+        return version;
+    }
+    catch (err) {
+        console.warn(`Could not determine the version of ${manager}.`);
+        return null;
+    }
+};
+exports.getPackageManagerVersionOrNull = getPackageManagerVersionOrNull;

package/dist/test/patch-package-json.test.d.ts

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

package/dist/test/patch-package-json.test.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const patch_package_json_1 = require("../patch-package-json");
+const packageManagers = ['npm', 'pnpm', 'yarn'];
+for (const packageManager of packageManagers) {
+    (0, vitest_1.test)(`Using ${packageManager} package manager provides the correct "packageManager" entry in package.json`, () => {
+        const latestRemotionVersion = '1.0.0';
+        const packageManagerVersion = '1.22.19';
+        const packageJson = {
+            name: 'my-video',
+            version: '1.0.0',
+            description: 'My Remotion video',
+            scripts: {
+                start: 'remotion preview',
+            },
+            dependencies: {
+                '@remotion/cli': 'stale-remotion-version',
+                react: '^18.0.0',
+                remotion: 'stale-remotion-version',
+            },
+            devDependencies: {
+                '@types/react': '^18.0.6',
+            },
+        };
+        let newPackageJson = null;
+        (0, patch_package_json_1.patchPackageJson)({
+            projectRoot: '/path/to/project',
+            latestRemotionVersion,
+            packageManager: `${packageManager}@${packageManagerVersion}`,
+            projectName: 'my-video',
+        }, {
+            getPackageJson: () => JSON.stringify(packageJson),
+            setPackageJson: (_, content) => {
+                newPackageJson = JSON.parse(content);
+            },
+        });
+        (0, vitest_1.expect)(newPackageJson).to.deep.equal({
+            ...packageJson,
+            dependencies: {
+                ...packageJson.dependencies,
+                '@remotion/cli': latestRemotionVersion,
+                remotion: latestRemotionVersion,
+            },
+            packageManager: `${packageManager}@${packageManagerVersion}`
+        });
+    });
+}

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

@@ -18,7 +18,8 @@ for (const template of templates_1.FEATURED_TEMPLATES) {
         });
         (0, vitest_1.expect)(res.statusCode).toBe(200);
         const body = JSON.parse(res.body);
-        if (!template.shortName.includes('Remix')) {
+        if (!template.shortName.includes('Remix') &&
+            !template.shortName.includes('Still')) {
             (0, vitest_1.expect)(body.scripts.build).toMatch(/render/);
             (0, vitest_1.expect)(body.scripts.build).not.toContain('index');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-video",
-	"version": "3.3.5",
+	"version": "3.3.7",
 	"description": "",
 	"main": "dist/index.js",
 	"bin": {
@@ -12,7 +12,8 @@
 	"scripts": {
 		"build": "tsc -d",
 		"watch": "tsc -w",
-		"lint": "eslint src --ext ts,tsx"
+		"lint": "eslint src --ext ts,tsx",
+		"test": "vitest --run"
 	},
 	"author": "",
 	"license": "SEE LICENSE IN LICENSE.md",
@@ -36,5 +37,5 @@
 		"typescript": "^4.7.0",
 		"vitest": "0.24.3"
 	},
-	"gitHead": "0a2d5f0ff4f2abf11b9a5a6d41c1ce8df67df63f"
+	"gitHead": "5a9310dd3db431e7a3e2eb2e2b3c508bbc7b258a"
 }