Update dependencies

.gitignore

@@ -1,3 +1,3 @@
 *~
 node_modules
-public
+dist

client/store.js

@@ -245,17 +245,16 @@ function fulfill(accessTimestamp, _fulfillTimestamp) {
             updated = true;
             let filter = queries.filter.get(queryResponse);
             filter = unpackExpression(filter);
-            m
+            m.request({
-              .request({
+              method: "HEAD",
-                method: "HEAD",
+              url:
-                url:
+                `/api/${resourceType}/?` +
-                  `/api/${resourceType}/?` +
+                m.buildQueryString({
-                  m.buildQueryString({
+                  filter: funcCache.get(expression.stringify, filter)
-                    filter: funcCache.get(expression.stringify, filter)
+                }),
-                  }),
+              extract: xhr => +xhr.getResponseHeader("x-total-count"),
-                extract: xhr => +xhr.getResponseHeader("x-total-count"),
+              background: true
-                background: true
+            })
-              })
               .then(c => {
                 queries.value.set(queryResponse, c);
                 queries.fulfilled.set(queryResponse, fulfillTimestamp);
@@ -291,19 +290,18 @@ function fulfill(accessTimestamp, _fulfillTimestamp) {
               updated = true;
               let filter = queries.filter.get(queryResponse);
               filter = unpackExpression(filter);
-              m
+              m.request({
-                .request({
+                method: "GET",
-                  method: "GET",
+                url:
-                  url:
+                  `/api/${resourceType}/?` +
-                    `/api/${resourceType}/?` +
+                  m.buildQueryString({
-                    m.buildQueryString({
+                    filter: funcCache.get(expression.stringify, filter),
-                      filter: funcCache.get(expression.stringify, filter),
+                    limit: 1,
-                      limit: 1,
+                    skip: limit - 1,
-                      skip: limit - 1,
+                    sort: JSON.stringify(sort),
-                      sort: JSON.stringify(sort),
+                    projection: Object.keys(sort).join(",")
-                      projection: Object.keys(sort).join(",")
+                  })
-                    })
+              })
-                })
                 .then(res => {
                   if (res.length) {
                     // Generate bookmark object
@@ -379,18 +377,17 @@ function fulfill(accessTimestamp, _fulfillTimestamp) {
 
           allPromises2.push(
             new Promise((resolve2, reject2) => {
-              m
+              m.request({
-                .request({
+                method: "GET",
-                  method: "GET",
+                url:
-                  url:
+                  `/api/${resourceType}/?` +
-                    `/api/${resourceType}/?` +
+                  m.buildQueryString({
-                    m.buildQueryString({
+                    filter: funcCache.get(
-                      filter: funcCache.get(
+                      expression.stringify,
-                        expression.stringify,
+                      combinedFilterDiff
-                        combinedFilterDiff
+                    )
-                      )
+                  })
-                    })
+              })
-                })
                 .then(res => {
                   for (let r of res) {
                     const id =
@@ -453,26 +450,24 @@ function postTasks(deviceId, tasks) {
   }
 
   return new Promise((resolve, reject) => {
-    m
+    m.request({
-      .request({
+      method: "POST",
-        method: "POST",
+      url: `/api/devices/${encodeURIComponent(deviceId)}/tasks`,
-        url: `/api/devices/${encodeURIComponent(deviceId)}/tasks`,
+      data: tasks,
-        data: tasks,
+      extract: xhr => {
-        extract: xhr => {
+        if (xhr.status !== 200) throw new Error(xhr.response);
-          if (xhr.status !== 200) throw new Error(xhr.response);
+        const connectionRequestStatus = xhr.getResponseHeader(
-          const connectionRequestStatus = xhr.getResponseHeader(
+          "Connection-Request"
-            "Connection-Request"
+        );
-          );
+        let st = JSON.parse(xhr.response);
-          let st = JSON.parse(xhr.response);
+        for (let [i, t] of st.entries()) {
-          for (let [i, t] of st.entries()) {
+          tasks[i]._id = t._id;
-            tasks[i]._id = t._id;
+          tasks[i].status = t.status;
-            tasks[i].status = t.status;
+          tasks[i].fault = t.fault;
-            tasks[i].fault = t.fault;
-          }
-          resolve(connectionRequestStatus);
         }
-      })
+        resolve(connectionRequestStatus);
-      .catch(reject);
+      }
+    }).catch(reject);
   });
 }
 

package.json

@@ -4,31 +4,34 @@
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "eslint --fix common/*.js common/validators/*.js server/*.js client/*.js client/components/*.js;prettier --write common/*.js common/validators/*.js server/*.js client/*.js client/components/*.js client/css/*.css",
+    "lint": "eslint --fix common/*.js common/validators/*.js server/*.js client/*.js client/components/*.js;prettier --write *.js common/*.js common/validators/*.js server/*.js client/*.js client/components/*.js client/css/*.css",
-    "build": "npm run lint;webpack;postcss -c postcss.config.js client/css/app.css -o public/app.css",
+    "build": "npm run lint;webpack;postcss -c postcss.config.js client/css/app.css -o dist/public/app.css",
-    "start": "node server/server"
+    "start": "cd dist && node server"
   },
   "author": "Zaid Abdulla <zaid@genieacs.com>",
   "dependencies": {
-    "jsonwebtoken": "^8.2.1",
+    "jsonwebtoken": "^8.3.0",
-    "koa": "^2.5.0",
+    "koa": "^2.5.2",
-    "koa-body": "^2.5.0",
+    "koa-bodyparser": "^4.2.1",
-    "koa-bodyparser": "^4.2.0",
+    "koa-compress": "^3.0.0",
-    "koa-compress": "^2.0.0",
+    "koa-jwt": "^3.3.2",
-    "koa-jwt": "^3.3.1",
     "koa-router": "^7.4.0",
-    "koa-static": "^4.0.2",
+    "koa-static": "^5.0.0",
-    "mithril": "^1.1.6",
+    "mongodb": "^3.1.1",
-    "mongodb": "^3.0.10",
+    "parsimmon": "^1.12.0"
-    "parsimmon": "^1.7.2"
   },
   "devDependencies": {
-    "cssnano": "^3.10.0",
+    "clean-webpack-plugin": "^0.1.19",
-    "eslint": "^4.19.1",
+    "copy-webpack-plugin": "^4.5.2",
-    "postcss-cli": "^4.1.1",
+    "cssnano": "^4.0.5",
+    "eslint": "^5.2.0",
+    "mithril": "^1.1.6",
+    "postcss-cli": "^6.0.0",
     "postcss-cssnext": "^3.1.0",
     "postcss-import": "^11.1.0",
-    "prettier": "^1.11.1",
+    "prettier": "^1.14.0",
-    "webpack": "^3.11.0"
+    "webpack": "^4.16.3",
+    "webpack-cli": "^3.1.0",
+    "webpack-node-externals": "^1.7.2"
   }
 }

postcss.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   plugins: [
     require("postcss-import"),
-    require("postcss-cssnext")({warnForDuplicates: false}),
+    require("postcss-cssnext")({ warnForDuplicates: false }),
     require("cssnano")
   ]
-}
+};

server/config.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const configFile = require("../config.json");
+const fs = require("fs");
+const configFile = JSON.parse(fs.readFileSync("./config.json"));
 
 let config;
 

server/db.js

@@ -21,10 +21,14 @@ function getClient(db) {
 
   return new Promise((resolve, reject) => {
     const CONNECTION_URL = config.server.mongodbConnectionUrl;
-    mongodb.MongoClient.connect(CONNECTION_URL, (err, client) => {
+    mongodb.MongoClient.connect(
-      if (err) return reject(err);
+      CONNECTION_URL,
-      resolve((_client[db] = client.db(db)));
+      { useNewUrlParser: true },
-    });
+      (err, client) => {
+        if (err) return reject(err);
+        resolve((_client[db] = client.db(db)));
+      }
+    );
   });
 }
 

server/server.js

@@ -4,7 +4,7 @@ const Koa = require("koa");
 const Router = require("koa-router");
 const koaStatic = require("koa-static");
 const koaCompress = require("koa-compress");
-const koaBody = require("koa-body");
+const koaBodyParser = require("koa-bodyparser");
 const koaJwt = require("koa-jwt");
 const jwt = require("jsonwebtoken");
 
@@ -81,7 +81,7 @@ router.post("/logout", async ctx => {
   ctx.body = "";
 });
 
-koa.use(koaBody());
+koa.use(koaBodyParser());
 router.use("/api", api.routes(), api.allowedMethods());
 
 router.get("/", async ctx => {

webpack.config.js

@@ -1,6 +1,49 @@
-module.exports = {
+const nodeExternals = require("webpack-node-externals");
-  entry: "./client/app.js",
+const CopyWebpackPlugin = require("copy-webpack-plugin");
-  output: {
+const CleanWebpackPlugin = require("clean-webpack-plugin");
-    filename: "public/app.js"
+
+const mode = "production";
+
+function transformPackageJson(content) {
+  const pkg = JSON.parse(content);
+  delete pkg["devDependencies"];
+  pkg["scripts"] = {
+    start: "node server"
+  };
+  return JSON.stringify(pkg, null, 2);
+}
+
+module.exports = [
+  {
+    mode: mode,
+    entry: "./server/server.js",
+    target: "node",
+    externals: [nodeExternals()],
+    output: {
+      filename: "server.js"
+    },
+    plugins: [
+      new CleanWebpackPlugin(["dist"]),
+      new CopyWebpackPlugin(
+        [
+          { from: "images/logo.svg", to: "public/logo.svg" },
+          { from: "images/favicon.png", to: "public/favicon.png" },
+          { from: "config.json", to: "config.json" },
+          {
+            from: "package.json",
+            to: "package.json",
+            transform: transformPackageJson
+          }
+        ],
+        {}
+      )
+    ]
+  },
+  {
+    mode: mode,
+    entry: "./client/app.js",
+    output: {
+      filename: "public/app.js"
+    }
   }
-};
+];