Merge pull request #1 from nightscout/master

Update 2019-05-08

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+    "plugins": [ ],
+    "extends": [
+      "eslint:recommended"
+    ],
+    "parser": "babel-eslint",
+    "env": {
+      "browser": true,
+      "commonjs": true,
+      "es6": true,
+      "node": true,
+      "jquery": true
+    }
+  };

.github/ISSUE_TEMPLATE/--bug-report.md

@@ -1,6 +1,7 @@
 ---
 name: "\U0001F41BBug report"
 about: Create a report to help us improve things
+label: bug
 
 ---
 

.jsbeautifyrc

@@ -0,0 +1,16 @@
+{
+  "indent_size": 2
+  , "indent_char": " "
+  , "comma_first": true
+  , "keep-array-indentation": true
+  , "space_after_named_function": true
+  , "space_after_anon_function": true
+  , "end_with_newline": true
+  , "brace_style": "collapse,preserve-inline"
+  , "space_in_brace": true
+  , "space-in-paren": false
+  , "break-chained-methods": false
+  , "max-preserve-newlines": 2
+  , "space-after-anon-function": false
+  , "indent-empty-lines": false
+}

.nvmrc

@@ -1 +1 @@
-8.11.x
+10.16.0

.travis.yml

@@ -1,23 +1,32 @@
-language: node_js
-os: osx
-node_js:
-  - "8"
-before_install:
-  - if [[ `npm --version` != "5.8.0" ]]; then npm install -g npm@latest; npm --version; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  # https://github.com/Homebrew/homebrew-core/issues/26358
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi
-  # "brew install" can succeed but return 1 if it has "caveats".
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mongodb || true; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start mongodb; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install docker || true; fi
+sudo: required
+dist: xenial
+
+node_js-steps: &node_js-steps
+  language: node_js
+  before_install:
+    - if [[ `npm --version` != "6.4.1" ]]; then npm install -g npm@latest; npm --version; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+    # https://github.com/Homebrew/homebrew-core/issues/26358
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi
+    # "brew install" can succeed but return 1 if it has "caveats".
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mongodb || true; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start mongodb; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install docker || true; fi
+  script: make travis
+  after_success:
+    - nvm version
+    - if [[ ! -z "$DOCKER_USER" ]]; then docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} && git checkout -- . && git clean -fd . && make docker_release; fi
+  after_script: make report
+  services:
+    - mongodb
+    - docker
 matrix:
-  fast_finish: true
-services:
-  - mongodb
-  - docker
-script: make travis
-after_success:
-  - nvm version
-  - if [[ ! -z "$DOCKER_USER" ]]; then docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} && git checkout -- . && git clean -fd . && make docker_release; fi
-after_script: make report
+  allow_failures:
+    node_js: "node"
+  include:
+    - node_js: "8"
+      <<: *node_js-steps
+    - node_js: "10"
+      <<: *node_js-steps
+    - node_js: "node" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
+      <<: *node_js-steps

Dockerfile.example

@@ -1,17 +1,17 @@
-FROM node:8.9.1
+FROM node:10-alpine
 
 MAINTAINER Nightscout Contributors
 
-RUN apt-get update && \
-  apt-get -y dist-upgrade
-
 RUN mkdir -p /opt/app
 ADD . /opt/app
 WORKDIR /opt/app
+RUN chown -R node:node /opt/app
+USER node
 
 RUN npm install && \
   npm run postinstall && \
-  npm run env
+  npm run env && \
+  npm audit fix
 
 EXPOSE 1337
 

Makefile

@@ -22,7 +22,8 @@ MOCHA=./node_modules/mocha/bin/_mocha
 # Pinned from dependency list.
 ISTANBUL=./node_modules/.bin/istanbul
 ANALYZED=./coverage/lcov.info
-export CODACY_REPO_TOKEN=e29ae5cf671f4f918912d9864316207c
+# Following token deprecated
+# export CODACY_REPO_TOKEN=e29ae5cf671f4f918912d9864316207c
 
 DOCKER_IMAGE=nightscout/cgm-remote-monitor-travis