@saltcorn/mobile-builder 1.6.0-alpha.7 → 1.6.0-alpha.9

package/dist/appium_tests/ui.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ui.test.d.ts.map

package/dist/appium_tests/ui.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui.test.d.ts","sourceRoot":"","sources":["../../appium_tests/ui.test.js"],"names":[],"mappings":""}

package/dist/appium_tests/ui.test.js

@@ -0,0 +1,43 @@
+"use strict";
+const { remote } = require("webdriverio");
+const capabilities = {
+    platformName: "Android",
+    "appium:automationName": "UiAutomator2",
+    "appium:deviceName": "Android",
+    "appium:appPackage": "saltcorn.mobile.app",
+    "appium:appActivity": ".MainActivity",
+};
+const wdOpts = {
+    host: process.env.APPIUM_HOST || "localhost",
+    port: 4723,
+    logLevel: "info",
+    capabilities,
+};
+jest.setTimeout(4000000);
+let driver;
+beforeAll(async () => {
+    driver = await remote(wdOpts);
+    await driver.switchContext("WEBVIEW_saltcorn.mobile.app");
+    await driver.pause(10000);
+});
+afterAll(async () => {
+    await driver.deleteSession();
+});
+describe("appium", () => {
+    it("basic test", async () => {
+        if (driver) {
+            const iframe = await driver.$("iframe");
+            await driver.switchToFrame(iframe);
+            await driver.pause(10000);
+            console.log(await driver.getLogs("browser"));
+            const emailInput = await driver.$('input[name="email"]');
+            await emailInput.setValue("user@foo.com");
+            const passwordInput = await driver.$('input[name="password"]');
+            await passwordInput.setValue("foobarbarfoo");
+            const button = await driver.$("button");
+            await button.click();
+            await driver.pause(10000);
+        }
+    });
+});
+//# sourceMappingURL=ui.test.js.map

package/dist/appium_tests/ui.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui.test.js","sourceRoot":"","sources":["../../appium_tests/ui.test.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE1C,MAAM,YAAY,GAAG;IACnB,YAAY,EAAE,SAAS;IACvB,uBAAuB,EAAE,cAAc;IACvC,mBAAmB,EAAE,SAAS;IAC9B,mBAAmB,EAAE,qBAAqB;IAC1C,oBAAoB,EAAE,eAAe;CACtC,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,WAAW;IAC5C,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,MAAM;IAChB,YAAY;CACb,CAAC;AAEF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAEzB,IAAI,MAAM,CAAC;AACX,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,MAAM,CAAC,aAAa,CAAC,6BAA6B,CAAC,CAAC;IAC1D,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC;YACzD,MAAM,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC1C,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;YAC/D,MAAM,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/tests/versioncode.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=versioncode.test.d.ts.map

package/dist/tests/versioncode.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"versioncode.test.d.ts","sourceRoot":"","sources":["../../tests/versioncode.test.ts"],"names":[],"mappings":""}

package/dist/tests/versioncode.test.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_build_utils_1 = require("../utils/common-build-utils");
+describe("versioncode tests", () => {
+    it("should generate version code", () => {
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("0.0.1")).toBe(1);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("1.0.0")).toBe(1000000);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.0")).toBe(1001000);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.1")).toBe(1001001);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("1.1.999")).toBe(1001999);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("1.999.1")).toBe(1999001);
+        expect((0, common_build_utils_1.generateAndroidVersionCode)("0.999.1")).toBe(999001);
+    });
+    it("should throw error for invalid version", () => {
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("")).toThrow();
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1")).toThrow();
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1.")).toThrow();
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1000.1.1")).toThrow();
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1000.1")).toThrow();
+        expect(() => (0, common_build_utils_1.generateAndroidVersionCode)("1.1.1000")).toThrow();
+    });
+});
+//# sourceMappingURL=versioncode.test.js.map

package/dist/tests/versioncode.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"versioncode.test.js","sourceRoot":"","sources":["../../tests/versioncode.test.ts"],"names":[],"mappings":";;AAAA,oEAAyE;AAEzE,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEpD,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAA,+CAA0B,EAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACvD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAE3D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,+CAA0B,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/tests/webpack.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=webpack.test.d.ts.map

package/dist/tests/webpack.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack.test.d.ts","sourceRoot":"","sources":["../../tests/webpack.test.ts"],"names":[],"mappings":""}

package/dist/tests/webpack.test.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = __importDefault(require("@saltcorn/data/db/index"));
+const child_process_1 = require("child_process");
+const plugin_1 = __importDefault(require("@saltcorn/data/models/plugin"));
+const assertions_1 = require("@saltcorn/data/tests/assertions");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const load_plugins = require("@saltcorn/server/load_plugins");
+afterAll(index_1.default.close);
+jest.setTimeout(30000);
+describe("webpack build", () => {
+    const bundleDir = (0, path_1.join)(__dirname, "bundle");
+    it("without plugins", async () => {
+        if ((0, fs_1.existsSync)(bundleDir))
+            (0, fs_1.rmSync)(bundleDir, { recursive: true, force: true });
+        const result = (0, child_process_1.spawnSync)("npm", ["run", "build", "--", "--env", `output=${__dirname}`], {
+            cwd: __dirname,
+        });
+        const output = result.output.toString();
+        if (result.status !== 0)
+            console.log(output);
+        expect(result.status).toBe(0);
+        for (const expected of [
+            bundleDir,
+            (0, path_1.join)(bundleDir, "base_plugin.bundle.js"),
+            (0, path_1.join)(bundleDir, "common_chunks.bundle.js"),
+            (0, path_1.join)(bundleDir, "data.bundle.js"),
+            (0, path_1.join)(bundleDir, "markup.bundle.js"),
+            (0, path_1.join)(bundleDir, "sbadmin2.bundle.js"),
+        ]) {
+            expect((0, fs_1.existsSync)(expected)).toBe(true);
+        }
+    });
+    it("with plugins", async () => {
+        const anyBootstrapTheme = await plugin_1.default.store_by_name("any-bootstrap-theme");
+        (0, assertions_1.assertIsSet)(anyBootstrapTheme);
+        delete anyBootstrapTheme.id;
+        await load_plugins.loadAndSaveNewPlugin(anyBootstrapTheme);
+        const tabulator = await plugin_1.default.store_by_name("tabulator");
+        (0, assertions_1.assertIsSet)(tabulator);
+        delete tabulator.id;
+        await load_plugins.loadAndSaveNewPlugin(tabulator);
+        if ((0, fs_1.existsSync)(bundleDir))
+            (0, fs_1.rmSync)(bundleDir, { recursive: true, force: true });
+        const result = (0, child_process_1.spawnSync)("npm", [
+            "run",
+            "build",
+            "--",
+            "--env",
+            `plugins=${JSON.stringify([anyBootstrapTheme, tabulator])}`,
+            "--env",
+            `output=${__dirname}`,
+        ], {
+            cwd: __dirname,
+        });
+        const output = result.output.toString();
+        if (result.status !== 0)
+            console.log(output);
+        expect(result.status).toBe(0);
+        for (const expected of [
+            bundleDir,
+            (0, path_1.join)(bundleDir, "any-bootstrap-theme.bundle.js"),
+            (0, path_1.join)(bundleDir, "tabulator.bundle.js"),
+        ]) {
+            expect((0, fs_1.existsSync)(expected)).toBe(true);
+        }
+    });
+});
+//# sourceMappingURL=webpack.test.js.map

package/dist/tests/webpack.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack.test.js","sourceRoot":"","sources":["../../tests/webpack.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,20 +3,20 @@
   "description": "plugin to to build a mobile app from a tenant application",
   "homepage": "https://saltcorn.com",
   "repository": "github:saltcorn/saltcorn",
-  "version": "1.6.0-alpha.7",
+  "version": "1.6.0-alpha.9",
   "author": "Christian Hugo",
   "scripts": {
     "test": "jest ./tests/ --runInBand",
     "build": "webpack --mode development"
   },
   "dependencies": {
-    "@saltcorn/markup": "1.6.0-alpha.7",
-    "@saltcorn/data": "1.6.0-alpha.7",
-    "@saltcorn/db-common": "1.6.0-alpha.7",
-    "@saltcorn/server": "1.6.0-alpha.7",
-    "@saltcorn/base-plugin": "1.6.0-alpha.7",
-    "@saltcorn/sbadmin2": "1.6.0-alpha.7",
-    "@saltcorn/mobile-app": "1.6.0-alpha.7",
+    "@saltcorn/markup": "1.6.0-alpha.9",
+    "@saltcorn/data": "1.6.0-alpha.9",
+    "@saltcorn/db-common": "1.6.0-alpha.9",
+    "@saltcorn/server": "1.6.0-alpha.9",
+    "@saltcorn/base-plugin": "1.6.0-alpha.9",
+    "@saltcorn/sbadmin2": "1.6.0-alpha.9",
+    "@saltcorn/mobile-app": "1.6.0-alpha.9",
     "fs-extra": "^11.3.3",
     "live-plugin-manager": "^1.0.0",
     "resize-with-sharp-or-jimp": "0.1.8",

package/webpack.config.js

@@ -43,16 +43,16 @@ const buildPluginEntries = async (plugins) => {
         return pluginName;
       }
     }
-    throw new Error(`Unable to find a plugin name for package: '${pckName}'`);
+    return null;
   };
 
   for (const plugin of plugins) {
     const { requireResult } = nameToModule.get(plugin.name);
-    const additionalDependencies = requireResult.plugin_module?.dependencies
-      ? requireResult.plugin_module.dependencies.map((dep) =>
-          nameByPackageName(dep)
-        )
-      : [];
+    const additionalDependencies = [];
+    for (const dependency of requireResult.plugin_module?.dependencies || []) {
+      const name = nameByPackageName(dependency);
+      if (name) additionalDependencies.push(name);
+    }
     const genericEntry = {
       [plugin.name]: {
         import: requireResult.location,