@multiplatform.one/cli 6.4.2 → 6.6.0

package/scripts/clone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Clone multiplatform.one repo into target directory.
 # Usage: clone.sh <remote_url> <branch> <target_dir>
-# Example: clone.sh https://gitlab.com/bitspur/multiplatform.one/multiplatform.one.git main ./my-app
+# Example: clone.sh https://gitlab.com/bitspur/frappe/multiplatform.one.git main ./my-app
 
 set -e
 

package/scripts/update.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Merge from upstream. Run from project root.
 # Usage: update.sh <remote_url> [branch]
-# Example: update.sh https://gitlab.com/bitspur/multiplatform.one/multiplatform.one.git main
+# Example: update.sh https://gitlab.com/bitspur/frappe/multiplatform.one.git main
 
 set -e
 

package/src/bin/multiplatformOne.ts

@@ -19,7 +19,7 @@ import YAML from "yaml";
 import yoctoSpinner from "yocto-spinner";
 import { discoverE2EApp, runE2ESession } from "../commands/e2e";
 import { init, runModifyStep } from "../commands/init";
-import { initApp, readProvenance } from "../commands/initApp";
+import { INIT_APP_PIECES, initApp, readProvenance } from "../commands/initApp";
 import { updateApp } from "../commands/updateApp";
 
 const projectRoot = lookupProjectRoot();
@@ -221,6 +221,15 @@ program
   .option("--universal", "scaffold the universal template (web + iOS + Android; default)")
   .option("--web", "scaffold the web-only template (Vite + React)")
   .option("--app", "alias of --web (back-compat)")
+  .option("--frappe", "add the Frappe backend piece (env keys, provider, docker compose bench)")
+  .option("--keycloak", "add the Keycloak auth piece (env keys, provider, docker compose + realm)")
+  .option(
+    "--gnome",
+    "add the GNOME desktop target piece (GTK4/GJS via react-gnome — native widgets, no webview)",
+  )
+  .option("--tauri", "add the desktop target piece (src-tauri skeleton, webview)")
+  .option("--vscode", "add the VS Code extension target piece")
+  .option("--webext", "add the browser extension target piece (MV3 popup + background)")
   .option("--skip-install", "skip pnpm install after scaffolding")
   .option("--skip-git", "skip git init + scaffold commit")
   .option(
@@ -269,20 +278,28 @@ program
     if (webOnly && options.universal) {
       throw new Error("Pass either --web/--app or --universal, not both");
     }
+    // Piece flags are multi-select; passing any of them skips the interactive
+    // pieces prompt. No flags + --yes (or non-TTY) → no pieces.
+    const pieces = INIT_APP_PIECES.filter((piece) => Boolean(options[piece]));
     await initApp(name, {
       skipInstall: Boolean(options.skipInstall),
       skipGit: Boolean(options.skipGit),
       version: options.mpoVersion,
       template: webOnly ? "app" : options.universal ? "universal" : undefined,
       yes: Boolean(options.yes),
+      pieces: pieces.length ? pieces : undefined,
     });
   });
 
-const defaultUpdateRemote = "https://gitlab.com/bitspur/multiplatform.one/multiplatform.one.git";
+const defaultUpdateRemote = "https://gitlab.com/bitspur/frappe/multiplatform.one.git";
 
 program
   .command("update")
-  .option("-c, --checkout <branch>", "branch, tag or commit to merge from upstream (monorepo forks)", "main")
+  .option(
+    "-c, --checkout <branch>",
+    "branch, tag or commit to merge from upstream (monorepo forks)",
+    "main",
+  )
   .option("-r, --remote <url>", "upstream remote URL (monorepo forks)", defaultUpdateRemote)
   .option("--skip-install", "skip pnpm install after the update")
   .option(
@@ -292,121 +309,123 @@ program
   .description(
     "update a scaffolded project to the current template (three-way merge via .mpo.json provenance); monorepo forks fall back to the upstream merge flow",
   )
-  .action(async (options: {
-    checkout: string;
-    remote: string;
-    skipInstall?: boolean;
-    mpoVersion?: string;
-  }) => {
-    // Update prechecks: must be in a git repo
-    if (
-      await spawn("git", ["rev-parse", "--is-inside-work-tree"]).then(
-        () => false,
-        () => true,
-      )
-    ) {
-      throw new Error("mpo cannot be updated outside of a git repository");
-    }
-    // Scaffolded consumer projects carry .mpo.json provenance — use the
-    // copier-style three-way template update. Monorepo forks (identified by
-    // the legacy features/package.json marker) fall through to the upstream-
-    // merge flow below; anything else gets the provenance guidance instead
-    // of the fork flow's unrelated errors.
-    if (readProvenance(projectRoot)) {
-      await updateApp({ skipInstall: options.skipInstall, version: options.mpoVersion });
-      return;
-    }
-    const legacyFork = await fs.stat(path.resolve(projectRoot, "features/package.json")).then(
-      (stat) => stat.isFile(),
-      () => false,
-    );
-    if (!legacyFork) {
-      throw new Error(
-        ".mpo.json not found — this project predates scaffold provenance. " +
-          "Create it with { template, cliVersion, name } matching how the project " +
-          "was generated (cliVersion = the @multiplatform.one/cli that scaffolded it), " +
-          "then re-run `mpo update`.",
-      );
-    }
-    // Require clean working tree (no staged or unstaged changes)
-    if (
-      await spawn("git", ["diff", "--cached", "--quiet"]).then(
-        () => false,
-        () => true,
-      )
-    ) {
-      throw new Error("mpo cannot be updated with uncommitted changes (staged changes present)");
-    }
-    if (
-      await spawn("git", ["diff", "--quiet"]).then(
+  .action(
+    async (options: {
+      checkout: string;
+      remote: string;
+      skipInstall?: boolean;
+      mpoVersion?: string;
+    }) => {
+      // Update prechecks: must be in a git repo
+      if (
+        await spawn("git", ["rev-parse", "--is-inside-work-tree"]).then(
+          () => false,
+          () => true,
+        )
+      ) {
+        throw new Error("mpo cannot be updated outside of a git repository");
+      }
+      // Scaffolded consumer projects carry .mpo.json provenance — use the
+      // copier-style three-way template update. Monorepo forks (identified by
+      // the legacy features/package.json marker) fall through to the upstream-
+      // merge flow below; anything else gets the provenance guidance instead
+      // of the fork flow's unrelated errors.
+      if (readProvenance(projectRoot)) {
+        await updateApp({ skipInstall: options.skipInstall, version: options.mpoVersion });
+        return;
+      }
+      const legacyFork = await fs.stat(path.resolve(projectRoot, "features/package.json")).then(
+        (stat) => stat.isFile(),
         () => false,
-        () => true,
-      )
-    ) {
-      throw new Error(
-        "multiplatform.one cannot be updated with uncommitted changes (unstaged changes present)",
       );
-    }
-    // Validate multiplatform.one project with clear errors per failure
-    const rootPkgPath = path.resolve(projectRoot, "package.json");
-    const featuresPkgPath = path.resolve(projectRoot, "features/package.json");
-    try {
-      const stat = await fs.stat(rootPkgPath);
-      if (!stat.isFile()) {
-        throw new Error("mpo update requires a valid project: root package.json not found");
+      if (!legacyFork) {
+        throw new Error(
+          ".mpo.json not found — this project predates scaffold provenance. " +
+            "Create it with { template, cliVersion, name } matching how the project " +
+            "was generated (cliVersion = the @multiplatform.one/cli that scaffolded it), " +
+            "then re-run `mpo update`.",
+        );
       }
-    } catch (err) {
-      if (err instanceof Error && err.message.includes("valid project")) {
-        throw err;
+      // Require clean working tree (no staged or unstaged changes)
+      if (
+        await spawn("git", ["diff", "--cached", "--quiet"]).then(
+          () => false,
+          () => true,
+        )
+      ) {
+        throw new Error("mpo cannot be updated with uncommitted changes (staged changes present)");
       }
-      throw new Error("mpo update requires a valid project: root package.json not found");
-    }
-    try {
-      const stat = await fs.stat(featuresPkgPath);
-      if (!stat.isFile()) {
+      if (
+        await spawn("git", ["diff", "--quiet"]).then(
+          () => false,
+          () => true,
+        )
+      ) {
+        throw new Error(
+          "multiplatform.one cannot be updated with uncommitted changes (unstaged changes present)",
+        );
+      }
+      // Validate multiplatform.one project with clear errors per failure
+      const rootPkgPath = path.resolve(projectRoot, "package.json");
+      const featuresPkgPath = path.resolve(projectRoot, "features/package.json");
+      try {
+        const stat = await fs.stat(rootPkgPath);
+        if (!stat.isFile()) {
+          throw new Error("mpo update requires a valid project: root package.json not found");
+        }
+      } catch (err) {
+        if (err instanceof Error && err.message.includes("valid project")) {
+          throw err;
+        }
+        throw new Error("mpo update requires a valid project: root package.json not found");
+      }
+      try {
+        const stat = await fs.stat(featuresPkgPath);
+        if (!stat.isFile()) {
+          throw new Error("mpo update requires a valid project: features/package.json not found");
+        }
+      } catch (err) {
+        if (err instanceof Error && err.message.includes("valid project")) {
+          throw err;
+        }
         throw new Error("mpo update requires a valid project: features/package.json not found");
       }
-    } catch (err) {
-      if (err instanceof Error && err.message.includes("valid project")) {
-        throw err;
+      const featuresPkg = JSON.parse(await fs.readFile(featuresPkgPath, "utf8")) as {
+        dependencies?: Record<string, string>;
+      };
+      if (
+        !featuresPkg?.dependencies?.["multiplatform.one"] ||
+        !String(featuresPkg.dependencies["multiplatform.one"]).length
+      ) {
+        throw new Error(
+          "mpo update requires a valid project: features must depend on multiplatform.one",
+        );
       }
-      throw new Error("mpo update requires a valid project: features/package.json not found");
-    }
-    const featuresPkg = JSON.parse(await fs.readFile(featuresPkgPath, "utf8")) as {
-      dependencies?: Record<string, string>;
-    };
-    if (
-      !featuresPkg?.dependencies?.["multiplatform.one"] ||
-      !String(featuresPkg.dependencies["multiplatform.one"]).length
-    ) {
-      throw new Error(
-        "mpo update requires a valid project: features must depend on multiplatform.one",
-      );
-    }
 
-    // Merge from upstream (update.sh: add remote, fetch, merge, remove remote, restore .updateignore list, pnpm lint)
-    const updateScript = path.resolve(
-      path.dirname(fileURLToPath(import.meta.url)),
-      "../../scripts/update.sh",
-    );
-    await spawn("sh", [updateScript, options.remote, options.checkout], {
-      cwd: projectRoot,
-      stdio: "inherit",
-      shell: true,
-    });
+      // Merge from upstream (update.sh: add remote, fetch, merge, remove remote, restore .updateignore list, pnpm lint)
+      const updateScript = path.resolve(
+        path.dirname(fileURLToPath(import.meta.url)),
+        "../../scripts/update.sh",
+      );
+      await spawn("sh", [updateScript, options.remote, options.checkout], {
+        cwd: projectRoot,
+        stdio: "inherit",
+        shell: true,
+      });
 
-    // Re-apply modify step with auto-detected apps and services
-    const presentServices = await getPresentServices(projectRoot);
-    const presentApps = await getPresentApps(projectRoot);
-    runModifyStep(projectRoot, presentServices, presentApps);
+      // Re-apply modify step with auto-detected apps and services
+      const presentServices = await getPresentServices(projectRoot);
+      const presentApps = await getPresentApps(projectRoot);
+      runModifyStep(projectRoot, presentServices, presentApps);
 
-    // Post-update refresh: .vscode from current workspace
-    try {
-      await generateVscodeConfig(projectRoot);
-    } catch {
-      // may fail in older projects without apps/ layout
-    }
-  });
+      // Post-update refresh: .vscode from current workspace
+      try {
+        await generateVscodeConfig(projectRoot);
+      } catch {
+        // may fail in older projects without apps/ layout
+      }
+    },
+  );
 
 program
   .command("wait")

package/src/commands/init.ts

@@ -3,7 +3,7 @@ import { type Dirent, existsSync, readFileSync, readdirSync, rmSync, writeFileSy
 import { join, resolve } from "node:path";
 import inquirer from "inquirer";
 
-const repoUrl = "https://gitlab.com/bitspur/multiplatform.one/multiplatform.one.git";
+const repoUrl = "https://gitlab.com/bitspur/frappe/multiplatform.one.git";
 
 const services = ["frappe", "solana", "ethereum", "sui"] as const;