From 19f8f6a09c284de157c7179d43275ea2344b2372 Mon Sep 17 00:00:00 2001 From: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:19:14 -0700 Subject: [PATCH] chore: isolate the one actual jquery dependency (#1339) --- plugins/legacy-plugin-chart-pivot-table/package.json | 1 + plugins/legacy-plugin-chart-pivot-table/src/PivotTable.js | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/legacy-plugin-chart-pivot-table/package.json b/plugins/legacy-plugin-chart-pivot-table/package.json index 76c6d6ffa5..11a56fac6e 100644 --- a/plugins/legacy-plugin-chart-pivot-table/package.json +++ b/plugins/legacy-plugin-chart-pivot-table/package.json @@ -32,6 +32,7 @@ "@superset-ui/core": "0.18.2", "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", + "jquery": "^3.6.0", "prop-types": "^15.6.2" } } diff --git a/plugins/legacy-plugin-chart-pivot-table/src/PivotTable.js b/plugins/legacy-plugin-chart-pivot-table/src/PivotTable.js index 4b028d04ea..d951d9daba 100644 --- a/plugins/legacy-plugin-chart-pivot-table/src/PivotTable.js +++ b/plugins/legacy-plugin-chart-pivot-table/src/PivotTable.js @@ -19,6 +19,7 @@ /* eslint-disable react/sort-prop-types */ import dt from 'datatables.net-bs'; import PropTypes from 'prop-types'; +import $ from 'jquery'; import { getTimeFormatter, getTimeFormatterForGranularity, @@ -28,10 +29,7 @@ import { formatCellValue, formatDateCellValue } from './utils/formatCells'; import fixTableHeight from './utils/fixTableHeight'; import 'datatables.net-bs/css/dataTables.bootstrap.css'; -if (window.$) { - dt(window, window.$); -} -const $ = window.$ || dt.$; +dt(window, $); const propTypes = { data: PropTypes.shape({