Merge branch 'dev' of github.com:Koenkk/zigbee2mqtt into dev

lib/util/data.ts

@@ -22,8 +22,8 @@ function getPath(): string {
 }
 
 // eslint-disable-next-line camelcase
-function __testingOnly_reload(): void {
+function testingOnlyReload(): void {
     load();
 }
 
-export default {joinPath, getPath, __testingOnly_reload};
+export default {joinPath, getPath, testingOnlyReload};

package.json

@@ -37,7 +37,7 @@
   "dependencies": {
     "ajv": "^8.6.3",
     "bind-decorator": "^1.0.11",
-    "core-js": "^3.18.2",
+    "core-js": "^3.19.0",
     "debounce": "^1.2.1",
     "deep-object-diff": "^1.1.0",
     "fast-deep-equal": "^3.1.3",
@@ -62,28 +62,28 @@
     "zigbee2mqtt-frontend": "0.6.30"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-proposal-decorators": "^7.15.4",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-typescript": "^7.15.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-decorators": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
     "@types/debounce": "^1.2.1",
     "@types/finalhandler": "^1.1.1",
-    "@types/humanize-duration": "^3.25.1",
+    "@types/humanize-duration": "^3.27.0",
     "@types/jest": "^27.0.2",
-    "@types/js-yaml": "^4.0.3",
+    "@types/js-yaml": "^4.0.4",
     "@types/object-assign-deep": "^0.4.0",
     "@types/rimraf": "^3.0.2",
     "@types/serve-static": "^1.13.10",
     "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^4.32.0",
-    "@typescript-eslint/parser": "^4.32.0",
-    "babel-jest": "^27.2.4",
-    "eslint": "^7.32.0",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
+    "babel-jest": "^27.3.1",
+    "eslint": "^8.1.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jest": "^24.5.0",
-    "jest": "^27.2.4",
+    "eslint-plugin-jest": "^25.2.2",
+    "jest": "^27.3.1",
     "tmp": "^0.2.1",
-    "typescript": "^4.4.3"
+    "typescript": "^4.4.4"
   },
   "jest": {
     "coverageThreshold": {

test/data.test.js

@@ -15,12 +15,12 @@ describe('Data', () => {
         it('Should return correct path when ZIGBEE2MQTT_DATA set', () => {
             const expected = tmp.dirSync().name;
             process.env.ZIGBEE2MQTT_DATA = expected;
-            data.__testingOnly_reload();
+            data.testingOnlyReload();
             const actual = data.getPath();
             expect(actual).toBe(expected);
             expect(data.joinPath('test')).toStrictEqual(path.join(expected, 'test'));
             delete process.env.ZIGBEE2MQTT_DATA;
-            data.__testingOnly_reload();
+            data.testingOnlyReload();
         });
     });
 });