From 4bb3ddcff27696a71e08a2b381b1201e0000dc92 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sun, 27 Sep 2020 22:14:29 +0200
Subject: [PATCH] Make frontend non-experimental.
 https://github.com/Koenkk/zigbee2mqtt/issues/4266

---
 lib/controller.js         | 2 +-
 lib/extension/frontend.js | 4 ++--
 test/frontend.test.js     | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 45abc4e48..432e0ba1a 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -68,7 +68,7 @@ class Controller {
             this.extensions.push(new ExtensionBridge(...args, this.enableDisableExtension));
         }
 
-        if (settings.get().experimental.frontend) {
+        if (settings.get().frontend) {
             this.extensions.push(new ExtensionFrontend(...args));
         }
 
diff --git a/lib/extension/frontend.js b/lib/extension/frontend.js
index 8a548698c..545869d3f 100644
--- a/lib/extension/frontend.js
+++ b/lib/extension/frontend.js
@@ -25,9 +25,9 @@ class Frontend extends Extension {
         this.onWebSocketConnection = this.onWebSocketConnection.bind(this);
         this.server = http.createServer(this.onRequest);
         this.server.on('upgrade', this.onUpgrade);
-        this.developmentServer = settings.get().experimental.frontend.development_server;
+        this.developmentServer = settings.get().frontend.development_server;
         this.development = !!this.developmentServer;
-        this.port = settings.get().experimental.frontend.port || 8080;
+        this.port = settings.get().frontend.port || 8080;
         this.retainedMessages = new Map();
 
         if (this.development) {
diff --git a/test/frontend.test.js b/test/frontend.test.js
index 2350c091b..a989edcec 100644
--- a/test/frontend.test.js
+++ b/test/frontend.test.js
@@ -84,7 +84,8 @@ describe('Frontend', () => {
         data.writeDefaultConfiguration();
         data.writeDefaultState();
         settings._reRead();
-        settings.set(['experimental'], {new_api: true, frontend: {port: 8081}});
+        settings.set(['experimental'], {new_api: true});
+        settings.set(['frontend'], {port: 8081});
         settings.set(['homeassistant'], true);
     });
 
@@ -177,7 +178,7 @@ describe('Frontend', () => {
     });
 
     it('Development server', async () => {
-        settings.set(['experimental', 'frontend'], {development_server: 'localhost:3001'});
+        settings.set(['frontend'], {development_server: 'localhost:3001'});
         controller = new Controller();
         await controller.start();
         expect(mockHTTPProxy.variables.initParameter).toStrictEqual({ws: true});