@saltcorn/mobile-builder 0.9.5-beta.2 → 0.9.5-beta.20
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 +2 -0
- package/dist/mobile-builder.d.ts.map +1 -1
- package/dist/mobile-builder.js +3 -3
- package/dist/mobile-builder.js.map +1 -1
- package/dist/utils/cordova-build-utils.d.ts +2 -2
- package/dist/utils/cordova-build-utils.d.ts.map +1 -1
- package/dist/utils/cordova-build-utils.js +5 -6
- package/dist/utils/cordova-build-utils.js.map +1 -1
- package/dist/utils/package-bundle-utils.d.ts.map +1 -1
- package/dist/utils/package-bundle-utils.js +17 -1
- package/dist/utils/package-bundle-utils.js.map +1 -1
- package/package.json +9 -10
- package/webpack.config.js +11 -18
- package/docker/post-installer.js +0 -32
package/dist/mobile-builder.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export declare class MobileBuilder {
|
|
|
28
28
|
copyTargetDir?: string;
|
|
29
29
|
user?: User;
|
|
30
30
|
buildForEmulator?: boolean;
|
|
31
|
+
appleTeamId?: string;
|
|
31
32
|
tenantAppName?: string;
|
|
32
33
|
/**
|
|
33
34
|
*
|
|
@@ -55,6 +56,7 @@ export declare class MobileBuilder {
|
|
|
55
56
|
copyTargetDir?: string;
|
|
56
57
|
user?: User;
|
|
57
58
|
buildForEmulator?: boolean;
|
|
59
|
+
appleTeamId?: string;
|
|
58
60
|
tenantAppName?: string;
|
|
59
61
|
});
|
|
60
62
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mobile-builder.d.ts","sourceRoot":"","sources":["../mobile-builder.ts"],"names":[],"mappings":"
|
|
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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;IA6BD;;OAEG;IACG,KAAK;CAyDZ"}
|
package/dist/mobile-builder.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MobileBuilder = void 0;
|
|
4
4
|
const { PluginManager } = require("live-plugin-manager");
|
|
5
|
-
const { loadAllPlugins
|
|
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
8
|
const common_build_utils_1 = require("./utils/common-build-utils");
|
|
@@ -37,12 +37,12 @@ class MobileBuilder {
|
|
|
37
37
|
this.allowOfflineMode = cfg.allowOfflineMode;
|
|
38
38
|
this.pluginManager = new PluginManager({
|
|
39
39
|
pluginsPath: (0, path_1.join)(this.buildDir, "plugin_packages", "node_modules"),
|
|
40
|
-
staticDependencies,
|
|
41
40
|
});
|
|
42
41
|
this.plugins = cfg.plugins;
|
|
43
42
|
this.copyTargetDir = cfg.copyTargetDir;
|
|
44
43
|
this.user = cfg.user;
|
|
45
44
|
this.buildForEmulator = cfg.buildForEmulator;
|
|
45
|
+
this.appleTeamId = cfg.appleTeamId;
|
|
46
46
|
this.tenantAppName = cfg.tenantAppName;
|
|
47
47
|
}
|
|
48
48
|
/**
|
|
@@ -84,7 +84,7 @@ class MobileBuilder {
|
|
|
84
84
|
resultCode = await (0, common_build_utils_1.createSqliteDb)(this.buildDir);
|
|
85
85
|
if (resultCode !== 0)
|
|
86
86
|
return resultCode;
|
|
87
|
-
resultCode = (0, cordova_build_utils_1.buildApp)(this.buildDir, this.platforms, this.useDocker, this.buildForEmulator);
|
|
87
|
+
resultCode = (0, cordova_build_utils_1.buildApp)(this.buildDir, this.platforms, this.useDocker, this.buildForEmulator, this.appleTeamId);
|
|
88
88
|
if (resultCode === 0 && this.copyTargetDir) {
|
|
89
89
|
await (0, cordova_build_utils_1.tryCopyAppFiles)(this.buildDir, this.copyTargetDir, this.user, this.appName);
|
|
90
90
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"mobile-builder.js","sourceRoot":"","sources":["../mobile-builder.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":"
|
|
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="
|
|
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":";;;;;;AAAA,iDAA0C;AAC1C,uCAOkB;AAClB,+BAA4B;AAC5B,2BAAiC;AACjC,sEAA8C;
|
|
1
|
+
{"version":3,"file":"cordova-build-utils.js","sourceRoot":"","sources":["../../utils/cordova-build-utils.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;
|
|
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
|
-
|
|
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":"
|
|
1
|
+
{"version":3,"file":"package-bundle-utils.js","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,21 +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.9.5-beta.
|
|
6
|
+
"version": "0.9.5-beta.20",
|
|
7
7
|
"author": "Christian Hugo",
|
|
8
8
|
"scripts": {
|
|
9
9
|
"test": "jest ./tests/ --runInBand",
|
|
10
|
-
"build": "webpack --mode development"
|
|
11
|
-
"postinstall": "node ./docker/post-installer.js"
|
|
10
|
+
"build": "webpack --mode development"
|
|
12
11
|
},
|
|
13
12
|
"dependencies": {
|
|
14
|
-
"@saltcorn/markup": "0.9.5-beta.
|
|
15
|
-
"@saltcorn/data": "0.9.5-beta.
|
|
16
|
-
"@saltcorn/db-common": "0.9.5-beta.
|
|
17
|
-
"@saltcorn/server": "0.9.5-beta.
|
|
18
|
-
"@saltcorn/base-plugin": "0.9.5-beta.
|
|
19
|
-
"@saltcorn/sbadmin2": "0.9.5-beta.
|
|
20
|
-
"@saltcorn/mobile-app": "0.9.5-beta.
|
|
13
|
+
"@saltcorn/markup": "0.9.5-beta.20",
|
|
14
|
+
"@saltcorn/data": "0.9.5-beta.20",
|
|
15
|
+
"@saltcorn/db-common": "0.9.5-beta.20",
|
|
16
|
+
"@saltcorn/server": "0.9.5-beta.20",
|
|
17
|
+
"@saltcorn/base-plugin": "0.9.5-beta.20",
|
|
18
|
+
"@saltcorn/sbadmin2": "0.9.5-beta.20",
|
|
19
|
+
"@saltcorn/mobile-app": "0.9.5-beta.20",
|
|
21
20
|
"fs-extra": "^10.0.1",
|
|
22
21
|
"live-plugin-manager": "^0.17.1",
|
|
23
22
|
"webpack-merge": "^5.8.0",
|
package/webpack.config.js
CHANGED
|
@@ -1,15 +1,6 @@
|
|
|
1
1
|
const { mergeWithCustomize, merge } = require("webpack-merge");
|
|
2
2
|
const { join } = require("path");
|
|
3
|
-
const {
|
|
4
|
-
const {
|
|
5
|
-
staticDependencies,
|
|
6
|
-
requirePlugin,
|
|
7
|
-
} = require("@saltcorn/server/load_plugins");
|
|
8
|
-
|
|
9
|
-
const manager = new PluginManager({
|
|
10
|
-
pluginsPath: join(__dirname, "plugin_packages", "node_modules"),
|
|
11
|
-
staticDependencies,
|
|
12
|
-
});
|
|
3
|
+
const { requirePlugin } = require("@saltcorn/server/load_plugins");
|
|
13
4
|
|
|
14
5
|
const dataCfg = require(join(
|
|
15
6
|
require.resolve("@saltcorn/data"),
|
|
@@ -42,27 +33,29 @@ const buildPluginEntries = async (plugins) => {
|
|
|
42
33
|
let result = [];
|
|
43
34
|
const nameToModule = new Map();
|
|
44
35
|
for (const plugin of plugins) {
|
|
45
|
-
const requireResult = await requirePlugin(plugin,
|
|
36
|
+
const requireResult = await requirePlugin(plugin, true);
|
|
46
37
|
const packageName = require(`${requireResult.location}/package.json`).name;
|
|
47
38
|
nameToModule.set(plugin.name, { packageName, requireResult });
|
|
48
39
|
}
|
|
49
40
|
const nameByPackageName = (pckName) => {
|
|
50
|
-
for(const [pluginName, value] of nameToModule.entries()) {
|
|
51
|
-
if(value.packageName === pckName) {
|
|
52
|
-
return pluginName
|
|
41
|
+
for (const [pluginName, value] of nameToModule.entries()) {
|
|
42
|
+
if (value.packageName === pckName) {
|
|
43
|
+
return pluginName;
|
|
53
44
|
}
|
|
54
45
|
}
|
|
55
|
-
throw new Error(`Unable to find a plugin name for package: '${pckName}'`)
|
|
46
|
+
throw new Error(`Unable to find a plugin name for package: '${pckName}'`);
|
|
56
47
|
};
|
|
57
48
|
|
|
58
49
|
for (const plugin of plugins) {
|
|
59
|
-
const { requireResult }
|
|
50
|
+
const { requireResult } = nameToModule.get(plugin.name);
|
|
60
51
|
const additionalDependencies = requireResult.plugin_module?.dependencies
|
|
61
|
-
? requireResult.plugin_module.dependencies.map((dep) =>
|
|
52
|
+
? requireResult.plugin_module.dependencies.map((dep) =>
|
|
53
|
+
nameByPackageName(dep)
|
|
54
|
+
)
|
|
62
55
|
: [];
|
|
63
56
|
const genericEntry = {
|
|
64
57
|
[plugin.name]: {
|
|
65
|
-
import: requireResult.
|
|
58
|
+
import: requireResult.location,
|
|
66
59
|
dependOn: ["markup", "data", ...additionalDependencies],
|
|
67
60
|
},
|
|
68
61
|
};
|
package/docker/post-installer.js
DELETED
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
const { spawn, spawnSync } = require("child_process");
|
|
2
|
-
const { join } = require("path");
|
|
3
|
-
|
|
4
|
-
if (process.env.SKIP_DOCKER_IMAGE_INSTALL === "true") {
|
|
5
|
-
console.log("skipping build 'saltcorn/cordova-builder' docker image");
|
|
6
|
-
} else {
|
|
7
|
-
const dArgs = [
|
|
8
|
-
"build",
|
|
9
|
-
__dirname,
|
|
10
|
-
"--network",
|
|
11
|
-
"host",
|
|
12
|
-
"--no-cache",
|
|
13
|
-
"-f",
|
|
14
|
-
join(__dirname, "Dockerfile"),
|
|
15
|
-
"-t",
|
|
16
|
-
"saltcorn/cordova-builder",
|
|
17
|
-
];
|
|
18
|
-
if (process.env.ATTTACH_DOCKER_IMAGE_BUILD === "true") {
|
|
19
|
-
const result = spawnSync("docker", dArgs, { cwd: ".", stdio: "inherit" });
|
|
20
|
-
if (result.error) console.log(result.error.toString());
|
|
21
|
-
} else {
|
|
22
|
-
const child = spawn("docker", dArgs, {
|
|
23
|
-
cwd: ".",
|
|
24
|
-
stdio: "ignore",
|
|
25
|
-
detached: true,
|
|
26
|
-
});
|
|
27
|
-
child.unref();
|
|
28
|
-
child.on("error", () => {
|
|
29
|
-
// console not available
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
}
|