create-video 3.3.33 → 3.3.35

package/dist/init.d.ts

@@ -1 +1,9 @@
+export declare const checkGitAvailability: (cwd: string, command: string) => Promise<{
+    type: 'no-git-repo';
+} | {
+    type: 'is-git-repo';
+    location: string;
+} | {
+    type: 'git-not-installed';
+}>;
 export declare const init: () => Promise<void>;

package/dist/init.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.init = void 0;
+exports.init = exports.checkGitAvailability = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const execa_1 = __importDefault(require("execa"));
 const degit_1 = require("./degit");
@@ -15,19 +15,29 @@ const patch_readme_1 = require("./patch-readme");
 const pkg_managers_1 = require("./pkg-managers");
 const resolve_project_root_1 = require("./resolve-project-root");
 const select_template_1 = require("./select-template");
-const isGitExecutableAvailable = async () => {
+const checkGitAvailability = async (cwd, command) => {
     try {
-        await (0, execa_1.default)('git', ['--version']);
-        return true;
+        const result = await (0, execa_1.default)(command, ['rev-parse', '--show-toplevel'], {
+            cwd,
+        });
+        return { type: 'is-git-repo', location: result.stdout };
     }
     catch (e) {
-        if (e.errno === 'ENOENT') {
-            log_1.Log.warn('Unable to find `git` command. `git` not in PATH.');
-            return false;
+        if (e.message.toLowerCase().includes('not a git repository')) {
+            return { type: 'no-git-repo' };
+        }
+        if (e.code === 'ENOENT') {
+            return { type: 'git-not-installed' };
         }
+        // win32
+        if (e.stderr.includes('is not recognized')) {
+            return { type: 'git-not-installed' };
+        }
+        throw e;
     }
 };
-const initGitRepoAsync = async (root) => {
+exports.checkGitAvailability = checkGitAvailability;
+const getGitStatus = async (root) => {
     // not in git tree, so let's init
     try {
         await (0, execa_1.default)('git', ['init'], { cwd: root });
@@ -49,8 +59,17 @@ const initGitRepoAsync = async (root) => {
 };
 const init = async () => {
     var _a, _b, _c, _d, _e, _f;
+    const result = await (0, exports.checkGitAvailability)(process.cwd(), 'git');
+    if (result.type === 'git-not-installed') {
+        log_1.Log.error('Git is not installed or not in the path. Install Git to continue.');
+        process.exit(1);
+    }
+    if (result.type === 'is-git-repo') {
+        log_1.Log.error(`You are already inside a Git repo (${result.location}).`);
+        log_1.Log.error('Create a Remotion project somewhere else.');
+        process.exit(1);
+    }
     const [projectRoot, folderName] = await (0, resolve_project_root_1.resolveProjectRoot)();
-    await isGitExecutableAvailable();
     const latestRemotionVersionPromise = (0, latest_remotion_version_1.getLatestRemotionVersion)();
     const selectedTemplate = await (0, select_template_1.selectTemplate)();
     const pkgManager = (0, pkg_managers_1.selectPackageManager)();
@@ -111,7 +130,7 @@ const init = async () => {
         (_f = promise.stdout) === null || _f === void 0 ? void 0 : _f.pipe(process.stdout);
         await promise;
     }
-    await initGitRepoAsync(projectRoot);
+    await getGitStatus(projectRoot);
     log_1.Log.info();
     log_1.Log.info(`Welcome to ${chalk_1.default.blueBright('Remotion')}!`);
     log_1.Log.info(`✨ Your video has been created at ${chalk_1.default.blueBright(folderName)}.`);

package/dist/test/git-status.test.d.ts

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

package/dist/test/git-status.test.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const vitest_1 = require("vitest");
+const init_1 = require("../init");
+(0, vitest_1.test)('Get git status', async () => {
+    const status = await (0, init_1.checkGitAvailability)(process.cwd(), 'git');
+    (0, vitest_1.expect)(status).toEqual({
+        type: 'is-git-repo',
+        location: path_1.default.posix
+            .join(__dirname, '..', '..', '..', '..')
+            .replace(/\\/g, '/'),
+    });
+    if (status.type !== 'is-git-repo') {
+        throw new Error('is git repo');
+    }
+    const status2 = await (0, init_1.checkGitAvailability)(path_1.default.dirname(status.location), 'git');
+    (0, vitest_1.expect)(status2).toEqual({ type: 'no-git-repo' });
+    const status3 = await (0, init_1.checkGitAvailability)(path_1.default.dirname(status.location), 'wronggitbinary');
+    (0, vitest_1.expect)(status3).toEqual({ type: 'git-not-installed' });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-video",
-	"version": "3.3.33",
+	"version": "3.3.35",
 	"description": "",
 	"main": "dist/index.js",
 	"bin": {
@@ -39,5 +39,5 @@
 		"typescript": "^4.7.0",
 		"vitest": "0.24.3"
 	},
-	"gitHead": "0356b9108673ac98c41990f192b101f7a6574ed0"
+	"gitHead": "92344ca937e4c51b8484f79528e3c38d598f7053"
 }