Chore/move gui to modules (#3001)

Move `GUI` to esm

.gitignore

@@ -31,3 +31,4 @@ nbproject/
 # Eclipse
 .project
 .settings/
+test-results-junit/

src/js/Clipboard.js

@@ -1,4 +1,4 @@
-'use strict';
+import GUI from './gui.js';
 
 /**
  * Encapsulates the Clipboard logic, depending on web or nw
@@ -99,3 +99,5 @@ if (GUI.isNWJS()){
 } else {
     Clipboard._configureClipboardAsOther();
 }
+
+export default Clipboard;

src/js/localization.js

@@ -1,5 +1,6 @@
 import i18next from 'i18next';
 import i18nextXHRBackend from 'i18next-xhr-backend';
+import GUI from './gui.js';
 
 const i18n = {};
 /*

src/js/main.js

@@ -1,5 +1,6 @@
 import '../components/init.js';
 import { i18n } from './localization.js';
+import GUI from './gui.js';
 
 $(document).ready(function () {
 

src/js/tabs/adjustments.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const adjustments = {};
 

src/js/tabs/auxiliary.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const auxiliary = {};
 

src/js/tabs/cli.js

@@ -1,4 +1,6 @@
 import { i18n } from "../localization";
+import Clipboard from "../Clipboard";
+import GUI from '../gui';
 
 const cli = {
     lineDelayMs: 15,

src/js/tabs/configuration.js

@@ -1,5 +1,6 @@
 import semver from 'semver';
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const configuration = {
     // intended

src/js/tabs/failsafe.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const failsafe = {};
 

src/js/tabs/firmware_flasher.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const firmware_flasher = {
     targets: null,

src/js/tabs/gps.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const gps = {};
 gps.initialize = function (callback) {

src/js/tabs/help.js

@@ -1,3 +1,5 @@
+import GUI from '../gui';
+
 const help = {};
 help.initialize = function (callback) {
 

src/js/tabs/landing.js

@@ -1,3 +1,5 @@
+import GUI from '../gui';
+
 const landing = {};
 landing.initialize = function (callback) {
 

src/js/tabs/led_strip.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const led_strip = {
         wireMode: false,

src/js/tabs/logging.js

@@ -1,4 +1,5 @@
 import { millitime } from '../utils/common.js';
+import GUI from '../gui';
 
 const logging = {};
 logging.initialize = function (callback) {

src/js/tabs/motors.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const motors = {
     previousDshotBidir: null,

src/js/tabs/onboard_logging.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 let sdcardTimer;
 

src/js/tabs/options.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const options = {};
 options.initialize = function (callback) {

src/js/tabs/osd.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const FONT = {};
 const SYM = {};

src/js/tabs/pid_tuning.js

@@ -1,5 +1,6 @@
 import { i18n } from "../localization";
 import { colorTables, getColorForPercentage } from '../utils/css.js';
+import GUI from '../gui';
 
 const pid_tuning = {
     RATE_PROFILE_MASK: 128,

src/js/tabs/ports.js

@@ -1,5 +1,6 @@
 import semver from 'semver';
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const ports = {
     // intentional

src/js/tabs/power.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const power = {
     supported: false,

src/js/tabs/receiver.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const MD5 = require('md5.js');
 

src/js/tabs/sensors.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const sensors = {};
 sensors.initialize = function (callback) {

src/js/tabs/servos.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const servos = {};
 servos.initialize = function (callback) {

src/js/tabs/setup.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const setup = {
     yaw_fix: 0.0,

src/js/tabs/setup_osd.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const setup_osd = {
 };

src/js/tabs/static_tab.js

@@ -1,4 +1,5 @@
 import { i18n } from '../localization';
+import GUI from '../gui';
 
 const staticTab = {};
 staticTab.initialize = function (staticTabName, callback) {

src/js/tabs/transponder.js

@@ -1,4 +1,5 @@
 import { i18n } from "../localization";
+import GUI from '../gui';
 
 const transponder = {
     available: false,

src/js/tabs/vtx.js

@@ -1,4 +1,6 @@
 import { i18n } from "../localization";
+import Clipboard from "../Clipboard";
+import GUI from '../gui';
 
 const vtx = {
     supported: false,

src/main.html

@@ -90,7 +90,6 @@
     <script type="text/javascript" src="./js/port_handler.js"></script>
     <script type="text/javascript" src="./js/port_usage.js"></script>
     <script type="text/javascript" src="./js/serial.js"></script>
-    <script type="text/javascript" src="./js/gui.js"></script>
     <script type="text/javascript" src="./js/mdns_discovery.js"></script>
     <script type="text/javascript" src="./js/huffman.js"></script>
     <script type="text/javascript" src="./js/default_huffman_tree.js"></script>
@@ -113,7 +112,6 @@
     <script type="text/javascript" src="./js/ConfigInserter.js"></script>
     <script type="text/javascript" src="./js/GitHubApi.js"></script>
     <script type="module" src="./js/main.js"></script>
-    <script type="text/javascript" src="./js/Clipboard.js"></script>
     <!-- TODO: might be removed when everythign is in modules -->
     <script type="text/javascript" src="./tabs/presets/CliEngine.js"></script>
     <script type="text/javascript" src="./tabs/presets/PickedPreset.js"></script>

src/tabs/presets/presets.js

@@ -1,4 +1,4 @@
-'use strict';
+import GUI from '../../js/gui';
 
 import { favoritePresets } from './FavoritePresets';
 

test/karma.conf.js

@@ -17,7 +17,7 @@ module.exports = function(config) {
             './src/js/serial.js',
             './src/js/data_storage.js',
             { pattern: './src/js/localization.js', type: 'module', watched: false },
-            './src/js/gui.js',
+            { pattern: './src/js/gui.js', type: 'module', watched: false },
             './src/js/CliAutoComplete.js',
             { pattern: './src/js/tabs/cli.js', type: 'module', watched: false },
             './src/js/phones_ui.js',
@@ -41,6 +41,7 @@ module.exports = function(config) {
         preprocessors: {
              './src/js/localization.js': ['rollup'],
              './src/js/tabs/cli.js': ['rollup'],
+             './src/js/gui.js': ['rollup'],
         },
         rollupPreprocessor: {
             plugins: [