@saltcorn/cli 1.0.0-beta.7 → 1.0.0-rc.1

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-rc.1",
   "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.0.0-beta.7",
+  "version": "1.0.0-rc.1",
   "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.0.0-beta.7",
-    "@saltcorn/common-code": "1.0.0-beta.7",
-    "@saltcorn/data": "1.0.0-beta.7",
-    "@saltcorn/mobile-app": "1.0.0-beta.7",
-    "@saltcorn/mobile-builder": "1.0.0-beta.7",
-    "@saltcorn/plugins-loader": "1.0.0-beta.7",
-    "@saltcorn/server": "1.0.0-beta.7",
+    "@saltcorn/admin-models": "1.0.0-rc.1",
+    "@saltcorn/common-code": "1.0.0-rc.1",
+    "@saltcorn/data": "1.0.0-rc.1",
+    "@saltcorn/mobile-app": "1.0.0-rc.1",
+    "@saltcorn/mobile-builder": "1.0.0-rc.1",
+    "@saltcorn/plugins-loader": "1.0.0-rc.1",
+    "@saltcorn/server": "1.0.0-rc.1",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
     "inquirer": "^7.3.3",
@@ -36,7 +36,7 @@
     "ts-node": "^9.1.1"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.14.0"
   },
   "files": [
     "/bin",

package/src/commands/build-cordova-builder.js

@@ -22,7 +22,8 @@ class BuildCordovaBuilder extends Command {
       "-f",
       join(dockerDir, "Dockerfile"),
       "-t",
-      "saltcorn/cordova-builder"
+      "saltcorn/cordova-builder",
+      "--progress=plain"
     );
     const result = spawnSync("docker", dArgs, { cwd: ".", stdio: "inherit" });
     if (result.error) console.log(result.error.toString());

package/src/commands/dev/release.js

@@ -127,9 +127,10 @@ class ReleaseCommand extends Command {
       updatePkgJson(p.dir);
       if (p.publish) {
         publish(p.dir);
-        await sleep(1000);
+        await sleep(3000);
       }
     }
+    await sleep(5000);
 
     // for cli:
     // 1. update version

package/src/commands/plugins.js

@@ -15,7 +15,10 @@ class PluginsCommand extends Command {
    */
   async run() {
     const db = require("@saltcorn/data/db");
-    const { requirePlugin } = require("@saltcorn/server/load_plugins");
+    const {
+      requirePlugin,
+      ensurePluginSupport,
+    } = require("@saltcorn/server/load_plugins");
     const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     const Plugin = require("@saltcorn/data/models/plugin");
     var plugins = [];
@@ -57,10 +60,19 @@ class PluginsCommand extends Command {
     if (flags.upgrade || flags.dryRun) {
       var new_versions = {};
       for (let plugin of plugins) {
-        plugin.version = "latest";
-        const { version } = await requirePlugin(plugin, true);
-        //console.log(plinfo)
-        if (version) new_versions[plugin.location] = version;
+        const oldVersion = plugin.version;
+        try {
+          plugin.version = "latest";
+          await ensurePluginSupport(plugin, true);
+          const { version } = await requirePlugin(plugin, true);
+          //console.log(plinfo)
+          if (version) new_versions[plugin.location] = version;
+        } catch (e) {
+          plugin.version = oldVersion;
+          console.log(
+            `Unable to find a supported version for '${plugin.location}'`
+          );
+        }
       }
       console.log(new_versions);
       for (const domain of tenantList) {

package/src/commands/scheduler.js

@@ -19,7 +19,7 @@ class ScheduleCommand extends Command {
       const db = require("@saltcorn/data/db");
       db.set_sql_logging();
     }
-    const runScheduler = require("@saltcorn/data/models/scheduler");
+    const { runScheduler } = require("@saltcorn/data/models/scheduler");
     await runScheduler({});
   }
 }