Merge branch 'master' of github.com:mongaku/mongaku into master

.babelrc

@@ -4,77 +4,10 @@
             "@babel/preset-env",
             {
                 "targets": {
-                    "browsers": "IE 11",
-                    "node": "current"
+                    "esmodules": true
                 },
                 "useBuiltIns": "entry",
-                "exclude": [
-                    "es6.typed.uint8-clamped-array",
-                    "es6.object.is",
-                    "es6.map",
-                    "es6.set",
-                    "es6.weak-map",
-                    "es6.weak-set",
-                    "es6.reflect.apply",
-                    "es6.reflect.construct",
-                    "es6.reflect.define-property",
-                    "es6.reflect.delete-property",
-                    "es6.reflect.get",
-                    "es6.reflect.get-own-property-descriptor",
-                    "es6.reflect.get-prototype-of",
-                    "es6.reflect.has",
-                    "es6.reflect.is-extensible",
-                    "es6.reflect.own-keys",
-                    "es6.reflect.prevent-extensions",
-                    "es6.reflect.set",
-                    "es6.reflect.set-prototype-of",
-                    "es6.number.is-finite",
-                    "es6.number.is-integer",
-                    "es6.number.is-safe-integer",
-                    "es6.number.is-nan",
-                    "es6.number.epsilon",
-                    "es6.number.min-safe-integer",
-                    "es6.number.max-safe-integer",
-                    "es6.string.raw",
-                    "es6.string.from-code-point",
-                    "es6.string.code-point-at",
-                    "es6.string.repeat",
-                    "es6.string.starts-with",
-                    "es6.string.ends-with",
-                    "es6.array.from",
-                    "es6.array.of",
-                    "es6.array.copy-within",
-                    "es6.array.fill",
-                    "es7.object.get-own-property-descriptors",
-                    "es7.string.pad-start",
-                    "es7.string.pad-end",
-                    "es6.math.acosh",
-                    "es6.math.asinh",
-                    "es6.math.atanh",
-                    "es6.math.cbrt",
-                    "es6.math.clz32",
-                    "es6.math.cosh",
-                    "es6.math.expm1",
-                    "es6.math.fround",
-                    "es6.math.hypot",
-                    "es6.math.imul",
-                    "es6.math.log1p",
-                    "es6.math.log10",
-                    "es6.math.log2",
-                    "es6.math.sign",
-                    "es6.math.sinh",
-                    "es6.math.tanh",
-                    "es6.math.trunc",
-                    "es6.function.name",
-                    "es6.regexp.flags",
-                    "es6.regexp.match",
-                    "es6.regexp.replace",
-                    "es6.regexp.split",
-                    "es6.regexp.search",
-                    "web.timers",
-                    "web.immediate",
-                    "web.dom.iterable"
-                ]
+                "corejs": 3
             }
         ],
         "@babel/preset-react",

package.json

@@ -46,6 +46,7 @@
         "concat-stream": "1.6.2",
         "connect-mongo": "2.0.1",
         "cookie-parser": "1.4.3",
+        "core-js": "^3.6.5",
         "csurf": "1.9.0",
         "csv-streamify": "4.0.0",
         "dotenv": "6.0.0",
@@ -62,7 +63,7 @@
         "jsondiffpatch": "0.3.11",
         "jsonlint": "1.6.3",
         "kerberos": "0.0.23",
-        "libxmljs": "0.19.5",
+        "libxmljs": "0.19.7",
         "lodash.clonedeepwith": "4.5.0",
         "method-override": "3.0.0",
         "minimist": "1.2.0",
@@ -93,7 +94,6 @@
     "devDependencies": {
         "@babel/cli": "^7.0.0",
         "@babel/core": "^7.0.0",
-        "@babel/polyfill": "^7.0.0",
         "@babel/preset-env": "^7.0.0",
         "@babel/preset-flow": "^7.0.0",
         "@babel/preset-react": "^7.0.0",

src/entries/AddSource.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/AddSource.js"));

src/entries/AddSources.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/AddSources.js"));

src/entries/AddUser.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/AddUser.js"));

src/entries/AddUsers.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/AddUsers.js"));

src/entries/Admin.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Admin.js"));

src/entries/EditRecord.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/EditRecord.js"));

src/entries/Error.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Error.js"));

src/entries/Home.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Home.js"));

src/entries/ImportImages.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/ImportImages.js"));

src/entries/ImportRecords.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/ImportRecords.js"));

src/entries/Login.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Login.js"));

src/entries/ManageSources.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/ManageSources.js"));

src/entries/Record.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Record.js"));

src/entries/Search.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Search.js"));

src/entries/SourceAdmin.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/SourceAdmin.js"));

src/entries/Upload.js

@@ -1,3 +1,3 @@
 // @flow
-require("@babel/polyfill");
+require("core-js");
 require("./shared/mount.js")(require("../views/Upload.js"));

src/lib/clone.js

@@ -19,9 +19,9 @@ const getArgs = (func: Function): Array<string> => {
     const strFunc = func.toString();
     // First match everything inside the function argument parens.
     const args =
-        strFunc.match(/function\s.*?\(([^)]*)\)/) ||
+        strFunc.match(/^function\s.*?\(([^)]*)\)/) ||
         strFunc.match(/^\(?([^)]*)\)?\s*=>/) ||
-        strFunc.match(/.*?\(([^)]*)\)/);
+        strFunc.match(/^[^)]*\(([^)]*)\)/);
 
     // Split the arguments string into an array comma delimited.
     return (

src/logic/source-admin.js

@@ -253,7 +253,8 @@ module.exports = function(app) {
                     allImagesImported:
                         imageImport.length > 0 &&
                         imageImport.every(batch => batch.isCompleted()) &&
-                        imageImport.some(batch => batch.isSuccessful()),
+                        imageImport.some(batch => batch.isSuccessful()) ||
+                        dataImport.length > 0,
                     allRecordsImported:
                         dataImport.length > 0 &&
                         dataImport.every(batch => batch.isCompleted()) &&

src/tests/init.js

@@ -11,7 +11,7 @@ const iconv = require("body-parser/node_modules/iconv-lite");
 iconv.getCodec("utf8");
 
 // Bring in any polyfills used for testing (e.g. async)
-require("@babel/polyfill");
+require("core-js");
 
 // Force dynamically loaded modules to load now
 require("negotiator/lib/mediaType");

src/utils/i18n-extract.js

@@ -44,7 +44,6 @@ module.exports = (args, callback) => {
             const relativeFiles = files.map(file =>
                 path.relative(process.cwd(), file),
             );
-            console.log(relativeFiles);
             execFile(
                 jsxgettext,
                 [