Merge remote-tracking branch 'origin/master' into upgrade-packages

apache · Jan 4, 2023 · d3c40c9 · d3c40c9
2 parents 9ee902a + 82b0c23
commit d3c40c9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -140,7 +140,7 @@
     "global-box": "^1.2.0",
     "html-webpack-plugin": "^5.3.2",
     "immer": "^9.0.6",
-    "interweave": "^11.2.0",
+    "interweave": "^13.0.0",
     "jquery": "^3.5.1",
     "js-levenshtein": "^1.1.6",
     "js-yaml-loader": "^1.2.2",
@@ -160,7 +160,7 @@
     "query-string": "^6.13.7",
     "re-resizable": "^6.6.1",
     "react": "^16.13.1",
-    "react-ace": "^9.4.4",
+    "react-ace": "^10.1.0",
     "react-checkbox-tree": "^1.5.1",
     "react-color": "^2.13.8",
     "react-datetime": "^3.2.0",

diff --git a/superset-frontend/packages/superset-ui-chart-controls/package.json b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/chart-controls",
-  "version": "0.18.25",
+  "version": "0.18.26",
   "description": "Superset UI control-utils",
   "keywords": [
     "superset"
@@ -43,7 +43,7 @@
     "brace": "^0.11.1",
     "memoize-one": "^5.1.1",
     "react": "^16.13.1",
-    "react-ace": "^9.4.4",
+    "react-ace": "^10.1.0",
     "react-dom": "^16.13.1"
   },
   "publishConfig": {

diff --git a/superset-frontend/plugins/plugin-chart-handlebars/package.json b/superset-frontend/plugins/plugin-chart-handlebars/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/plugin-chart-handlebars",
-  "version": "0.18.25",
+  "version": "0.18.26",
   "description": "Superset Chart - Write a handlebars template to render the data",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -36,7 +36,7 @@
     "lodash": "^4.17.11",
     "moment": "^2.26.0",
     "react": "^16.13.1",
-    "react-ace": "^9.4.4",
+    "react-ace": "^10.1.0",
     "react-dom": "^16.13.1"
   },
   "devDependencies": {

diff --git a/superset-frontend/src/components/MessageToasts/Toast.tsx b/superset-frontend/src/components/MessageToasts/Toast.tsx
@@ -18,7 +18,7 @@
  */
 import { styled, css, SupersetTheme } from '@superset-ui/core';
 import cx from 'classnames';
-import Interweave from 'interweave';
+import { Interweave } from 'interweave';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import Icons from 'src/components/Icons';
 import { ToastType, ToastMeta } from './types';