@multiplatform.one/cli 1.0.25 → 1.0.27

package/lib/bin/multiplatformOne.mjs

@@ -6,7 +6,7 @@ import { program } from "commander";
 program.name("multiplatform.one");
 program.command("init").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").description("init multiplatform.one").action(async (remote) => {
   await execa("sh", [
-    path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../scripts/init.sh"),
+    path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/init.sh"),
     remote
   ], {
     stdio: "inherit"
@@ -14,7 +14,7 @@ program.command("init").argument("[remote]", "the remote to use", "https://gitla
 });
 program.command("update").argument("[remote]", "the remote to use", "https://gitlab.com/bitspur/multiplatform.one/cookiecutter").description("update multiplatform.one").action(async (remote) => {
   await execa("sh", [
-    path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../scripts/update.sh"),
+    path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../scripts/update.sh"),
     remote
   ], {
     stdio: "inherit"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "author": "BitSpur <support@bitspur.com> (https://bitspur.com)",
   "contributors": [
     {
@@ -29,8 +29,8 @@
   "files": [
     "bin",
     "lib",
-    "src",
-    "update"
+    "scripts",
+    "src"
   ],
   "license": "Apache-2.0",
   "repository": {
@@ -51,7 +51,7 @@
     "@types/node": "~20.12.13",
     "tsup": "^8.1.0",
     "typescript": "~5.3.3",
-    "@multiplatform.one/utils": "^0.0.10"
+    "@multiplatform.one/utils": "^0.0.12"
   },
   "dependencies": {
     "commander": "^9.5.0",

package/scripts/init.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cookiecutter "$@"

package/scripts/update.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+if ! (cat app/package.json | grep -q multiplatform.one); then
+    echo "\033[0;31mError:\033[0m not a multiplatform.one project" >&2
+    exit 1
+fi
+if ! git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
+    echo "\033[0;31mError:\033[0m not inside a git repository" >&2
+    exit 1
+fi
+cd "$(git rev-parse --show-toplevel)"
+if ! git diff --cached --exit-code > /dev/null; then
+    echo "\033[0;31mError:\033[0m there are uncommitted changes" >&2
+    exit 1
+fi
+git clean -fxd
+PROJECT_DIR="$(pwd)"
+TEMP_DIR="$(mktemp -d)"
+trap 'rm -rf "$TEMP_DIR"' EXIT
+echo "TEMP_DIR $TEMP_DIR"
+cd "$TEMP_DIR"
+cookiecutter "$@"
+COOKIECUTTER_DIR="$TEMP_DIR/$(ls "$TEMP_DIR")"
+cd "$COOKIECUTTER_DIR"
+git add .
+git commit -m "Updated multiplatform.one"
+cd "$PROJECT_DIR"
+INITIAL_COMMIT="$(git rev-parse HEAD)"
+git remote add multiplatform.one "$COOKIECUTTER_DIR"
+git fetch multiplatform.one
+git merge --allow-unrelated-histories multiplatform.one/main || true
+git remote remove multiplatform.one
+if [ -f .updateignore ]; then
+    while IFS= read -r pattern; do
+        find . -name "$pattern" -exec git checkout "$INITIAL_COMMIT" -- '{}' +
+    done < .updateignore
+fi
+while IFS= read -r pattern; do
+    find . -name "$pattern" -exec git checkout "$INITIAL_COMMIT" -- '{}' +
+done <<EOF
+.mkpm/cache.tar.gz
+platforms/storybook/.lostpixel/baseline
+pnpm-lock.yaml
+EOF
+pnpm install

package/src/bin/multiplatformOne.ts

@@ -1,5 +1,5 @@
 /*
- * File: /src/multiplatformOne.ts
+ * File: /src/bin/multiplatformOne.ts
  * Project: @multiplatform.one/cli
  * File Created: 22-06-2024 14:17:12
  * Author: Clay Risser
@@ -31,7 +31,7 @@ program
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
   .description('init multiplatform.one')
   .action(async (remote) => {
-    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../scripts/init.sh'), remote], {
+    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/init.sh'), remote], {
       stdio: 'inherit',
     });
   });
@@ -41,7 +41,7 @@ program
   .argument('[remote]', 'the remote to use', 'https://gitlab.com/bitspur/multiplatform.one/cookiecutter')
   .description('update multiplatform.one')
   .action(async (remote) => {
-    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../scripts/update.sh'), remote], {
+    await execa('sh', [path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../scripts/update.sh'), remote], {
       stdio: 'inherit',
     });
   });