@multiplatform.one/cli 1.0.30 → 1.0.32

package/lib/bin/multiplatformOne.mjs

@@ -1,20 +1,22 @@
 // src/bin/multiplatformOne.ts
 import fs from "fs/promises";
+import fsSync from "fs";
 import inquirer from "inquirer";
 import os from "os";
 import path from "path";
-import pkg from "@multiplatform.one/cli/package.json";
 import { execa } from "execa";
 import { fileURLToPath } from "url";
 import { program } from "commander";
 process.env.COOKIECUTTER = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/cookiecutter.sh");
 program.name("multiplatform.one");
-program.version(pkg.version);
+program.version(JSON.parse(fsSync.readFileSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../package.json"), "utf8"))?.version);
 program.command("init").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").option("--name <name>", "the name of the project").description("init multiplatform.one").action(async (remote) => {
   if ((await execa("git", [
     "rev-parse",
     "--is-inside-work-tree"
-  ])).stdout.trim() === "true") {
+  ], {
+    reject: false
+  })).exitCode === 0) {
     throw new Error("multiplatform.one cannot be initialized inside a git repository");
   }
   const cookieCutterConfig = {
@@ -42,14 +44,18 @@ program.command("update").argument("[remote]", "the remote to use", "https://git
   if ((await execa("git", [
     "rev-parse",
     "--is-inside-work-tree"
-  ])).stdout.trim() !== "true") {
+  ], {
+    reject: false
+  })).exitCode !== 0) {
     throw new Error("multiplatform.one cannot be updated outside of a git repository");
   }
   if ((await execa("git", [
     "diff",
     "--cached",
     "--quiet"
-  ])).stdout.trim() !== "true") {
+  ], {
+    reject: false
+  })).exitCode !== 0) {
     throw new Error("multiplatform.one cannot be updated with uncommitted changes");
   }
   const projectRoot = (await execa("git", [
@@ -73,8 +79,8 @@ program.command("update").argument("[remote]", "the remote to use", "https://git
     cookieCutterConfigFile,
     remote
   ], {
-    stdio: "inherit",
-    cwd: projectRoot
+    cwd: projectRoot,
+    stdio: "inherit"
   });
 });
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "author": "BitSpur <support@bitspur.com> (https://bitspur.com)",
   "contributors": [
     {
@@ -52,7 +52,7 @@
     "@types/node": "~20.12.13",
     "tsup": "^8.1.0",
     "typescript": "~5.3.3",
-    "@multiplatform.one/utils": "^0.0.15"
+    "@multiplatform.one/utils": "^0.0.17"
   },
   "dependencies": {
     "commander": "^9.5.0",

package/src/bin/multiplatformOne.ts

@@ -20,10 +20,10 @@
  */
 
 import fs from 'fs/promises';
+import fsSync from 'fs';
 import inquirer from 'inquirer';
 import os from 'os';
 import path from 'path';
-import pkg from '@multiplatform.one/cli/package.json';
 import type { CookieCutterConfig } from '../types';
 import { execa } from 'execa';
 import { fileURLToPath } from 'url';
@@ -31,7 +31,11 @@ import { program } from 'commander';
 
 process.env.COOKIECUTTER = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/cookiecutter.sh');
 program.name('multiplatform.one');
-program.version(pkg.version);
+program.version(
+  JSON.parse(
+    fsSync.readFileSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../package.json'), 'utf8'),
+  )?.version,
+);
 
 program
   .command('init')
@@ -39,7 +43,7 @@ program
   .option('--name <name>', 'the name of the project')
   .description('init multiplatform.one')
   .action(async (remote) => {
-    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() === 'true') {
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'], { reject: false })).exitCode === 0) {
       throw new Error('multiplatform.one cannot be initialized inside a git repository');
     }
     const cookieCutterConfig: CookieCutterConfig = {
@@ -77,10 +81,16 @@ program
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
   .description('update multiplatform.one')
   .action(async (remote) => {
-    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'])).stdout.trim() !== 'true') {
+    if ((await execa('git', ['rev-parse', '--is-inside-work-tree'], { reject: false })).exitCode !== 0) {
       throw new Error('multiplatform.one cannot be updated outside of a git repository');
     }
-    if ((await execa('git', ['diff', '--cached', '--quiet'])).stdout.trim() !== 'true') {
+    if (
+      (
+        await execa('git', ['diff', '--cached', '--quiet'], {
+          reject: false,
+        })
+      ).exitCode !== 0
+    ) {
       throw new Error('multiplatform.one cannot be updated with uncommitted changes');
     }
     const projectRoot = (await execa('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
@@ -108,8 +118,8 @@ program
         remote,
       ],
       {
-        stdio: 'inherit',
         cwd: projectRoot,
+        stdio: 'inherit',
       },
     );
   });