@saltcorn/mobile-builder 0.9.5-beta.9 → 0.9.6-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -3,7 +3,6 @@
3
3
  * @module
4
4
  */
5
5
  export * as common_build_utils from "./utils/common-build-utils";
6
- export * as cordova_build_utils from "./utils/cordova-build-utils";
7
6
  export * as package_bundle_utils from "./utils/package-bundle-utils";
8
7
  export * from "./mobile-builder";
9
8
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,OAAO,KAAK,kBAAkB,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,mBAAmB,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,oBAAoB,MAAM,8BAA8B,CAAC;AAErE,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,OAAO,KAAK,kBAAkB,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,oBAAoB,MAAM,8BAA8B,CAAC;AAErE,cAAc,kBAAkB,CAAC"}
package/dist/index.js CHANGED
@@ -27,13 +27,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
27
27
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
28
28
  };
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
- exports.package_bundle_utils = exports.cordova_build_utils = exports.common_build_utils = void 0;
30
+ exports.package_bundle_utils = exports.common_build_utils = void 0;
31
31
  /**
32
32
  * This is the mobile builder package
33
33
  * @module
34
34
  */
35
35
  exports.common_build_utils = __importStar(require("./utils/common-build-utils"));
36
- exports.cordova_build_utils = __importStar(require("./utils/cordova-build-utils"));
37
36
  exports.package_bundle_utils = __importStar(require("./utils/package-bundle-utils"));
38
37
  __exportStar(require("./mobile-builder"), exports);
39
38
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";AAAA,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhC;;;GAGG;AACH,iFAAiE;AACjE,mFAAmE;AACnE,qFAAqE;AAErE,mDAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";AAAA,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhC;;;GAGG;AACH,iFAAiE;AACjE,qFAAqE;AAErE,mDAAiC"}
@@ -1,11 +1,42 @@
1
1
  import Plugin from "@saltcorn/data/models/plugin";
2
2
  import User from "@saltcorn/data/models/user";
3
3
  declare type EntryPointType = "view" | "page";
4
+ declare type MobileBuilderConfig = {
5
+ appName?: string;
6
+ appId?: string;
7
+ appVersion?: string;
8
+ appIcon?: string;
9
+ templateDir: string;
10
+ buildDir: string;
11
+ cliDir: string;
12
+ useDocker?: boolean;
13
+ platforms: string[];
14
+ localUserTables?: string[];
15
+ synchedTables?: string[];
16
+ includedPlugins?: string[];
17
+ entryPoint: string;
18
+ entryPointType: EntryPointType;
19
+ serverURL: string;
20
+ splashPage?: string;
21
+ autoPublicLogin: string;
22
+ allowOfflineMode: string;
23
+ plugins: Plugin[];
24
+ copyTargetDir?: string;
25
+ user?: User;
26
+ appleTeamId?: string;
27
+ provisioningProfile?: string;
28
+ tenantAppName?: string;
29
+ keyStorePath?: string;
30
+ keyStoreAlias?: string;
31
+ keyStorePassword?: string;
32
+ buildType: "debug" | "release";
33
+ };
4
34
  /**
5
35
  *
6
36
  */
7
37
  export declare class MobileBuilder {
8
- appName?: string;
38
+ appName: string;
39
+ appId: string;
9
40
  appVersion?: string;
10
41
  appIcon?: string;
11
42
  templateDir: string;
@@ -27,36 +58,18 @@ export declare class MobileBuilder {
27
58
  packageRoot: string;
28
59
  copyTargetDir?: string;
29
60
  user?: User;
30
- buildForEmulator?: boolean;
61
+ appleTeamId?: string;
62
+ provisioningProfile?: string;
31
63
  tenantAppName?: string;
64
+ keyStorePath?: string;
65
+ keyStoreAlias?: string;
66
+ keyStorePassword?: string;
67
+ buildType: "debug" | "release";
32
68
  /**
33
69
  *
34
70
  * @param cfg
35
71
  */
36
- constructor(cfg: {
37
- appName?: string;
38
- appVersion?: string;
39
- appIcon?: string;
40
- templateDir: string;
41
- buildDir: string;
42
- cliDir: string;
43
- useDocker?: boolean;
44
- platforms: string[];
45
- localUserTables?: string[];
46
- synchedTables?: string[];
47
- includedPlugins?: string[];
48
- entryPoint: string;
49
- entryPointType: EntryPointType;
50
- serverURL: string;
51
- splashPage?: string;
52
- autoPublicLogin: string;
53
- allowOfflineMode: string;
54
- plugins: Plugin[];
55
- copyTargetDir?: string;
56
- user?: User;
57
- buildForEmulator?: boolean;
58
- tenantAppName?: string;
59
- });
72
+ constructor(cfg: MobileBuilderConfig);
60
73
  /**
61
74
  *
62
75
  */
@@ -1 +1 @@
1
- {"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAwBlD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAE9C,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtC;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,SAA0B;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;gBACS,GAAG,EAAE;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,gBAAgB,EAAE,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;IA4BD;;OAEG;IACG,KAAK;CAwDZ"}
1
+ {"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAKA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAqBlD,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAI9C,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAItC,aAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,GAAG,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,SAA0B;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/B;;;OAGG;gBACS,GAAG,EAAE,mBAAmB;IAoCpC;;OAEG;IACG,KAAK;CAuEZ"}
@@ -5,9 +5,13 @@ const { PluginManager } = require("live-plugin-manager");
5
5
  const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
6
6
  const { features } = require("@saltcorn/data/db/state");
7
7
  const path_1 = require("path");
8
+ const fs_extra_1 = require("fs-extra");
8
9
  const common_build_utils_1 = require("./utils/common-build-utils");
9
10
  const package_bundle_utils_1 = require("./utils/package-bundle-utils");
10
- const cordova_build_utils_1 = require("./utils/cordova-build-utils");
11
+ const cordova_helper_1 = require("./utils/cordova_helper");
12
+ const utils_1 = require("@saltcorn/data/utils");
13
+ const appIdDefault = "saltcorn.mobile.app";
14
+ const appNameDefault = "SaltcornMobileApp";
11
15
  /**
12
16
  *
13
17
  */
@@ -18,7 +22,13 @@ class MobileBuilder {
18
22
  */
19
23
  constructor(cfg) {
20
24
  this.packageRoot = (0, path_1.join)(__dirname, "../");
21
- this.appName = cfg.appName;
25
+ this.appName = cfg.appName || appNameDefault;
26
+ if (cfg.appId)
27
+ this.appId = cfg.appId;
28
+ else if (cfg.appName && cfg.appName !== appNameDefault)
29
+ this.appId = `${(0, utils_1.removeNonWordChars)(cfg.appName)}.mobile.app`;
30
+ else
31
+ this.appId = appIdDefault;
22
32
  this.appVersion = cfg.appVersion;
23
33
  this.appIcon = cfg.appIcon;
24
34
  this.templateDir = cfg.templateDir;
@@ -41,20 +51,30 @@ class MobileBuilder {
41
51
  this.plugins = cfg.plugins;
42
52
  this.copyTargetDir = cfg.copyTargetDir;
43
53
  this.user = cfg.user;
44
- this.buildForEmulator = cfg.buildForEmulator;
54
+ this.provisioningProfile = cfg.provisioningProfile;
45
55
  this.tenantAppName = cfg.tenantAppName;
56
+ this.keyStorePath = cfg.keyStorePath;
57
+ this.keyStoreAlias = cfg.keyStoreAlias;
58
+ this.keyStorePassword = cfg.keyStorePassword;
59
+ this.buildType = cfg.buildType;
46
60
  }
47
61
  /**
48
62
  *
49
63
  */
50
64
  async build() {
51
- (0, cordova_build_utils_1.prepareBuildDir)(this.buildDir, this.templateDir);
52
- if (this.appName)
53
- await (0, cordova_build_utils_1.setAppName)(this.buildDir, this.appName);
54
- if (this.appVersion)
55
- await (0, cordova_build_utils_1.setAppVersion)(this.buildDir, this.appVersion);
65
+ (0, common_build_utils_1.prepareBuildDir)(this.buildDir, this.templateDir);
66
+ await (0, common_build_utils_1.modifyConfigXml)(this.buildDir, {
67
+ appName: this.appName,
68
+ appId: this.appId !== appIdDefault ? this.appId : undefined,
69
+ appVersion: this.appVersion,
70
+ });
56
71
  if (this.appIcon)
57
- await (0, cordova_build_utils_1.prepareAppIcon)(this.buildDir, this.appIcon);
72
+ await (0, common_build_utils_1.prepareAppIcon)(this.buildDir, this.appIcon, this.platforms);
73
+ let iosParams = null;
74
+ if (this.platforms.includes("ios")) {
75
+ iosParams = await (0, common_build_utils_1.decodeProvisioningProfile)(this.buildDir, this.provisioningProfile);
76
+ (0, common_build_utils_1.prepareExportOptionsPlist)(this.buildDir, this.appId, iosParams.guuid);
77
+ }
58
78
  (0, common_build_utils_1.copyServerFiles)(this.buildDir);
59
79
  (0, common_build_utils_1.copySbadmin2Deps)(this.buildDir);
60
80
  await (0, common_build_utils_1.copySiteLogo)(this.buildDir);
@@ -83,10 +103,16 @@ class MobileBuilder {
83
103
  resultCode = await (0, common_build_utils_1.createSqliteDb)(this.buildDir);
84
104
  if (resultCode !== 0)
85
105
  return resultCode;
86
- resultCode = (0, cordova_build_utils_1.buildApp)(this.buildDir, this.platforms, this.useDocker, this.buildForEmulator);
87
- if (resultCode === 0 && this.copyTargetDir) {
88
- await (0, cordova_build_utils_1.tryCopyAppFiles)(this.buildDir, this.copyTargetDir, this.user, this.appName);
89
- }
106
+ if (this.keyStorePath)
107
+ (0, fs_extra_1.copySync)(this.keyStorePath, (0, path_1.join)(this.buildDir, (0, path_1.basename)(this.keyStorePath)));
108
+ const cordovaHelper = new cordova_helper_1.CordovaHelper({
109
+ ...this,
110
+ appleTeamId: iosParams?.teamId,
111
+ provisioningGUUID: iosParams?.guuid,
112
+ });
113
+ resultCode = cordovaHelper.buildApp();
114
+ if (resultCode === 0 && this.copyTargetDir)
115
+ await cordovaHelper.tryCopyAppFiles(this.copyTargetDir, this.user, this.appName);
90
116
  return resultCode;
91
117
  }
92
118
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,22 @@
1
1
  import type User from "@saltcorn/data/models/user";
2
+ /**
3
+ * copy saltcorn-mobile-app as a template to buildDir
4
+ * @param buildDir directory where the app will be build
5
+ * @param templateDir directory of the template code that will be copied to 'buildDir'
6
+ */
7
+ export declare function prepareBuildDir(buildDir: string, templateDir: string): void;
8
+ export declare function modifyConfigXml(buildDir: string, config: any): Promise<void>;
9
+ /**
10
+ * copy a png file into the build dir and use it as launcher icon
11
+ * @param buildDir
12
+ * @param appIcon path to appIcon file
13
+ */
14
+ export declare function prepareAppIcon(buildDir: string, appIcon: string, platforms: string[]): Promise<void>;
15
+ export declare function prepareExportOptionsPlist(buildDir: string, appId: string, provisioningProfile: string): void;
16
+ export declare function decodeProvisioningProfile(buildDir: string, provisioningProfile: string): Promise<{
17
+ guuid: any;
18
+ teamId: any;
19
+ }>;
2
20
  /**
3
21
  * copy files from 'server/public' into the www folder (with a version_tag prefix)
4
22
  * @param buildDir directory where the app will be build
@@ -1 +1 @@
1
- {"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAInD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,QA8B/C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,QA8BhD;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,iBA4BlD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,cAAc,EACd,UAAU,EACV,eAAe,EACf,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,GACjB,EAAE,GAAG,QAiBL;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,EAAE,iBA0C3B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,QAGpD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,0BAmBpD;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,IAAI,iBAmDZ"}
1
+ {"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAOnD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAQpE;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAkBlE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EAAE,iBAepB;AA0CD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,mBAAmB,EAAE,MAAM,QA4B5B;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM;;;GAoB5B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,QA8B/C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,QA8BhD;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,iBA4BlD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,cAAc,EACd,UAAU,EACV,eAAe,EACf,aAAa,EACb,aAAa,EACb,eAAe,EACf,gBAAgB,GACjB,EAAE,GAAG,QAiBL;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,EAAE,iBA0C3B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,QAGpD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,0BAmBpD;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,IAAI,iBAmDZ"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = void 0;
6
+ exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = exports.decodeProvisioningProfile = exports.prepareExportOptionsPlist = exports.prepareAppIcon = exports.modifyConfigXml = exports.prepareBuildDir = void 0;
7
7
  const index_1 = __importDefault(require("@saltcorn/data/db/index"));
8
8
  const utils = require("@saltcorn/data/utils");
9
9
  const { getSafeSaltcornCmd } = utils;
@@ -13,6 +13,140 @@ const child_process_1 = require("child_process");
13
13
  const page_1 = __importDefault(require("@saltcorn/data/models/page"));
14
14
  const file_1 = __importDefault(require("@saltcorn/data/models/file"));
15
15
  const state_1 = require("@saltcorn/data/db/state");
16
+ const xml2js_1 = require("xml2js");
17
+ const resizer = require("resize-with-sharp-or-jimp");
18
+ /**
19
+ * copy saltcorn-mobile-app as a template to buildDir
20
+ * @param buildDir directory where the app will be build
21
+ * @param templateDir directory of the template code that will be copied to 'buildDir'
22
+ */
23
+ function prepareBuildDir(buildDir, templateDir) {
24
+ if ((0, fs_extra_1.existsSync)(buildDir))
25
+ (0, fs_extra_1.rmSync)(buildDir, { force: true, recursive: true });
26
+ (0, fs_extra_1.copySync)(templateDir, buildDir);
27
+ (0, fs_extra_1.rmSync)(`${buildDir}/node_modules`, { recursive: true, force: true });
28
+ const result = (0, child_process_1.spawnSync)("npm", ["install", "--legacy-peer-deps"], {
29
+ cwd: buildDir,
30
+ });
31
+ console.log(result.output.toString());
32
+ }
33
+ exports.prepareBuildDir = prepareBuildDir;
34
+ async function modifyConfigXml(buildDir, config) {
35
+ try {
36
+ const configXml = (0, path_1.join)(buildDir, "config.xml");
37
+ const content = (0, fs_extra_1.readFileSync)(configXml);
38
+ const parsed = await (0, xml2js_1.parseStringPromise)(content);
39
+ if (config.appName)
40
+ parsed.widget.name[0] = config.appName;
41
+ if (config.appId)
42
+ parsed.widget.$.id = config.appId;
43
+ if (config.appVersion)
44
+ parsed.widget.$.version = config.appVersion;
45
+ const xmlBuilder = new xml2js_1.Builder();
46
+ const newCfg = xmlBuilder.buildObject(parsed);
47
+ (0, fs_extra_1.writeFileSync)(configXml, newCfg);
48
+ }
49
+ catch (error) {
50
+ console.log(`Unable to modify the config.xml: ${error.message ? error.message : "Unknown error"}`);
51
+ }
52
+ }
53
+ exports.modifyConfigXml = modifyConfigXml;
54
+ /**
55
+ * copy a png file into the build dir and use it as launcher icon
56
+ * @param buildDir
57
+ * @param appIcon path to appIcon file
58
+ */
59
+ async function prepareAppIcon(buildDir, appIcon, platforms) {
60
+ try {
61
+ if (platforms.includes("android"))
62
+ (0, fs_extra_1.copySync)(appIcon, (0, path_1.join)(buildDir, "res", "icon", "android", "icon.png"), {
63
+ overwrite: true,
64
+ });
65
+ if (platforms.includes("ios"))
66
+ await prepareAppIconSet(buildDir, appIcon);
67
+ }
68
+ catch (error) {
69
+ console.log(`Unable to set the app icon '${appIcon}': ${error.message ? error.message : "Unknown error"}`);
70
+ }
71
+ }
72
+ exports.prepareAppIcon = prepareAppIcon;
73
+ async function prepareAppIconSet(buildDir, appIcon) {
74
+ console.log("prepareAppIconSet", buildDir, appIcon);
75
+ const dir = (0, path_1.join)(buildDir, "AppIcon.appiconset");
76
+ (0, fs_extra_1.mkdirSync)(dir);
77
+ const contentsJSON = { images: new Array() };
78
+ try {
79
+ for (const { size, scale, idiom } of [
80
+ { size: 29, scale: 1, idiom: "iphone" },
81
+ { size: 20, scale: 2, idiom: "iphone" },
82
+ { size: 40, scale: 2, idiom: "iphone" },
83
+ { size: 57, scale: 1, idiom: "iphone" },
84
+ { size: 60, scale: 2, idiom: "iphone" },
85
+ { size: 1024, scale: 1, idiom: "ios-marketing" },
86
+ ]) {
87
+ const scaledSize = size * scale;
88
+ const fileName = `${size}x${scale}.png`;
89
+ await resizer({
90
+ fromFileName: appIcon,
91
+ width: scaledSize,
92
+ height: scaledSize,
93
+ toFileName: (0, path_1.join)(dir, fileName),
94
+ });
95
+ contentsJSON.images.push({
96
+ size: `${size}x${size}`,
97
+ idiom: idiom,
98
+ filename: fileName,
99
+ "expected-size": scaledSize,
100
+ scale: `${scale}x`,
101
+ });
102
+ }
103
+ (0, fs_extra_1.writeFileSync)((0, path_1.join)(dir, "Contents.json"), JSON.stringify(contentsJSON));
104
+ }
105
+ catch (error) {
106
+ console.log(`Unable to generate appicon set for '${appIcon}': ${error.message ? error.message : "Unknown error"}`);
107
+ }
108
+ }
109
+ function prepareExportOptionsPlist(buildDir, appId, provisioningProfile) {
110
+ try {
111
+ const exportOptionsPlist = (0, path_1.join)(buildDir, "ExportOptions.plist");
112
+ (0, fs_extra_1.writeFileSync)(exportOptionsPlist, `<?xml version="1.0" encoding="UTF-8"?>
113
+ <!DOCTYPE plist PUBLIC "~//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
114
+ <plist version="1.0">
115
+ <dict>
116
+ <key>method</key>
117
+ <string>app-store-connect</string>
118
+ <key>provisioningProfiles</key>
119
+ <dict>
120
+ <key>${appId}</key>
121
+ <string>${provisioningProfile}</string>
122
+ </dict>
123
+ </dict>
124
+
125
+ </plist>`);
126
+ }
127
+ catch (error) {
128
+ console.log(`Unable to set the provisioning profile '${provisioningProfile}': ${error.message ? error.message : "Unknown error"}`);
129
+ }
130
+ }
131
+ exports.prepareExportOptionsPlist = prepareExportOptionsPlist;
132
+ async function decodeProvisioningProfile(buildDir, provisioningProfile) {
133
+ console.log("decodeProvisioningProfile", buildDir, provisioningProfile);
134
+ const outFile = (0, path_1.join)(buildDir, "provisioningProfile.xml");
135
+ try {
136
+ (0, child_process_1.execSync)(`security cms -D -i "${provisioningProfile}" > ${outFile}`);
137
+ const content = (0, fs_extra_1.readFileSync)(outFile);
138
+ const parsed = await (0, xml2js_1.parseStringPromise)(content);
139
+ const dict = parsed.plist.dict[0];
140
+ const guuid = dict.string[dict.string.length - 1];
141
+ const teamId = dict.array[0].string[0];
142
+ return { guuid, teamId };
143
+ }
144
+ catch (error) {
145
+ console.log(`Unable to decode the provisioning profile '${provisioningProfile}': ${error.message ? error.message : "Unknown error"}`);
146
+ throw error;
147
+ }
148
+ }
149
+ exports.decodeProvisioningProfile = decodeProvisioningProfile;
16
150
  /**
17
151
  * copy files from 'server/public' into the www folder (with a version_tag prefix)
18
152
  * @param buildDir directory where the app will be build
@@ -1 +1 @@
1
- {"version":3,"file":"common-build-utils.js","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common-build-utils.js","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ export declare function buildApkInContainer(buildDir: string): number | null;
36
36
  * @param flags
37
37
  * @returns
38
38
  */
39
- export declare function buildApp(buildDir: string, platforms: string[], useDocker?: boolean, buildForEmulator?: boolean): number | null;
39
+ export declare function buildApp(buildDir: string, platforms: string[], useDocker?: boolean, buildForEmulator?: boolean, appleTeamId?: string): number | null;
40
40
  /**
41
41
  *
42
42
  * @param buildDir directory where the app will be build
@@ -49,7 +49,7 @@ export declare function addPlatforms(buildDir: string, platforms: string[]): voi
49
49
  * @param platforms
50
50
  * @returns
51
51
  */
52
- export declare function callBuild(buildDir: string, platforms: string[], buildForEmulator?: boolean): number | null;
52
+ export declare function callBuild(buildDir: string, platforms: string[], buildForEmulator?: boolean, appleTeamId?: string): number | null;
53
53
  /**
54
54
  * copy .apk / .ipa files to 'copyDir' if they exist
55
55
  * @param buildDir directory where the app was build
@@ -1 +1 @@
1
- {"version":3,"file":"cordova-build-utils.d.ts","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAQpE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAiBjE;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgBvE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAYrE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,iBAiBnD;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,CAAC,EAAE,OAAO,EACnB,gBAAgB,CAAC,EAAE,OAAO,iBAW3B;AAkFD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QASjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,gBAAgB,CAAC,EAAE,OAAO,iBAe3B;AAoBD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,iBA8BjB"}
1
+ {"version":3,"file":"cordova-build-utils.d.ts","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAQpE;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAiBjE;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAgBvE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAYrE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,iBAiBnD;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,CAAC,EAAE,OAAO,EACnB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,WAAW,CAAC,EAAE,MAAM,iBAWrB;AAkFD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QASjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,WAAW,CAAC,EAAE,MAAM,iBAiBrB;AAoBD;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,iBA8BjB"}
@@ -9,7 +9,6 @@ const fs_extra_1 = require("fs-extra");
9
9
  const path_1 = require("path");
10
10
  const fs_1 = require("fs");
11
11
  const file_1 = __importDefault(require("@saltcorn/data/models/file"));
12
- const { getState } = require("@saltcorn/data/db/state");
13
12
  const xml2js_1 = require("xml2js");
14
13
  const utils_1 = require("@saltcorn/data/utils");
15
14
  /**
@@ -115,15 +114,15 @@ exports.buildApkInContainer = buildApkInContainer;
115
114
  * @param flags
116
115
  * @returns
117
116
  */
118
- function buildApp(buildDir, platforms, useDocker, buildForEmulator) {
117
+ function buildApp(buildDir, platforms, useDocker, buildForEmulator, appleTeamId) {
119
118
  if (!useDocker) {
120
119
  addPlugins(buildDir);
121
- return callBuild(buildDir, platforms, buildForEmulator);
120
+ return callBuild(buildDir, platforms, buildForEmulator, appleTeamId);
122
121
  }
123
122
  else {
124
123
  let code = buildApkInContainer(buildDir);
125
124
  if (code === 0 && platforms.indexOf("ios") > -1)
126
- code = callBuild(buildDir, ["ios"]);
125
+ code = callBuild(buildDir, ["ios"], buildForEmulator, appleTeamId);
127
126
  return code;
128
127
  }
129
128
  }
@@ -205,11 +204,11 @@ exports.addPlatforms = addPlatforms;
205
204
  * @param platforms
206
205
  * @returns
207
206
  */
208
- function callBuild(buildDir, platforms, buildForEmulator) {
207
+ function callBuild(buildDir, platforms, buildForEmulator, appleTeamId) {
209
208
  addPlatforms(buildDir, platforms);
210
209
  let buildParams = [...platforms];
211
210
  if (!buildForEmulator) {
212
- buildParams.push("--device", `--developmentTeam="${getState().getConfig("apple_team_id")}"`);
211
+ buildParams.push("--device", `--developmentTeam=${appleTeamId}`, "--codeSignIdentity=iPhone Developer", "--automaticProvisioning=true");
213
212
  }
214
213
  const result = (0, child_process_1.spawnSync)("npm", ["run", "build-app", "--", ...buildParams], {
215
214
  cwd: buildDir,
@@ -1 +1 @@
1
- {"version":3,"file":"cordova-build-utils.js","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cordova-build-utils.js","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,43 @@
1
+ import type User from "@saltcorn/data/models/user";
2
+ export declare type CordovaCfg = {
3
+ buildDir: string;
4
+ platforms: string[];
5
+ buildType: "debug" | "release";
6
+ appName: string;
7
+ useDocker?: boolean;
8
+ keyStorePath?: string;
9
+ keyStoreAlias?: string;
10
+ keyStorePassword?: string;
11
+ appleTeamId?: string;
12
+ provisioningGUUID?: string;
13
+ };
14
+ export declare class CordovaHelper {
15
+ buildDir: string;
16
+ platforms: string[];
17
+ buildType: "debug" | "release";
18
+ appName: string;
19
+ useDocker?: boolean;
20
+ keyStoreFile?: string;
21
+ keyStoreAlias?: string;
22
+ keyStorePassword?: string;
23
+ androidReleaseOut: string;
24
+ androidDebugOut: string;
25
+ appleTeamId?: string;
26
+ provisioningGUUID?: string;
27
+ constructor(cfg: CordovaCfg);
28
+ buildApp(): number | null;
29
+ private runXcodeCmds;
30
+ private copyAppIconsSet;
31
+ private buildApkInContainer;
32
+ private addPlugins;
33
+ private addPlatforms;
34
+ private callBuild;
35
+ /**
36
+ * copy .apk / .aab / .ipa files to 'copyDir' if they exist
37
+ * @param copyDir directory where the resulting app file will be copied to
38
+ * @param user the user specified by the userEmail (-c) parameter
39
+ * @param appName
40
+ */
41
+ tryCopyAppFiles(copyDir: string, user: User, appName?: string): Promise<void>;
42
+ }
43
+ //# sourceMappingURL=cordova_helper.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cordova_helper.d.ts","sourceRoot":"","sources":["../../utils/cordova_helper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAEnD,oBAAY,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,qBAAa,aAAa;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IAExB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;gBAEf,GAAG,EAAE,UAAU;IA2B3B,QAAQ;IAkBR,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,SAAS;IA8BjB;;;;;OAKG;IACG,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM;CAwBpE"}
@@ -0,0 +1,191 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.CordovaHelper = void 0;
7
+ const child_process_1 = require("child_process");
8
+ const path_1 = require("path");
9
+ const fs_extra_1 = require("fs-extra");
10
+ const utils = require("@saltcorn/data/utils");
11
+ const { fileWithEnding, safeEnding } = utils;
12
+ const file_1 = __importDefault(require("@saltcorn/data/models/file"));
13
+ class CordovaHelper {
14
+ constructor(cfg) {
15
+ this.buildDir = cfg.buildDir;
16
+ this.platforms = cfg.platforms;
17
+ this.buildType = cfg.buildType || "debug";
18
+ this.appName = cfg.appName;
19
+ this.useDocker = cfg.useDocker;
20
+ this.keyStoreFile = cfg.keyStorePath
21
+ ? (0, path_1.basename)(cfg.keyStorePath)
22
+ : undefined;
23
+ this.keyStoreAlias = cfg.keyStoreAlias;
24
+ this.keyStorePassword = cfg.keyStorePassword;
25
+ const androidOut = (0, path_1.join)(this.buildDir, "platforms", "android", "app", "build", "outputs");
26
+ this.androidReleaseOut = (0, path_1.join)(androidOut, "bundle", "release");
27
+ this.androidDebugOut = (0, path_1.join)(androidOut, "apk", "debug");
28
+ this.appleTeamId = cfg.appleTeamId;
29
+ this.provisioningGUUID = cfg.provisioningGUUID;
30
+ }
31
+ buildApp() {
32
+ let code = null;
33
+ if (!this.useDocker) {
34
+ this.addPlugins();
35
+ code = this.callBuild();
36
+ }
37
+ else {
38
+ code = this.buildApkInContainer();
39
+ if (code === 0 && this.platforms.includes("ios"))
40
+ code = this.callBuild(["ios"]);
41
+ }
42
+ if (code !== 0)
43
+ return code;
44
+ if (this.platforms.includes("ios")) {
45
+ this.copyAppIconsSet();
46
+ code = this.runXcodeCmds();
47
+ }
48
+ return code;
49
+ }
50
+ runXcodeCmds() {
51
+ try {
52
+ console.log("xcodebuild -workspace");
53
+ let buffer = (0, child_process_1.execSync)(`xcodebuild -workspace platforms/ios/${this.appName}.xcworkspace ` +
54
+ `-scheme ${this.appName} -destination "generic/platform=iOS" ` +
55
+ `-archivePath MyArchive.xcarchive archive PROVISIONING_PROFILE="${this.provisioningGUUID}" ` +
56
+ ' CODE_SIGN_STYLE="Manual" CODE_SIGN_IDENTITY="iPhone Distribution" ' +
57
+ ` DEVELOPMENT_TEAM="${this.appleTeamId}"`, { cwd: this.buildDir });
58
+ console.log(buffer.toString());
59
+ if (!(0, fs_extra_1.existsSync)((0, path_1.join)(this.buildDir, "MyArchive.xcarchive"))) {
60
+ console.log("Unable to export ipa: xcodebuild did not create the archivePath.");
61
+ return 1;
62
+ }
63
+ else {
64
+ console.log("xcodebuild -exportArchive");
65
+ buffer = (0, child_process_1.execSync)("xcodebuild -exportArchive -archivePath MyArchive.xcarchive " +
66
+ `-exportPath ${this.buildDir} -exportOptionsPlist ExportOptions.plist`, { cwd: this.buildDir });
67
+ console.log(buffer.toString());
68
+ // to upload it automatically:
69
+ // xrun altool --upload-app -f [.ipa file] -t ios -u [apple-id] -p [app-specific password]
70
+ return 0;
71
+ }
72
+ }
73
+ catch (err) {
74
+ console.log(err);
75
+ return 1;
76
+ }
77
+ }
78
+ copyAppIconsSet() {
79
+ const src = (0, path_1.join)(this.buildDir, "AppIcon.appiconset");
80
+ if (!(0, fs_extra_1.existsSync)(src)) {
81
+ console.log("AppIcon.appiconset not found");
82
+ }
83
+ else {
84
+ const dst = (0, path_1.join)(this.buildDir, "platforms", "ios", this.appName, "Assets.xcassets", "AppIcon.appiconset");
85
+ try {
86
+ (0, fs_extra_1.rmSync)(dst, { recursive: true, force: true });
87
+ (0, fs_extra_1.copySync)(src, dst, { recursive: true, overwrite: true });
88
+ }
89
+ catch (err) {
90
+ console.log(err);
91
+ }
92
+ }
93
+ }
94
+ buildApkInContainer() {
95
+ const spawnParams = [
96
+ "run",
97
+ "--network",
98
+ "host",
99
+ "-v",
100
+ `${this.buildDir}:/saltcorn-mobile-app`,
101
+ "saltcorn/cordova-builder",
102
+ ];
103
+ spawnParams.push(this.buildType);
104
+ if (this.keyStoreFile)
105
+ spawnParams.push(this.keyStoreFile, this.keyStoreAlias || "??", this.keyStorePassword || "??");
106
+ const result = (0, child_process_1.spawnSync)("docker", spawnParams, { cwd: "." });
107
+ if (result.output)
108
+ console.log(result.output.toString());
109
+ else if (result.error)
110
+ console.log(result.error.toString());
111
+ else
112
+ console.log("docker finished without output");
113
+ return result.status;
114
+ }
115
+ addPlugins() {
116
+ const addFn = (plugin) => {
117
+ let result = (0, child_process_1.spawnSync)("npm", ["run", "add-plugin", "--", plugin], {
118
+ cwd: this.buildDir,
119
+ env: {
120
+ ...process.env,
121
+ NODE_ENV: "development",
122
+ },
123
+ });
124
+ console.log(result.output.toString());
125
+ };
126
+ addFn("cordova-sqlite-ext");
127
+ addFn("cordova-plugin-file@7.0.0");
128
+ addFn("cordova-plugin-inappbrowser");
129
+ addFn("cordova-plugin-network-information");
130
+ addFn("cordova-plugin-geolocation");
131
+ addFn("cordova-plugin-camera");
132
+ }
133
+ addPlatforms() {
134
+ const result = (0, child_process_1.spawnSync)("npm", ["run", "add-platform", "--", ...this.platforms], {
135
+ cwd: this.buildDir,
136
+ env: {
137
+ ...process.env,
138
+ NODE_ENV: "development",
139
+ },
140
+ });
141
+ console.log(result.output.toString());
142
+ }
143
+ callBuild(platforms = this.platforms) {
144
+ this.addPlatforms();
145
+ let buildParams = [...platforms, `--${this.buildType}`];
146
+ if (this.keyStoreFile) {
147
+ buildParams.push(`--keystore=${this.keyStoreFile}`, `--alias=${this.keyStoreAlias || "??"}`, `--password=${this.keyStorePassword || "??"}`, `--storePassword=${this.keyStorePassword || "??"}`);
148
+ }
149
+ if (platforms.includes("ios")) {
150
+ buildParams.push(`--developmentTeam=${this.appleTeamId}`, '--codeSignIdentity="iPhone Distribution"', "--packageType=app-store", `--provisioningProfile=${this.provisioningGUUID}`);
151
+ }
152
+ const result = (0, child_process_1.spawnSync)("npm", ["run", "build-app", "--", ...buildParams], {
153
+ cwd: this.buildDir,
154
+ });
155
+ console.log(result.output.toString());
156
+ return result.status;
157
+ }
158
+ /**
159
+ * copy .apk / .aab / .ipa files to 'copyDir' if they exist
160
+ * @param copyDir directory where the resulting app file will be copied to
161
+ * @param user the user specified by the userEmail (-c) parameter
162
+ * @param appName
163
+ */
164
+ async tryCopyAppFiles(copyDir, user, appName) {
165
+ const copyHelper = async (ending, apkBuildDir) => {
166
+ const appFile = fileWithEnding(apkBuildDir, `.${ending}`);
167
+ if (appFile) {
168
+ const dstFile = appName
169
+ ? safeEnding(appName, `.${ending}`)
170
+ : `app-${this.buildType}.${ending}`;
171
+ (0, fs_extra_1.copySync)((0, path_1.join)(apkBuildDir, appFile), (0, path_1.join)(copyDir, dstFile));
172
+ await file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
173
+ }
174
+ };
175
+ if (!(0, fs_extra_1.existsSync)(copyDir))
176
+ (0, fs_extra_1.mkdirSync)(copyDir);
177
+ if (this.buildType === "debug")
178
+ copyHelper("apk", this.androidDebugOut);
179
+ else
180
+ copyHelper("aab", this.androidReleaseOut);
181
+ // iOS .ipa file
182
+ const ipaFile = fileWithEnding(this.buildDir, ".ipa");
183
+ if (ipaFile) {
184
+ const dstFile = appName ? safeEnding(appName, ".ipa") : "app-debug.ipa";
185
+ (0, fs_extra_1.copySync)((0, path_1.join)(this.buildDir, ipaFile), (0, path_1.join)(copyDir, dstFile));
186
+ await file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
187
+ }
188
+ }
189
+ }
190
+ exports.CordovaHelper = CordovaHelper;
191
+ //# sourceMappingURL=cordova_helper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cordova_helper.js","sourceRoot":"","sources":["../../utils/cordova_helper.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"package-bundle-utils.d.ts","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAIlD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,0BAuBlB;AAoCD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,iBAcpD;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,iBA+BtE"}
1
+ {"version":3,"file":"package-bundle-utils.d.ts","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAKlD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,0BAuBlB;AAyCD;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,iBAwBpD;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,iBA+BtE"}
@@ -1,8 +1,12 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.installNpmPackages = exports.copyPublicDirs = exports.bundlePackagesAndPlugins = void 0;
4
7
  const path_1 = require("path");
5
8
  const fs_extra_1 = require("fs-extra");
9
+ const file_1 = __importDefault(require("@saltcorn/data/models/file"));
6
10
  const child_process_1 = require("child_process");
7
11
  const { getState } = require("@saltcorn/data/db/state");
8
12
  /**
@@ -39,7 +43,13 @@ async function copyHeaderToApp(pluginLocation, header, wwwDir) {
39
43
  (0, fs_extra_1.mkdirSync)(dstPublicDir, { recursive: true });
40
44
  }
41
45
  const headerFile = (0, path_1.basename)(header);
42
- (0, fs_extra_1.copySync)((0, path_1.join)(pluginLocation, "public", pluginSubDir, headerFile), (0, path_1.join)(dstPublicDir, headerFile));
46
+ try {
47
+ (0, fs_extra_1.copySync)((0, path_1.join)(pluginLocation, "public", pluginSubDir, headerFile), (0, path_1.join)(dstPublicDir, headerFile));
48
+ }
49
+ catch (e) {
50
+ console.log(`Error copying header ${header} to ${dstPublicDir}`);
51
+ console.log(e);
52
+ }
43
53
  }
44
54
  else {
45
55
  console.log(`skipping header '${header}'`);
@@ -64,6 +74,7 @@ function copyAllPublicFiles(location, dstPublicDir) {
64
74
  async function copyPublicDirs(buildDir) {
65
75
  const state = getState();
66
76
  const wwwDir = (0, path_1.join)(buildDir, "www");
77
+ const pluginCfgs = state.plugin_cfgs || {};
67
78
  for (const [k, v] of Object.entries(state.plugins)) {
68
79
  const location = state.plugin_locations[k];
69
80
  if (location) {
@@ -76,6 +87,11 @@ async function copyPublicDirs(buildDir) {
76
87
  if (k !== "sbadmin2")
77
88
  copyAllPublicFiles(location, (0, path_1.join)(wwwDir, "plugins", "public", k));
78
89
  }
90
+ if (pluginCfgs[k] && pluginCfgs[k].alt_css_file) {
91
+ const altCssFile = await file_1.default.findOne(pluginCfgs[k].alt_css_file);
92
+ if (altCssFile)
93
+ (0, fs_extra_1.copySync)(altCssFile.location, (0, path_1.join)(wwwDir, "plugins", "public", k, pluginCfgs[k].alt_css_file), { recursive: true });
94
+ }
79
95
  }
80
96
  }
81
97
  exports.copyPublicDirs = copyPublicDirs;
@@ -1 +1 @@
1
- {"version":3,"file":"package-bundle-utils.js","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package-bundle-utils.js","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"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"}
package/docker/Dockerfile CHANGED
@@ -1,22 +1,23 @@
1
- FROM node:16
1
+ FROM node:18
2
2
 
3
- RUN apt update && apt install -y wget unzip \
4
- openjdk-11-jdk openjdk-11-demo openjdk-11-doc openjdk-11-jre-headless openjdk-11-source
3
+ RUN apt update && apt install -y wget unzip
4
+ RUN apt install -y openjdk-17-jdk
5
+ ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
5
6
 
6
7
  # install android commandline tools and sdk
7
8
  RUN wget https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip
8
9
  RUN unzip commandlinetools-linux-8512546_latest.zip
9
10
  RUN mkdir android_sdk
10
- RUN yes | cmdline-tools/bin/sdkmanager --sdk_root=android_sdk --install "cmdline-tools;10.0"
11
- RUN android_sdk/cmdline-tools/10.0/bin/sdkmanager --list
12
- RUN android_sdk/cmdline-tools/10.0/bin/sdkmanager "platforms;android-11"
13
- RUN android_sdk/cmdline-tools/10.0/bin/sdkmanager "build-tools;30.0.3"
11
+ RUN yes | cmdline-tools/bin/sdkmanager --sdk_root=android_sdk --install "cmdline-tools;13.0"
12
+ RUN android_sdk/cmdline-tools/13.0/bin/sdkmanager --list
13
+ RUN android_sdk/cmdline-tools/13.0/bin/sdkmanager "platforms;android-13"
14
+ RUN android_sdk/cmdline-tools/13.0/bin/sdkmanager "build-tools;33.0.3"
14
15
 
15
16
  # download gradle
16
- RUN wget -q https://services.gradle.org/distributions/gradle-7.1.1-all.zip \
17
- && unzip gradle-7.1.1-all.zip -d /opt
17
+ RUN wget -q https://services.gradle.org/distributions/gradle-7.5.1-all.zip \
18
+ && unzip gradle-7.5.1-all.zip -d /opt
18
19
 
19
- RUN npm install -g cordova@11.1.0
20
+ RUN npm install -g cordova@12.0.0
20
21
 
21
22
  # create an empty project, the first init seems to take longer
22
23
  WORKDIR /init_project
@@ -31,13 +32,12 @@ RUN cordova plugin add cordova-plugin-network-information@3.0.0
31
32
  RUN cordova plugin add cordova-plugin-geolocation@4.1.0
32
33
  RUN cordova plugin add cordova-plugin-camera@6.0.0
33
34
  RUN cordova platform add android
34
- ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
35
35
  ENV ANDROID_SDK_ROOT=/android_sdk
36
36
  ENV ANDROID_HOME=/android_sdk
37
- ENV GRADLE_HOME=/opt/gradle-7.1.1
38
- ENV PATH=$PATH:/opt/gradle-7.1.1/bin
37
+ ENV GRADLE_HOME=/opt/gradle-7.5.1
38
+ ENV PATH=$PATH:/opt/gradle-7.5.1/bin
39
39
  # stop gradle from downloading itself
40
- ENV CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-7.1.1-all.zip
40
+ ENV CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-7.5.1-all.zip
41
41
  RUN cordova build android
42
42
 
43
43
  # due to a bug in npm that has been addressed since then
package/docker/entry.bash CHANGED
@@ -1,12 +1,22 @@
1
1
  #!/bin/bash
2
2
 
3
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
3
+ BUILD_TYPE="$1"
4
+ KEYSTORE_FILE="$2"
5
+ KEYSTORE_ALIAS="$3"
6
+ KEYSTORE_PASSWORD="$4"
7
+
8
+ echo "BUILD_TYPE: $BUILD_TYPE"
9
+ echo "KEYSTORE_FILE: $KEYSTORE_FILE"
10
+ echo "KEYSTORE_ALIAS: $KEYSTORE_ALIAS"
11
+ #echo "KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD"
12
+
13
+ export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
4
14
  export ANDROID_SDK_ROOT=/android_sdk
5
15
  export ANDROID_HOME=/android_sdk
6
- export GRADLE_HOME=/opt/gradle-7.1.1
7
- export PATH=$PATH:/opt/gradle-7.1.1/bin
16
+ export GRADLE_HOME=/opt/gradle-7.5.1
17
+ export PATH=$PATH:/opt/gradle-7.5.1/bin
8
18
  # stop gradle from downloading itself
9
- export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-7.1.1-all.zip
19
+ export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-7.5.1-all.zip
10
20
 
11
21
  cd /saltcorn-mobile-app
12
22
  echo "adding android platform"
@@ -20,7 +30,13 @@ npm run add-plugin /init_project/project/plugins/cordova-sqlite-ext
20
30
  npm run add-plugin /init_project/project/plugins/cordova-plugin-network-information
21
31
  npm run add-plugin /init_project/project/plugins/cordova-plugin-geolocation
22
32
  npm run add-plugin /init_project/project/plugins/cordova-plugin-camera
23
- echo "calling cordova build";
24
- cordova build android
33
+
34
+ if [ -n "$KEYSTORE_FILE" ]; then
35
+ echo "building signed app with keystore"
36
+ cordova build android --"$BUILD_TYPE" -- --keystore="$KEYSTORE_FILE" --alias="$KEYSTORE_ALIAS" --storePassword="$KEYSTORE_PASSWORD" --password="$KEYSTORE_PASSWORD"
37
+ else
38
+ echo "building unsigned app"
39
+ cordova build android --"$BUILD_TYPE"
40
+ fi
25
41
 
26
42
  chmod -R o+rwx /saltcorn-mobile-app
package/package.json CHANGED
@@ -3,22 +3,23 @@
3
3
  "description": "plugin to to build a mobile app from a tenant application",
4
4
  "homepage": "https://saltcorn.com",
5
5
  "repository": "github:saltcorn/saltcorn",
6
- "version": "0.9.5-beta.9",
6
+ "version": "0.9.6-beta.0",
7
7
  "author": "Christian Hugo",
8
8
  "scripts": {
9
9
  "test": "jest ./tests/ --runInBand",
10
10
  "build": "webpack --mode development"
11
11
  },
12
12
  "dependencies": {
13
- "@saltcorn/markup": "0.9.5-beta.9",
14
- "@saltcorn/data": "0.9.5-beta.9",
15
- "@saltcorn/db-common": "0.9.5-beta.9",
16
- "@saltcorn/server": "0.9.5-beta.9",
17
- "@saltcorn/base-plugin": "0.9.5-beta.9",
18
- "@saltcorn/sbadmin2": "0.9.5-beta.9",
19
- "@saltcorn/mobile-app": "0.9.5-beta.9",
13
+ "@saltcorn/markup": "0.9.6-beta.0",
14
+ "@saltcorn/data": "0.9.6-beta.0",
15
+ "@saltcorn/db-common": "0.9.6-beta.0",
16
+ "@saltcorn/server": "0.9.6-beta.0",
17
+ "@saltcorn/base-plugin": "0.9.6-beta.0",
18
+ "@saltcorn/sbadmin2": "0.9.6-beta.0",
19
+ "@saltcorn/mobile-app": "0.9.6-beta.0",
20
20
  "fs-extra": "^10.0.1",
21
21
  "live-plugin-manager": "^0.17.1",
22
+ "resize-with-sharp-or-jimp": "0.1.7",
22
23
  "webpack-merge": "^5.8.0",
23
24
  "webpack": "5.68.0",
24
25
  "webpack-cli": "4.9.2",
package/webpack.config.js CHANGED
@@ -33,7 +33,7 @@ const buildPluginEntries = async (plugins) => {
33
33
  let result = [];
34
34
  const nameToModule = new Map();
35
35
  for (const plugin of plugins) {
36
- const requireResult = await requirePlugin(plugin, false);
36
+ const requireResult = await requirePlugin(plugin, true);
37
37
  const packageName = require(`${requireResult.location}/package.json`).name;
38
38
  nameToModule.set(plugin.name, { packageName, requireResult });
39
39
  }