@saltcorn/cli 1.1.0-beta.11 → 1.1.0-beta.13

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.11",
+  "version": "1.1.0-beta.13",
   "commands": {
     "add-schema": {
       "id": "add-schema",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.1.0-beta.11",
+  "version": "1.1.0-beta.13",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "^2.16.0",
     "@oclif/plugin-plugins": "^3.9.4",
-    "@saltcorn/admin-models": "1.1.0-beta.11",
-    "@saltcorn/common-code": "1.1.0-beta.11",
-    "@saltcorn/data": "1.1.0-beta.11",
-    "@saltcorn/mobile-app": "1.1.0-beta.11",
-    "@saltcorn/mobile-builder": "1.1.0-beta.11",
-    "@saltcorn/plugins-loader": "1.1.0-beta.11",
-    "@saltcorn/server": "1.1.0-beta.11",
+    "@saltcorn/admin-models": "1.1.0-beta.13",
+    "@saltcorn/common-code": "1.1.0-beta.13",
+    "@saltcorn/data": "1.1.0-beta.13",
+    "@saltcorn/mobile-app": "1.1.0-beta.13",
+    "@saltcorn/mobile-builder": "1.1.0-beta.13",
+    "@saltcorn/plugins-loader": "1.1.0-beta.13",
+    "@saltcorn/server": "1.1.0-beta.13",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
     "inquirer": "^7.3.3",

package/src/commands/build-app.js

@@ -61,7 +61,7 @@ class BuildAppCommand extends Command {
   }
 
   async run() {
-    const { flags } = await await this.parse(BuildAppCommand);
+    const { flags } = await this.parse(BuildAppCommand);
     this.validateParameters(flags);
     const mobileAppDir = path.join(
       require.resolve("@saltcorn/mobile-app"),

package/src/commands/dev/release.js

@@ -7,6 +7,19 @@ const fs = require("fs");
 const { spawnSync } = require("child_process");
 const { sleep } = require("../../common");
 
+const runCmd = (cmd, args, options) => {
+  const dirStr =
+    options?.cwd && options.cwd !== "." ? ` [cwd=${options.cwd}]` : "";
+  console.log(`>${dirStr} ${cmd} ${args.join(" ")}`);
+  const res = spawnSync(cmd, args, options);
+  if (res.status !== 0)
+    throw new Error(
+      `Non-zero exit status for command: "${cmd} ${args.join(" ")}" in ${
+        options?.cwd || "."
+      }`
+    );
+};
+
 /**
  * ReleaseCommand Class
  * @extends oclif.Command
@@ -21,7 +34,7 @@ class ReleaseCommand extends Command {
       args: { version },
       flags,
     } = await this.parse(ReleaseCommand);
-    spawnSync("git", ["pull"], {
+    runCmd("git", ["pull"], {
       stdio: "inherit",
       cwd: ".",
     });
@@ -32,7 +45,7 @@ class ReleaseCommand extends Command {
     });
     console.log("\n");
 
-    spawnSync("git", ["show", "--summary"], {
+    runCmd("git", ["show", "--summary"], {
       stdio: "inherit",
       cwd: ".",
     });
@@ -89,11 +102,11 @@ class ReleaseCommand extends Command {
       );
     };
     const compileTsFiles = () => {
-      spawnSync("npm", ["install", "--legacy-peer-deps"], {
+      runCmd("npm", ["install", "--legacy-peer-deps"], {
         stdio: "inherit",
         cwd: ".",
       });
-      spawnSync("npm", ["run", "tsc"], {
+      runCmd("npm", ["run", "tsc"], {
         stdio: "inherit",
         cwd: ".",
       });
@@ -102,20 +115,22 @@ class ReleaseCommand extends Command {
       const tags = !tags0 ? [] : Array.isArray(tags0) ? tags0 : [tags0];
       if (flags.tag) tags.push(flags.tag);
       const firstTag = tags[0];
-      console.log(
-        `packages/${dir}$ npm publish --access=public ${firstTag ? `--tag ${firstTag}` : ""}`
+      runCmd(
+        "npm",
+        [
+          "publish",
+          "--access=public",
+          ...(firstTag ? ["--tag", firstTag] : []),
+        ],
+        {
+          stdio: "inherit",
+          cwd: `packages/${dir}/`,
+        }
       );
-      spawnSync("npm", ["publish", "--access=public", ...(firstTag ? ["--tag", firstTag] : [])], {
-        stdio: "inherit",
-        cwd: `packages/${dir}/`,
-      });
       tags.shift();
       for (const tag of tags) {
         await sleep(3000);
-        console.log(
-          `packages/${dir}$ npm dist-tag add @saltcorn/cli@${version} ${tag}`
-        );
-        spawnSync("npm", ["dist-tag", "add", `@saltcorn/cli@${version}`, tag], {
+        runCmd("npm", ["dist-tag", "add", `@saltcorn/cli@${version}`, tag], {
           stdio: "inherit",
           cwd: `packages/${dir}/`,
         });
@@ -125,14 +140,11 @@ class ReleaseCommand extends Command {
     const rootPackageJson = require(`../../../../../package.json`);
 
     compileTsFiles();
-    //for each package:
+    //for each package:1
     // 1. update version
     // 2. update dependencies for other packages
     // 3. publish
-    spawnSync("npm", ["install", "--legacy-peer-deps"], {
-      stdio: "inherit",
-      cwd: `packages/saltcorn-cli/`,
-    });
+
     for (const p of Object.values(pkgs)) {
       updatePkgJson(p.dir);
       if (p.publish) {
@@ -152,19 +164,25 @@ class ReleaseCommand extends Command {
       `package.json`,
       JSON.stringify({ ...rootPackageJson, workspaces: undefined }, null, 2)
     );
-    spawnSync("npm", ["update", "--legacy-peer-deps"], {
+
+    runCmd("npm", ["install", "--legacy-peer-deps"], {
+      stdio: "inherit",
+      cwd: `packages/saltcorn-cli/`,
+    });
+
+    runCmd("npm", ["update", "--legacy-peer-deps"], {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });
-    spawnSync("npm", ["install", "--legacy-peer-deps"], {
+    runCmd("npm", ["install", "--legacy-peer-deps"], {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });
-    spawnSync("npm", ["run", "manifest"], {
+    runCmd("npm", ["run", "manifest"], {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });
-    spawnSync("npm", ["install", "--legacy-peer-deps"], {
+    runCmd("npm", ["install", "--legacy-peer-deps"], {
       stdio: "inherit",
       cwd: ".",
     });
@@ -174,7 +192,7 @@ class ReleaseCommand extends Command {
     });
     // do not run 'audit fix' on full point releases, only on -beta.x, -rc.x etc
     /*if (version.includes("-"))
-      spawnSync("npm", ["audit", "fix"], {
+      runCmd("npm", ["audit", "fix"], {
         stdio: "inherit",
         cwd: `packages/saltcorn-cli/`,
       });*/
@@ -195,21 +213,20 @@ class ReleaseCommand extends Command {
       dockerfileWithMobile.replace(/cli@.* --unsafe/, `cli@${version} --unsafe`)
     );
     //git commit tag and push
-    spawnSync("git", ["commit", "-am", "v" + version], {
+    runCmd("git", ["commit", "-am", "v" + version], {
       stdio: "inherit",
     });
-    spawnSync("git", ["tag", "-a", "v" + version, "-m", "v" + version], {
+    runCmd("git", ["tag", "-a", "v" + version, "-m", "v" + version], {
       stdio: "inherit",
     });
-    spawnSync("git", ["push", "origin", "v" + version], {
+    runCmd("git", ["push", "origin", "v" + version], {
       stdio: "inherit",
     });
-    spawnSync("git", ["push"], {
+    runCmd("git", ["push"], {
       stdio: "inherit",
     });
     console.log("Now run:\n");
-    console.log("  rm -rf packages/saltcorn-cli/node_modules\n");
-    console.log("  rm -rf node_modules\n");
+    console.log("npm install --legacy-peer-deps && npm run tsc\n");
     this.exit(0);
   }
 }

package/src/commands/sync-upload-data.js

@@ -232,7 +232,7 @@ class SyncUploadData extends Command {
   async run() {
     let returnCode = 0,
       inTransaction = false;
-    const { flags } = await await this.parse(SyncUploadData);
+    const { flags } = await this.parse(SyncUploadData);
     if (db.is_it_multi_tenant() && flags.tenantAppName) {
       await init_multi_tenant(loadAllPlugins, true, [flags.tenantAppName]);
     }