feat: use jquery package

chmelevskij · chmelevskij · commit fbbac8ee0072 · 2023-08-06T20:04:08.000+03:00
diff --git a/package.json b/package.json
@@ -63,10 +63,10 @@
     "i18next-xhr-backend": "^3.2.2",
     "inflection": "^1.13.4",
     "jbox": "^1.3.3",
-    "jquery": "^3.6.1",
+    "jquery": "^3.6.3",
     "jquery-textcomplete": "^1.8.5",
     "jquery-touchswipe": "^1.6.19",
-    "jquery-ui-npm": "^1.12.0",
+    "jquery-ui": "^1.13.2",
     "jsdom": "^21.0.0",
     "lodash.debounce": "^4.0.8",
     "marked": "^4.1.1",
@@ -135,6 +135,9 @@
   "optionalDependencies": {
     "appdmg": "^0.6.4"
   },
+  "resolutions": {
+    "jquery": "3.6.3"
+  },
   "husky": {
     "hooks": {
       "pre-commit": "yarn lint"
diff --git a/src/components/EscDshotDirection/EscDshotDirectionComponent.js b/src/components/EscDshotDirection/EscDshotDirectionComponent.js
@@ -6,6 +6,7 @@ import DshotCommand from "../../js/utils/DshotCommand.js";
 import FC from "../../js/fc.js";
 import { API_VERSION_1_44 } from '../../js/data_storage.js';
 import { getMixerImageSrc } from "../../js/utils/common.js";
+import $ from "jquery";
 
 class EscDshotDirectionComponent
 {
diff --git a/src/components/MotorOutputReordering/MotorOutputReorderingComponent.js b/src/components/MotorOutputReordering/MotorOutputReorderingComponent.js
@@ -8,6 +8,7 @@ import FC from "../../js/fc";
 import { gui_log } from "../../js/gui_log";
 import { i18n } from "../../js/localization";
 import GUI, { TABS } from "../../js/gui";
+import $ from "jquery";
 
 export default class MotorOutputReorderComponent
 {
diff --git a/src/js/Analytics.js b/src/js/Analytics.js
@@ -3,6 +3,7 @@ import googleAnalytics from 'universal-ga';
 import { set as setConfig, get as getConfig } from './ConfigStorage';
 import GUI from './gui';
 import CONFIGURATOR from './data_storage';
+import $ from 'jquery';
 
 let tracking = null;
 export { tracking };
diff --git a/src/js/Beepers.js b/src/js/Beepers.js
@@ -1,4 +1,5 @@
 import { bit_check, bit_clear, bit_set } from './bit';
+import $ from 'jquery';
 
 class Beepers {
     constructor(config, supportedConditions) {
diff --git a/src/js/BuildApi.js b/src/js/BuildApi.js
@@ -1,6 +1,7 @@
 import { gui_log } from './gui_log';
 import { i18n } from "./localization";
 import { get as getStorage, set as setStorage } from "./SessionStorage";
+import $ from 'jquery';
 
 export default class BuildApi {
 
diff --git a/src/js/CliAutoComplete.js b/src/js/CliAutoComplete.js
@@ -3,6 +3,7 @@ import CONFIGURATOR from './data_storage';
 import FC from './fc';
 import semver from 'semver';
 import { tracking } from './Analytics';
+import $ from 'jquery';
 
 /**
  * Encapsulates the AutoComplete logic
diff --git a/src/js/DarkTheme.js b/src/js/DarkTheme.js
@@ -1,6 +1,7 @@
 import GUI from "./gui";
 import windowWatcherUtil from "./utils/window_watchers";
 import { checkSetupAnalytics } from "./Analytics";
+import $ from 'jquery';
 
 const css_dark = [
     './css/dark-theme.css',
diff --git a/src/js/Features.js b/src/js/Features.js
@@ -2,6 +2,7 @@ import { bit_check, bit_set, bit_clear } from "./bit";
 import { API_VERSION_1_44, API_VERSION_1_45 } from './data_storage';
 import semver from "semver";
 import { tracking } from "./Analytics";
+import $ from 'jquery';
 
 const Features = function (config) {
     const self = this;
diff --git a/src/js/LogoManager.js b/src/js/LogoManager.js
@@ -1,6 +1,7 @@
 import { gui_log } from "./gui_log";
 import { i18n } from "./localization";
 import { checkChromeRuntimeError } from "./utils/common";
+import $ from 'jquery';
 
 /**
  * Takes an ImageData object and returns an MCM symbol as an array of strings.
diff --git a/src/js/TuningSliders.js b/src/js/TuningSliders.js
@@ -6,6 +6,7 @@ import { isExpertModeEnabled } from "./utils/isExportModeEnabled";
 import semver from "semver";
 import { mspHelper } from "./msp/MSPHelper";
 import { TABS } from "./gui";
+import $ from 'jquery';
 
 const TuningSliders = {
     // Legacy Sliders
diff --git a/src/js/gui.js b/src/js/gui.js
@@ -3,6 +3,7 @@ import MSP from './msp';
 import Switchery from 'switchery-latest';
 import jBox from 'jbox';
 import { checkChromeRuntimeError } from './utils/common';
+import $ from 'jquery';
 
 const TABS = {};
 
@@ -316,7 +317,7 @@ class GuiControl {
         documentationButton.html("Wiki").attr("href", `https://betaflight.com/docs/wiki/configurator/${tRex}-tab`);
 
         // loading tooltip
-        jQuery(function () {
+        $(function () {
 
             new jBox('Tooltip', {
                 attach: '.cf_tip',
diff --git a/src/js/gui_log.js b/src/js/gui_log.js
@@ -1,3 +1,5 @@
+import $ from "jquery";
+
 /**
  * log to GUI
  * @param {string} message message to log to GUI
diff --git a/src/js/jquery.js b/src/js/jquery.js
@@ -0,0 +1,10 @@
+import $ from 'jquery';
+
+// eslint-disable-next-line no-undef
+globalThis.jQuery = $;
+// eslint-disable-next-line no-undef
+globalThis.$ = $;
+window.jQuery = $;
+window.$ = $;
+
+export default $;
diff --git a/src/js/jqueryPlugins.js b/src/js/jqueryPlugins.js
@@ -0,0 +1,9 @@
+import './jquery';
+import 'jquery-ui';
+import 'jquery-textcomplete';
+import 'jquery-touchswipe';
+import select2 from 'select2';
+select2(jQuery);
+import 'multiple-select';
+import '../../libraries/jquery.nouislider.all.min.js';
+import '../../libraries/jquery.flightindicators.js';
diff --git a/src/js/localization.js b/src/js/localization.js
@@ -2,6 +2,7 @@ import i18next from 'i18next';
 import i18nextXHRBackend from 'i18next-xhr-backend';
 import { gui_log } from './gui_log.js';
 import { get as getConfig, set as setConfig } from './ConfigStorage.js';
+import $ from "jquery";
 
 const i18n = {};
 /*
diff --git a/src/js/main.js b/src/js/main.js
@@ -1,3 +1,5 @@
+import './jqueryPlugins';
+import $ from 'jquery';
 import 'jbox';
 import '../components/init.js';
 import { gui_log } from './gui_log.js';
diff --git a/src/js/main_cordova.js b/src/js/main_cordova.js
@@ -1,4 +1,5 @@
 import { i18n } from "./localization.js";
+import $ from 'jquery';
 
 const REQUIRED_WEBVIEW_VERSION = 72;
 const WEBVIEW = {
diff --git a/src/js/msp/MSPConnector.js b/src/js/msp/MSPConnector.js
@@ -9,6 +9,9 @@ import CONFIGURATOR from "../data_storage";
 import serial from "../serial";
 import { gui_log } from "../gui_log";
 
+/**
+ * This seems to be mainly used in firmware flasher parts.
+ */
 const MSPConnectorImpl = function () {
     this.baud = undefined;
     this.port = undefined;
diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js
@@ -1,3 +1,4 @@
+import '../injected_methods';
 import { update_dataflash_global } from "../update_dataflash_global";
 import { sensor_status } from "../sensor_helpers";
 import { bit_check, bit_set } from "../bit";
diff --git a/src/js/phones_ui.js b/src/js/phones_ui.js
@@ -1,4 +1,5 @@
 import GUI from "./gui";
+import $ from 'jquery';
 
 const UI_PHONES = {
     background: '#background',
diff --git a/src/js/port_handler.js b/src/js/port_handler.js
@@ -5,6 +5,7 @@ import { generateVirtualApiVersions, getTextWidth } from './utils/common';
 import { get as getConfig } from "./ConfigStorage";
 import serial from "./serial";
 import MdnsDiscovery from "./mdns_discovery";
+import $ from 'jquery';
 
 const TIMEOUT_CHECK = 500 ; // With 250 it seems that it produces a memory leak and slowdown in some versions, reason unknown
 
diff --git a/src/js/protocols/stm32.js b/src/js/protocols/stm32.js
@@ -19,6 +19,7 @@ import { API_VERSION_1_42 } from "../data_storage";
 import serial from "../serial";
 import STM32DFU from "./stm32usbdfu";
 import semver from "semver";
+import $ from 'jquery';
 
 const STM32_protocol = function () {
     this.baud = null;
diff --git a/src/js/sensor_helpers.js b/src/js/sensor_helpers.js
@@ -1,4 +1,5 @@
 import { bit_check } from './bit';
+import $ from 'jquery';
 
 export function have_sensor(sensors_detected, sensor_code) {
     switch(sensor_code) {
diff --git a/src/js/serial.js b/src/js/serial.js
@@ -6,6 +6,7 @@ import { gui_log } from "./gui_log";
 import inflection from "inflection";
 import PortHandler from "./port_handler";
 import { checkChromeRuntimeError } from "./utils/common";
+import $ from 'jquery';
 
 const serial = {
     connected:      false,
diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
@@ -22,6 +22,7 @@ import { get as getConfig, set as setConfig } from "./ConfigStorage";
 import { tracking } from "./Analytics";
 import semver from 'semver';
 import CryptoES from "crypto-es";
+import $ from 'jquery';
 import BuildApi from "./BuildApi";
 
 let mspHelper;
diff --git a/src/js/tabs/adjustments.js b/src/js/tabs/adjustments.js
@@ -7,6 +7,7 @@ import MSPCodes from '../msp/MSPCodes';
 import { API_VERSION_1_42 } from '../data_storage';
 import { gui_log } from '../gui_log';
 import semver from 'semver';
+import $ from 'jquery';
 
 const adjustments = {};
 
diff --git a/src/js/tabs/auxiliary.js b/src/js/tabs/auxiliary.js
@@ -8,6 +8,7 @@ import MSP from '../msp';
 import MSPCodes from '../msp/MSPCodes';
 import adjustBoxNameIfPeripheralWithModeID from '../peripherals';
 import { getTextWidth } from '../utils/common';
+import $ from 'jquery';
 import inflection from "inflection";
 
 const auxiliary = {};
diff --git a/src/js/tabs/cli.js b/src/js/tabs/cli.js
@@ -12,6 +12,7 @@ import UI_PHONES from "../phones_ui";
 import { gui_log } from "../gui_log";
 import jBox from "jbox";
 import { checkChromeRuntimeError } from "../utils/common";
+import $ from 'jquery';
 
 const cli = {
     lineDelayMs: 15,
diff --git a/src/js/tabs/configuration.js b/src/js/tabs/configuration.js
@@ -8,6 +8,7 @@ import MSP from '../msp';
 import MSPCodes from '../msp/MSPCodes';
 import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_45 } from '../data_storage';
 import { updateTabList } from '../utils/updateTabList';
+import $ from 'jquery';
 
 const configuration = {
     analyticsChanges: {},
diff --git a/src/js/tabs/failsafe.js b/src/js/tabs/failsafe.js
@@ -7,6 +7,7 @@ import MSPCodes from "../msp/MSPCodes";
 import adjustBoxNameIfPeripheralWithModeID from "../peripherals";
 import { API_VERSION_1_43, API_VERSION_1_44, API_VERSION_1_45 } from "../data_storage";
 import semver from 'semver';
+import $ from 'jquery';
 
 const failsafe = {};
 
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import { i18n } from '../localization';
 import GUI, { TABS } from '../gui';
 import { get as getConfig, set as setConfig } from '../ConfigStorage';
diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js
@@ -5,6 +5,7 @@ import GUI, { TABS } from '../gui';
 import FC from '../fc';
 import MSP from "../msp";
 import MSPCodes from "../msp/MSPCodes";
+import $ from 'jquery';
 import { have_sensor } from "../sensor_helpers";
 import { mspHelper } from '../msp/MSPHelper';
 import { updateTabList } from '../utils/updateTabList';
diff --git a/src/js/tabs/help.js b/src/js/tabs/help.js
@@ -1,5 +1,6 @@
 import GUI, { TABS } from '../gui';
 import { i18n } from '../localization';
+import $ from 'jquery';
 
 const help = {};
 help.initialize = function (callback) {
diff --git a/src/js/tabs/landing.js b/src/js/tabs/landing.js
@@ -1,5 +1,6 @@
 import GUI, { TABS } from '../gui';
 import { i18n } from '../localization';
+import $ from 'jquery';
 
 const landing = {};
 landing.initialize = function (callback) {
diff --git a/src/js/tabs/led_strip.js b/src/js/tabs/led_strip.js
@@ -5,6 +5,7 @@ import FC from "../fc";
 import semver from 'semver';
 import MSP from "../msp";
 import MSPCodes from "../msp/MSPCodes";
+import $ from 'jquery';
 import { API_VERSION_1_46 } from '../data_storage';
 
 const led_strip = {
diff --git a/src/js/tabs/logging.js b/src/js/tabs/logging.js
@@ -8,6 +8,7 @@ import MSP from '../msp.js';
 import MSPCodes from '../msp/MSPCodes.js';
 import CONFIGURATOR from '../data_storage.js';
 import { gui_log } from '../gui_log.js';
+import $ from 'jquery';
 
 const logging = {};
 logging.initialize = function (callback) {
diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
@@ -18,6 +18,7 @@ import { updateTabList } from "../utils/updateTabList";
 import { isInt, getMixerImageSrc } from "../utils/common";
 import semver from 'semver';
 import * as d3 from 'd3';
+import $ from 'jquery';
 
 const motors = {
     previousDshotBidir: null,
diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js
@@ -11,6 +11,7 @@ import { generateFilename } from "../utils/generate_filename";
 import semver from 'semver';
 import { showErrorDialog } from "../utils/showErrorDialog";
 import { checkChromeRuntimeError } from "../utils/common";
+import $ from 'jquery';
 
 let sdcardTimer;
 
diff --git a/src/js/tabs/options.js b/src/js/tabs/options.js
@@ -6,6 +6,7 @@ import CliAutoComplete from '../CliAutoComplete';
 import DarkTheme, { setDarkTheme } from '../DarkTheme';
 import { checkForConfiguratorUpdates } from '../utils/checkForConfiguratorUpdates';
 import { checkSetupAnalytics } from '../Analytics';
+import $ from 'jquery';
 import CONFIGURATOR from '../data_storage';
 
 const options = {};
diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js
@@ -15,6 +15,7 @@ import jBox from "jbox";
 import inflection from "inflection";
 import { checkChromeRuntimeError } from "../utils/common";
 import debounce from "lodash.debounce";
+import $ from 'jquery';
 
 const FONT = {};
 const SYM = {};
diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js
@@ -15,6 +15,7 @@ import { gui_log } from "../gui_log";
 import { degToRad, isInt } from "../utils/common";
 import semver from "semver";
 import * as THREE from "three";
+import $ from 'jquery';
 
 const pid_tuning = {
     RATE_PROFILE_MASK: 128,
diff --git a/src/js/tabs/ports.js b/src/js/tabs/ports.js
@@ -8,6 +8,7 @@ import MSP from '../msp';
 import MSPCodes from '../msp/MSPCodes';
 import { API_VERSION_1_42, API_VERSION_1_43, API_VERSION_1_45 } from '../data_storage';
 import BOARD from '../boards';
+import $ from 'jquery';
 
 const ports = {
     analyticsChanges: {},
diff --git a/src/js/tabs/power.js b/src/js/tabs/power.js
@@ -6,6 +6,7 @@ import FC from '../fc';
 import MSP from '../msp';
 import MSPCodes from '../msp/MSPCodes';
 import jBox from 'jbox';
+import $ from 'jquery';
 
 const power = {
     supported: false,
diff --git a/src/js/tabs/receiver.js b/src/js/tabs/receiver.js
@@ -18,7 +18,7 @@ import semver from 'semver';
 import { updateTabList } from "../utils/updateTabList";
 import * as THREE from 'three';
 import * as d3 from "d3";
-
+import $ from 'jquery';
 import CryptoES from 'crypto-es';
 
 const receiver = {
diff --git a/src/js/tabs/receiver_msp.js b/src/js/tabs/receiver_msp.js
@@ -1,4 +1,5 @@
 import windowWatcherUtil from "../utils/window_watchers";
+import $ from 'jquery';
 
 const css_dark = [
     '/css/dark-theme.css',
diff --git a/src/js/tabs/sensors.js b/src/js/tabs/sensors.js
@@ -7,6 +7,7 @@ import MSP from "../msp";
 import MSPCodes from "../msp/MSPCodes";
 import serial from "../serial";
 import * as d3 from 'd3';
+import $ from 'jquery';
 import semver from 'semver';
 import { API_VERSION_1_46 } from "../data_storage";
 
diff --git a/src/js/tabs/servos.js b/src/js/tabs/servos.js
@@ -5,6 +5,7 @@ import FC from "../fc";
 import MSP from "../msp";
 import MSPCodes from "../msp/MSPCodes";
 import { gui_log } from "../gui_log";
+import $ from 'jquery';
 
 const servos = {};
 servos.initialize = function (callback) {
diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js
diff --git a/src/js/tabs/setup_osd.js b/src/js/tabs/setup_osd.js
diff --git a/src/js/tabs/static_tab.js b/src/js/tabs/static_tab.js
diff --git a/src/js/tabs/transponder.js b/src/js/tabs/transponder.js
diff --git a/src/js/tabs/vtx.js b/src/js/tabs/vtx.js
diff --git a/src/js/update_dataflash_global.js b/src/js/update_dataflash_global.js
diff --git a/src/js/utils/checkForConfiguratorUpdates.js b/src/js/utils/checkForConfiguratorUpdates.js
diff --git a/src/js/utils/common.js b/src/js/utils/common.js
diff --git a/src/js/utils/isExportModeEnabled.js b/src/js/utils/isExportModeEnabled.js
diff --git a/src/js/utils/showErrorDialog.js b/src/js/utils/showErrorDialog.js
diff --git a/src/js/utils/updateTabList.js b/src/js/utils/updateTabList.js
diff --git a/src/main.html b/src/main.html
diff --git a/src/tabs/pid_tuning.html b/src/tabs/pid_tuning.html
diff --git a/src/tabs/presets/DetailedDialog/PresetsDetailedDialog.js b/src/tabs/presets/DetailedDialog/PresetsDetailedDialog.js
diff --git a/src/tabs/presets/SourcesDialog/SourcePanel.js b/src/tabs/presets/SourcesDialog/SourcePanel.js
diff --git a/src/tabs/presets/SourcesDialog/SourcesDialog.js b/src/tabs/presets/SourcesDialog/SourcesDialog.js
diff --git a/src/tabs/presets/TitlePanel/PresetTitlePanel.js b/src/tabs/presets/TitlePanel/PresetTitlePanel.js
diff --git a/src/tabs/presets/presets.js b/src/tabs/presets/presets.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import DshotCommand from "../../js/utils/DshotCommand.js";`
`6`	`6`	`import FC from "../../js/fc.js";`
`7`	`7`	`import { API_VERSION_1_44 } from '../../js/data_storage.js';`
`8`	`8`	`import { getMixerImageSrc } from "../../js/utils/common.js";`
	`9`	`+import $ from "jquery";`
`9`	`10`
`10`	`11`	`class EscDshotDirectionComponent`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import FC from "../../js/fc";`
`8`	`8`	`import { gui_log } from "../../js/gui_log";`
`9`	`9`	`import { i18n } from "../../js/localization";`
`10`	`10`	`import GUI, { TABS } from "../../js/gui";`
	`11`	`+import $ from "jquery";`
`11`	`12`
`12`	`13`	`export default class MotorOutputReorderComponent`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { bit_check, bit_clear, bit_set } from './bit';`
	`2`	`+import $ from 'jquery';`
`2`	`3`
`3`	`4`	`class Beepers {`
`4`	`5`	`constructor(config, supportedConditions) {`