update npm dependencies

Author: joshiste

spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package-lock.json

@@ -8,13 +8,13 @@
   },
   "dependencies": {
     "babel-eslint": "^10.1.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "eslint-plugin-vue": "^6.2.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
+    "@vue/cli-plugin-babel": "^4.3.1",
+    "@vue/cli-plugin-eslint": "^4.3.1",
+    "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-standard": "^4.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "eslint": "^6.8.0",

spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package.json

@@ -9,17 +9,17 @@
     "watch": "vue-cli-service build --watch"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.27",
-    "@fortawesome/free-brands-svg-icons": "^5.12.1",
-    "@fortawesome/free-regular-svg-icons": "^5.12.1",
-    "@fortawesome/free-solid-svg-icons": "^5.12.1",
+    "@fortawesome/fontawesome-svg-core": "^1.2.28",
+    "@fortawesome/free-brands-svg-icons": "^5.13.0",
+    "@fortawesome/free-regular-svg-icons": "^5.13.0",
+    "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
     "ansi_up": "^4.0.4",
-    "autolinker": "^3.13.0",
+    "autolinker": "^3.14.1",
     "axios": "^0.19.2",
-    "bulma": "^0.8.0",
+    "bulma": "^0.8.2",
     "bulma-badge": "^3.0.1",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "d3-array": "^2.4.0",
     "d3-axis": "^1.0.12",
     "d3-brush": "^1.1.5",
@@ -30,25 +30,24 @@
     "event-source-polyfill": "^1.0.12",
     "file-saver": "^2.0.2",
     "lodash": "^4.17.15",
-    "moment": "^2.24.0",
-    "moment-shortformat": "^2.1.0",
+    "moment": "^2.25.1",
     "popper.js": "^1.16.1",
     "pretty-bytes": "^5.3.0",
     "resize-observer-polyfill": "^1.5.1",
-    "rxjs": "^6.5.4",
+    "rxjs": "^6.5.5",
     "vue": "^2.6.11",
-    "vue-clickaway2": "^2.3.1",
-    "vue-i18n": "^8.15.5",
+    "vue-clickaway2": "^2.3.2",
+    "vue-i18n": "^8.17.4",
     "vue-infinite-loading": "^2.4.5",
     "vue-router": "^3.1.6"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-plugin-unit-jest": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
+    "@vue/cli-plugin-babel": "^4.3.1",
+    "@vue/cli-plugin-eslint": "^4.3.1",
+    "@vue/cli-plugin-unit-jest": "^4.3.1",
+    "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.0.0-beta.32",
+    "@vue/test-utils": "^1.0.0-beta.33",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
@@ -57,10 +56,10 @@
     "eslint-plugin-vue": "^6.2.2",
     "html-loader": "^0.5.5",
     "jest": "^24.9.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.0",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11",
-    "webpack-bundle-analyzer": "^3.6.1"
+    "webpack-bundle-analyzer": "^3.7.0"
   },
   "eslintConfig": {
     "root": true,

spring-boot-admin-server-ui/package-lock.json

@@ -14,7 +14,37 @@
  * limitations under the License.
  */
 
-import moment from 'moment-shortformat';
+import moment from 'moment';
+
+const minute = 60 * 1000;
+const hour = 60 * minute;
+const day = 24 * hour;
+const week = 7 * day;
+
+function shortFormat(aMoment, withoutPreOrSuffix, now = moment()) {
+  let diff = Math.abs(aMoment.diff(now));
+  let unit;
+  if (diff < minute) {
+    unit = 'seconds';
+  } else if (diff < hour) {
+    unit = 'minutes';
+  } else if (diff < day) {
+    unit = 'hours';
+  } else if (diff < week) {
+    unit = 'days';
+  } else if (aMoment.year() !== now.year()) {
+    return aMoment.format('MMM D, YYYY');
+  } else {
+    return aMoment.format('MMM D');
+  }
+  let num = Math.max(1, moment.duration(diff)[unit]());
+
+  let result = num + unit.charAt(0);
+  if (!withoutPreOrSuffix) {
+    result = moment.localeData().pastFuture(aMoment.diff(now), result);
+  }
+  return result;
+}
 
 export default {
   props: {
@@ -29,7 +59,7 @@ export default {
   }),
   computed: {
     timeAgo() {
-      return moment(this.date).short(true, this.now);
+      return shortFormat(moment(this.date), true, this.now);
     }
   },
   created() {

spring-boot-admin-server-ui/package.json

@@ -17,7 +17,6 @@
 import '@/assets/css/base.scss';
 import axios from '@/utils/axios';
 import moment from 'moment';
-import 'moment/locale/de';
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import components from './components';

spring-boot-admin-server-ui/src/main/frontend/components/sba-time-ago.js

@@ -51,7 +51,7 @@
   import Instance from '@/services/instance';
   import {concatMap, timer} from '@/utils/rxjs';
   import remove from 'lodash/remove';
-  import moment from 'moment-shortformat';
+  import moment from 'moment';
   import threadsList from './threads-list';
   import {VIEW_GROUP} from '../../index';
 

spring-boot-admin-server-ui/src/main/frontend/index.js

@@ -89,8 +89,7 @@ module.exports = {
         analyzerMode: 'static',
         openAnalyzer: false,
         reportFilename: '../report.html'
-      }),
-      new IgnorePlugin(/^\.\/locale$/, /moment$/),
+      })
     ]
   }
 };