diff --git a/extension/package.json b/extension/package.json index adcfb30c..ee498fbe 100644 --- a/extension/package.json +++ b/extension/package.json @@ -44,7 +44,7 @@ "lodash": "^4.17.21", "react": "^16.14.0", "react-dom": "^16.14.0", - "react-icons": "^3.11.0", + "react-icons": "^4.2.0", "react-json-tree": "^0.15.0", "react-redux": "^7.2.4", "redux": "^4.1.1" diff --git a/package.json b/package.json index 33603a13..69ed8c51 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^9.0.1", "cross-env": "^7.0.3", - "css-loader": "^4.3.0", + "css-loader": "^6.2.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-babel": "^5.3.1", @@ -30,7 +30,7 @@ "file-loader": "^6.2.0", "fork-ts-checker-webpack-plugin": "^6.3.2", "html-loader": "^2.1.2", - "html-webpack-plugin": "^4.5.2", + "html-webpack-plugin": "^5.3.2", "jest": "^27.1.0", "lerna": "^4.0.0", "prettier": "^2.3.2", @@ -71,5 +71,8 @@ "packages/redux-devtools/examples/counter", "packages/redux-devtools/examples/todomvc", "packages/redux-devtools-slider-monitor/examples/todomvc" - ] + ], + "resolutions": { + "@babel/highlight/chalk": "Methuselah96/chalk#head=v2-without-process" + } } diff --git a/packages/d3-state-visualizer/examples/tree/package.json b/packages/d3-state-visualizer/examples/tree/package.json index 0b8d671f..eb842d0e 100644 --- a/packages/d3-state-visualizer/examples/tree/package.json +++ b/packages/d3-state-visualizer/examples/tree/package.json @@ -14,7 +14,7 @@ }, "license": "MIT", "scripts": { - "start": "webpack-dev-server --open" + "start": "webpack serve --open" }, "repository": { "type": "git", diff --git a/packages/devui/package.json b/packages/devui/package.json index 7b4b6d50..775ca022 100755 --- a/packages/devui/package.json +++ b/packages/devui/package.json @@ -36,11 +36,11 @@ "prepublishOnly": "npm run clean && npm run build" }, "dependencies": { - "@rjsf/core": "^2.5.1", + "@rjsf/core": "^3.1.0", "@types/base16": "^1.0.2", "@types/codemirror": "^5.60.2", "@types/prop-types": "^15.7.4", - "@types/react-select": "^3.1.2", + "@types/react-select": "^4.0.17", "@types/redux-devtools-themes": "^1.0.0", "@types/simple-element-resize-detector": "^1.3.0", "@types/styled-components": "^5.1.13", @@ -48,8 +48,8 @@ "codemirror": "^5.62.3", "color": "^3.2.1", "prop-types": "^15.7.2", - "react-icons": "^3.11.0", - "react-select": "^3.2.0", + "react-icons": "^4.2.0", + "react-select": "^4.3.1", "redux-devtools-themes": "^1.0.0", "simple-element-resize-detector": "^1.3.0", "styled-components": "^5.3.1" diff --git a/packages/devui/src/Select/Select.tsx b/packages/devui/src/Select/Select.tsx index 00b6e399..4b59d016 100644 --- a/packages/devui/src/Select/Select.tsx +++ b/packages/devui/src/Select/Select.tsx @@ -1,6 +1,7 @@ import React, { PureComponent, Component, ReactElement } from 'react'; import PropTypes from 'prop-types'; import ReactSelect, { + GroupTypeBase, NamedProps as ReactSelectProps, OptionTypeBase, } from 'react-select'; @@ -8,9 +9,10 @@ import createThemedComponent from '../utils/createThemedComponent'; import { Theme } from '../themes/default'; export interface SelectProps< - Option extends OptionTypeBase = OptionTypeBase, - IsMulti extends boolean = false -> extends Omit, 'theme'> { + Option extends OptionTypeBase, + IsMulti extends boolean = false, + Group extends GroupTypeBase