@saltcorn/mobile-builder 1.1.1-beta.0 → 1.1.1-beta.2
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/mobile-builder.d.ts +22 -5
- package/dist/mobile-builder.d.ts.map +1 -1
- package/dist/mobile-builder.js +61 -18
- package/dist/mobile-builder.js.map +1 -1
- package/dist/utils/capacitor-helper.d.ts +9 -7
- package/dist/utils/capacitor-helper.d.ts.map +1 -1
- package/dist/utils/capacitor-helper.js +66 -34
- package/dist/utils/capacitor-helper.js.map +1 -1
- package/dist/utils/common-build-utils.d.ts +9 -6
- package/dist/utils/common-build-utils.d.ts.map +1 -1
- package/dist/utils/common-build-utils.js +105 -22
- package/dist/utils/common-build-utils.js.map +1 -1
- package/docker/entry.bash +31 -29
- package/package.json +8 -8
package/dist/mobile-builder.d.ts
CHANGED
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
import Plugin from "@saltcorn/data/models/plugin";
|
|
2
2
|
import User from "@saltcorn/data/models/user";
|
|
3
|
+
import { CapacitorHelper } from "./utils/capacitor-helper";
|
|
3
4
|
type EntryPointType = "view" | "page";
|
|
5
|
+
export type IosCfg = {
|
|
6
|
+
appleTeamId: string;
|
|
7
|
+
mainProvisioningProfile: {
|
|
8
|
+
guuid: string;
|
|
9
|
+
};
|
|
10
|
+
shareExtensionProvisioningProfile?: {
|
|
11
|
+
guuid: string;
|
|
12
|
+
specifier: string;
|
|
13
|
+
identifier: string;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
4
16
|
type MobileBuilderConfig = {
|
|
5
17
|
appName?: string;
|
|
6
18
|
appId?: string;
|
|
@@ -23,8 +35,8 @@ type MobileBuilderConfig = {
|
|
|
23
35
|
plugins: Plugin[];
|
|
24
36
|
copyTargetDir?: string;
|
|
25
37
|
user?: User;
|
|
26
|
-
|
|
27
|
-
|
|
38
|
+
iosParams?: IosCfg;
|
|
39
|
+
allowShareTo?: boolean;
|
|
28
40
|
tenantAppName?: string;
|
|
29
41
|
keyStorePath?: string;
|
|
30
42
|
keyStoreAlias?: string;
|
|
@@ -58,14 +70,15 @@ export declare class MobileBuilder {
|
|
|
58
70
|
packageRoot: string;
|
|
59
71
|
copyTargetDir?: string;
|
|
60
72
|
user?: User;
|
|
61
|
-
|
|
62
|
-
provisioningProfile?: string;
|
|
73
|
+
allowShareTo: boolean;
|
|
63
74
|
tenantAppName?: string;
|
|
64
75
|
keyStorePath: string;
|
|
65
76
|
keyStoreAlias: string;
|
|
66
77
|
keyStorePassword: string;
|
|
67
78
|
isUnsecureKeyStore: boolean;
|
|
68
79
|
buildType: "debug" | "release";
|
|
80
|
+
iosParams?: IosCfg;
|
|
81
|
+
capacitorHelper: CapacitorHelper;
|
|
69
82
|
/**
|
|
70
83
|
*
|
|
71
84
|
* @param cfg
|
|
@@ -74,7 +87,11 @@ export declare class MobileBuilder {
|
|
|
74
87
|
/**
|
|
75
88
|
*
|
|
76
89
|
*/
|
|
77
|
-
|
|
90
|
+
fullBuild(): Promise<number | null>;
|
|
91
|
+
prepareStep(): Promise<0 | 1>;
|
|
92
|
+
finishStep(): Promise<number | null>;
|
|
93
|
+
private handleIosPlatform;
|
|
94
|
+
private handleAndroidPlatform;
|
|
78
95
|
}
|
|
79
96
|
export {};
|
|
80
97
|
//# sourceMappingURL=mobile-builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"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"}
|
package/dist/mobile-builder.js
CHANGED
|
@@ -50,7 +50,7 @@ class MobileBuilder {
|
|
|
50
50
|
this.plugins = cfg.plugins;
|
|
51
51
|
this.copyTargetDir = cfg.copyTargetDir;
|
|
52
52
|
this.user = cfg.user;
|
|
53
|
-
this.
|
|
53
|
+
this.allowShareTo = cfg.allowShareTo || false;
|
|
54
54
|
this.tenantAppName = cfg.tenantAppName;
|
|
55
55
|
if (cfg.keyStorePath && cfg.keyStoreAlias && cfg.keyStorePassword) {
|
|
56
56
|
this.keyStorePath = cfg.keyStorePath;
|
|
@@ -65,11 +65,29 @@ class MobileBuilder {
|
|
|
65
65
|
this.isUnsecureKeyStore = true;
|
|
66
66
|
}
|
|
67
67
|
this.buildType = cfg.buildType;
|
|
68
|
+
this.iosParams = cfg.iosParams;
|
|
69
|
+
this.capacitorHelper = new capacitor_helper_1.CapacitorHelper({
|
|
70
|
+
...this,
|
|
71
|
+
appVersion: this.appVersion,
|
|
72
|
+
});
|
|
68
73
|
}
|
|
69
74
|
/**
|
|
70
75
|
*
|
|
71
76
|
*/
|
|
72
|
-
async
|
|
77
|
+
async fullBuild() {
|
|
78
|
+
try {
|
|
79
|
+
let resultCode = await this.prepareStep();
|
|
80
|
+
if (resultCode !== 0)
|
|
81
|
+
return resultCode;
|
|
82
|
+
else
|
|
83
|
+
return await this.finishStep();
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
console.error(error);
|
|
87
|
+
return 1;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
async prepareStep() {
|
|
73
91
|
try {
|
|
74
92
|
(0, common_build_utils_1.prepareBuildDir)(this.buildDir, this.templateDir);
|
|
75
93
|
(0, common_build_utils_1.writeCapacitorConfig)(this.buildDir, {
|
|
@@ -83,13 +101,18 @@ class MobileBuilder {
|
|
|
83
101
|
keystoreAliasPassword: this.keyStorePassword,
|
|
84
102
|
buildType: this.buildType,
|
|
85
103
|
});
|
|
104
|
+
this.capacitorHelper.addPlatforms();
|
|
105
|
+
return 0;
|
|
106
|
+
}
|
|
107
|
+
catch (e) {
|
|
108
|
+
console.error(e);
|
|
109
|
+
return 1;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
async finishStep() {
|
|
113
|
+
try {
|
|
86
114
|
if (this.appIcon)
|
|
87
115
|
(0, common_build_utils_1.prepAppIcon)(this.buildDir, this.appIcon);
|
|
88
|
-
let iosParams = null;
|
|
89
|
-
if (this.platforms.includes("ios")) {
|
|
90
|
-
iosParams = await (0, common_build_utils_1.decodeProvisioningProfile)(this.buildDir, this.provisioningProfile);
|
|
91
|
-
(0, common_build_utils_1.prepareExportOptionsPlist)(this.buildDir, this.appId, iosParams.guuid);
|
|
92
|
-
}
|
|
93
116
|
(0, common_build_utils_1.copyServerFiles)(this.buildDir);
|
|
94
117
|
(0, common_build_utils_1.copySbadmin2Deps)(this.buildDir);
|
|
95
118
|
await (0, common_build_utils_1.copySiteLogo)(this.buildDir);
|
|
@@ -104,6 +127,7 @@ class MobileBuilder {
|
|
|
104
127
|
tenantAppName: this.tenantAppName,
|
|
105
128
|
autoPublicLogin: this.autoPublicLogin,
|
|
106
129
|
allowOfflineMode: this.allowOfflineMode,
|
|
130
|
+
allowShareTo: this.allowShareTo,
|
|
107
131
|
});
|
|
108
132
|
let resultCode = await (0, package_bundle_utils_1.bundlePackagesAndPlugins)(this.buildDir, this.plugins);
|
|
109
133
|
if (resultCode !== 0)
|
|
@@ -119,25 +143,44 @@ class MobileBuilder {
|
|
|
119
143
|
resultCode = await (0, common_build_utils_1.createSqliteDb)(this.buildDir);
|
|
120
144
|
if (resultCode !== 0)
|
|
121
145
|
return resultCode;
|
|
122
|
-
if (
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
provisioningGUUID: iosParams?.guuid,
|
|
129
|
-
});
|
|
130
|
-
await capacitorHelper.buildApp();
|
|
146
|
+
if (this.platforms.includes("ios"))
|
|
147
|
+
await this.handleIosPlatform();
|
|
148
|
+
if (this.platforms.includes("android"))
|
|
149
|
+
await this.handleAndroidPlatform();
|
|
150
|
+
this.capacitorHelper.generateAssets();
|
|
151
|
+
await this.capacitorHelper.buildApp();
|
|
131
152
|
if (resultCode === 0 && this.copyTargetDir) {
|
|
132
|
-
capacitorHelper.tryCopyAppFiles(this.copyTargetDir, this.user, this.appName);
|
|
153
|
+
this.capacitorHelper.tryCopyAppFiles(this.copyTargetDir, this.user, this.appName);
|
|
133
154
|
}
|
|
134
|
-
return
|
|
155
|
+
return resultCode;
|
|
135
156
|
}
|
|
136
157
|
catch (e) {
|
|
137
158
|
console.error(e);
|
|
138
159
|
return 1;
|
|
139
160
|
}
|
|
140
161
|
}
|
|
162
|
+
async handleIosPlatform() {
|
|
163
|
+
(0, common_build_utils_1.prepareExportOptionsPlist)({
|
|
164
|
+
buildDir: this.buildDir,
|
|
165
|
+
appId: this.appId,
|
|
166
|
+
iosParams: this.iosParams,
|
|
167
|
+
});
|
|
168
|
+
(0, common_build_utils_1.modifyXcodeProjectFile)(this.buildDir, this.appVersion, this.iosParams);
|
|
169
|
+
(0, common_build_utils_1.writePodfile)(this.buildDir);
|
|
170
|
+
(0, common_build_utils_1.writePrivacyInfo)(this.buildDir);
|
|
171
|
+
(0, common_build_utils_1.modifyInfoPlist)(this.buildDir, this.allowShareTo);
|
|
172
|
+
if (this.allowShareTo)
|
|
173
|
+
(0, common_build_utils_1.copyShareExtFiles)(this.buildDir);
|
|
174
|
+
}
|
|
175
|
+
async handleAndroidPlatform() {
|
|
176
|
+
if (!this.isUnsecureKeyStore) {
|
|
177
|
+
(0, fs_extra_1.copySync)(this.keyStorePath, (0, path_1.join)(this.buildDir, (0, path_1.basename)(this.keyStorePath)));
|
|
178
|
+
}
|
|
179
|
+
await (0, common_build_utils_1.modifyAndroidManifest)(this.buildDir);
|
|
180
|
+
(0, common_build_utils_1.writeDataExtractionRules)(this.buildDir);
|
|
181
|
+
(0, common_build_utils_1.writeNetworkSecurityConfig)(this.buildDir, this.serverURL);
|
|
182
|
+
(0, common_build_utils_1.modifyGradleConfig)(this.buildDir, this.appVersion);
|
|
183
|
+
}
|
|
141
184
|
}
|
|
142
185
|
exports.MobileBuilder = MobileBuilder;
|
|
143
186
|
//# sourceMappingURL=mobile-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACzD,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACpE,+BAAsC;AACtC,uCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import type User from "@saltcorn/data/models/user";
|
|
2
|
+
import type { IosCfg } from "../mobile-builder";
|
|
2
3
|
export type CapacitorCfg = {
|
|
3
4
|
buildDir: string;
|
|
4
5
|
platforms: string[];
|
|
5
6
|
buildType: "debug" | "release";
|
|
6
7
|
appName: string;
|
|
7
8
|
appVersion: string;
|
|
9
|
+
serverURL: string;
|
|
8
10
|
useDocker?: boolean;
|
|
9
11
|
keyStorePath: string;
|
|
10
12
|
keyStoreAlias: string;
|
|
11
13
|
keyStorePassword: string;
|
|
12
14
|
isUnsecureKeyStore: boolean;
|
|
13
|
-
|
|
14
|
-
provisioningGUUID?: string;
|
|
15
|
+
iosParams?: IosCfg;
|
|
15
16
|
};
|
|
16
17
|
export declare class CapacitorHelper {
|
|
17
18
|
buildDir: string;
|
|
@@ -19,23 +20,24 @@ export declare class CapacitorHelper {
|
|
|
19
20
|
buildType: "debug" | "release";
|
|
20
21
|
appName: string;
|
|
21
22
|
appVersion: string;
|
|
23
|
+
serverURL: string;
|
|
22
24
|
useDocker?: boolean;
|
|
23
25
|
keyStoreFile: string;
|
|
24
26
|
keyStoreAlias: string;
|
|
25
27
|
keyStorePassword: string;
|
|
26
28
|
isUnsecureKeyStore: boolean;
|
|
27
|
-
appleTeamId?: string;
|
|
28
|
-
provisioningGUUID?: string;
|
|
29
29
|
isAndroid: boolean;
|
|
30
30
|
isIOS: boolean;
|
|
31
|
+
iosParams?: IosCfg;
|
|
31
32
|
constructor(cfg: CapacitorCfg);
|
|
32
33
|
buildApp(): Promise<void>;
|
|
33
34
|
tryCopyAppFiles(copyDir: string, user: User, appName?: string): void;
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
addPlatforms(): void;
|
|
36
|
+
generateAssets(): void;
|
|
36
37
|
private capBuild;
|
|
38
|
+
private gradleBuild;
|
|
37
39
|
private buildWithDocker;
|
|
38
40
|
private xCodeBuild;
|
|
39
|
-
|
|
41
|
+
capSync(): void;
|
|
40
42
|
}
|
|
41
43
|
//# sourceMappingURL=capacitor-helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacitor-helper.d.ts","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"capacitor-helper.d.ts","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAMnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,eAAe;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAE5B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;gBAEP,GAAG,EAAE,YAAY;IAiBhB,QAAQ;IAgBd,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM;IAwD7D,YAAY;IAmCZ,cAAc;IAiBrB,OAAO,CAAC,QAAQ;IAoChB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,UAAU;IAmCX,OAAO;CAiBf"}
|
|
@@ -18,62 +18,75 @@ class CapacitorHelper {
|
|
|
18
18
|
this.platforms = cfg.platforms;
|
|
19
19
|
this.buildType = cfg.buildType || "debug";
|
|
20
20
|
this.appName = cfg.appName;
|
|
21
|
+
this.serverURL = cfg.serverURL;
|
|
21
22
|
this.appVersion = cfg.appVersion;
|
|
22
23
|
this.useDocker = cfg.useDocker;
|
|
23
24
|
this.keyStoreFile = (0, path_1.basename)(cfg.keyStorePath);
|
|
24
25
|
this.keyStoreAlias = cfg.keyStoreAlias;
|
|
25
26
|
this.keyStorePassword = cfg.keyStorePassword;
|
|
26
27
|
this.isUnsecureKeyStore = cfg.isUnsecureKeyStore;
|
|
27
|
-
this.
|
|
28
|
-
this.provisioningGUUID = cfg.provisioningGUUID;
|
|
28
|
+
this.iosParams = cfg.iosParams;
|
|
29
29
|
this.isAndroid = this.platforms.includes("android");
|
|
30
30
|
this.isIOS = this.platforms.includes("ios");
|
|
31
31
|
}
|
|
32
32
|
async buildApp() {
|
|
33
33
|
if (!this.useDocker) {
|
|
34
|
-
this.addPlatforms();
|
|
35
|
-
this.generateAssets();
|
|
36
34
|
this.capSync();
|
|
37
35
|
(0, common_build_utils_1.copyPrepopulatedDb)(this.buildDir, this.platforms);
|
|
38
36
|
if (this.isAndroid) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
if (this.buildType === "release")
|
|
38
|
+
this.capBuild();
|
|
39
|
+
else {
|
|
40
|
+
// there seems to be a problem with apks generated from 'npx cap build'
|
|
41
|
+
// so for debug builds we use gradle directly
|
|
42
|
+
this.gradleBuild();
|
|
43
|
+
}
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
else
|
|
47
47
|
this.buildWithDocker();
|
|
48
|
-
if (this.isIOS)
|
|
49
|
-
(0, common_build_utils_1.modifyXcodeProjectFile)(this.buildDir, this.appVersion);
|
|
50
|
-
(0, common_build_utils_1.writePodfile)(this.buildDir);
|
|
51
|
-
await (0, common_build_utils_1.modifyInfoPlist)(this.buildDir);
|
|
52
|
-
(0, common_build_utils_1.writePrivacyInfo)(this.buildDir);
|
|
48
|
+
if (this.isIOS)
|
|
53
49
|
this.xCodeBuild();
|
|
54
|
-
}
|
|
55
50
|
}
|
|
56
51
|
tryCopyAppFiles(copyDir, user, appName) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
52
|
+
if (this.isAndroid) {
|
|
53
|
+
if (this.buildType === "release") {
|
|
54
|
+
const bundleDir = (0, path_1.join)(this.buildDir, "android", "app", "build", "outputs", "bundle", "release");
|
|
55
|
+
const aabFile = (0, path_1.join)(bundleDir, !this.isUnsecureKeyStore
|
|
56
|
+
? "app-release-signed.aab"
|
|
57
|
+
: "app-release.aab");
|
|
58
|
+
if ((0, fs_1.existsSync)(aabFile)) {
|
|
59
|
+
const dstFile = appName
|
|
60
|
+
? safeEnding(appName, ".aab")
|
|
61
|
+
: `app-${this.buildType}.aab`;
|
|
62
|
+
(0, fs_extra_1.copySync)(aabFile, (0, path_1.join)(copyDir, dstFile));
|
|
63
|
+
file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
const apkFile = (0, path_1.join)(this.buildDir, "android", "app", "build", "outputs", "apk", "debug", "app-debug.apk");
|
|
68
|
+
if ((0, fs_1.existsSync)(apkFile)) {
|
|
69
|
+
const dstFile = appName
|
|
70
|
+
? safeEnding(appName, ".apk")
|
|
71
|
+
: `app-${this.buildType}.apk`;
|
|
72
|
+
(0, fs_extra_1.copySync)(apkFile, (0, path_1.join)(copyDir, dstFile));
|
|
73
|
+
file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else if (this.isIOS) {
|
|
78
|
+
const ipaFile = (0, path_1.join)(this.buildDir, "App.ipa");
|
|
79
|
+
if ((0, fs_1.existsSync)(ipaFile)) {
|
|
62
80
|
const dstFile = appName
|
|
63
|
-
? safeEnding(appName,
|
|
64
|
-
: `app-${this.buildType}
|
|
65
|
-
(0, fs_extra_1.copySync)(
|
|
66
|
-
|
|
81
|
+
? safeEnding(appName, ".ipa")
|
|
82
|
+
: `app-${this.buildType}.ipa`;
|
|
83
|
+
(0, fs_extra_1.copySync)(ipaFile, (0, path_1.join)(copyDir, dstFile));
|
|
84
|
+
file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
|
|
67
85
|
}
|
|
68
|
-
}
|
|
69
|
-
if (!(0, fs_1.existsSync)(copyDir))
|
|
70
|
-
(0, fs_1.mkdirSync)(copyDir);
|
|
71
|
-
// android
|
|
72
|
-
copyHelper(this.buildType === "debug" ? "apk" : "aab", (0, path_1.join)(this.buildDir, "android", "app", "build", "outputs", this.buildType === "debug" ? "apk" : "bundle", "release"));
|
|
73
|
-
// ipa
|
|
74
|
-
copyHelper("ipa", this.buildDir);
|
|
86
|
+
}
|
|
75
87
|
}
|
|
76
88
|
addPlatforms() {
|
|
89
|
+
console.log("add platforms");
|
|
77
90
|
const addFn = (platform) => {
|
|
78
91
|
let result = (0, child_process_1.spawnSync)("npm", ["install", `@capacitor/${platform}`], {
|
|
79
92
|
cwd: this.buildDir,
|
|
@@ -106,6 +119,7 @@ class CapacitorHelper {
|
|
|
106
119
|
addFn(platform);
|
|
107
120
|
}
|
|
108
121
|
generateAssets() {
|
|
122
|
+
console.log("npx capacitor-assets generate");
|
|
109
123
|
const result = (0, child_process_1.spawnSync)("npx", ["capacitor-assets", "generate"], {
|
|
110
124
|
cwd: this.buildDir,
|
|
111
125
|
maxBuffer: 1024 * 1024 * 10,
|
|
@@ -126,7 +140,7 @@ class CapacitorHelper {
|
|
|
126
140
|
"build",
|
|
127
141
|
"android",
|
|
128
142
|
"--androidreleasetype",
|
|
129
|
-
|
|
143
|
+
"AAB",
|
|
130
144
|
"--keystorepath",
|
|
131
145
|
(0, path_1.join)(this.buildDir, this.keyStoreFile),
|
|
132
146
|
"--keystorepass",
|
|
@@ -149,6 +163,22 @@ class CapacitorHelper {
|
|
|
149
163
|
throw new Error(`Unable to call the build (code ${result.status})` +
|
|
150
164
|
`\n\n${result.error.toString()}`);
|
|
151
165
|
}
|
|
166
|
+
gradleBuild() {
|
|
167
|
+
console.log("gradlew assembleDebug");
|
|
168
|
+
const result = (0, child_process_1.spawnSync)("./gradlew", ["assembleDebug"], {
|
|
169
|
+
cwd: this.buildDir + "/android",
|
|
170
|
+
maxBuffer: 1024 * 1024 * 10,
|
|
171
|
+
env: {
|
|
172
|
+
...process.env,
|
|
173
|
+
NODE_ENV: "development",
|
|
174
|
+
},
|
|
175
|
+
});
|
|
176
|
+
if (result.output)
|
|
177
|
+
console.log(result.output.toString());
|
|
178
|
+
else if (result.error)
|
|
179
|
+
throw new Error(`Unable to call the gradlew build (code ${result.status})` +
|
|
180
|
+
`\n\n${result.error.toString()}`);
|
|
181
|
+
}
|
|
152
182
|
buildWithDocker() {
|
|
153
183
|
console.log("building with docker");
|
|
154
184
|
const spawnParams = [
|
|
@@ -161,6 +191,7 @@ class CapacitorHelper {
|
|
|
161
191
|
];
|
|
162
192
|
spawnParams.push(this.buildType);
|
|
163
193
|
spawnParams.push(this.appVersion);
|
|
194
|
+
spawnParams.push(this.serverURL);
|
|
164
195
|
if (this.buildType === "release")
|
|
165
196
|
spawnParams.push(this.keyStoreFile, this.keyStoreAlias, this.keyStorePassword);
|
|
166
197
|
const result = (0, child_process_1.spawnSync)("docker", spawnParams, {
|
|
@@ -178,9 +209,9 @@ class CapacitorHelper {
|
|
|
178
209
|
console.log("xcodebuild -workspace");
|
|
179
210
|
let buffer = (0, child_process_1.execSync)(`xcodebuild -workspace ios/App/App.xcworkspace ` +
|
|
180
211
|
`-scheme App -destination "generic/platform=iOS" ` +
|
|
181
|
-
`-archivePath MyArchive.xcarchive archive PROVISIONING_PROFILE="${this.
|
|
212
|
+
`-archivePath MyArchive.xcarchive archive PROVISIONING_PROFILE="${this.iosParams?.mainProvisioningProfile.guuid}" ` +
|
|
182
213
|
' CODE_SIGN_STYLE="Manual" CODE_SIGN_IDENTITY="iPhone Distribution" ' +
|
|
183
|
-
` DEVELOPMENT_TEAM="${this.appleTeamId}" `, { cwd: this.buildDir, maxBuffer: 1024 * 1024 * 10 });
|
|
214
|
+
` DEVELOPMENT_TEAM="${this.iosParams?.appleTeamId}" `, { cwd: this.buildDir, maxBuffer: 1024 * 1024 * 10 });
|
|
184
215
|
if (!(0, fs_1.existsSync)((0, path_1.join)(this.buildDir, "MyArchive.xcarchive"))) {
|
|
185
216
|
console.log("Unable to export ipa: xcodebuild did not create the archivePath.");
|
|
186
217
|
return 1;
|
|
@@ -201,6 +232,7 @@ class CapacitorHelper {
|
|
|
201
232
|
}
|
|
202
233
|
}
|
|
203
234
|
capSync() {
|
|
235
|
+
console.log("npx cap sync");
|
|
204
236
|
const result = (0, child_process_1.spawnSync)("npx", ["cap", "sync"], {
|
|
205
237
|
cwd: this.buildDir,
|
|
206
238
|
maxBuffer: 1024 * 1024 * 10,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacitor-helper.js","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAoD;AACpD,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"capacitor-helper.js","sourceRoot":"","sources":["../../utils/capacitor-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type User from "@saltcorn/data/models/user";
|
|
2
|
+
import type { IosCfg } from "../mobile-builder";
|
|
2
3
|
/**
|
|
3
4
|
* copy saltcorn-mobile-app as a template to buildDir
|
|
4
5
|
* and install the capacitor and cordova modules to node_modules (cap sync will be run later)
|
|
@@ -22,7 +23,7 @@ export declare function prepAppIcon(buildDir: string, appIcon: string): void;
|
|
|
22
23
|
export declare function modifyAndroidManifest(buildDir: string): Promise<void>;
|
|
23
24
|
export declare function writeDataExtractionRules(buildDir: string): void;
|
|
24
25
|
export declare function copyPrepopulatedDb(buildDir: string, platforms: string[]): void;
|
|
25
|
-
export declare function writeNetworkSecurityConfig(buildDir: string): void;
|
|
26
|
+
export declare function writeNetworkSecurityConfig(buildDir: string, serverPath: string): void;
|
|
26
27
|
export declare function modifyConfigXml(buildDir: string, config: any): Promise<void>;
|
|
27
28
|
/**
|
|
28
29
|
* copy a png file into the build dir and use it as launcher icon
|
|
@@ -39,11 +40,14 @@ export declare function prepareAppIcon(buildDir: string, appIcon: string, platfo
|
|
|
39
40
|
* @param platforms
|
|
40
41
|
*/
|
|
41
42
|
export declare function prepareSplashIcon(buildDir: string, splashIcon: string, platforms: string[]): Promise<void>;
|
|
42
|
-
export declare function prepareExportOptionsPlist(buildDir
|
|
43
|
-
export declare function modifyInfoPlist(buildDir: string):
|
|
43
|
+
export declare function prepareExportOptionsPlist({ buildDir, appId, iosParams }: any): void;
|
|
44
|
+
export declare function modifyInfoPlist(buildDir: string, allowShareTo: boolean): void;
|
|
45
|
+
export declare function copyShareExtFiles(buildDir: string): void;
|
|
44
46
|
export declare function decodeProvisioningProfile(buildDir: string, provisioningProfile: string): Promise<{
|
|
45
47
|
guuid: any;
|
|
46
48
|
teamId: any;
|
|
49
|
+
specifier: any;
|
|
50
|
+
identifier: any;
|
|
47
51
|
}>;
|
|
48
52
|
export declare function writePrivacyInfo(buildDir: string): void;
|
|
49
53
|
/**
|
|
@@ -66,7 +70,7 @@ export declare function copySiteLogo(buildDir: string): Promise<void>;
|
|
|
66
70
|
* create a cfg file, the app use this configs
|
|
67
71
|
* @param param0
|
|
68
72
|
*/
|
|
69
|
-
export declare function writeCfgFile({ buildDir, entryPoint, entryPointType, serverPath, localUserTables, synchedTables, tenantAppName, autoPublicLogin, allowOfflineMode, }: any): void;
|
|
73
|
+
export declare function writeCfgFile({ buildDir, entryPoint, entryPointType, serverPath, localUserTables, synchedTables, tenantAppName, autoPublicLogin, allowOfflineMode, allowShareTo, }: any): void;
|
|
70
74
|
/**
|
|
71
75
|
* create a file with all data from the db
|
|
72
76
|
* the app updates its local db from this
|
|
@@ -97,11 +101,10 @@ export declare function createSqliteDb(buildDir: string): Promise<number | null>
|
|
|
97
101
|
export declare function prepareSplashPage(buildDir: string, pageName: string, serverUrl: string, tenantAppName?: string, user?: User): Promise<void>;
|
|
98
102
|
export declare function writePodfile(buildDir: string): void;
|
|
99
103
|
/**
|
|
100
|
-
* replace the MARKETING_VERSION in project.pbxproj
|
|
101
104
|
* @param buildDir
|
|
102
105
|
* @param appVersion new app version
|
|
103
106
|
*/
|
|
104
|
-
export declare function modifyXcodeProjectFile(buildDir: string, appVersion: string): void;
|
|
107
|
+
export declare function modifyXcodeProjectFile(buildDir: string, appVersion: string, iosCfg: IosCfg): void;
|
|
105
108
|
export declare function generateAndroidVersionCode(appVersion: string): number;
|
|
106
109
|
export declare function modifyGradleConfig(buildDir: string, appVersion: string): void;
|
|
107
110
|
//# sourceMappingURL=common-build-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"common-build-utils.d.ts","sourceRoot":"","sources":["../../utils/common-build-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.modifyGradleConfig = exports.generateAndroidVersionCode = exports.modifyXcodeProjectFile = exports.writePodfile = exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = exports.writePrivacyInfo = exports.decodeProvisioningProfile = exports.modifyInfoPlist = exports.prepareExportOptionsPlist = exports.prepareSplashIcon = exports.prepareAppIcon = exports.modifyConfigXml = exports.writeNetworkSecurityConfig = exports.copyPrepopulatedDb = exports.writeDataExtractionRules = exports.modifyAndroidManifest = exports.prepAppIcon = exports.writeCapacitorConfig = exports.prepareBuildDir = void 0;
|
|
6
|
+
exports.modifyGradleConfig = exports.generateAndroidVersionCode = exports.modifyXcodeProjectFile = exports.writePodfile = exports.prepareSplashPage = exports.createSqliteDb = exports.copyTranslationFiles = exports.buildTablesFile = exports.writeCfgFile = exports.copySiteLogo = exports.copySbadmin2Deps = exports.copyServerFiles = exports.writePrivacyInfo = exports.decodeProvisioningProfile = exports.copyShareExtFiles = exports.modifyInfoPlist = exports.prepareExportOptionsPlist = exports.prepareSplashIcon = exports.prepareAppIcon = exports.modifyConfigXml = exports.writeNetworkSecurityConfig = exports.copyPrepopulatedDb = exports.writeDataExtractionRules = exports.modifyAndroidManifest = exports.prepAppIcon = exports.writeCapacitorConfig = 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;
|
|
@@ -43,6 +43,7 @@ function prepareBuildDir(buildDir, templateDir) {
|
|
|
43
43
|
"@capacitor/network@6.0.3",
|
|
44
44
|
"@capacitor-community/sqlite@6.0.2",
|
|
45
45
|
"@capacitor/screen-orientation@6.0.3",
|
|
46
|
+
"send-intent",
|
|
46
47
|
];
|
|
47
48
|
result = (0, child_process_1.spawnSync)("npm", ["install", ...capDepsAndPlugins], {
|
|
48
49
|
cwd: buildDir,
|
|
@@ -82,16 +83,13 @@ const config: CapacitorConfig = {
|
|
|
82
83
|
`
|
|
83
84
|
: ""}
|
|
84
85
|
releaseType: '${config.buildType === "release" ? "AAB" : "APK"}',
|
|
85
|
-
}
|
|
86
|
+
},
|
|
87
|
+
${config.unsecureNetwork ? "allowMixedContent: true," : ""}
|
|
86
88
|
},
|
|
87
89
|
${config.unsecureNetwork
|
|
88
|
-
? `
|
|
89
|
-
allowMixedContent: true,
|
|
90
|
-
},
|
|
91
|
-
server: {
|
|
90
|
+
? `server: {
|
|
92
91
|
cleartext: true,
|
|
93
92
|
androidScheme: 'http',
|
|
94
|
-
|
|
95
93
|
},`
|
|
96
94
|
: ""}
|
|
97
95
|
plugins: {
|
|
@@ -137,6 +135,7 @@ function prepAppIcon(buildDir, appIcon) {
|
|
|
137
135
|
}
|
|
138
136
|
exports.prepAppIcon = prepAppIcon;
|
|
139
137
|
async function modifyAndroidManifest(buildDir) {
|
|
138
|
+
console.log("modifyAndroidManifest");
|
|
140
139
|
try {
|
|
141
140
|
const androidManifest = (0, path_1.join)(buildDir, "android", "app", "src", "main", "AndroidManifest.xml");
|
|
142
141
|
const content = (0, fs_extra_1.readFileSync)(androidManifest);
|
|
@@ -154,6 +153,17 @@ async function modifyAndroidManifest(buildDir) {
|
|
|
154
153
|
"android:networkSecurityConfig": "@xml/network_security_config",
|
|
155
154
|
"android:usesCleartextTraffic": "true",
|
|
156
155
|
};
|
|
156
|
+
// add intent-filter for sharing
|
|
157
|
+
parsed.manifest.application[0].activity[0]["intent-filter"] = [
|
|
158
|
+
...parsed.manifest.application[0].activity[0]["intent-filter"],
|
|
159
|
+
{
|
|
160
|
+
action: [{ $: { "android:name": "android.intent.action.SEND" } }],
|
|
161
|
+
category: [
|
|
162
|
+
{ $: { "android:name": "android.intent.category.DEFAULT" } },
|
|
163
|
+
],
|
|
164
|
+
data: [{ $: { "android:mimeType": "*/*" } }],
|
|
165
|
+
},
|
|
166
|
+
];
|
|
157
167
|
const xmlBuilder = new xml2js_1.Builder();
|
|
158
168
|
const newCfg = xmlBuilder.buildObject(parsed);
|
|
159
169
|
(0, fs_extra_1.writeFileSync)(androidManifest, newCfg);
|
|
@@ -164,6 +174,7 @@ async function modifyAndroidManifest(buildDir) {
|
|
|
164
174
|
}
|
|
165
175
|
exports.modifyAndroidManifest = modifyAndroidManifest;
|
|
166
176
|
function writeDataExtractionRules(buildDir) {
|
|
177
|
+
console.log("writeDataExtractionRules");
|
|
167
178
|
const dataExtractionRules = (0, path_1.join)(buildDir, "android", "app", "src", "main", "res", "xml", "data_extraction_rules.xml");
|
|
168
179
|
(0, fs_extra_1.writeFileSync)(dataExtractionRules, `<?xml version="1.0" encoding="utf-8"?>
|
|
169
180
|
<data-extraction-rules>
|
|
@@ -184,6 +195,7 @@ function writeDataExtractionRules(buildDir) {
|
|
|
184
195
|
}
|
|
185
196
|
exports.writeDataExtractionRules = writeDataExtractionRules;
|
|
186
197
|
function copyPrepopulatedDb(buildDir, platforms) {
|
|
198
|
+
console.log("copyPrepopulatedDb", buildDir, platforms);
|
|
187
199
|
if (platforms.includes("android")) {
|
|
188
200
|
(0, fs_extra_1.copySync)((0, path_1.join)(buildDir, "www", "scdb.sqlite"), (0, path_1.join)(buildDir, "android", "app", "src", "main", "assets", "public", "assets", "databases", "prepopulated.db"));
|
|
189
201
|
}
|
|
@@ -192,12 +204,22 @@ function copyPrepopulatedDb(buildDir, platforms) {
|
|
|
192
204
|
}
|
|
193
205
|
}
|
|
194
206
|
exports.copyPrepopulatedDb = copyPrepopulatedDb;
|
|
195
|
-
function writeNetworkSecurityConfig(buildDir) {
|
|
207
|
+
function writeNetworkSecurityConfig(buildDir, serverPath) {
|
|
208
|
+
console.log("writeNetworkSecurityConfig");
|
|
209
|
+
let domain = serverPath;
|
|
210
|
+
if (domain.startsWith("http://"))
|
|
211
|
+
domain = domain.substring(7);
|
|
212
|
+
if (domain.startsWith("https://"))
|
|
213
|
+
domain = domain.substring(8);
|
|
214
|
+
if (domain.endsWith("/"))
|
|
215
|
+
domain = domain.substring(0, domain.length - 1);
|
|
216
|
+
if (domain.includes(":"))
|
|
217
|
+
domain = domain.substring(0, domain.indexOf(":"));
|
|
196
218
|
const networkSecurityConfig = (0, path_1.join)(buildDir, "android", "app", "src", "main", "res", "xml", "network_security_config.xml");
|
|
197
219
|
(0, fs_extra_1.writeFileSync)(networkSecurityConfig, `<?xml version="1.0" encoding="utf-8"?>
|
|
198
220
|
<network-security-config>
|
|
199
221
|
<domain-config cleartextTrafficPermitted="true">
|
|
200
|
-
<domain includeSubdomains="true"
|
|
222
|
+
<domain includeSubdomains="true">${domain}</domain>
|
|
201
223
|
</domain-config>
|
|
202
224
|
</network-security-config>
|
|
203
225
|
`);
|
|
@@ -306,10 +328,18 @@ async function prepareAppIconSet(buildDir, appIcon) {
|
|
|
306
328
|
console.log(`Unable to generate appicon set for '${appIcon}': ${error.message ? error.message : "Unknown error"}`);
|
|
307
329
|
}
|
|
308
330
|
}
|
|
309
|
-
function prepareExportOptionsPlist(buildDir, appId,
|
|
331
|
+
function prepareExportOptionsPlist({ buildDir, appId, iosParams }) {
|
|
332
|
+
console.log("prepareExportOptionsPlist", buildDir, appId, iosParams);
|
|
333
|
+
const buildShareExtBloock = () => {
|
|
334
|
+
if (!iosParams.shareExtensionProvisioningProfile)
|
|
335
|
+
return "";
|
|
336
|
+
const teamId = iosParams.appleTeamId;
|
|
337
|
+
const shareExtIdentifier = iosParams.shareExtensionProvisioningProfile.identifier;
|
|
338
|
+
return `<key>${shareExtIdentifier.replace(`${teamId}.`, "")}</key>
|
|
339
|
+
<string>${iosParams.shareExtensionProvisioningProfile.guuid}</string>`;
|
|
340
|
+
};
|
|
310
341
|
try {
|
|
311
|
-
|
|
312
|
-
(0, fs_extra_1.writeFileSync)(exportOptionsPlist, `<?xml version="1.0" encoding="UTF-8"?>
|
|
342
|
+
(0, fs_extra_1.writeFileSync)((0, path_1.join)(buildDir, "ExportOptions.plist"), `<?xml version="1.0" encoding="UTF-8"?>
|
|
313
343
|
<!DOCTYPE plist PUBLIC "~//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
314
344
|
<plist version="1.0">
|
|
315
345
|
<dict>
|
|
@@ -318,18 +348,19 @@ function prepareExportOptionsPlist(buildDir, appId, provisioningProfile) {
|
|
|
318
348
|
<key>provisioningProfiles</key>
|
|
319
349
|
<dict>
|
|
320
350
|
<key>${appId}</key>
|
|
321
|
-
<string>${
|
|
351
|
+
<string>${iosParams.mainProvisioningProfile.guuid}</string>
|
|
352
|
+
${buildShareExtBloock()}
|
|
322
353
|
</dict>
|
|
323
354
|
</dict>
|
|
324
355
|
|
|
325
356
|
</plist>`);
|
|
326
357
|
}
|
|
327
358
|
catch (error) {
|
|
328
|
-
console.log(`Unable to
|
|
359
|
+
console.log(`Unable to write the ExportOptionsPlist file: ${error.message ? error.message : "Unknown error"}`);
|
|
329
360
|
}
|
|
330
361
|
}
|
|
331
362
|
exports.prepareExportOptionsPlist = prepareExportOptionsPlist;
|
|
332
|
-
|
|
363
|
+
function modifyInfoPlist(buildDir, allowShareTo) {
|
|
333
364
|
const infoPlist = (0, path_1.join)(buildDir, "ios", "App", "App", "Info.plist");
|
|
334
365
|
const content = (0, fs_extra_1.readFileSync)(infoPlist, "utf8");
|
|
335
366
|
const newCfgs = `
|
|
@@ -347,12 +378,35 @@ async function modifyInfoPlist(buildDir) {
|
|
|
347
378
|
<true/>
|
|
348
379
|
<key>LSSupportsOpeningDocumentsInPlace</key>
|
|
349
380
|
<true/>
|
|
381
|
+
${allowShareTo
|
|
382
|
+
? `<key>CFBundleURLTypes</key>
|
|
383
|
+
<array>
|
|
384
|
+
<dict>
|
|
385
|
+
<key>CFBundleTypeRole</key>
|
|
386
|
+
<string>Viewer</string>
|
|
387
|
+
<key>CFBundleURLName</key>
|
|
388
|
+
<string>com.saltcorn.store</string>
|
|
389
|
+
<key>CFBundleURLSchemes</key>
|
|
390
|
+
<array>
|
|
391
|
+
<string>scappscheme</string>
|
|
392
|
+
</array>
|
|
393
|
+
</dict>
|
|
394
|
+
</array>`
|
|
395
|
+
: ""}
|
|
350
396
|
`;
|
|
351
397
|
// add newCfgs after the first <dict> tag
|
|
352
398
|
const newContent = content.replace(/<dict>/, `<dict>${newCfgs}`);
|
|
353
399
|
(0, fs_extra_1.writeFileSync)(infoPlist, newContent, "utf8");
|
|
354
400
|
}
|
|
355
401
|
exports.modifyInfoPlist = modifyInfoPlist;
|
|
402
|
+
function copyShareExtFiles(buildDir) {
|
|
403
|
+
const iosAppDir = (0, path_1.join)(buildDir, "ios", "App");
|
|
404
|
+
const sefDir = (0, path_1.join)(buildDir, "share_extension_files");
|
|
405
|
+
(0, fs_extra_1.copySync)((0, path_1.join)(sefDir, "ShareViewController.swift"), (0, path_1.join)(iosAppDir, "share-ext", "ShareViewController.swift"), { overwrite: true });
|
|
406
|
+
(0, fs_extra_1.copySync)((0, path_1.join)(sefDir, "Info.plist"), (0, path_1.join)(iosAppDir, "share-ext", "Info.plist"), { overwrite: true });
|
|
407
|
+
(0, fs_extra_1.copySync)((0, path_1.join)(sefDir, "AppDelegate.swift"), (0, path_1.join)(iosAppDir, "App", "AppDelegate.swift"), { overwrite: true });
|
|
408
|
+
}
|
|
409
|
+
exports.copyShareExtFiles = copyShareExtFiles;
|
|
356
410
|
async function decodeProvisioningProfile(buildDir, provisioningProfile) {
|
|
357
411
|
console.log("decodeProvisioningProfile", buildDir, provisioningProfile);
|
|
358
412
|
const outFile = (0, path_1.join)(buildDir, "provisioningProfile.xml");
|
|
@@ -363,7 +417,11 @@ async function decodeProvisioningProfile(buildDir, provisioningProfile) {
|
|
|
363
417
|
const dict = parsed.plist.dict[0];
|
|
364
418
|
const guuid = dict.string[dict.string.length - 1];
|
|
365
419
|
const teamId = dict.array[0].string[0];
|
|
366
|
-
|
|
420
|
+
const specifier = dict.string[1];
|
|
421
|
+
const identifier = dict.dict[0].string[0];
|
|
422
|
+
const result = { guuid, teamId, specifier, identifier };
|
|
423
|
+
console.log(result);
|
|
424
|
+
return result;
|
|
367
425
|
}
|
|
368
426
|
catch (error) {
|
|
369
427
|
console.log(`Unable to decode the provisioning profile '${provisioningProfile}': ${error.message ? error.message : "Unknown error"}`);
|
|
@@ -489,7 +547,7 @@ exports.copySiteLogo = copySiteLogo;
|
|
|
489
547
|
* create a cfg file, the app use this configs
|
|
490
548
|
* @param param0
|
|
491
549
|
*/
|
|
492
|
-
function writeCfgFile({ buildDir, entryPoint, entryPointType, serverPath, localUserTables, synchedTables, tenantAppName, autoPublicLogin, allowOfflineMode, }) {
|
|
550
|
+
function writeCfgFile({ buildDir, entryPoint, entryPointType, serverPath, localUserTables, synchedTables, tenantAppName, autoPublicLogin, allowOfflineMode, allowShareTo, }) {
|
|
493
551
|
const wwwDir = (0, path_1.join)(buildDir, "www");
|
|
494
552
|
let cfg = {
|
|
495
553
|
version_tag: index_1.default.connectObj.version_tag,
|
|
@@ -501,6 +559,7 @@ function writeCfgFile({ buildDir, entryPoint, entryPointType, serverPath, localU
|
|
|
501
559
|
synchedTables,
|
|
502
560
|
autoPublicLogin,
|
|
503
561
|
allowOfflineMode,
|
|
562
|
+
allowShareTo,
|
|
504
563
|
};
|
|
505
564
|
if (tenantAppName)
|
|
506
565
|
cfg.tenantAppName = tenantAppName;
|
|
@@ -661,6 +720,8 @@ function writePodfile(buildDir) {
|
|
|
661
720
|
pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
|
|
662
721
|
pod 'CapacitorGeolocation', :path => '../../node_modules/@capacitor/geolocation'
|
|
663
722
|
pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
|
|
723
|
+
pod 'CapacitorScreenOrientation', :path => '../../node_modules/@capacitor/screen-orientation'
|
|
724
|
+
pod 'SendIntent', :path => '../../node_modules/send-intent'
|
|
664
725
|
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
|
665
726
|
pod 'CordovaPluginsResources', :path => '../capacitor-cordova-ios-plugins'
|
|
666
727
|
end
|
|
@@ -693,15 +754,36 @@ function writePodfile(buildDir) {
|
|
|
693
754
|
}
|
|
694
755
|
exports.writePodfile = writePodfile;
|
|
695
756
|
/**
|
|
696
|
-
* replace the MARKETING_VERSION in project.pbxproj
|
|
697
757
|
* @param buildDir
|
|
698
758
|
* @param appVersion new app version
|
|
699
759
|
*/
|
|
700
|
-
function modifyXcodeProjectFile(buildDir, appVersion) {
|
|
760
|
+
function modifyXcodeProjectFile(buildDir, appVersion, iosCfg) {
|
|
701
761
|
const projectFile = (0, path_1.join)(buildDir, "ios", "App", "App.xcodeproj", "project.pbxproj");
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
762
|
+
let fileContent = (0, fs_extra_1.readFileSync)(projectFile, "utf8");
|
|
763
|
+
if (iosCfg.shareExtensionProvisioningProfile) {
|
|
764
|
+
const shareExtId = iosCfg.shareExtensionProvisioningProfile.identifier.replace(`${iosCfg.appleTeamId}.`, "");
|
|
765
|
+
// modify debug/release blocks of the share extension target
|
|
766
|
+
for (const targetCfgBlock of fileContent.match(new RegExp(`buildSettings = {[^}]*${shareExtId}[^}]*};`, "g")) || []) {
|
|
767
|
+
let newCfgBlock = targetCfgBlock
|
|
768
|
+
.replaceAll(/"CODE_SIGN_IDENTITY.*\n/g, "")
|
|
769
|
+
.replaceAll(/CODE_SIGN_STYLE.*\n/g, "")
|
|
770
|
+
.replaceAll(/DEVELOPMENT_TEAM.*\n/g, "")
|
|
771
|
+
.replaceAll(/"DEVELOPMENT_TEAM.*\n/g, "")
|
|
772
|
+
.replaceAll(/PROVISIONING_PROFILE_SPECIFIER.*\n/g, "")
|
|
773
|
+
.replaceAll(/"PROVISIONING_PROFILE_SPECIFIER.*\n/g, "")
|
|
774
|
+
// set new values
|
|
775
|
+
.replaceAll(/MARKETING_VERSION = 1.0;/g, ` MARKETING_VERSION = ${appVersion};
|
|
776
|
+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
|
|
777
|
+
CODE_SIGN_STYLE = Manual;
|
|
778
|
+
DEVELOPMENT_TEAM="";
|
|
779
|
+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ${iosCfg.appleTeamId};
|
|
780
|
+
PROVISIONING_PROFILE_SPECIFIER = "";
|
|
781
|
+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "${iosCfg.shareExtensionProvisioningProfile.specifier}";`);
|
|
782
|
+
fileContent = fileContent.replace(targetCfgBlock, newCfgBlock);
|
|
783
|
+
}
|
|
784
|
+
}
|
|
785
|
+
fileContent = fileContent.replace(/MARKETING_VERSION = 1.0;/, `MARKETING_VERSION = ${appVersion};`);
|
|
786
|
+
(0, fs_extra_1.writeFileSync)(projectFile, fileContent, "utf8");
|
|
705
787
|
}
|
|
706
788
|
exports.modifyXcodeProjectFile = modifyXcodeProjectFile;
|
|
707
789
|
function generateAndroidVersionCode(appVersion) {
|
|
@@ -714,6 +796,7 @@ function generateAndroidVersionCode(appVersion) {
|
|
|
714
796
|
}
|
|
715
797
|
exports.generateAndroidVersionCode = generateAndroidVersionCode;
|
|
716
798
|
function modifyGradleConfig(buildDir, appVersion) {
|
|
799
|
+
console.log("modifyGradleConfig");
|
|
717
800
|
const gradleFile = (0, path_1.join)(buildDir, "android", "app", "build.gradle");
|
|
718
801
|
const gradleContent = (0, fs_extra_1.readFileSync)(gradleFile, "utf8");
|
|
719
802
|
const versionCode = generateAndroidVersionCode(appVersion);
|
|
@@ -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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"}
|
package/docker/entry.bash
CHANGED
|
@@ -4,9 +4,10 @@ set -e
|
|
|
4
4
|
|
|
5
5
|
BUILD_TYPE="$1"
|
|
6
6
|
APP_VERSION="$2"
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
SERVER_URL="$3"
|
|
8
|
+
KEYSTORE_FILE="$4"
|
|
9
|
+
KEYSTORE_ALIAS="$5"
|
|
10
|
+
KEYSTORE_PASSWORD="$6"
|
|
10
11
|
|
|
11
12
|
echo "BUILD_TYPE: $BUILD_TYPE"
|
|
12
13
|
echo "APP_VERSION: $APP_VERSION"
|
|
@@ -22,13 +23,8 @@ export PATH=$PATH:/opt/gradle-8.4/bin
|
|
|
22
23
|
|
|
23
24
|
cd /saltcorn-mobile-app
|
|
24
25
|
npm install @capacitor/cli @capacitor/core @capacitor/android
|
|
25
|
-
npx cap add android
|
|
26
|
-
npx capacitor-assets generate
|
|
27
26
|
npx cap sync
|
|
28
27
|
|
|
29
|
-
npm install cordova-plugin-file@8.1.2
|
|
30
|
-
npm install cordova-plugin-inappbrowser@6.0.0
|
|
31
|
-
|
|
32
28
|
# data extraction rules
|
|
33
29
|
cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/data_extraction_rules.xml
|
|
34
30
|
<?xml version="1.0" encoding="utf-8"?>
|
|
@@ -53,7 +49,7 @@ cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/network_security_c
|
|
|
53
49
|
<?xml version="1.0" encoding="utf-8"?>
|
|
54
50
|
<network-security-config>
|
|
55
51
|
<domain-config cleartextTrafficPermitted="true">
|
|
56
|
-
<domain includeSubdomains="true"
|
|
52
|
+
<domain includeSubdomains="true">$SERVER_URL</domain>
|
|
57
53
|
</domain-config>
|
|
58
54
|
</network-security-config>
|
|
59
55
|
EOF
|
|
@@ -82,26 +78,32 @@ cp /saltcorn-mobile-app/www/scdb.sqlite /saltcorn-mobile-app/android/app/src/mai
|
|
|
82
78
|
# set app version and code in build.gradle
|
|
83
79
|
npm run modify-gradle-cfg -- --app-version=$APP_VERSION
|
|
84
80
|
|
|
85
|
-
|
|
86
|
-
if [ "$BUILD_TYPE" == "
|
|
87
|
-
|
|
81
|
+
# .aab files are generated with 'npx cap build'
|
|
82
|
+
if [ "$BUILD_TYPE" == "release" ]; then
|
|
83
|
+
# if KEYSTORE_FILE is not empty
|
|
84
|
+
if [ -n "$KEYSTORE_FILE" ]; then
|
|
85
|
+
echo "building signed app"
|
|
86
|
+
npx cap build android \
|
|
87
|
+
--androidreleasetype "AAB" \
|
|
88
|
+
--keystorepath "/saltcorn-mobile-app/$KEYSTORE_FILE" \
|
|
89
|
+
--keystorepass "$KEYSTORE_PASSWORD" \
|
|
90
|
+
--keystorealias "$KEYSTORE_ALIAS" \
|
|
91
|
+
--keystorealiaspass "$KEYSTORE_PASSWORD"
|
|
92
|
+
else
|
|
93
|
+
echo "building unsigned app"
|
|
94
|
+
npx cap build android \
|
|
95
|
+
--androidreleasetype "AAB" \
|
|
96
|
+
--keystorepath "/saltcorn-mobile-app/unsecure-default-key.jks" \
|
|
97
|
+
--keystorepass "unsecurepassw" \
|
|
98
|
+
--keystorealias "unsecure-default-alias" \
|
|
99
|
+
--keystorealiaspass "unsecurepassw"
|
|
100
|
+
fi
|
|
88
101
|
fi
|
|
89
102
|
|
|
90
|
-
#
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
--keystorepass "$KEYSTORE_PASSWORD" \
|
|
97
|
-
--keystorealias "$KEYSTORE_ALIAS" \
|
|
98
|
-
--keystorealiaspass "$KEYSTORE_PASSWORD"
|
|
99
|
-
else
|
|
100
|
-
echo "building unsigned app"
|
|
101
|
-
npx cap build android \
|
|
102
|
-
--androidreleasetype "$ANDROID_RELEASE_TYPE" \
|
|
103
|
-
--keystorepath "/saltcorn-mobile-app/unsecure-default-key.jks" \
|
|
104
|
-
--keystorepass "unsecurepassw" \
|
|
105
|
-
--keystorealias "unsecure-default-alias" \
|
|
106
|
-
--keystorealiaspass "unsecurepassw"
|
|
103
|
+
# .apk files are generated with './gradlew assembleDebug'
|
|
104
|
+
# there seems to be a problem with apks generated with 'npx cap build'
|
|
105
|
+
if [ "$BUILD_TYPE" == "debug" ]; then
|
|
106
|
+
echo "building debug app"
|
|
107
|
+
cd /saltcorn-mobile-app/android
|
|
108
|
+
./gradlew assembleDebug
|
|
107
109
|
fi
|
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": "1.1.1-beta.
|
|
6
|
+
"version": "1.1.1-beta.2",
|
|
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": "1.1.1-beta.
|
|
14
|
-
"@saltcorn/data": "1.1.1-beta.
|
|
15
|
-
"@saltcorn/db-common": "1.1.1-beta.
|
|
16
|
-
"@saltcorn/server": "1.1.1-beta.
|
|
17
|
-
"@saltcorn/base-plugin": "1.1.1-beta.
|
|
18
|
-
"@saltcorn/sbadmin2": "1.1.1-beta.
|
|
19
|
-
"@saltcorn/mobile-app": "1.1.1-beta.
|
|
13
|
+
"@saltcorn/markup": "1.1.1-beta.2",
|
|
14
|
+
"@saltcorn/data": "1.1.1-beta.2",
|
|
15
|
+
"@saltcorn/db-common": "1.1.1-beta.2",
|
|
16
|
+
"@saltcorn/server": "1.1.1-beta.2",
|
|
17
|
+
"@saltcorn/base-plugin": "1.1.1-beta.2",
|
|
18
|
+
"@saltcorn/sbadmin2": "1.1.1-beta.2",
|
|
19
|
+
"@saltcorn/mobile-app": "1.1.1-beta.2",
|
|
20
20
|
"fs-extra": "^10.0.1",
|
|
21
21
|
"live-plugin-manager": "^0.17.1",
|
|
22
22
|
"resize-with-sharp-or-jimp": "0.1.8",
|