@saltcorn/mobile-builder 0.7.4-beta.0 → 0.7.4-beta.1

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.
@@ -18,6 +18,7 @@ export declare class MobileBuilder {
18
18
  packageRoot: string;
19
19
  copyTargetDir?: string;
20
20
  copyFileName?: string;
21
+ buildForEmulator?: boolean;
21
22
  /**
22
23
  *
23
24
  * @param cfg
@@ -35,6 +36,7 @@ export declare class MobileBuilder {
35
36
  plugins: Plugin[];
36
37
  copyTargetDir?: string;
37
38
  copyFileName?: string;
39
+ buildForEmulator?: boolean;
38
40
  });
39
41
  /**
40
42
  *
@@ -1 +1 @@
1
- {"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAoBlD,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtC;;GAEG;AACH,qBAAa,aAAa;IACxB,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,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,SAA0B;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;gBACS,GAAG,EAAE;QACf,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,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;IAmBD;;OAEG;IACG,KAAK;CAwBZ"}
1
+ {"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAoBlD,aAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtC;;GAEG;AACH,qBAAa,aAAa;IACxB,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,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;IACnB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,SAA0B;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;gBACS,GAAG,EAAE;QACf,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,UAAU,EAAE,MAAM,CAAC;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B;IAoBD;;OAEG;IACG,KAAK;CAuBZ"}
@@ -33,6 +33,7 @@ class MobileBuilder {
33
33
  this.plugins = cfg.plugins;
34
34
  this.copyTargetDir = cfg.copyTargetDir;
35
35
  this.copyFileName = cfg.copyFileName;
36
+ this.buildForEmulator = cfg.buildForEmulator;
36
37
  }
37
38
  /**
38
39
  *
@@ -54,10 +55,9 @@ class MobileBuilder {
54
55
  await (0, package_bundle_utils_1.installNpmPackages)(this.buildDir, this.pluginManager);
55
56
  await (0, common_build_utils_1.buildTablesFile)(this.buildDir);
56
57
  await (0, common_build_utils_1.createSqliteDb)(this.buildDir);
57
- const resultCode = (0, cordova_build_utils_1.buildApp)(this.buildDir, this.platforms, this.useDocker);
58
+ const resultCode = (0, cordova_build_utils_1.buildApp)(this.buildDir, this.platforms, this.useDocker, this.buildForEmulator);
58
59
  if (resultCode === 0 && this.copyTargetDir) {
59
- // copy file to 'copyTargetDir' (only apk)
60
- await (0, cordova_build_utils_1.copyApp)(this.buildDir, this.copyTargetDir, this.copyFileName);
60
+ await (0, cordova_build_utils_1.tryCopyAppFiles)(this.buildDir, this.copyTargetDir, this.copyFileName);
61
61
  }
62
62
  return resultCode;
63
63
  }
@@ -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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"}
@@ -15,7 +15,7 @@ export declare function buildApkInContainer(buildDir: string): number | null;
15
15
  * @param flags
16
16
  * @returns
17
17
  */
18
- export declare function buildApp(buildDir: string, platforms: string[], useDocker?: boolean): number | null;
18
+ export declare function buildApp(buildDir: string, platforms: string[], useDocker?: boolean, buildForEmulator?: boolean): number | null;
19
19
  /**
20
20
  *
21
21
  * @param buildDir directory where the app will be build
@@ -28,12 +28,12 @@ export declare function addPlatforms(buildDir: string, platforms: string[]): voi
28
28
  * @param platforms
29
29
  * @returns
30
30
  */
31
- export declare function callBuild(buildDir: string, platforms: string[]): number | null;
31
+ export declare function callBuild(buildDir: string, platforms: string[], buildForEmulator?: boolean): number | null;
32
32
  /**
33
- *
33
+ * copy .apk / .ipa files to 'copyDir' if they exist
34
34
  * @param buildDir directory where the app was build
35
35
  * @param copyDir directory where the resulting app file will be copied to
36
36
  * @param appFileName name of the copied app file
37
37
  */
38
- export declare function copyApp(buildDir: string, copyDir: string, appFileName?: string): Promise<void>;
38
+ export declare function tryCopyAppFiles(buildDir: string, copyDir: string, appFileName?: string): Promise<void>;
39
39
  //# sourceMappingURL=cordova-build-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cordova-build-utils.d.ts","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAQpE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,iBAcnD;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,CAAC,EAAE,OAAO,iBAUpB;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAKjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAO9D;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,iBAmBrB"}
1
+ {"version":3,"file":"cordova-build-utils.d.ts","sourceRoot":"","sources":["../../utils/cordova-build-utils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAQpE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,iBAanD;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,CAAC,EAAE,OAAO,EACnB,gBAAgB,CAAC,EAAE,OAAO,iBAU3B;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAKjE;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,gBAAgB,CAAC,EAAE,OAAO,iBAe3B;AAoBD;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,iBAsCrB"}
@@ -1,10 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.copyApp = exports.callBuild = exports.addPlatforms = exports.buildApp = exports.buildApkInContainer = exports.prepareBuildDir = void 0;
3
+ exports.tryCopyAppFiles = exports.callBuild = exports.addPlatforms = exports.buildApp = exports.buildApkInContainer = exports.prepareBuildDir = void 0;
4
4
  const child_process_1 = require("child_process");
5
5
  const fs_extra_1 = require("fs-extra");
6
6
  const path_1 = require("path");
7
- const os_1 = require("os");
7
+ const fs_1 = require("fs");
8
+ const { getState } = require("@saltcorn/data/db/state");
8
9
  /**
9
10
  * copy saltcorn-mobile-app as a template to buildDir
10
11
  * @param buildDir directory where the app will be build
@@ -27,7 +28,6 @@ exports.prepareBuildDir = prepareBuildDir;
27
28
  * @returns
28
29
  */
29
30
  function buildApkInContainer(buildDir) {
30
- const info = (0, os_1.userInfo)();
31
31
  const result = (0, child_process_1.spawnSync)("docker", [
32
32
  "run",
33
33
  "-v",
@@ -43,9 +43,9 @@ exports.buildApkInContainer = buildApkInContainer;
43
43
  * @param flags
44
44
  * @returns
45
45
  */
46
- function buildApp(buildDir, platforms, useDocker) {
46
+ function buildApp(buildDir, platforms, useDocker, buildForEmulator) {
47
47
  if (!useDocker) {
48
- return callBuild(buildDir, platforms);
48
+ return callBuild(buildDir, platforms, buildForEmulator);
49
49
  }
50
50
  else {
51
51
  let code = buildApkInContainer(buildDir);
@@ -73,9 +73,13 @@ exports.addPlatforms = addPlatforms;
73
73
  * @param platforms
74
74
  * @returns
75
75
  */
76
- function callBuild(buildDir, platforms) {
76
+ function callBuild(buildDir, platforms, buildForEmulator) {
77
77
  addPlatforms(buildDir, platforms);
78
- const result = (0, child_process_1.spawnSync)("npm", ["run", "build-app", "--", ...platforms], {
78
+ let buildParams = [...platforms];
79
+ if (!buildForEmulator) {
80
+ buildParams.push("--device", `--developmentTeam="${getState().getConfig("apple_team_id")}"`);
81
+ }
82
+ const result = (0, child_process_1.spawnSync)("npm", ["run", "build-app", "--", ...buildParams], {
79
83
  cwd: buildDir,
80
84
  });
81
85
  console.log(result.output.toString());
@@ -83,19 +87,46 @@ function callBuild(buildDir, platforms) {
83
87
  }
84
88
  exports.callBuild = callBuild;
85
89
  /**
86
- *
90
+ * find first file with specific ending
91
+ * @param directory directory to search
92
+ * @param ending wantet ending
93
+ */
94
+ function fileWithEnding(directory, ending) {
95
+ if (!(0, fs_extra_1.existsSync)(directory))
96
+ return null;
97
+ for (const file of (0, fs_1.readdirSync)(directory)) {
98
+ if (file.endsWith(ending))
99
+ return file;
100
+ }
101
+ return null;
102
+ }
103
+ function safeEnding(file, ending) {
104
+ if (!file.endsWith(ending))
105
+ return `${file}${ending}`;
106
+ return file;
107
+ }
108
+ /**
109
+ * copy .apk / .ipa files to 'copyDir' if they exist
87
110
  * @param buildDir directory where the app was build
88
111
  * @param copyDir directory where the resulting app file will be copied to
89
112
  * @param appFileName name of the copied app file
90
113
  */
91
- async function copyApp(buildDir, copyDir, appFileName) {
114
+ async function tryCopyAppFiles(buildDir, copyDir, appFileName) {
92
115
  if (!(0, fs_extra_1.existsSync)(copyDir)) {
93
116
  (0, fs_extra_1.mkdirSync)(copyDir);
94
117
  }
95
- const apkName = "app-debug.apk";
96
- const apkFile = (0, path_1.join)(buildDir, "platforms", "android", "app", "build", "outputs", "apk", "debug", apkName);
97
- const targetFile = appFileName ? appFileName : apkName;
98
- (0, fs_extra_1.copySync)(apkFile, (0, path_1.join)(copyDir, targetFile));
118
+ // android .apk file
119
+ const apkBuildDir = (0, path_1.join)(buildDir, "platforms", "android", "app", "build", "outputs", "apk", "debug");
120
+ const apkFile = fileWithEnding(apkBuildDir, ".apk");
121
+ if (apkFile) {
122
+ (0, fs_extra_1.copySync)((0, path_1.join)(apkBuildDir, apkFile), (0, path_1.join)(copyDir, appFileName ? safeEnding(appFileName, ".apk") : "app-debug.apk"));
123
+ }
124
+ // iOS .ipa file
125
+ const ipaBuildDir = (0, path_1.join)(buildDir, "platforms", "ios", "build", "device");
126
+ const ipaFile = fileWithEnding(ipaBuildDir, ".ipa");
127
+ if (ipaFile) {
128
+ (0, fs_extra_1.copySync)((0, path_1.join)(ipaBuildDir, ipaFile), (0, path_1.join)(copyDir, appFileName ? safeEnding(appFileName, ".ipa") : "app-debug.ipa"));
129
+ }
99
130
  }
100
- exports.copyApp = copyApp;
131
+ exports.tryCopyAppFiles = tryCopyAppFiles;
101
132
  //# sourceMappingURL=cordova-build-utils.js.map
@@ -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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"}
package/package.json CHANGED
@@ -3,20 +3,20 @@
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.7.4-beta.0",
6
+ "version": "0.7.4-beta.1",
7
7
  "author": "Christian Hugo",
8
8
  "scripts": {
9
9
  "build": "webpack --mode development",
10
10
  "postinstall": "node ./docker/post-installer.js"
11
11
  },
12
12
  "dependencies": {
13
- "@saltcorn/markup": "0.7.4-beta.0",
14
- "@saltcorn/data": "0.7.4-beta.0",
15
- "@saltcorn/db-common": "0.7.4-beta.0",
16
- "@saltcorn/server": "0.7.4-beta.0",
17
- "@saltcorn/base-plugin": "0.7.4-beta.0",
18
- "@saltcorn/sbadmin2": "0.7.4-beta.0",
19
- "@saltcorn/mobile-app": "0.7.4-beta.0",
13
+ "@saltcorn/markup": "0.7.4-beta.1",
14
+ "@saltcorn/data": "0.7.4-beta.1",
15
+ "@saltcorn/db-common": "0.7.4-beta.1",
16
+ "@saltcorn/server": "0.7.4-beta.1",
17
+ "@saltcorn/base-plugin": "0.7.4-beta.1",
18
+ "@saltcorn/sbadmin2": "0.7.4-beta.1",
19
+ "@saltcorn/mobile-app": "0.7.4-beta.1",
20
20
  "fs-extra": "^10.0.1",
21
21
  "live-plugin-manager": "^0.16.0",
22
22
  "webpack-merge": "^5.8.0",