@saltcorn/cli 1.1.1-beta.1 → 1.1.1-beta.3

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.1-beta.1",
+  "version": "1.1.1-beta.3",
   "commands": {
     "add-schema": {
       "id": "add-schema",
@@ -81,6 +81,25 @@
       "aliases": [],
       "hiddenAliases": [],
       "flags": {
+        "mode": {
+          "name": "mode",
+          "type": "option",
+          "char": "m",
+          "description": "Build the app completely (full), prepare the ios build directory (prepare) or finish the ios build in the prepared ios folder (finish)",
+          "multiple": false,
+          "options": [
+            "full",
+            "prepare",
+            "finish"
+          ],
+          "default": "full"
+        },
+        "allowShareTo": {
+          "name": "allowShareTo",
+          "type": "boolean",
+          "description": "Allow sharing from other apps to this app",
+          "allowNo": false
+        },
         "tenantAppName": {
           "name": "tenantAppName",
           "type": "option",
@@ -210,6 +229,12 @@
           "description": "This profile will be used to sign your app",
           "multiple": false
         },
+        "shareExtensionProvisioningProfile": {
+          "name": "shareExtensionProvisioningProfile",
+          "type": "option",
+          "description": "This profile will be used to sign your share extension on iOS",
+          "multiple": false
+        },
         "buildType": {
           "name": "buildType",
           "type": "option",

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.1-beta.1",
+  "version": "1.1.1-beta.3",
   "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.1-beta.1",
-    "@saltcorn/common-code": "1.1.1-beta.1",
-    "@saltcorn/data": "1.1.1-beta.1",
-    "@saltcorn/mobile-app": "1.1.1-beta.1",
-    "@saltcorn/mobile-builder": "1.1.1-beta.1",
-    "@saltcorn/plugins-loader": "1.1.1-beta.1",
-    "@saltcorn/server": "1.1.1-beta.1",
+    "@saltcorn/admin-models": "1.1.1-beta.3",
+    "@saltcorn/common-code": "1.1.1-beta.3",
+    "@saltcorn/data": "1.1.1-beta.3",
+    "@saltcorn/mobile-app": "1.1.1-beta.3",
+    "@saltcorn/mobile-builder": "1.1.1-beta.3",
+    "@saltcorn/plugins-loader": "1.1.1-beta.3",
+    "@saltcorn/server": "1.1.1-beta.3",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
     "inquirer": "^7.3.3",

package/src/commands/build-app.js

@@ -2,7 +2,10 @@ const { Command, Flags } = require("@oclif/core");
 const path = require("path");
 const Plugin = require("@saltcorn/data/models/plugin");
 const { MobileBuilder } = require("@saltcorn/mobile-builder/mobile-builder");
-const { init_multi_tenant } = require("@saltcorn/data/db/state");
+const {
+  decodeProvisioningProfile,
+} = require("@saltcorn/mobile-builder/utils/common-build-utils");
+const { init_multi_tenant, getState } = require("@saltcorn/data/db/state");
 const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
 const User = require("@saltcorn/data/models/user");
 
@@ -39,8 +42,13 @@ class BuildAppCommand extends Command {
       );
     }
 
-    if (flags.platforms.includes("ios") && !flags.provisioningProfile) {
-      throw new Error("Please specify a provisioning profile");
+    if (flags.platforms.includes("ios")) {
+      if (!flags.provisioningProfile)
+        throw new Error("Please specify a provisioning profile");
+      if (flags.allowShareTo && !flags.shareExtensionProvisioningProfile)
+        throw new Error(
+          "Please specify a share extension provisioning profile"
+        );
     }
   }
 
@@ -60,6 +68,34 @@ class BuildAppCommand extends Command {
     return Array.from(pluginsMap.values());
   }
 
+  async buildIosParams(flags) {
+    let result = undefined;
+    if (flags.platforms.includes("ios")) {
+      const mainProfileVals = await decodeProvisioningProfile(
+        flags.buildDirectory,
+        flags.provisioningProfile
+      );
+      result = {
+        appleTeamId: mainProfileVals.teamId,
+        mainProvisioningProfile: {
+          guuid: mainProfileVals.guuid,
+        },
+      };
+      if (flags.allowShareTo) {
+        const shareExtProfileVals = await decodeProvisioningProfile(
+          flags.buildDirectory,
+          flags.shareExtensionProvisioningProfile
+        );
+        result.shareExtensionProvisioningProfile = {
+          guuid: shareExtProfileVals.guuid,
+          specifier: shareExtProfileVals.specifier,
+          identifier: shareExtProfileVals.identifier,
+        };
+      }
+    }
+    return result;
+  }
+
   async run() {
     const { flags } = await this.parse(BuildAppCommand);
     this.validateParameters(flags);
@@ -77,6 +113,8 @@ class BuildAppCommand extends Command {
         : undefined;
       if (!user && flags.userEmail)
         throw new Error(`The user '${flags.userEmail}' does not exist'`);
+
+      const iosParams = await this.buildIosParams(flags);
       const builder = new MobileBuilder({
         appName: flags.appName,
         appId: flags.appId,
@@ -96,17 +134,38 @@ class BuildAppCommand extends Command {
         splashPage: flags.splashPage,
         autoPublicLogin: flags.autoPublicLogin,
         allowOfflineMode: flags.allowOfflineMode,
+        allowShareTo: flags.allowShareTo,
         plugins: await this.uniquePlugins(flags.includedPlugins),
         copyTargetDir: flags.copyAppDirectory,
         user,
-        provisioningProfile: flags.provisioningProfile,
+        iosParams: iosParams,
         tenantAppName: flags.tenantAppName,
         buildType: flags.buildType,
         keyStorePath: flags.androidKeystore,
         keyStoreAlias: flags.androidKeyStoreAlias,
         keyStorePassword: flags.androidKeystorePassword,
       });
-      process.exit(await builder.build());
+      let result;
+      switch (flags.mode) {
+        case "full":
+          getState().log(5, "Building completely");
+          result = await builder.fullBuild();
+          break;
+        case "prepare":
+          getState().log(5, "Preparing the ios build directory");
+          result = await builder.prepareStep();
+          break;
+        case "finish":
+          getState().log(
+            5,
+            "Finishing the ios build in the prepared ios folder"
+          );
+          result = await builder.finishStep();
+          break;
+        default:
+          throw new Error(`Unknown mode '${flags.mode}'`);
+      }
+      process.exit(result);
     };
     if (
       flags.tenantAppName &&
@@ -122,6 +181,21 @@ class BuildAppCommand extends Command {
 BuildAppCommand.description = "Build mobile app";
 
 BuildAppCommand.flags = {
+  mode: Flags.string({
+    name: "mode",
+    char: "m",
+    description:
+      "Build the app completely (full), " +
+      "prepare the ios build directory (prepare) or finish the ios build in the prepared ios folder (finish)",
+    options: ["full", "prepare", "finish"],
+    default: "full",
+  }),
+  allowShareTo: Flags.boolean({
+    name: "allow share to",
+    string: "allowShareTo",
+    description: "Allow sharing from other apps to this app",
+    default: false,
+  }),
   tenantAppName: Flags.string({
     name: "tenant",
     string: "tenant",
@@ -235,6 +309,12 @@ BuildAppCommand.flags = {
     string: "provisioningProfile",
     description: "This profile will be used to sign your app",
   }),
+  shareExtensionProvisioningProfile: Flags.string({
+    name: "share extension provisioning profile",
+    string: "shareExtensionProvisioningProfile",
+    description:
+      "This profile will be used to sign your share extension on iOS",
+  }),
   buildType: Flags.string({
     name: "build type",
     string: "buildType",

package/src/commands/dev/release.js

@@ -51,6 +51,10 @@ class ReleaseCommand extends Command {
     });
     console.log("Release begins in five seconds, press Ctrl-C to abort");
     await sleep(5000);
+    runCmd("cp", ["CHANGELOG.md", "packages/server/"], {
+      stdio: "inherit",
+      cwd: ".",
+    });
     const pkgs = {
       "@saltcorn/db-common": { dir: "db-common", publish: true },
       "@saltcorn/common-code": { dir: "common-code", publish: true },