From e7c65e61b85c0511401104f2ebc7b55bb096b24e Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Mon, 4 Mar 2024 11:21:56 +0100 Subject: [PATCH] chore(frontend): fix jquery imports --- packages/grafana-ui/src/components/Gauge/Gauge.tsx | 2 +- packages/grafana-ui/src/graveyard/Graph/Graph.tsx | 2 +- public/app/angular/bsTooltip.ts | 2 +- public/app/angular/bsTypeahead.ts | 2 +- public/app/angular/components/query_part_editor.ts | 2 +- public/app/angular/components/scroll.ts | 2 +- public/app/angular/components/sql_part/sql_part_editor.ts | 2 +- public/app/angular/dropdown_typeahead.ts | 2 +- public/app/angular/jquery_extended.ts | 2 +- public/app/features/dashboard/services/DashboardLoaderSrv.ts | 2 +- public/app/plugins/panel/graph/annotation_tooltip.ts | 2 +- public/app/plugins/panel/graph/graph.ts | 2 +- public/app/plugins/panel/graph/graph_tooltip.ts | 2 +- public/app/plugins/panel/graph/jquery.flot.events.ts | 2 +- public/app/plugins/panel/graph/threshold_manager.ts | 2 +- public/app/plugins/panel/table-old/module.ts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx index cecd0351f5e..38b0ce36388 100644 --- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx +++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { PureComponent } from 'react'; import * as React from 'react'; diff --git a/packages/grafana-ui/src/graveyard/Graph/Graph.tsx b/packages/grafana-ui/src/graveyard/Graph/Graph.tsx index 759e041decd..bc2a53383c9 100644 --- a/packages/grafana-ui/src/graveyard/Graph/Graph.tsx +++ b/packages/grafana-ui/src/graveyard/Graph/Graph.tsx @@ -1,5 +1,5 @@ // Libraries -import $ from 'jquery'; +import 'jquery'; import { uniqBy } from 'lodash'; import { PureComponent } from 'react'; import * as React from 'react'; diff --git a/public/app/angular/bsTooltip.ts b/public/app/angular/bsTooltip.ts index 3f2d6302ecc..8a11104763a 100644 --- a/public/app/angular/bsTooltip.ts +++ b/public/app/angular/bsTooltip.ts @@ -1,5 +1,5 @@ import angular from 'angular'; -import $ from 'jquery'; +import 'jquery'; import coreModule from './core_module'; diff --git a/public/app/angular/bsTypeahead.ts b/public/app/angular/bsTypeahead.ts index 696a3678b68..2e808c40f32 100644 --- a/public/app/angular/bsTypeahead.ts +++ b/public/app/angular/bsTypeahead.ts @@ -1,5 +1,5 @@ import angular from 'angular'; -import $ from 'jquery'; +import 'jquery'; import { isFunction } from 'lodash'; import coreModule from './core_module'; diff --git a/public/app/angular/components/query_part_editor.ts b/public/app/angular/components/query_part_editor.ts index 22a0958b69d..b7b2508558f 100644 --- a/public/app/angular/components/query_part_editor.ts +++ b/public/app/angular/components/query_part_editor.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { debounce, each, map, partial, escape, unescape } from 'lodash'; import coreModule from 'app/angular/core_module'; diff --git a/public/app/angular/components/scroll.ts b/public/app/angular/components/scroll.ts index c9fbe69a515..4f35789d960 100644 --- a/public/app/angular/components/scroll.ts +++ b/public/app/angular/components/scroll.ts @@ -1,6 +1,6 @@ // @ts-ignore import baron from 'baron'; -import $ from 'jquery'; +import 'jquery'; import coreModule from 'app/angular/core_module'; diff --git a/public/app/angular/components/sql_part/sql_part_editor.ts b/public/app/angular/components/sql_part/sql_part_editor.ts index d62e24646b4..aa70d42637a 100644 --- a/public/app/angular/components/sql_part/sql_part_editor.ts +++ b/public/app/angular/components/sql_part/sql_part_editor.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { debounce, each, indexOf, map, partial, escape, unescape } from 'lodash'; import coreModule from 'app/angular/core_module'; diff --git a/public/app/angular/dropdown_typeahead.ts b/public/app/angular/dropdown_typeahead.ts index 520e968525a..8ccfcaecd0e 100644 --- a/public/app/angular/dropdown_typeahead.ts +++ b/public/app/angular/dropdown_typeahead.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { each, reduce } from 'lodash'; import coreModule from './core_module'; diff --git a/public/app/angular/jquery_extended.ts b/public/app/angular/jquery_extended.ts index d878c87d188..f3cd85440a3 100644 --- a/public/app/angular/jquery_extended.ts +++ b/public/app/angular/jquery_extended.ts @@ -1,5 +1,5 @@ import angular from 'angular'; -import $ from 'jquery'; +import 'jquery'; import { extend } from 'lodash'; const $win = $(window); diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts index f0ddc2a32ab..91b267d5092 100644 --- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts +++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import _, { isFunction } from 'lodash'; // eslint-disable-line lodash/import-scope import moment from 'moment'; // eslint-disable-line no-restricted-imports diff --git a/public/app/plugins/panel/graph/annotation_tooltip.ts b/public/app/plugins/panel/graph/annotation_tooltip.ts index a9d4a77c62f..51db2efd704 100644 --- a/public/app/plugins/panel/graph/annotation_tooltip.ts +++ b/public/app/plugins/panel/graph/annotation_tooltip.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { isString, escape } from 'lodash'; import coreModule from 'app/angular/core_module'; diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index bffde64875e..8267f477cb3 100644 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -8,7 +8,7 @@ import 'vendor/flot/jquery.flot.crosshair'; import 'vendor/flot/jquery.flot.dashes'; import './jquery.flot.events'; -import $ from 'jquery'; +import 'jquery'; import { clone, find, flatten, isUndefined, map, max as _max, min as _min, sortBy as _sortBy, toNumber } from 'lodash'; import { createElement } from 'react'; import { createRoot, Root } from 'react-dom/client'; diff --git a/public/app/plugins/panel/graph/graph_tooltip.ts b/public/app/plugins/panel/graph/graph_tooltip.ts index 86a90bc5789..325f9d164df 100644 --- a/public/app/plugins/panel/graph/graph_tooltip.ts +++ b/public/app/plugins/panel/graph/graph_tooltip.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { textUtil, diff --git a/public/app/plugins/panel/graph/jquery.flot.events.ts b/public/app/plugins/panel/graph/jquery.flot.events.ts index 5f446704088..d6083432c5c 100644 --- a/public/app/plugins/panel/graph/jquery.flot.events.ts +++ b/public/app/plugins/panel/graph/jquery.flot.events.ts @@ -1,4 +1,4 @@ -import $ from 'jquery'; +import 'jquery'; import { partition, each } from 'lodash'; //@ts-ignore import Drop from 'tether-drop'; diff --git a/public/app/plugins/panel/graph/threshold_manager.ts b/public/app/plugins/panel/graph/threshold_manager.ts index fb2210dd876..9152bf358b0 100644 --- a/public/app/plugins/panel/graph/threshold_manager.ts +++ b/public/app/plugins/panel/graph/threshold_manager.ts @@ -1,5 +1,5 @@ import 'vendor/flot/jquery.flot'; -import $ from 'jquery'; +import 'jquery'; import { isNumber } from 'lodash'; import { PanelCtrl } from 'app/angular/panel/panel_ctrl'; diff --git a/public/app/plugins/panel/table-old/module.ts b/public/app/plugins/panel/table-old/module.ts index 82d6903929e..2383b3aa92d 100644 --- a/public/app/plugins/panel/table-old/module.ts +++ b/public/app/plugins/panel/table-old/module.ts @@ -1,5 +1,5 @@ import { IScope, IAngularStatic } from 'angular'; -import $ from 'jquery'; +import 'jquery'; import { defaults } from 'lodash'; import { isTableData, PanelEvents, PanelPlugin } from '@grafana/data';