diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f4bdcfe9..a630a83fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       - checkout
       - node/install:
           install-yarn: true
-          node-version: '16.13'
+          node-version: '20'
       - run:
           name: install-deps
           command: yarn
@@ -40,7 +40,7 @@ jobs:
           at: ~/react-forms
       - node/install:
           install-yarn: true
-          node-version: '16.13'
+          node-version: '20'
       - run:
           name: Release new version
           command: |
@@ -55,7 +55,7 @@ jobs:
           at: ~/react-forms
       - node/install:
           install-yarn: true
-          node-version: '16.13'
+          node-version: '20'
       - run:
           name: Predeploy demo
           command: |
diff --git a/.eslintrc.json b/.eslintrc.json
index 94eaf55f8..fb830d1c5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -79,7 +79,7 @@
     "no-unused-vars": "error",
     "react/no-unused-prop-types": "error",
     "react-hooks/rules-of-hooks": "error",
-    "react/prop-types": "error",
+    "react/prop-types": "off",
     "react/no-unescaped-entities": "error",
     "no-prototype-builtins": "error",
     "no-mixed-operators": "error",
diff --git a/package.json b/package.json
index 1b4b53fda..8e9617c17 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "testEnvironment": "jest-environment-jsdom",
     "verbose": true,
     "testPathIgnorePatterns": [
-      "/node_modules/"
+      "/node_modules/",
+      "packages/suir-component-mapper/"
     ],
     "setupFilesAfterEnv": [
       "<rootDir>/config/jest.setup.js"
@@ -41,6 +42,7 @@
       "<rootDir>/packages/**/src/**/*.ts",
       "!<rootDir>/packages/**/src/**/*.d.ts",
       "!<rootDir>/packages/react-renderer-demo/**/*.js",
+      "!<rootDir>/packages/suir-component-mapper/**/*.js",
       "!<rootDir>/packages/**/dist",
       "!<rootDir>/templates/**/*.js",
       "!<rootDir>/packages/**/src/**/index.js",
@@ -76,8 +78,8 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/react": "^18.0.18",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^19.1.2",
+    "@types/react-dom": "^19.1.3",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^27.4.6",
@@ -106,9 +108,8 @@
     "ncp": "^2.0.0",
     "sass": "^1.77.8",
     "prettier": "^2.5.1",
-    "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "regenerator-runtime": "^0.13.9",
     "replace-in-file": "^6.3.2",
     "sass-loader": "^12.4.0",
diff --git a/packages/ant-component-mapper/package.json b/packages/ant-component-mapper/package.json
index 1390083e3..65fb461bd 100644
--- a/packages/ant-component-mapper/package.json
+++ b/packages/ant-component-mapper/package.json
@@ -31,8 +31,8 @@
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "*",
     "antd": "^4.2.0",
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
diff --git a/packages/ant-component-mapper/src/checkbox/checkbox.js b/packages/ant-component-mapper/src/checkbox/checkbox.js
index 199347416..37eb7dc90 100644
--- a/packages/ant-component-mapper/src/checkbox/checkbox.js
+++ b/packages/ant-component-mapper/src/checkbox/checkbox.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Checkbox as AntCheckbox } from 'antd';
 import MultipleChoiceList from '../multiple-choice-list/multiple-choice-list';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -37,21 +36,6 @@ export const SingleCheckbox = (props) => {
   );
 };
 
-SingleCheckbox.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  FormItemProps: PropTypes.object,
-};
-
 const Checkbox = ({ options, ...props }) => (options ? <MultipleChoiceList options={options} {...props} /> : <SingleCheckbox {...props} />);
 
-Checkbox.propTypes = {
-  options: PropTypes.array,
-};
-
 export default Checkbox;
diff --git a/packages/ant-component-mapper/src/date-picker/date-picker.js b/packages/ant-component-mapper/src/date-picker/date-picker.js
index fac269f0f..c9d438045 100644
--- a/packages/ant-component-mapper/src/date-picker/date-picker.js
+++ b/packages/ant-component-mapper/src/date-picker/date-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { DatePicker as AntDatePicker } from 'antd';
 import { validationError } from '../validation-error/validation-error';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -37,17 +36,4 @@ const DatePicker = ({ placeholder = 'Select date', ...props }) => {
   );
 };
 
-DatePicker.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  locale: PropTypes.string,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-};
-
 export default DatePicker;
diff --git a/packages/ant-component-mapper/src/field-array/field-array.js b/packages/ant-component-mapper/src/field-array/field-array.js
index 6d4ada922..64f1a39c8 100644
--- a/packages/ant-component-mapper/src/field-array/field-array.js
+++ b/packages/ant-component-mapper/src/field-array/field-array.js
@@ -1,6 +1,5 @@
 import React, { memo, useReducer } from 'react';
 import isEqual from 'lodash/isEqual';
-import PropTypes from 'prop-types';
 import { useFieldApi, useFormApi, FieldArray } from '@data-driven-forms/react-form-renderer';
 import { Row, Col, Button, Typography, Space } from 'antd';
 import { UndoOutlined, RedoOutlined } from '@ant-design/icons';
@@ -44,20 +43,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  name: PropTypes.string,
-  fieldIndex: PropTypes.number.isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object),
-  remove: PropTypes.func.isRequired,
-  length: PropTypes.number,
-  minItems: PropTypes.number,
-  removeLabel: PropTypes.node.isRequired,
-  ArrayItemProps: PropTypes.object.isRequired,
-  FieldsContainerProps: PropTypes.object.isRequired,
-  RemoveContainerProps: PropTypes.object.isRequired,
-  RemoveButtonProps: PropTypes.object.isRequired,
-};
-
 const defaultButtonLabels = {
   add: 'ADD',
   remove: 'REMOVE',
@@ -247,32 +232,4 @@ const DynamicArray = ({ ...props }) => {
   );
 };
 
-DynamicArray.propTypes = {
-  label: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
-  defaultItem: PropTypes.any,
-  minItems: PropTypes.number,
-  maxItems: PropTypes.number,
-  noItemsMessage: PropTypes.node,
-  buttonLabels: PropTypes.object,
-  // customization props
-  FormItemProps: PropTypes.object,
-  ArrayItemProps: PropTypes.object,
-  FieldsContainerProps: PropTypes.object,
-  RemoveContainerProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  FieldArrayRowProps: PropTypes.object,
-  FieldArrayRowCol: PropTypes.object,
-  FieldArrayHeaderProps: PropTypes.object,
-  FieldArrayLabelProps: PropTypes.object,
-  FieldArrayButtonsProps: PropTypes.object,
-  UndoButtonProps: PropTypes.object,
-  RedoButtonProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  FieldArrayDescriptionProps: PropTypes.object,
-  NoItemsMessageProps: PropTypes.object,
-  ErrorMessageProps: PropTypes.object,
-};
-
 export default DynamicArray;
diff --git a/packages/ant-component-mapper/src/form-group/form-group.js b/packages/ant-component-mapper/src/form-group/form-group.js
index 20514e268..c2b0ce497 100644
--- a/packages/ant-component-mapper/src/form-group/form-group.js
+++ b/packages/ant-component-mapper/src/form-group/form-group.js
@@ -1,9 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Form } from 'antd';
 import { validationError } from '../validation-error/';
-import { childrenPropTypes } from '@data-driven-forms/common/prop-types-templates';
 
 const FormGroup = ({ label, children, isRequired, FormItemProps, meta, validateOnMount, helperText, description, hideLabel, input }) => {
   const invalid = validationError(meta, validateOnMount);
@@ -24,19 +22,4 @@ const FormGroup = ({ label, children, isRequired, FormItemProps, meta, validateO
   );
 };
 
-FormGroup.propTypes = {
-  label: PropTypes.string,
-  children: childrenPropTypes,
-  help: PropTypes.string,
-  isRequired: PropTypes.bool,
-  invalid: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
-  FormItemProps: PropTypes.object,
-  meta: PropTypes.object,
-  validateOnMount: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  input: PropTypes.object,
-};
-
 export default FormGroup;
diff --git a/packages/ant-component-mapper/src/form-template/form-template.js b/packages/ant-component-mapper/src/form-template/form-template.js
index 47e502895..38d3d185c 100644
--- a/packages/ant-component-mapper/src/form-template/form-template.js
+++ b/packages/ant-component-mapper/src/form-template/form-template.js
@@ -1,8 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Button, Typography, Form as AntForm } from 'antd';
 import FormTemplate from '@data-driven-forms/common/form-template';
-import { childrenPropTypes } from '@data-driven-forms/common/prop-types-templates';
 
 const { Title, Paragraph } = Typography;
 
@@ -12,56 +10,30 @@ const Form = ({ children, onSubmit, layout = 'vertical', ...props }) => (
   </AntForm>
 );
 
-Form.propTypes = {
-  layout: PropTypes.string,
-  onSubmit: PropTypes.func,
-  children: childrenPropTypes,
-};
-
 const Description = ({ children, ...props }) => (
   <Typography {...props}>
     <Paragraph>{children}</Paragraph>
   </Typography>
 );
 
-Description.propTypes = {
-  children: childrenPropTypes,
-};
-
 const TitleComponent = ({ children, ...props }) => (
   <Typography {...props}>
     <Title level={3}>{children}</Title>
   </Typography>
 );
 
-TitleComponent.propTypes = {
-  children: childrenPropTypes,
-};
-
 const ButtonGroup = ({ children, ...props }) => (
   <div style={{ display: 'flex', justifyContent: 'flex-end' }} {...props}>
     {children}
   </div>
 );
 
-ButtonGroup.propTypes = {
-  children: childrenPropTypes,
-};
-
 const ButtonComponent = ({ label, variant, children, buttonType, ...props }) => (
   <Button {...props} type="primary" htmlType={props.type}>
     {label || children}
   </Button>
 );
 
-ButtonComponent.propTypes = {
-  children: childrenPropTypes,
-  label: PropTypes.node,
-  variant: PropTypes.string,
-  buttonType: PropTypes.string,
-  type: PropTypes.string,
-};
-
 const AntFormTemplate = ({ layout, formWrapperProps, ...props }) => (
   <FormTemplate
     FormWrapper={Form}
@@ -74,9 +46,4 @@ const AntFormTemplate = ({ layout, formWrapperProps, ...props }) => (
   />
 );
 
-AntFormTemplate.propTypes = {
-  layout: PropTypes.string,
-  formWrapperProps: PropTypes.object,
-};
-
 export default AntFormTemplate;
diff --git a/packages/ant-component-mapper/src/is-required/is-required.js b/packages/ant-component-mapper/src/is-required/is-required.js
index 35df225eb..d20871249 100644
--- a/packages/ant-component-mapper/src/is-required/is-required.js
+++ b/packages/ant-component-mapper/src/is-required/is-required.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { childrenPropTypes } from '@data-driven-forms/common/prop-types-templates';
 
 import './is-required.css';
 
@@ -12,8 +11,4 @@ const IsRequired = ({ children }) => (
   </React.Fragment>
 );
 
-IsRequired.propTypes = {
-  children: childrenPropTypes,
-};
-
 export default IsRequired;
diff --git a/packages/ant-component-mapper/src/multiple-choice-list/multiple-choice-list.js b/packages/ant-component-mapper/src/multiple-choice-list/multiple-choice-list.js
index 2e7f2eebf..a56f01bfa 100644
--- a/packages/ant-component-mapper/src/multiple-choice-list/multiple-choice-list.js
+++ b/packages/ant-component-mapper/src/multiple-choice-list/multiple-choice-list.js
@@ -1,8 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Checkbox as AntCheckbox } from 'antd';
-import MultipleChoiceListCommon, { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
+import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
 import FormGroup from '../form-group';
 
 const FinalCheckbox = ({ isDisabled, label, ...props }) => (
@@ -11,11 +10,6 @@ const FinalCheckbox = ({ isDisabled, label, ...props }) => (
   </AntCheckbox>
 );
 
-FinalCheckbox.propTypes = {
-  isDisabled: PropTypes.bool,
-  label: PropTypes.node,
-};
-
 const Wrapper = ({ label, isRequired, children, meta, input, validateOnMount, helperText, description, FormItemProps }) => (
   <FormGroup
     label={label}
@@ -31,16 +25,6 @@ const Wrapper = ({ label, isRequired, children, meta, input, validateOnMount, he
   </FormGroup>
 );
 
-Wrapper.propTypes = {
-  ...wrapperProps,
-};
-
 const MultipleChoiceList = (props) => <MultipleChoiceListCommon {...props} Wrapper={Wrapper} Checkbox={FinalCheckbox} />;
 
-MultipleChoiceList.propTypes = {
-  input: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-  }),
-};
-
 export default MultipleChoiceList;
diff --git a/packages/ant-component-mapper/src/plain-text/plain-text.js b/packages/ant-component-mapper/src/plain-text/plain-text.js
index a47073c30..0cdf2fb6e 100644
--- a/packages/ant-component-mapper/src/plain-text/plain-text.js
+++ b/packages/ant-component-mapper/src/plain-text/plain-text.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Typography } from 'antd';
-import PropTypes from 'prop-types';
 
 const { Paragraph } = Typography;
 
@@ -14,10 +13,4 @@ const PlainText = ({ label, name, TypographyProps, ...rest }) => (
   </Typography>
 );
 
-PlainText.propTypes = {
-  label: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  TypographyProps: PropTypes.object,
-};
-
 export default PlainText;
diff --git a/packages/ant-component-mapper/src/radio/radio.js b/packages/ant-component-mapper/src/radio/radio.js
index 6670b143d..40a8edfb8 100644
--- a/packages/ant-component-mapper/src/radio/radio.js
+++ b/packages/ant-component-mapper/src/radio/radio.js
@@ -1,7 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Radio as AntRadio } from 'antd';
-import { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
 import FormGroup from '../form-group';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
@@ -11,11 +9,6 @@ const RadioOption = ({ name, option: { label, value, ...rest } }) => (
   </AntRadio>
 );
 
-RadioOption.propTypes = {
-  name: PropTypes.string.isRequired,
-  option: PropTypes.shape({ label: PropTypes.string.isRequired, value: PropTypes.any.isRequired }).isRequired,
-};
-
 const Radio = ({ name, component, ...props }) => {
   const {
     options = [],
@@ -54,20 +47,4 @@ const Radio = ({ name, component, ...props }) => {
   );
 };
 
-Radio.propTypes = {
-  ...wrapperProps,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.any,
-      label: PropTypes.node,
-    })
-  ),
-  label: PropTypes.node.isRequired,
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-  component: PropTypes.string,
-};
-
 export default Radio;
diff --git a/packages/ant-component-mapper/src/select/select.js b/packages/ant-component-mapper/src/select/select.js
index a8a6de170..8d7482090 100644
--- a/packages/ant-component-mapper/src/select/select.js
+++ b/packages/ant-component-mapper/src/select/select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormGroup from '../form-group';
 import { Select as AntSelect } from 'antd';
@@ -69,20 +68,4 @@ const Select = (props) => {
   );
 };
 
-Select.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isSearchable: PropTypes.bool,
-  options: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.any.isRequired, label: PropTypes.node.isRequired })).isRequired,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-  isMulti: PropTypes.bool,
-};
-
 export default Select;
diff --git a/packages/ant-component-mapper/src/sub-form/sub-form.js b/packages/ant-component-mapper/src/sub-form/sub-form.js
index 533d1268c..9e732f208 100644
--- a/packages/ant-component-mapper/src/sub-form/sub-form.js
+++ b/packages/ant-component-mapper/src/sub-form/sub-form.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Typography, Row, Col } from 'antd';
 
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
@@ -51,20 +50,4 @@ const SubForm = ({
   );
 };
 
-SubForm.propTypes = {
-  fields: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
-  title: PropTypes.node,
-  description: PropTypes.node,
-  TitleRowProps: PropTypes.object,
-  TitleColProps: PropTypes.object,
-  TitleProps: PropTypes.object,
-  DescriptionColProps: PropTypes.object,
-  DescriptionProps: PropTypes.object,
-  DescriptionRowProps: PropTypes.object,
-  RowProps: PropTypes.object,
-  ColProps: PropTypes.object,
-  component: PropTypes.string,
-  name: PropTypes.string,
-};
-
 export default SubForm;
diff --git a/packages/ant-component-mapper/src/switch/switch.js b/packages/ant-component-mapper/src/switch/switch.js
index 0f1225b36..fcc4490ad 100644
--- a/packages/ant-component-mapper/src/switch/switch.js
+++ b/packages/ant-component-mapper/src/switch/switch.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Switch as AntSwitch } from 'antd';
 import FormGroup from '../form-group';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -52,17 +51,4 @@ export const Switch = (props) => {
   );
 };
 
-Switch.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  onText: PropTypes.node,
-  offText: PropTypes.node,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-};
-
 export default Switch;
diff --git a/packages/ant-component-mapper/src/tabs/tabs.js b/packages/ant-component-mapper/src/tabs/tabs.js
index 9867f37e5..6540d897f 100644
--- a/packages/ant-component-mapper/src/tabs/tabs.js
+++ b/packages/ant-component-mapper/src/tabs/tabs.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
 import { Tabs } from 'antd';
@@ -19,8 +18,4 @@ const FormTabs = ({ fields, ...rest }) => {
   );
 };
 
-FormTabs.propTypes = {
-  fields: PropTypes.array.isRequired,
-};
-
 export default FormTabs;
diff --git a/packages/ant-component-mapper/src/text-field/text-field.js b/packages/ant-component-mapper/src/text-field/text-field.js
index 43bcfd4d6..2f5519f26 100644
--- a/packages/ant-component-mapper/src/text-field/text-field.js
+++ b/packages/ant-component-mapper/src/text-field/text-field.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Input /* Typography */ } from 'antd';
 
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -33,16 +32,4 @@ const TextField = (props) => {
   );
 };
 
-TextField.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-};
-
 export default TextField;
diff --git a/packages/ant-component-mapper/src/textarea/textarea.js b/packages/ant-component-mapper/src/textarea/textarea.js
index dbc9af9ea..09cabc484 100644
--- a/packages/ant-component-mapper/src/textarea/textarea.js
+++ b/packages/ant-component-mapper/src/textarea/textarea.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Input } from 'antd';
 
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -35,16 +34,4 @@ const Textarea = (props) => {
   );
 };
 
-Textarea.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-};
-
 export default Textarea;
diff --git a/packages/ant-component-mapper/src/time-picker/time-picker.js b/packages/ant-component-mapper/src/time-picker/time-picker.js
index 67e58d700..0e6c60ee1 100644
--- a/packages/ant-component-mapper/src/time-picker/time-picker.js
+++ b/packages/ant-component-mapper/src/time-picker/time-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { TimePicker as AntTimePicker } from 'antd';
 import { validationError } from '../validation-error/validation-error';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -51,17 +50,4 @@ const TimePicker = (props) => {
   );
 };
 
-TimePicker.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  locale: PropTypes.string,
-  description: PropTypes.node,
-  FormItemProps: PropTypes.object,
-};
-
 export default TimePicker;
diff --git a/packages/ant-component-mapper/src/wizard/step-buttons.js b/packages/ant-component-mapper/src/wizard/step-buttons.js
index 29e56409d..ee1bc5637 100644
--- a/packages/ant-component-mapper/src/wizard/step-buttons.js
+++ b/packages/ant-component-mapper/src/wizard/step-buttons.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Button } from 'antd';
 import selectNext from '@data-driven-forms/common/wizard/select-next';
 
@@ -29,23 +28,6 @@ const NextButton = ({
   );
 };
 
-NextButton.propTypes = {
-  nextStep: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
-  handleSubmit: PropTypes.func.isRequired,
-  valid: PropTypes.bool,
-  handleNext: PropTypes.func.isRequired,
-  getState: PropTypes.func.isRequired,
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node.isRequired,
-    cancel: PropTypes.node.isRequired,
-    back: PropTypes.node.isRequired,
-    next: PropTypes.node.isRequired,
-  }).isRequired,
-  NextButtonProps: PropTypes.object,
-  SubmitButtonProps: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const WizardStepButtons = ({
   disableBack,
   handlePrev,
@@ -81,27 +63,4 @@ const WizardStepButtons = ({
   </div>
 );
 
-WizardStepButtons.propTypes = {
-  disableBack: PropTypes.bool,
-  handlePrev: PropTypes.func.isRequired,
-  handleNext: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-  nextStep: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.shape({
-      when: PropTypes.string.isRequired,
-      stepMapper: PropTypes.object.isRequired,
-    }),
-  ]),
-  buttonLabels: PropTypes.object.isRequired,
-  formOptions: PropTypes.shape({
-    onCancel: PropTypes.func.isRequired,
-  }).isRequired,
-  ButtonProps: PropTypes.object,
-  NextButtonProps: PropTypes.object,
-  BackButtonProps: PropTypes.object,
-  CancelButtonProps: PropTypes.object,
-  SubmitButtonProps: PropTypes.object,
-};
-
 export default WizardStepButtons;
diff --git a/packages/ant-component-mapper/src/wizard/wizard-step.js b/packages/ant-component-mapper/src/wizard/wizard-step.js
index a9b6d5ab6..a8c07e08d 100644
--- a/packages/ant-component-mapper/src/wizard/wizard-step.js
+++ b/packages/ant-component-mapper/src/wizard/wizard-step.js
@@ -1,5 +1,4 @@
 import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
 import FormSpy from '@data-driven-forms/react-form-renderer/form-spy';
 import WizardStepButtons from './step-buttons';
 
@@ -14,12 +13,4 @@ const WizardStep = ({ fields = [], formOptions, WizardStepProps, ...rest }) => (
   </Fragment>
 );
 
-WizardStep.propTypes = {
-  fields: PropTypes.array,
-  formOptions: PropTypes.shape({
-    renderForm: PropTypes.func.isRequired,
-  }).isRequired,
-  WizardStepProps: PropTypes.object,
-};
-
 export default WizardStep;
diff --git a/packages/ant-component-mapper/src/wizard/wizard.js b/packages/ant-component-mapper/src/wizard/wizard.js
index 24c6dd1e4..31a58e40e 100644
--- a/packages/ant-component-mapper/src/wizard/wizard.js
+++ b/packages/ant-component-mapper/src/wizard/wizard.js
@@ -1,6 +1,5 @@
 import React, { useContext } from 'react';
 import WizardStep from './wizard-step';
-import PropTypes from 'prop-types';
 import { Steps, Modal } from 'antd';
 import Wizard from '@data-driven-forms/common/wizard/wizard';
 import { WizardContext } from '@data-driven-forms/react-form-renderer';
@@ -60,28 +59,8 @@ const WizardInternal = ({
   );
 };
 
-WizardInternal.propTypes = {
-  title: PropTypes.string,
-  buttonLabels: PropTypes.object,
-  stepsInfo: PropTypes.array,
-  WizardProps: PropTypes.object,
-  TitleProps: PropTypes.object,
-  StepProps: PropTypes.object,
-  WizardStepProps: PropTypes.object,
-  ButtonProps: PropTypes.object,
-  NextButtonProps: PropTypes.object,
-  BackButtonProps: PropTypes.object,
-  CancelButtonProps: PropTypes.object,
-  SubmitButtonProps: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const WizardFinal = ({ buttonLabels, ...props }) => (
   <Wizard Wizard={WizardInternal} buttonLabels={{ ...defaultButtonLabels, ...buttonLabels }} {...props} />
 );
 
-WizardFinal.propTypes = {
-  buttonLabels: PropTypes.object,
-};
-
 export default WizardFinal;
diff --git a/packages/blueprint-component-mapper/package.json b/packages/blueprint-component-mapper/package.json
index 266f1d15b..7eea1dc54 100644
--- a/packages/blueprint-component-mapper/package.json
+++ b/packages/blueprint-component-mapper/package.json
@@ -37,14 +37,13 @@
     "@blueprintjs/core": "^4.2.1",
     "@blueprintjs/datetime": "^4.1.4",
     "@blueprintjs/select": "^4.1.4",
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
     "clsx": "^1.1.0",
     "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
     "react-jss": "^10.5.0"
   }
 }
diff --git a/packages/blueprint-component-mapper/src/checkbox/checkbox.js b/packages/blueprint-component-mapper/src/checkbox/checkbox.js
index cc40dfe09..ee10ed860 100644
--- a/packages/blueprint-component-mapper/src/checkbox/checkbox.js
+++ b/packages/blueprint-component-mapper/src/checkbox/checkbox.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 
 import MultipleChoiceList from '@data-driven-forms/common/multiple-choice-list';
 import { Checkbox, FormGroup, Intent } from '@blueprintjs/core';
@@ -24,15 +23,6 @@ const SingleCheckbox = ({ input, isDisabled, disabled, label, providerRequired,
   />
 );
 
-SingleCheckbox.propTypes = {
-  input: PropTypes.object,
-  isDisabled: PropTypes.bool,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  providerRequired: PropTypes.node,
-  disabled: PropTypes.bool,
-};
-
 const Wrapper = ({ children, isRequired, showError, error, validateOnMount, ...props }) => {
   const { required } = useContext(BlueprintContext);
 
@@ -47,14 +37,6 @@ const Wrapper = ({ children, isRequired, showError, error, validateOnMount, ...p
   );
 };
 
-Wrapper.propTypes = {
-  children: PropTypes.node,
-  isRequired: PropTypes.bool,
-  showError: PropTypes.bool,
-  error: PropTypes.string,
-  validateOnMount: PropTypes.bool,
-};
-
 const WrapperCheckbox = (props) =>
   props.options ? (
     <MultipleChoiceList {...props} Wrapper={Wrapper} Checkbox={SingleCheckbox} />
@@ -62,8 +44,4 @@ const WrapperCheckbox = (props) =>
     <FormGroupWrapper {...props} hideLabel Component={SingleCheckbox} />
   );
 
-WrapperCheckbox.propTypes = {
-  options: PropTypes.array,
-};
-
 export default WrapperCheckbox;
diff --git a/packages/blueprint-component-mapper/src/date-picker/date-picker.js b/packages/blueprint-component-mapper/src/date-picker/date-picker.js
index 24a1cff2f..77467bb5b 100644
--- a/packages/blueprint-component-mapper/src/date-picker/date-picker.js
+++ b/packages/blueprint-component-mapper/src/date-picker/date-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Popover, Button } from '@blueprintjs/core';
 import { DatePicker as BDatePicker } from '@blueprintjs/datetime';
@@ -22,15 +21,6 @@ const DatePicker = ({
   </Popover>
 );
 
-DatePicker.propTypes = {
-  input: PropTypes.object,
-  disabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  valueRenderer: PropTypes.func,
-  PopoverProps: PropTypes.object,
-  ButtonProps: PropTypes.object,
-};
-
 const WrapperDatePicker = (props) => <FormGroupWrapper {...props} Component={DatePicker} />;
 
 export default WrapperDatePicker;
diff --git a/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js b/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
index d9036552d..b4e5cfa5f 100644
--- a/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import DualListSelectCommon from '@data-driven-forms/common/dual-list-select';
 import { Menu, MenuItem, ButtonGroup, Button, ControlGroup, InputGroup } from '@blueprintjs/core';
@@ -49,23 +48,6 @@ const List = ({ value = [], optionClick, noOptionsTitle, filterValue, filterValu
   );
 };
 
-List.propTypes = {
-  value: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.string.isRequired,
-    })
-  ),
-  optionClick: PropTypes.func.isRequired,
-  noOptionsTitle: PropTypes.node,
-  filterValue: PropTypes.string,
-  filterValueText: PropTypes.node,
-  selectedValues: PropTypes.array,
-  checkboxVariant: PropTypes.bool,
-  MenuProps: PropTypes.object,
-  MenuItemProps: PropTypes.object,
-};
-
 const Toolbar = ({
   sortTitle,
   onFilter,
@@ -83,18 +65,6 @@ const Toolbar = ({
   </ControlGroup>
 );
 
-Toolbar.propTypes = {
-  sortTitle: PropTypes.node,
-  onFilter: PropTypes.func.isRequired,
-  onSort: PropTypes.func.isRequired,
-  sortDirection: PropTypes.bool,
-  value: PropTypes.string,
-  placeholder: PropTypes.string,
-  ControlGroupProps: PropTypes.object,
-  InputGroupProps: PropTypes.object,
-  ButtonProps: PropTypes.object,
-};
-
 const DualListInternal = ({
   allToRight = true,
   allToLeft = true,
@@ -234,57 +204,6 @@ const DualListInternal = ({
   );
 };
 
-DualListInternal.propTypes = {
-  leftTitle: PropTypes.node,
-  rightTitle: PropTypes.node,
-  moveLeftTitle: PropTypes.node,
-  moveRightTitle: PropTypes.node,
-  allToLeft: PropTypes.bool,
-  allToRight: PropTypes.bool,
-  validateOnMount: PropTypes.bool,
-  moveAllLeftTitle: PropTypes.node,
-  moveAllRightTitle: PropTypes.node,
-  noValueTitle: PropTypes.node,
-  noOptionsTitle: PropTypes.node,
-  filterOptionsTitle: PropTypes.node,
-  filterValueTitle: PropTypes.node,
-  filterValueText: PropTypes.node,
-  filterOptionsText: PropTypes.node,
-  state: PropTypes.object,
-  sortOptions: PropTypes.func,
-  filterOptions: PropTypes.func,
-  handleOptionsClick: PropTypes.func,
-  leftValues: PropTypes.array,
-  handleMoveRight: PropTypes.func,
-  handleMoveLeft: PropTypes.func,
-  handleClearLeftValues: PropTypes.func,
-  handleClearRightValues: PropTypes.func,
-  sortValues: PropTypes.func,
-  filterValues: PropTypes.func,
-  rightValues: PropTypes.array,
-  handleValuesClick: PropTypes.func,
-  WrapperProps: PropTypes.object,
-  LeftWrapperProps: PropTypes.object,
-  RightWrapperProps: PropTypes.object,
-  ButtonGroupProps: PropTypes.object,
-  ToRightButtonProps: PropTypes.object,
-  AllToRightButtonProps: PropTypes.object,
-  AllToLeftButtonProps: PropTypes.object,
-  ToLeftButtonProps: PropTypes.object,
-  LeftControlGroupProps: PropTypes.object,
-  LeftInputGroupProps: PropTypes.object,
-  LeftButtonProps: PropTypes.object,
-  RightControlGroupProps: PropTypes.object,
-  RightInputGroupProps: PropTypes.object,
-  RightButtonProps: PropTypes.object,
-  LeftMenuProps: PropTypes.object,
-  LeftMenuItemProps: PropTypes.object,
-  RightMenuProps: PropTypes.object,
-  RightMenuItemProps: PropTypes.object,
-  leftSortTitle: PropTypes.string,
-  rightSortTitle: PropTypes.string,
-};
-
 const DualListWrapper = (props) => <FormGroupInternal {...props} Component={DualListInternal} />;
 const DualListSelect = (props) => <DualListSelectCommon {...props} DualListSelect={DualListWrapper} />;
 
diff --git a/packages/blueprint-component-mapper/src/field-array/field-array.js b/packages/blueprint-component-mapper/src/field-array/field-array.js
index b34208e0f..b3d9d1406 100644
--- a/packages/blueprint-component-mapper/src/field-array/field-array.js
+++ b/packages/blueprint-component-mapper/src/field-array/field-array.js
@@ -1,5 +1,4 @@
 import React, { memo, useContext } from 'react';
-import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 import clsx from 'clsx';
 import { useFieldApi, useFormApi, FieldArray as FieldArrayFF } from '@data-driven-forms/react-form-renderer';
@@ -48,16 +47,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  remove: PropTypes.func,
-  fields: PropTypes.array,
-  name: PropTypes.string,
-  removeLabel: PropTypes.node,
-  ArrayItemProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  disabledRemove: PropTypes.bool,
-};
-
 const FieldArray = (props) => {
   const {
     defaultItem,
@@ -134,25 +123,4 @@ const FieldArray = (props) => {
   );
 };
 
-FieldArray.propTypes = {
-  name: PropTypes.string,
-  defaultItem: PropTypes.any,
-  fields: PropTypes.array,
-  label: PropTypes.node,
-  description: PropTypes.node,
-  buttonLabels: PropTypes.object,
-  AddContainerProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  ArrayItemProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  FieldArrayProps: PropTypes.object,
-  noItemsMessage: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  helperText: PropTypes.node,
-  isRequired: PropTypes.bool,
-  maxItems: PropTypes.number,
-  minItems: PropTypes.number,
-};
-
 export default FieldArray;
diff --git a/packages/blueprint-component-mapper/src/form-group/form-group.js b/packages/blueprint-component-mapper/src/form-group/form-group.js
index 99aa9899b..0ffb21e34 100644
--- a/packages/blueprint-component-mapper/src/form-group/form-group.js
+++ b/packages/blueprint-component-mapper/src/form-group/form-group.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 
 import { FormGroup, Intent } from '@blueprintjs/core';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -46,21 +45,6 @@ export const FormGroupInternal = ({
   );
 };
 
-FormGroupInternal.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  Component: PropTypes.any,
-  helperText: PropTypes.node,
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormGroupProps: PropTypes.object,
-  hideLabel: PropTypes.bool,
-  meta: PropTypes.object,
-  input: PropTypes.object,
-};
-
 const FormGroupWrapper = (props) => {
   const rest = useFieldApi(props);
 
diff --git a/packages/blueprint-component-mapper/src/form-template/form-template.js b/packages/blueprint-component-mapper/src/form-template/form-template.js
index 0ea11a116..32e69584f 100644
--- a/packages/blueprint-component-mapper/src/form-template/form-template.js
+++ b/packages/blueprint-component-mapper/src/form-template/form-template.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { createUseStyles } from 'react-jss';
 
 import FormTemplate from '@data-driven-forms/common/form-template';
@@ -12,10 +11,6 @@ const Form = ({ children, ...props }) => (
   </form>
 );
 
-Form.propTypes = {
-  children: PropTypes.node,
-};
-
 const useStyles = createUseStyles({
   buttonGroup: {
     marginTop: 16,
@@ -36,42 +31,20 @@ const ButtonGroup = ({ children, ...props }) => {
   );
 };
 
-ButtonGroup.propTypes = {
-  children: PropTypes.node,
-};
-
 const Title = ({ children, ...props }) => <H1 {...props}>{children}</H1>;
 
-Title.propTypes = {
-  children: PropTypes.node,
-};
-
 const Description = ({ children, ...props }) => <H2 {...props}>{children}</H2>;
 
-Description.propTypes = {
-  children: PropTypes.node,
-};
-
 const InnerButton = ({ label, buttonType, ...props }) => (
   <Button intent={buttonType === 'submit' ? 'success' : ''} {...props}>
     {label}
   </Button>
 );
 
-InnerButton.propTypes = {
-  children: PropTypes.node,
-  label: PropTypes.node,
-  buttonType: PropTypes.string,
-};
-
 const BlueprintFormTemplate = ({ requiredLabelInfo, ...props }) => (
   <BlueprintContext.Provider value={{ required: requiredLabelInfo || <span className="bp4-text-muted">(required)</span> }}>
     <FormTemplate FormWrapper={Form} Button={InnerButton} ButtonGroup={ButtonGroup} Title={Title} Description={Description} {...props} />
   </BlueprintContext.Provider>
 );
 
-BlueprintFormTemplate.propTypes = {
-  requiredLabelInfo: PropTypes.node,
-};
-
 export default BlueprintFormTemplate;
diff --git a/packages/blueprint-component-mapper/src/plain-text/plain-text.js b/packages/blueprint-component-mapper/src/plain-text/plain-text.js
index 2fa6f1c2c..a7468dbe3 100644
--- a/packages/blueprint-component-mapper/src/plain-text/plain-text.js
+++ b/packages/blueprint-component-mapper/src/plain-text/plain-text.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Text } from '@blueprintjs/core';
 
@@ -7,10 +6,4 @@ const PlainText = ({ component, label, name, ...props }) => {
   return <Text {...props}>{label}</Text>;
 };
 
-PlainText.propTypes = {
-  component: PropTypes.string,
-  label: PropTypes.node,
-  name: PropTypes.string,
-};
-
 export default PlainText;
diff --git a/packages/blueprint-component-mapper/src/radio/radio.js b/packages/blueprint-component-mapper/src/radio/radio.js
index 593364a31..c473153f1 100644
--- a/packages/blueprint-component-mapper/src/radio/radio.js
+++ b/packages/blueprint-component-mapper/src/radio/radio.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { RadioGroup } from '@blueprintjs/core';
 
@@ -23,13 +22,6 @@ const Radio = ({ input, label, isRequired, providerRequired, ...props }) => (
   />
 );
 
-Radio.propTypes = {
-  input: PropTypes.object,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  providerRequired: PropTypes.node,
-};
-
 const WrapperRadio = (props) => <FormGroupWrapper {...props} hideLabel Component={Radio} component="not-radio" />;
 
 export default WrapperRadio;
diff --git a/packages/blueprint-component-mapper/src/select/select.js b/packages/blueprint-component-mapper/src/select/select.js
index fd21ecb72..464cba222 100644
--- a/packages/blueprint-component-mapper/src/select/select.js
+++ b/packages/blueprint-component-mapper/src/select/select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormGroupWrapper from '../form-group/form-group';
 
@@ -78,17 +77,6 @@ const Select = ({
   );
 };
 
-Select.propTypes = {
-  input: PropTypes.object,
-  options: PropTypes.array,
-  placeholder: PropTypes.node,
-  isSearchable: PropTypes.bool,
-  noOptionsMessage: PropTypes.node,
-  tagInputProps: PropTypes.object,
-  isMulti: PropTypes.bool,
-  disabled: PropTypes.bool,
-};
-
 const WrapperSelect = (props) => <FormGroupWrapper {...props} Component={Select} />;
 
 export default WrapperSelect;
diff --git a/packages/blueprint-component-mapper/src/slider/slider.js b/packages/blueprint-component-mapper/src/slider/slider.js
index e7e5d4709..e73f35028 100644
--- a/packages/blueprint-component-mapper/src/slider/slider.js
+++ b/packages/blueprint-component-mapper/src/slider/slider.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormGroupWrapper from '../form-group/form-group';
 
@@ -8,11 +7,6 @@ import propsCatcher from '../props-catcher/props-catcher';
 
 const Slider = ({ input, step, ...props }) => <BSlider stepSize={step} {...propsCatcher(props)} {...input} value={input.value || 0} />;
 
-Slider.propTypes = {
-  input: PropTypes.object,
-  step: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-};
-
 const WrapperSlider = (props) => <FormGroupWrapper {...props} Component={Slider} />;
 
 export default WrapperSlider;
diff --git a/packages/blueprint-component-mapper/src/sub-form/sub-form.js b/packages/blueprint-component-mapper/src/sub-form/sub-form.js
index 6b5970051..580e227e0 100644
--- a/packages/blueprint-component-mapper/src/sub-form/sub-form.js
+++ b/packages/blueprint-component-mapper/src/sub-form/sub-form.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 import { H3, H4 } from '@blueprintjs/core';
@@ -18,10 +17,4 @@ const SubForm = ({ title, description, fields, ...props }) => {
   );
 };
 
-SubForm.propTypes = {
-  title: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.array,
-};
-
 export default SubForm;
diff --git a/packages/blueprint-component-mapper/src/switch/switch.js b/packages/blueprint-component-mapper/src/switch/switch.js
index df0c60d14..d99e6f649 100644
--- a/packages/blueprint-component-mapper/src/switch/switch.js
+++ b/packages/blueprint-component-mapper/src/switch/switch.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Switch as BSwitch } from '@blueprintjs/core';
 
@@ -21,15 +20,6 @@ const Switch = ({ input, isRequired, label, onText, offText, providerRequired, .
   />
 );
 
-Switch.propTypes = {
-  input: PropTypes.object,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  onText: PropTypes.node,
-  offText: PropTypes.node,
-  providerRequired: PropTypes.node,
-};
-
 const WrapperSwitch = (props) => <FormGroupWrapper {...props} hideLabel type="checkbox" Component={Switch} />;
 
 export default WrapperSwitch;
diff --git a/packages/blueprint-component-mapper/src/tabs/tabs.js b/packages/blueprint-component-mapper/src/tabs/tabs.js
index fadd3ac51..a1fa7d8ab 100644
--- a/packages/blueprint-component-mapper/src/tabs/tabs.js
+++ b/packages/blueprint-component-mapper/src/tabs/tabs.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Tab, Tabs as BTabs } from '@blueprintjs/core';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
@@ -16,10 +15,4 @@ const Tabs = ({ component, name, fields, ...props }) => {
   );
 };
 
-Tabs.propTypes = {
-  component: PropTypes.string,
-  name: PropTypes.string,
-  fields: PropTypes.array,
-};
-
 export default Tabs;
diff --git a/packages/blueprint-component-mapper/src/text-field/text-field.js b/packages/blueprint-component-mapper/src/text-field/text-field.js
index ec1dac5bf..ecd98357a 100644
--- a/packages/blueprint-component-mapper/src/text-field/text-field.js
+++ b/packages/blueprint-component-mapper/src/text-field/text-field.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormGroupWrapper from '../form-group/form-group';
 
@@ -8,10 +7,6 @@ import propsCatcher from '../props-catcher/props-catcher';
 
 const TextField = ({ input, ...props }) => <InputGroup id={input.name} {...propsCatcher(props)} {...input} />;
 
-TextField.propTypes = {
-  input: PropTypes.object,
-};
-
 const WrapperTextField = (props) => <FormGroupWrapper {...props} Component={TextField} />;
 
 export default WrapperTextField;
diff --git a/packages/blueprint-component-mapper/src/textarea/textarea.js b/packages/blueprint-component-mapper/src/textarea/textarea.js
index fab55706e..ec09b90db 100644
--- a/packages/blueprint-component-mapper/src/textarea/textarea.js
+++ b/packages/blueprint-component-mapper/src/textarea/textarea.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { TextArea } from '@blueprintjs/core';
 
 import FormGroupWrapper from '../form-group/form-group';
@@ -7,10 +6,6 @@ import propsCatcher from '../props-catcher/props-catcher';
 
 const Textarea = ({ input, ...props }) => <TextArea id={input.name} {...propsCatcher(props)} {...input} />;
 
-Textarea.propTypes = {
-  input: PropTypes.object,
-};
-
 const WrapperTextarea = (props) => <FormGroupWrapper {...props} Component={Textarea} />;
 
 export default WrapperTextarea;
diff --git a/packages/blueprint-component-mapper/src/time-picker/time-picker.js b/packages/blueprint-component-mapper/src/time-picker/time-picker.js
index 0ced07cd6..64d8fd993 100644
--- a/packages/blueprint-component-mapper/src/time-picker/time-picker.js
+++ b/packages/blueprint-component-mapper/src/time-picker/time-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { TimePicker as BTimePicker } from '@blueprintjs/datetime';
 
@@ -8,10 +7,6 @@ import propsCatcher from '../props-catcher/props-catcher';
 
 const TimePicker = ({ input, ...props }) => <BTimePicker id={input.name} {...propsCatcher(props)} {...input} value={input.value || null} />;
 
-TimePicker.propTypes = {
-  input: PropTypes.object,
-};
-
 const WrapperTimePicker = (props) => <FormGroupWrapper {...props} Component={TimePicker} />;
 
 export default WrapperTimePicker;
diff --git a/packages/blueprint-component-mapper/src/wizard/step-buttons.js b/packages/blueprint-component-mapper/src/wizard/step-buttons.js
index dc2d2d7c2..91388f877 100644
--- a/packages/blueprint-component-mapper/src/wizard/step-buttons.js
+++ b/packages/blueprint-component-mapper/src/wizard/step-buttons.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import selectNext from '@data-driven-forms/common/wizard/select-next';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
@@ -22,21 +21,6 @@ const NextButton = ({ nextStep, handleNext, buttonLabels, getState, handleSubmit
   );
 };
 
-NextButton.propTypes = {
-  handleNext: PropTypes.func,
-  formOptions: PropTypes.shape({
-    onCancel: PropTypes.func,
-    renderForm: PropTypes.func,
-    getState: PropTypes.func,
-  }),
-  buttonLabels: PropTypes.object,
-  nextStep: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
-  getState: PropTypes.func,
-  handleSubmit: PropTypes.func,
-  isDisabled: PropTypes.bool,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const useStyles = createUseStyles({
   buttonGroup: {
     marginTop: 16,
@@ -91,27 +75,4 @@ const StepButtons = ({
   );
 };
 
-StepButtons.propTypes = {
-  currentStep: PropTypes.object,
-  handlePrev: PropTypes.func,
-  handleNext: PropTypes.func,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-  formOptions: PropTypes.shape({
-    onCancel: PropTypes.func,
-    renderForm: PropTypes.func,
-    getState: PropTypes.func,
-    handleSubmit: PropTypes.func,
-    valid: PropTypes.bool,
-  }),
-  activeStepIndex: PropTypes.number,
-  buttonLabels: PropTypes.object,
-  isNextDisabled: PropTypes.bool,
-  ButtonToolbarProps: PropTypes.object,
-  DirectionButtonProps: PropTypes.object,
-  CancelButtonProps: PropTypes.object,
-  BackButtonProps: PropTypes.object,
-  NextButtonProps: PropTypes.object,
-  SubmitButtonProps: PropTypes.object,
-};
-
 export default StepButtons;
diff --git a/packages/blueprint-component-mapper/src/wizard/wizard.js b/packages/blueprint-component-mapper/src/wizard/wizard.js
index 74e20367e..b2e41d507 100644
--- a/packages/blueprint-component-mapper/src/wizard/wizard.js
+++ b/packages/blueprint-component-mapper/src/wizard/wizard.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 import WizardCommon from '@data-driven-forms/common/wizard/wizard';
 import { FormSpy, WizardContext } from '@data-driven-forms/react-form-renderer';
 
@@ -20,10 +19,6 @@ const WizardInternal = ({ WizardProps, ...props }) => {
   );
 };
 
-WizardInternal.propTypes = {
-  WizardProps: PropTypes.object,
-};
-
 const defaultLabels = {
   submit: 'Submit',
   cancel: 'Cancel',
@@ -35,8 +30,4 @@ const Wizard = ({ buttonLabels, ...props }) => (
   <WizardCommon Wizard={WizardInternal} {...props} buttonLabels={{ ...defaultLabels, ...buttonLabels }} />
 );
 
-Wizard.propTypes = {
-  buttonLabels: PropTypes.object,
-};
-
 export default Wizard;
diff --git a/packages/carbon-component-mapper/package.json b/packages/carbon-component-mapper/package.json
index 6e46851af..373db42f3 100644
--- a/packages/carbon-component-mapper/package.json
+++ b/packages/carbon-component-mapper/package.json
@@ -36,14 +36,13 @@
     "carbon-icons": "^7.0.7"
   },
   "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
     "clsx": "^1.1.1",
     "lodash": "^4.17.21",
-    "prop-types": ">=15.7.2",
     "react-jss": "^10.5.0"
   }
 }
diff --git a/packages/carbon-component-mapper/src/checkbox/checkbox.js b/packages/carbon-component-mapper/src/checkbox/checkbox.js
index 74f10e811..c8ece3a90 100644
--- a/packages/carbon-component-mapper/src/checkbox/checkbox.js
+++ b/packages/carbon-component-mapper/src/checkbox/checkbox.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
 
@@ -18,16 +17,6 @@ const Wrapper = ({ label, description, children, helperText, error, showError, i
   </FormGroup>
 );
 
-Wrapper.propTypes = {
-  label: PropTypes.node,
-  children: PropTypes.node,
-  description: PropTypes.node,
-  helperText: PropTypes.node,
-  error: PropTypes.node,
-  showError: PropTypes.bool,
-  isRequired: PropTypes.bool,
-};
-
 const SingleCheckbox = (props) => {
   const { input, meta, validateOnMount, helperText, WrapperProps, ...rest } = useFieldApi(prepareProps({ ...props, type: 'checkbox' }));
 
@@ -47,19 +36,6 @@ const SingleCheckboxInCommon = ({ label, isDisabled, id, meta, option: { value,
   <CarbonCheckbox id={id} labelText={label} disabled={isDisabled} {...props} {...rest} onChange={(_value, _name, event) => onChange(event)} />
 );
 
-SingleCheckboxInCommon.propTypes = {
-  label: PropTypes.node,
-  input: PropTypes.object,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  name: PropTypes.string,
-  id: PropTypes.string,
-  WrapperProps: PropTypes.object,
-  meta: PropTypes.object,
-  option: PropTypes.object,
-  onChange: PropTypes.func,
-};
-
 const Checkbox = ({ options, ...props }) =>
   options ? (
     <MultipleChoiceListCommon options={options} {...props} Wrapper={Wrapper} Checkbox={SingleCheckboxInCommon} />
@@ -67,8 +43,4 @@ const Checkbox = ({ options, ...props }) =>
     <SingleCheckbox {...props} />
   );
 
-Checkbox.propTypes = {
-  options: PropTypes.arrayOf(PropTypes.shape({ label: PropTypes.node, value: PropTypes.any })),
-};
-
 export default Checkbox;
diff --git a/packages/carbon-component-mapper/src/date-picker/date-picker.js b/packages/carbon-component-mapper/src/date-picker/date-picker.js
index 73a5adbb6..a81a0cd41 100644
--- a/packages/carbon-component-mapper/src/date-picker/date-picker.js
+++ b/packages/carbon-component-mapper/src/date-picker/date-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { DatePicker as CarbonDatePicker, DatePickerInput } from 'carbon-components-react';
@@ -32,12 +31,4 @@ const DatePicker = (props) => {
   );
 };
 
-DatePicker.propTypes = {
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  datePickerType: PropTypes.string,
-  DatePickerProps: PropTypes.object,
-  WrapperProps: PropTypes.object,
-};
-
 export default DatePicker;
diff --git a/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js b/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
index ae1ac410c..b3fd760b2 100644
--- a/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/carbon-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import DualListSelectCommon from '@data-driven-forms/common/dual-list-select';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
@@ -67,10 +66,6 @@ const EmptyList = ({ message }) => (
   </StructuredListWrapper>
 );
 
-EmptyList.propTypes = {
-  message: PropTypes.string,
-};
-
 const List = ({ options, selectedValues, handleOptionsClick, noTitle, ListProps, BodyProps }) => {
   const { dualList, dualListBody } = useStyles();
 
@@ -100,15 +95,6 @@ const List = ({ options, selectedValues, handleOptionsClick, noTitle, ListProps,
   );
 };
 
-List.propTypes = {
-  options: PropTypes.array,
-  selectedValues: PropTypes.array,
-  handleOptionsClick: PropTypes.func,
-  noTitle: PropTypes.node,
-  ListProps: PropTypes.object,
-  BodyProps: PropTypes.object,
-};
-
 const Toolbar = ({ sortTitle, onFilter, onSort, sortDirection, placeholder, ToolbarProps, SearchProps, SortProps }) => {
   const { toolbar, tooltipButton } = useStyles();
 
@@ -122,17 +108,6 @@ const Toolbar = ({ sortTitle, onFilter, onSort, sortDirection, placeholder, Tool
   );
 };
 
-Toolbar.propTypes = {
-  sortTitle: PropTypes.string,
-  onFilter: PropTypes.func,
-  onSort: PropTypes.func,
-  sortDirection: PropTypes.bool,
-  placeholder: PropTypes.string,
-  ToolbarProps: PropTypes.object,
-  SearchProps: PropTypes.object,
-  SortProps: PropTypes.object,
-};
-
 const isEmpty = (array) => array.length === 0;
 
 const DualListSelectInner = ({
@@ -270,62 +245,6 @@ const DualListSelectInner = ({
   );
 };
 
-DualListSelectInner.propTypes = {
-  leftValues: PropTypes.array,
-  handleOptionsClick: PropTypes.func,
-  rightValues: PropTypes.array,
-  handleValuesClick: PropTypes.func,
-  handleMoveRight: PropTypes.func,
-  handleClearLeftValues: PropTypes.func,
-  handleMoveLeft: PropTypes.func,
-  handleClearRightValues: PropTypes.func,
-  state: PropTypes.object,
-  filterOptions: PropTypes.func,
-  filterValues: PropTypes.func,
-  sortValues: PropTypes.func,
-  sortOptions: PropTypes.func,
-  noOptionsTitle: PropTypes.node,
-  noValueTitle: PropTypes.node,
-  leftTitle: PropTypes.node,
-  rightTitle: PropTypes.node,
-  LeftTitleElement: PropTypes.string,
-  RightTitleElement: PropTypes.string,
-  LeftTitleProps: PropTypes.object,
-  RightTitleProps: PropTypes.object,
-  moveLeftTitle: PropTypes.node,
-  moveRightTitle: PropTypes.node,
-  moveAllLeftTitle: PropTypes.node,
-  moveAllRightTitle: PropTypes.node,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  filterOptionsTitle: PropTypes.string,
-  filterValuesTitle: PropTypes.string,
-  sortOptionsTitle: PropTypes.string,
-  sortValuesTitle: PropTypes.string,
-  filterOptionsText: PropTypes.node,
-  filterValueText: PropTypes.node,
-  FormGroupProps: PropTypes.object,
-  GridProps: PropTypes.object,
-  RowProps: PropTypes.object,
-  OptionsColumnProps: PropTypes.object,
-  ButtonColumnProps: PropTypes.object,
-  ValuesColumnProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  AddAllButtonProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  RemoveAllButtonProps: PropTypes.object,
-  LeftToolbarProps: PropTypes.object,
-  RightToolbarProps: PropTypes.object,
-  LeftSearchProps: PropTypes.object,
-  RightSearchProps: PropTypes.object,
-  LeftSortProps: PropTypes.object,
-  RightSortProps: PropTypes.object,
-  LeftListProps: PropTypes.object,
-  LeftBodyProps: PropTypes.object,
-  RightListProps: PropTypes.object,
-  RightBodyProps: PropTypes.object,
-};
-
 const DualListSelect = (props) => <DualListSelectCommon {...props} DualListSelect={DualListSelectInner} />;
 
 export default DualListSelect;
diff --git a/packages/carbon-component-mapper/src/field-array/field-array.js b/packages/carbon-component-mapper/src/field-array/field-array.js
index 68c8d6bf7..89c9ba803 100644
--- a/packages/carbon-component-mapper/src/field-array/field-array.js
+++ b/packages/carbon-component-mapper/src/field-array/field-array.js
@@ -1,5 +1,4 @@
 import React, { memo } from 'react';
-import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
@@ -61,16 +60,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  remove: PropTypes.func,
-  fields: PropTypes.array,
-  name: PropTypes.string,
-  removeText: PropTypes.node,
-  buttonDisabled: PropTypes.bool,
-  RemoveButtonProps: PropTypes.object,
-  ArrayItemProps: PropTypes.object,
-};
-
 const FieldArray = (props) => {
   const {
     AddContainerProps = {},
@@ -146,23 +135,4 @@ const FieldArray = (props) => {
   );
 };
 
-FieldArray.propTypes = {
-  noItemsMessage: PropTypes.node,
-  maxItems: PropTypes.number,
-  minItems: PropTypes.number,
-  buttonLabels: PropTypes.shape({
-    add: PropTypes.node,
-    remove: PropTypes.node,
-  }),
-  AddContainerProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  WrapperProps: PropTypes.object,
-  ArrayItemProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  defaultItem: PropTypes.any,
-  isRequired: PropTypes.bool,
-  fields: PropTypes.array,
-};
-
 export default FieldArray;
diff --git a/packages/carbon-component-mapper/src/form-template/form-template.js b/packages/carbon-component-mapper/src/form-template/form-template.js
index cf20c744d..aab954ded 100644
--- a/packages/carbon-component-mapper/src/form-template/form-template.js
+++ b/packages/carbon-component-mapper/src/form-template/form-template.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
 
@@ -30,11 +29,6 @@ export const Button = ({ label, buttonType, ...props }) => (
   </CarbonButton>
 );
 
-Button.propTypes = {
-  label: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  buttonType: PropTypes.string,
-};
-
 export const ButtonGroup = ({ children, className, ...props }) => {
   const { butttons } = useStyles();
 
@@ -45,23 +39,10 @@ export const ButtonGroup = ({ children, className, ...props }) => {
   );
 };
 
-ButtonGroup.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  className: PropTypes.string,
-};
-
 export const Title = ({ children, ...props }) => <h3 {...props}>{children}</h3>;
 
-Title.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
-
 export const Description = ({ children, ...props }) => <div {...props}>{children}</div>;
 
-Description.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
-
 export const Form = ({ children, className, ...props }) => {
   const { form } = useStyles();
 
@@ -72,11 +53,6 @@ export const Form = ({ children, className, ...props }) => {
   );
 };
 
-Form.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  className: PropTypes.string,
-};
-
 export const Header = (props) => {
   const { header } = useStyles();
 
diff --git a/packages/carbon-component-mapper/src/helper-text-block/helper-text-block.js b/packages/carbon-component-mapper/src/helper-text-block/helper-text-block.js
index 5b7124a0c..789f777d5 100644
--- a/packages/carbon-component-mapper/src/helper-text-block/helper-text-block.js
+++ b/packages/carbon-component-mapper/src/helper-text-block/helper-text-block.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { createUseStyles } from 'react-jss';
 
 const useStyles = createUseStyles({
@@ -28,10 +27,4 @@ const HelperTextBlock = ({ helperText, errorText, warnText }) => {
   return null;
 };
 
-HelperTextBlock.propTypes = {
-  helperText: PropTypes.node,
-  errorText: PropTypes.node,
-  warnText: PropTypes.node,
-};
-
 export default HelperTextBlock;
diff --git a/packages/carbon-component-mapper/src/is-required/is-required.js b/packages/carbon-component-mapper/src/is-required/is-required.js
index 58318c3e9..8984bf2bf 100644
--- a/packages/carbon-component-mapper/src/is-required/is-required.js
+++ b/packages/carbon-component-mapper/src/is-required/is-required.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { childrenPropTypes } from '@data-driven-forms/common/prop-types-templates';
 import { createUseStyles } from 'react-jss';
 
 const useStyles = createUseStyles({
@@ -22,8 +21,4 @@ const IsRequired = ({ children }) => {
   );
 };
 
-IsRequired.propTypes = {
-  children: childrenPropTypes,
-};
-
 export default IsRequired;
diff --git a/packages/carbon-component-mapper/src/plain-text/plain-text.js b/packages/carbon-component-mapper/src/plain-text/plain-text.js
index e3284bbbf..d67cc8295 100644
--- a/packages/carbon-component-mapper/src/plain-text/plain-text.js
+++ b/packages/carbon-component-mapper/src/plain-text/plain-text.js
@@ -1,13 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 const PlainText = ({ label, element = 'p', component, ...rest }) =>
   label.split('\n').map((paragraph, index) => React.createElement(element, { key: index, ...rest }, paragraph));
 
-PlainText.propTypes = {
-  label: PropTypes.string,
-  element: PropTypes.string,
-  component: PropTypes.string,
-};
-
 export default PlainText;
diff --git a/packages/carbon-component-mapper/src/radio/radio.js b/packages/carbon-component-mapper/src/radio/radio.js
index 30fd27e89..71b3a1f71 100644
--- a/packages/carbon-component-mapper/src/radio/radio.js
+++ b/packages/carbon-component-mapper/src/radio/radio.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { FormGroup, RadioButtonGroup, RadioButton } from 'carbon-components-react';
@@ -25,18 +24,4 @@ const Radio = ({ component, ...props }) => {
   );
 };
 
-Radio.propTypes = {
-  component: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-  isDisabled: PropTypes.bool,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      label: PropTypes.node,
-      value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    })
-  ),
-};
-
 export default Radio;
diff --git a/packages/carbon-component-mapper/src/select/select.js b/packages/carbon-component-mapper/src/select/select.js
index 91267c476..b41d7c8e1 100644
--- a/packages/carbon-component-mapper/src/select/select.js
+++ b/packages/carbon-component-mapper/src/select/select.js
@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import DataDrivenSelect from '@data-driven-forms/common/select';
@@ -65,25 +64,6 @@ const ClearedMultiSelectFilterable = ({
   />
 );
 
-ClearedMultiSelectFilterable.propTypes = {
-  invalidText: PropTypes.node,
-  hideSelectedOptions: PropTypes.any,
-  noOptionsMessage: PropTypes.any,
-  onInputChange: PropTypes.func,
-  options: PropTypes.array,
-  isFetching: PropTypes.bool,
-  invalid: PropTypes.oneOfType([PropTypes.bool, PropTypes.node]),
-  isMulti: PropTypes.bool,
-  classNamePrefix: PropTypes.any,
-  closeMenuOnSelect: PropTypes.any,
-  onChange: PropTypes.func,
-  originalOnChange: PropTypes.func,
-  carbonLabel: PropTypes.node,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-};
-
 const ClearedMultiSelect = ({
   invalidText,
   hideSelectedOptions,
@@ -116,25 +96,6 @@ const ClearedMultiSelect = ({
   />
 );
 
-ClearedMultiSelect.propTypes = {
-  invalidText: PropTypes.node,
-  hideSelectedOptions: PropTypes.any,
-  noOptionsMessage: PropTypes.any,
-  onInputChange: PropTypes.func,
-  options: PropTypes.array,
-  isFetching: PropTypes.bool,
-  invalid: PropTypes.oneOfType([PropTypes.bool, PropTypes.node]),
-  isMulti: PropTypes.bool,
-  classNamePrefix: PropTypes.any,
-  closeMenuOnSelect: PropTypes.any,
-  onChange: PropTypes.func,
-  originalOnChange: PropTypes.func,
-  carbonLabel: PropTypes.node,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-};
-
 const getSelectValue = (value, isMulti) => (isMulti ? value : Array.isArray(value) ? value[0] : value);
 
 const ClearedSelect = ({
@@ -169,28 +130,6 @@ const ClearedSelect = ({
   </CarbonSelect>
 );
 
-ClearedSelect.propTypes = {
-  invalidText: PropTypes.node,
-  hideSelectedOptions: PropTypes.any,
-  noOptionsMessage: PropTypes.any,
-  onInputChange: PropTypes.func,
-  options: PropTypes.array,
-  isFetching: PropTypes.bool,
-  invalid: PropTypes.oneOfType([PropTypes.bool, PropTypes.node]),
-  isMulti: PropTypes.bool,
-  classNamePrefix: PropTypes.any,
-  closeMenuOnSelect: PropTypes.any,
-  onChange: PropTypes.func,
-  originalOnChange: PropTypes.func,
-  carbonLabel: PropTypes.node,
-  placeholder: PropTypes.node,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  isSearchable: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  value: PropTypes.any,
-};
-
 const getComboInitialValue = (value, options = []) => {
   const result = Array.isArray(value) ? value[0] : value;
   return typeof result === 'object' ? result : options.find(({ value }) => value === result) || result;
@@ -234,29 +173,6 @@ const ClearedSelectSearchable = ({
   />
 );
 
-ClearedSelectSearchable.propTypes = {
-  invalidText: PropTypes.node,
-  hideSelectedOptions: PropTypes.any,
-  noOptionsMessage: PropTypes.any,
-  onInputChange: PropTypes.func,
-  options: PropTypes.array,
-  isFetching: PropTypes.bool,
-  invalid: PropTypes.oneOfType([PropTypes.bool, PropTypes.node]),
-  isMulti: PropTypes.bool,
-  classNamePrefix: PropTypes.any,
-  closeMenuOnSelect: PropTypes.any,
-  onChange: PropTypes.func,
-  originalOnChange: PropTypes.func,
-  carbonLabel: PropTypes.node,
-  placeholder: PropTypes.node,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  isSearchable: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  labelText: PropTypes.string,
-  value: PropTypes.any,
-};
-
 const Select = (props) => {
   const {
     isMulti,
@@ -310,15 +226,4 @@ const Select = (props) => {
   );
 };
 
-Select.propTypes = {
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-      label: PropTypes.node,
-    })
-  ),
-};
-
 export default Select;
diff --git a/packages/carbon-component-mapper/src/slider/slider.js b/packages/carbon-component-mapper/src/slider/slider.js
index 1e788d461..61aa76341 100644
--- a/packages/carbon-component-mapper/src/slider/slider.js
+++ b/packages/carbon-component-mapper/src/slider/slider.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { Slider as CarbonSlider } from 'carbon-components-react';
@@ -31,13 +30,4 @@ const Slider = (props) => {
   );
 };
 
-Slider.propTypes = {
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  WrapperProps: PropTypes.object,
-};
-
 export default Slider;
diff --git a/packages/carbon-component-mapper/src/sub-form/sub-form.js b/packages/carbon-component-mapper/src/sub-form/sub-form.js
index 3a3a0a4e5..6f3156e91 100644
--- a/packages/carbon-component-mapper/src/sub-form/sub-form.js
+++ b/packages/carbon-component-mapper/src/sub-form/sub-form.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
 
@@ -41,16 +40,4 @@ const SubForm = ({
   );
 };
 
-SubForm.propTypes = {
-  fields: PropTypes.array,
-  component: PropTypes.string,
-  title: PropTypes.node,
-  description: PropTypes.node,
-  TitleElement: PropTypes.string,
-  DescriptionElement: PropTypes.string,
-  TitleProps: PropTypes.object,
-  DescriptionProps: PropTypes.object,
-  HeaderProps: PropTypes.object,
-};
-
 export default SubForm;
diff --git a/packages/carbon-component-mapper/src/switch/switch.js b/packages/carbon-component-mapper/src/switch/switch.js
index 2acc1ef43..4f80dcc78 100644
--- a/packages/carbon-component-mapper/src/switch/switch.js
+++ b/packages/carbon-component-mapper/src/switch/switch.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { Toggle } from 'carbon-components-react';
@@ -26,14 +25,4 @@ const Switch = (props) => {
   );
 };
 
-Switch.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  WrapperProps: PropTypes.object,
-};
-
 export default Switch;
diff --git a/packages/carbon-component-mapper/src/tabs/tabs.js b/packages/carbon-component-mapper/src/tabs/tabs.js
index 66493d0ba..b6d4e5d69 100644
--- a/packages/carbon-component-mapper/src/tabs/tabs.js
+++ b/packages/carbon-component-mapper/src/tabs/tabs.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
 
@@ -32,18 +31,4 @@ const Tabs = ({ fields, component, name, TabWrapperProps = {}, ...props }) => {
   );
 };
 
-Tabs.propTypes = {
-  TabWrapperProps: PropTypes.object,
-  component: PropTypes.string,
-  name: PropTypes.string,
-  fields: PropTypes.arrayOf(
-    PropTypes.shape({
-      name: PropTypes.string,
-      fields: PropTypes.array,
-      title: PropTypes.node,
-      label: PropTypes.node,
-    })
-  ),
-};
-
 export default Tabs;
diff --git a/packages/carbon-component-mapper/src/text-field/text-field.js b/packages/carbon-component-mapper/src/text-field/text-field.js
index 154e0cf01..d5222b5d0 100644
--- a/packages/carbon-component-mapper/src/text-field/text-field.js
+++ b/packages/carbon-component-mapper/src/text-field/text-field.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { TextInput, NumberInput } from 'carbon-components-react';
@@ -32,13 +31,4 @@ const TextField = (props) => {
   );
 };
 
-TextField.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-};
-
 export default TextField;
diff --git a/packages/carbon-component-mapper/src/textarea/textarea.js b/packages/carbon-component-mapper/src/textarea/textarea.js
index f2a7c26f2..e5f0f431c 100644
--- a/packages/carbon-component-mapper/src/textarea/textarea.js
+++ b/packages/carbon-component-mapper/src/textarea/textarea.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import { TextArea } from 'carbon-components-react';
@@ -15,14 +14,4 @@ const Textarea = (props) => {
   return <TextArea {...input} key={input.name} id={input.name} invalid={Boolean(invalid)} invalidText={invalid || ''} helperText={text} {...rest} />;
 };
 
-Textarea.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  helperText: PropTypes.node,
-};
-
 export default Textarea;
diff --git a/packages/carbon-component-mapper/src/time-picker-base/time-picker-base.js b/packages/carbon-component-mapper/src/time-picker-base/time-picker-base.js
index a9fa6e5eb..7925a709d 100644
--- a/packages/carbon-component-mapper/src/time-picker-base/time-picker-base.js
+++ b/packages/carbon-component-mapper/src/time-picker-base/time-picker-base.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { TimePicker as CarbonTimePicker, TimePickerSelect, SelectItem } from 'carbon-components-react';
 
@@ -63,35 +62,4 @@ const TimePickerBase = ({
   </div>
 );
 
-TimePickerBase.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  twelveHoursFormat: PropTypes.bool,
-  timezones: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.node.isRequired,
-      showAs: PropTypes.string,
-    })
-  ),
-  WrapperProps: PropTypes.object,
-  input: PropTypes.shape({
-    name: PropTypes.string,
-  }).isRequired,
-  enhnancedOnBlur: PropTypes.func,
-  enhancedOnChange: PropTypes.func,
-  finalValue: PropTypes.any,
-  invalid: PropTypes.node,
-  helperText: PropTypes.node,
-  warnText: PropTypes.node,
-  selectFormat: PropTypes.func.isRequired,
-  selectTimezone: PropTypes.func.isRequired,
-  format: PropTypes.oneOf(['AM', 'PM']),
-  timezone: PropTypes.string,
-};
-
 export default TimePickerBase;
diff --git a/packages/carbon-component-mapper/src/time-picker-date/time-picker-date.js b/packages/carbon-component-mapper/src/time-picker-date/time-picker-date.js
index 09164bb98..3e3720f9a 100644
--- a/packages/carbon-component-mapper/src/time-picker-date/time-picker-date.js
+++ b/packages/carbon-component-mapper/src/time-picker-date/time-picker-date.js
@@ -1,5 +1,4 @@
 import React, { useState, useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import prepareProps from '../prepare-props';
@@ -84,23 +83,4 @@ const TimePickerDate = (props) => {
   );
 };
 
-TimePickerDate.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  twelveHoursFormat: PropTypes.bool,
-  timezones: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.node.isRequired,
-      showAs: PropTypes.string,
-    })
-  ),
-  WrapperProps: PropTypes.object,
-  defaultTimezone: PropTypes.string,
-};
-
 export default TimePickerDate;
diff --git a/packages/carbon-component-mapper/src/time-picker-string/time-picker-string.js b/packages/carbon-component-mapper/src/time-picker-string/time-picker-string.js
index 8ce0493f3..287352fa7 100644
--- a/packages/carbon-component-mapper/src/time-picker-string/time-picker-string.js
+++ b/packages/carbon-component-mapper/src/time-picker-string/time-picker-string.js
@@ -1,5 +1,4 @@
 import React, { useState, useEffect, useRef } from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 import prepareProps from '../prepare-props';
@@ -49,23 +48,4 @@ const TimePickerString = (props) => {
   );
 };
 
-TimePickerString.propTypes = {
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-  twelveHoursFormat: PropTypes.bool,
-  timezones: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.node.isRequired,
-      showAs: PropTypes.string,
-    })
-  ),
-  WrapperProps: PropTypes.object,
-  useStringFormat: PropTypes.bool,
-};
-
 export default TimePickerString;
diff --git a/packages/carbon-component-mapper/src/time-picker/time-picker.js b/packages/carbon-component-mapper/src/time-picker/time-picker.js
index fc411abeb..c89465dc2 100644
--- a/packages/carbon-component-mapper/src/time-picker/time-picker.js
+++ b/packages/carbon-component-mapper/src/time-picker/time-picker.js
@@ -1,13 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import TimePickerString from '../time-picker-string/time-picker-string';
 import TimePickerDate from '../time-picker-date';
 
 const TimePicker = ({ useStringFormat, ...props }) => (useStringFormat ? <TimePickerString {...props} /> : <TimePickerDate {...props} />);
 
-TimePicker.propTypes = {
-  useStringFormat: PropTypes.bool,
-};
-
 export default TimePicker;
diff --git a/packages/carbon-component-mapper/src/with-description/with-description.js b/packages/carbon-component-mapper/src/with-description/with-description.js
index 660f8c94a..9c7ccbc19 100644
--- a/packages/carbon-component-mapper/src/with-description/with-description.js
+++ b/packages/carbon-component-mapper/src/with-description/with-description.js
@@ -1,13 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Tooltip } from 'carbon-components-react';
 
 const WithDescription = ({ labelText, description }) => <Tooltip triggerText={labelText}>{description}</Tooltip>;
 
-WithDescription.propTypes = {
-  labelText: PropTypes.node,
-  description: PropTypes.node,
-};
-
 export default WithDescription;
diff --git a/packages/carbon-component-mapper/src/wizard/wizard.js b/packages/carbon-component-mapper/src/wizard/wizard.js
index b65a4c556..7eea9bb9e 100644
--- a/packages/carbon-component-mapper/src/wizard/wizard.js
+++ b/packages/carbon-component-mapper/src/wizard/wizard.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { createUseStyles } from 'react-jss';
 
@@ -41,17 +40,6 @@ const WizardNav = ({ stepsInfo, jumpToStep, ...props }) => {
   );
 };
 
-WizardNav.propTypes = {
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-    })
-  ),
-  currentIndex: PropTypes.number,
-  jumpToStep: PropTypes.func,
-  className: PropTypes.string,
-};
-
 const defaultLabels = {
   submit: 'Submit',
   back: 'Back',
@@ -71,12 +59,6 @@ const Layout = ({ nav, fields, WizardBodyProps }) => {
   );
 };
 
-Layout.propTypes = {
-  nav: PropTypes.node,
-  fields: PropTypes.node,
-  WizardBodyProps: PropTypes.object,
-};
-
 const VerticalLayout = ({ nav, fields, WizardBodyProps }) => {
   const { body } = useStyles();
 
@@ -94,12 +76,6 @@ const VerticalLayout = ({ nav, fields, WizardBodyProps }) => {
   );
 };
 
-VerticalLayout.propTypes = {
-  nav: PropTypes.node,
-  fields: PropTypes.node,
-  WizardBodyProps: PropTypes.object,
-};
-
 const WizardInternal = ({
   stepsInfo,
   buttonLabels,
@@ -166,27 +142,6 @@ const WizardInternal = ({
   );
 };
 
-WizardInternal.propTypes = {
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-    })
-  ),
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node,
-    back: PropTypes.node,
-    next: PropTypes.node,
-  }),
-  BackButtonProps: PropTypes.object,
-  NextButtonProps: PropTypes.object,
-  SubmitButtonProps: PropTypes.object,
-  ButtonSetProps: PropTypes.object,
-  ProgressIndicatorProps: PropTypes.object,
-  vertical: PropTypes.bool,
-  WizardBodyProps: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const Wizard = (props) => <WizardCommon Wizard={WizardInternal} {...props} />;
 
 export default Wizard;
diff --git a/packages/common/package.json b/packages/common/package.json
index d41ebdaa0..46e3304a8 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -23,11 +23,10 @@
   "devDependencies": {},
   "dependencies": {
     "clsx": "^1.0.4",
-    "lodash": "^4.17.15",
-    "prop-types": "^15.7.2"
+    "lodash": "^4.17.15"
   },
   "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/common/src/dual-list-select/dual-list-select.js b/packages/common/src/dual-list-select/dual-list-select.js
index 5564fffb1..53a950810 100644
--- a/packages/common/src/dual-list-select/dual-list-select.js
+++ b/packages/common/src/dual-list-select/dual-list-select.js
@@ -1,5 +1,4 @@
 import React, { useReducer } from 'react';
-import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -97,8 +96,4 @@ const DualListSelectCommon = (props) => {
   );
 };
 
-DualListSelectCommon.propTypes = {
-  DualListSelect: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-};
-
 export default DualListSelectCommon;
diff --git a/packages/common/src/form-template/form-template.js b/packages/common/src/form-template/form-template.js
index 39f7116bc..aa89c2f39 100644
--- a/packages/common/src/form-template/form-template.js
+++ b/packages/common/src/form-template/form-template.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi, FormSpy } from '@data-driven-forms/react-form-renderer';
 
 export const isDisabled = (disableStates, getState) => disableStates.map((item) => getState()[item]).find((item) => !!item);
@@ -70,32 +69,6 @@ export const FormControls = ({
   );
 };
 
-FormControls.propTypes = {
-  onCancel: PropTypes.func,
-  onReset: PropTypes.func,
-  submitLabel: PropTypes.node,
-  cancelLabel: PropTypes.node,
-  resetLabel: PropTypes.node,
-  canReset: PropTypes.bool,
-  disableSubmit: PropTypes.bool,
-  buttonOrder: PropTypes.arrayOf(PropTypes.string),
-  buttonClassName: PropTypes.string,
-  FormButtons: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.func]),
-  Button: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.func]),
-  ButtonGroup: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.func]),
-  formSpyProps: PropTypes.shape({
-    submitting: PropTypes.bool,
-    pristine: PropTypes.bool,
-    validating: PropTypes.bool,
-    form: PropTypes.shape({
-      reset: PropTypes.func,
-    }),
-    values: PropTypes.object,
-  }),
-  buttonGroupProps: PropTypes.object,
-  buttonsProps: PropTypes.object,
-};
-
 const FormTemplate = ({
   FormWrapper,
   Title,
@@ -160,23 +133,4 @@ const FormTemplate = ({
   );
 };
 
-FormTemplate.propTypes = {
-  FormWrapper: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]).isRequired,
-  Title: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]).isRequired,
-  Description: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]).isRequired,
-  Button: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]).isRequired,
-  ButtonGroup: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]).isRequired,
-  formWrapperProps: PropTypes.object,
-  showFormControls: PropTypes.bool,
-  disableSubmit: PropTypes.arrayOf(PropTypes.string),
-  Header: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element, PropTypes.oneOf([React.Fragment])]),
-  headerProps: PropTypes.object,
-  titleProps: PropTypes.object,
-  descriptionProps: PropTypes.object,
-  buttonGroupProps: PropTypes.object,
-  buttonsProps: PropTypes.object,
-  BeforeError: PropTypes.elementType,
-  alertProps: PropTypes.object,
-};
-
 export default FormTemplate;
diff --git a/packages/common/src/multiple-choice-list/multiple-choice-list.js b/packages/common/src/multiple-choice-list/multiple-choice-list.js
index 4e99cb612..2e45c008a 100644
--- a/packages/common/src/multiple-choice-list/multiple-choice-list.js
+++ b/packages/common/src/multiple-choice-list/multiple-choice-list.js
@@ -1,9 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
-import { formGroup } from '../prop-types-templates';
-
 const SingleCheckbox = (props) => {
   const { input, Checkbox, ...rest } = useFieldApi({ ...props, type: 'checkbox' });
 
@@ -47,15 +44,4 @@ const MultipleChoiceList = (props) => {
   );
 };
 
-MultipleChoiceList.propTypes = {
-  name: PropTypes.string.isRequired,
-  Wrapper: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  Checkbox: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-};
-
 export default MultipleChoiceList;
-
-export const wrapperProps = {
-  ...formGroup,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
diff --git a/packages/common/src/prop-types-templates/index.d.ts b/packages/common/src/prop-types-templates/index.d.ts
deleted file mode 100644
index 6bd84647e..000000000
--- a/packages/common/src/prop-types-templates/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './prop-types-templates';
diff --git a/packages/common/src/prop-types-templates/index.js b/packages/common/src/prop-types-templates/index.js
deleted file mode 100644
index 6bd84647e..000000000
--- a/packages/common/src/prop-types-templates/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './prop-types-templates';
diff --git a/packages/common/src/prop-types-templates/prop-types-templates.d.ts b/packages/common/src/prop-types-templates/prop-types-templates.d.ts
deleted file mode 100644
index a78b46728..000000000
--- a/packages/common/src/prop-types-templates/prop-types-templates.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Requireable } from 'prop-types'
-
-export const optionsPropType: { [key: string]: Requireable<any> }
-
-export const meta: { [key: string]: Requireable<any> }
-
-export const formGroup: { [key: string]: Requireable<any> }
-
-export const input: { [key: string]: Requireable<any> }
-
-export const childrenPropTypes: { [key: string]: Requireable<any> }
diff --git a/packages/common/src/prop-types-templates/prop-types-templates.js b/packages/common/src/prop-types-templates/prop-types-templates.js
deleted file mode 100644
index cd205123a..000000000
--- a/packages/common/src/prop-types-templates/prop-types-templates.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-
-export const optionsPropType = PropTypes.arrayOf(PropTypes.shape({ label: PropTypes.node.isRequired, value: PropTypes.any }));
-
-export const meta = PropTypes.shape({
-  active: PropTypes.bool,
-  dirty: PropTypes.bool,
-  dirtySinceLastSubmit: PropTypes.bool,
-  error: PropTypes.any,
-  initial: PropTypes.any,
-  invalid: PropTypes.bool,
-  modified: PropTypes.bool,
-  pristine: PropTypes.bool,
-  submitError: PropTypes.any,
-  submitFailed: PropTypes.bool,
-  submitSucceeded: PropTypes.bool,
-  submitting: PropTypes.bool,
-  touched: PropTypes.bool,
-  valid: PropTypes.bool,
-  validating: PropTypes.bool,
-  visited: PropTypes.bool,
-});
-
-export const formGroup = {
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  meta,
-  description: PropTypes.node,
-};
-
-export const input = PropTypes.shape({
-  name: PropTypes.string.isRequired,
-  value: PropTypes.any,
-});
-
-export const childrenPropTypes = PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]);
diff --git a/packages/common/src/select/select.js b/packages/common/src/select/select.js
index 224b1de55..e77b3df06 100644
--- a/packages/common/src/select/select.js
+++ b/packages/common/src/select/select.js
@@ -1,7 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useMemo } from 'react';
 
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import useSelect from '../use-select/use-select';
 import deepEqual from './deep-equal';
@@ -108,31 +107,4 @@ const Select = ({
   );
 };
 
-Select.propTypes = {
-  options: PropTypes.array,
-  onChange: PropTypes.func,
-  classNamePrefix: PropTypes.string,
-  invalid: PropTypes.bool,
-  simpleValue: PropTypes.bool,
-  isMulti: PropTypes.bool,
-  pluckSingleValue: PropTypes.bool,
-  value: PropTypes.any,
-  placeholder: PropTypes.string,
-  loadOptionsChangeCounter: PropTypes.number,
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  loadOptions: PropTypes.func,
-  loadingMessage: PropTypes.node,
-  loadingProps: PropTypes.object,
-  selectVariant: PropTypes.string,
-  updatingMessage: PropTypes.node,
-  noOptionsMessage: PropTypes.node,
-  isSearchable: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  SelectComponent: PropTypes.elementType.isRequired,
-  noValueUpdates: PropTypes.bool,
-  optionsTransformer: PropTypes.func,
-  compareValues: PropTypes.func,
-};
-
 export default Select;
diff --git a/packages/common/src/wizard/wizard.js b/packages/common/src/wizard/wizard.js
index c3b06d425..e1da956cc 100644
--- a/packages/common/src/wizard/wizard.js
+++ b/packages/common/src/wizard/wizard.js
@@ -1,5 +1,4 @@
 import React, { useReducer, useEffect } from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi, WizardContext } from '@data-driven-forms/react-form-renderer';
 
 import get from 'lodash/get';
@@ -97,34 +96,4 @@ const Wizard = ({ fields, isDynamic, crossroads, Wizard, component, initialState
   );
 };
 
-Wizard.propTypes = {
-  fields: PropTypes.arrayOf(
-    PropTypes.shape({
-      name: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-    })
-  ).isRequired,
-  isDynamic: PropTypes.bool,
-  crossroads: PropTypes.arrayOf(PropTypes.string),
-  Wizard: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  component: PropTypes.any,
-  initialState: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string,
-};
-
 export default Wizard;
-
-export const wizardProps = {
-  currentStep: PropTypes.object,
-  handlePrev: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  jumpToStep: PropTypes.func,
-  setPrevSteps: PropTypes.func,
-  handleNext: PropTypes.func,
-  navSchema: PropTypes.array,
-  activeStepIndex: PropTypes.number,
-  maxStepIndex: PropTypes.number,
-  formOptions: PropTypes.shape({
-    onCancel: PropTypes.func,
-  }),
-  prevSteps: PropTypes.array,
-};
diff --git a/packages/mui-component-mapper/package.json b/packages/mui-component-mapper/package.json
index f672c125a..0179bdf7a 100644
--- a/packages/mui-component-mapper/package.json
+++ b/packages/mui-component-mapper/package.json
@@ -7,7 +7,7 @@
   "typings": "index.d.ts",
   "license": "Apache-2.0",
   "scripts": {
-    "start": "webpack-dev-server --config ./config/webpack.config.js --open --hot",
+    "start": "webpack-dev-server --config ./config/webpack.config.js --open --hot --port=8003",
     "build": "yarn build:cjs && yarn build:esm && yarn build:typings && yarn build:packages",
     "build:cjs": "BABEL_ENV=cjs babel src --out-dir ./ --ignore \"src/tests/*\"",
     "build:esm": "BABEL_ENV=esm babel src --out-dir ./esm --ignore \"src/tests/*\"",
@@ -35,9 +35,8 @@
     "@mui/icons-material": "^5.10.3",
     "@mui/material": "^5.10.4",
     "@mui/x-date-pickers": "^5.0.1 || ^6.13.0",
-    "prop-types": ">=15.7.2",
-    "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
diff --git a/packages/mui-component-mapper/src/checkbox/checkbox.js b/packages/mui-component-mapper/src/checkbox/checkbox.js
index a96050a1d..54ea662e1 100644
--- a/packages/mui-component-mapper/src/checkbox/checkbox.js
+++ b/packages/mui-component-mapper/src/checkbox/checkbox.js
@@ -1,7 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Checkbox as MUICheckbox, FormControl, FormControlLabel, FormHelperText, FormGroup, FormLabel } from '@mui/material';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
@@ -63,29 +61,6 @@ export const SingleCheckbox = (props) => {
   );
 };
 
-SingleCheckbox.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  FormFieldGridProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  FormControlLabelProps: PropTypes.object,
-  CheckboxProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-};
-
 const Checkbox = ({ options, ...props }) => (options ? <MultipleChoiceList options={options} {...props} /> : <SingleCheckbox {...props} />);
 
-Checkbox.propTypes = {
-  options: PropTypes.array,
-};
-
 export default Checkbox;
diff --git a/packages/mui-component-mapper/src/date-picker/date-picker.js b/packages/mui-component-mapper/src/date-picker/date-picker.js
index f5a201b64..ae13b440b 100644
--- a/packages/mui-component-mapper/src/date-picker/date-picker.js
+++ b/packages/mui-component-mapper/src/date-picker/date-picker.js
@@ -1,11 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { DatePicker as MUIDatePicker } from '@mui/x-date-pickers';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import { TextField } from '@mui/material';
 
@@ -65,19 +63,4 @@ const DatePicker = (props) => {
   );
 };
 
-DatePicker.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-  DatePickerProps: PropTypes.object,
-};
-
 export default DatePicker;
diff --git a/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js b/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
index 0f6ae2ae8..694bf3221 100644
--- a/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/mui-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
 import {
@@ -142,28 +141,6 @@ const ListInternal = ({
   </Paper>
 );
 
-ListInternal.propTypes = {
-  value: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.string.isRequired,
-    })
-  ),
-  optionClick: PropTypes.func.isRequired,
-  noOptionsTitle: PropTypes.node,
-  filterValue: PropTypes.string,
-  filterValueText: PropTypes.node,
-  selectedValues: PropTypes.array,
-  checkboxVariant: PropTypes.bool,
-  ListProps: PropTypes.object,
-  ListItemProps: PropTypes.object,
-  ListItemIconProps: PropTypes.object,
-  ListItemTextProps: PropTypes.object,
-  ListItemSecondaryActionProps: PropTypes.object,
-  PaperProps: PropTypes.object,
-  LeftPaperProps: PropTypes.object,
-};
-
 const ToolbarInternal = ({
   ToolbarProps,
   LeftToolbarProps,
@@ -215,24 +192,6 @@ const ToolbarInternal = ({
   </Toolbar>
 );
 
-ToolbarInternal.propTypes = {
-  ToolbarProps: PropTypes.object,
-  LeftToolbarProps: PropTypes.object,
-  filterOptions: PropTypes.func,
-  filterOptionsTitle: PropTypes.node,
-  state: PropTypes.object,
-  FilterFieldProps: PropTypes.object,
-  sortOptions: PropTypes.func,
-  SortIconButtonProps: PropTypes.object,
-  SortIconProps: PropTypes.object,
-  LeftSortIconProps: PropTypes.object,
-  LeftFilterFieldProps: PropTypes.object,
-  LeftSortIconButtonProps: PropTypes.object,
-  filter: PropTypes.string,
-  sortDesc: PropTypes.bool,
-  isValue: PropTypes.bool,
-};
-
 const DualListSelect = ({
   handleOptionsClick,
   rightValues,
@@ -514,103 +473,6 @@ const DualListSelect = ({
   );
 };
 
-DualListSelect.propTypes = {
-  leftTitle: PropTypes.node,
-  rightTitle: PropTypes.node,
-  moveLeftTitle: PropTypes.node,
-  moveRightTitle: PropTypes.node,
-  allToLeft: PropTypes.bool,
-  allToRight: PropTypes.bool,
-  checkboxVariant: PropTypes.bool,
-  validateOnMount: PropTypes.bool,
-  moveAllLeftTitle: PropTypes.node,
-  moveAllRightTitle: PropTypes.node,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  noValueTitle: PropTypes.node,
-  noOptionsTitle: PropTypes.node,
-  filterOptionsTitle: PropTypes.node,
-  filterValueTitle: PropTypes.node,
-  filterValueText: PropTypes.node,
-  filterOptionsText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  id: PropTypes.string,
-  input: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-  }),
-  meta: PropTypes.any,
-  state: PropTypes.object,
-  sortOptions: PropTypes.func,
-  filterOptions: PropTypes.func,
-  handleOptionsClick: PropTypes.func,
-  leftValues: PropTypes.array,
-  handleMoveRight: PropTypes.func,
-  handleMoveLeft: PropTypes.func,
-  handleClearLeftValues: PropTypes.func,
-  handleClearRightValues: PropTypes.func,
-  sortValues: PropTypes.func,
-  filterValues: PropTypes.func,
-  rightValues: PropTypes.array,
-  handleValuesClick: PropTypes.func,
-  isFilterable: PropTypes.bool,
-  // props
-  FormFieldGridProps: PropTypes.object,
-  InternalGridProps: PropTypes.object,
-  ListGridProps: PropTypes.object,
-  LeftListGridProps: PropTypes.object,
-  ListProps: PropTypes.object,
-  LeftListProps: PropTypes.object,
-  ButtonsGridProps: PropTypes.object,
-  ButtonsInternalGridProps: PropTypes.object,
-  ButtonGridProps: PropTypes.object,
-  ToRightGridProps: PropTypes.object,
-  IconButtonProps: PropTypes.object,
-  ToRightIconButtonProps: PropTypes.object,
-  AllToRightGridProps: PropTypes.object,
-  AllToRightIconButtonProps: PropTypes.object,
-  AllToLeftGridProps: PropTypes.object,
-  AllToLeftIconButtonProps: PropTypes.object,
-  ToLeftGridProps: PropTypes.object,
-  ToLeftIconButtonProps: PropTypes.object,
-  RightListGridProps: PropTypes.object,
-  RightListProps: PropTypes.object,
-  ListItemProps: PropTypes.object,
-  ListItemIconProps: PropTypes.object,
-  ListItemTextProps: PropTypes.object,
-  ListItemSecondaryActionProps: PropTypes.object,
-  LeftListItemProps: PropTypes.object,
-  LeftListItemIconProps: PropTypes.object,
-  LeftItemTextProps: PropTypes.object,
-  LeftItemSecondaryActionProps: PropTypes.object,
-  RightListItemProps: PropTypes.object,
-  RightListItemIconProps: PropTypes.object,
-  RightItemTextProps: PropTypes.object,
-  RightItemSecondaryActionProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-  TitleProps: PropTypes.object,
-  ToolbarProps: PropTypes.object,
-  FilterFieldProps: PropTypes.object,
-  SortIconButtonProps: PropTypes.object,
-  SortIconProps: PropTypes.object,
-  LeftToolbarProps: PropTypes.object,
-  LeftFilterFieldProps: PropTypes.object,
-  LeftSortIconButtonProps: PropTypes.object,
-  LeftSortIconProps: PropTypes.object,
-  LeftTitleProps: PropTypes.object,
-  RightToolbarProps: PropTypes.object,
-  RightFilterFieldProps: PropTypes.object,
-  RightSortIconButtonProps: PropTypes.object,
-  RightSortIconProps: PropTypes.object,
-  RightTitleProps: PropTypes.object,
-  PaperProps: PropTypes.object,
-  LeftPaperProps: PropTypes.object,
-  RightPaperProps: PropTypes.object,
-};
-
 const DualListSelectWrapper = (props) => <DualListSelectCommon {...props} DualListSelect={DualListSelect} />;
 
 export default DualListSelectWrapper;
diff --git a/packages/mui-component-mapper/src/field-array/field-array.js b/packages/mui-component-mapper/src/field-array/field-array.js
index bf5c9dcbd..07c1c61e3 100644
--- a/packages/mui-component-mapper/src/field-array/field-array.js
+++ b/packages/mui-component-mapper/src/field-array/field-array.js
@@ -1,6 +1,5 @@
 import React, { memo, useReducer } from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import { useFormApi, FieldArray } from '@data-driven-forms/react-form-renderer';
 import isEqual from 'lodash/isEqual';
 
@@ -87,20 +86,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  name: PropTypes.string,
-  fieldIndex: PropTypes.number.isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object),
-  remove: PropTypes.func.isRequired,
-  length: PropTypes.number,
-  minItems: PropTypes.number,
-  removeLabel: PropTypes.node.isRequired,
-  FieldContainerProps: PropTypes.object,
-  FieldGroupGridProps: PropTypes.object,
-  RemoveButtonGridProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-};
-
 const defaultButtonLabels = {
   add: 'ADD',
   remove: 'REMOVE',
@@ -289,33 +274,4 @@ const DynamicArray = ({ ...props }) => {
   );
 };
 
-DynamicArray.propTypes = {
-  label: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
-  defaultItem: PropTypes.any,
-  minItems: PropTypes.number,
-  maxItems: PropTypes.number,
-  noItemsMessage: PropTypes.node,
-  FormControlProps: PropTypes.object,
-  FormFieldGridProps: PropTypes.object,
-  buttonLabels: PropTypes.object,
-  GridContainerProps: PropTypes.object,
-  HeaderGridProps: PropTypes.object,
-  HeaderProps: PropTypes.object,
-  UndoButtonProps: PropTypes.object,
-  RedoButtonProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  DescriptionGridProps: PropTypes.object,
-  DescriptionProps: PropTypes.object,
-  BodyGridProps: PropTypes.object,
-  NoItemsProps: PropTypes.object,
-  FormHelperTextGridProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-  FieldContainerProps: PropTypes.object,
-  FieldGroupGridProps: PropTypes.object,
-  RemoveButtonGridProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-};
-
 export default DynamicArray;
diff --git a/packages/mui-component-mapper/src/form-field-grid/form-field-grid.js b/packages/mui-component-mapper/src/form-field-grid/form-field-grid.js
index 41fe109e2..fe88f12f2 100644
--- a/packages/mui-component-mapper/src/form-field-grid/form-field-grid.js
+++ b/packages/mui-component-mapper/src/form-field-grid/form-field-grid.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 
 import { Grid } from '@mui/material';
 import clsx from 'clsx';
@@ -23,9 +22,4 @@ const FormFieldGrid = ({ children, className, ...props }) => (
   </StyledGrid>
 );
 
-FormFieldGrid.propTypes = {
-  children: PropTypes.node,
-  className: PropTypes.string,
-};
-
 export default FormFieldGrid;
diff --git a/packages/mui-component-mapper/src/form-template/form-template.js b/packages/mui-component-mapper/src/form-template/form-template.js
index 468b5f03d..887a39a9b 100644
--- a/packages/mui-component-mapper/src/form-template/form-template.js
+++ b/packages/mui-component-mapper/src/form-template/form-template.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import { Grid, Button as MUIButton, Typography } from '@mui/material';
 import { Alert, AlertTitle } from '@mui/material';
 
@@ -33,12 +32,6 @@ const Form = ({ children, GridContainerProps, GridProps, ...props }) => (
   </Grid>
 );
 
-Form.propTypes = {
-  children: PropTypes.node,
-  GridProps: PropTypes.object,
-  GridContainerProps: PropTypes.object,
-};
-
 const Description = ({ children, GridProps, ...props }) => (
   <Grid item xs={12} {...GridProps}>
     <Typography variant="body1" gutterBottom {...props}>
@@ -47,11 +40,6 @@ const Description = ({ children, GridProps, ...props }) => (
   </Grid>
 );
 
-Description.propTypes = {
-  children: PropTypes.node,
-  GridProps: PropTypes.object,
-};
-
 const Title = ({ children, GridProps, ...props }) => (
   <Grid item xs={12} {...GridProps}>
     <Typography variant="h3" gutterBottom {...props}>
@@ -60,11 +48,6 @@ const Title = ({ children, GridProps, ...props }) => (
   </Grid>
 );
 
-Title.propTypes = {
-  children: PropTypes.node,
-  GridProps: PropTypes.object,
-};
-
 const ButtonGroup = ({ children, GridProps, ...props }) => (
   <StyledButtonGroup item xs={12} {...GridProps}>
     <div className={classes.buttonGroup} {...props}>
@@ -73,24 +56,12 @@ const ButtonGroup = ({ children, GridProps, ...props }) => (
   </StyledButtonGroup>
 );
 
-ButtonGroup.propTypes = {
-  children: PropTypes.node,
-  GridProps: PropTypes.object,
-};
-
 const Button = ({ label, variant, children, buttonType, ...props }) => (
   <MUIButton color={variant} variant="contained" {...props}>
     {label || children}
   </MUIButton>
 );
 
-Button.propTypes = {
-  children: PropTypes.node,
-  label: PropTypes.node,
-  variant: PropTypes.string,
-  buttonType: PropTypes.string,
-};
-
 const StyledAlert = styled(Alert)(() => ({
   '& .alert': {
     width: '100%',
@@ -121,11 +92,6 @@ export const FormError = ({ formError, alertProps }) => {
   return null;
 };
 
-FormError.propTypes = {
-  formError: PropTypes.any,
-  alertProps: PropTypes.object,
-};
-
 const MuiFormTemplate = (props) => (
   <FormTemplate
     BeforeError={FormError}
diff --git a/packages/mui-component-mapper/src/multiple-choice-list/multiple-choice-list.js b/packages/mui-component-mapper/src/multiple-choice-list/multiple-choice-list.js
index 16eca98d6..fcf7e329a 100644
--- a/packages/mui-component-mapper/src/multiple-choice-list/multiple-choice-list.js
+++ b/packages/mui-component-mapper/src/multiple-choice-list/multiple-choice-list.js
@@ -1,9 +1,8 @@
 import React, { createContext, useContext } from 'react';
-import PropTypes from 'prop-types';
 
 import { Grid, Checkbox, FormControlLabel, FormLabel, FormGroup, FormControl, FormHelperText } from '@mui/material';
 
-import MultipleChoiceListCommon, { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
+import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
 import { validationError } from '../validation-error/validation-error';
 
 const CheckboxContext = createContext({});
@@ -27,11 +26,6 @@ const FinalCheckbox = ({ label, isDisabled: _isDisabled, ...rest }) => {
   );
 };
 
-FinalCheckbox.propTypes = {
-  isDisabled: PropTypes.bool,
-  label: PropTypes.node,
-};
-
 const Wrapper = ({ label, isRequired, children, meta, validateOnMount, helperText, description }) => {
   const invalid = validationError(meta, validateOnMount);
   const { FormFieldGridProps, FormControlProps, FormLabelProps, FormGroupProps, FormHelperTextProps } = useContext(CheckboxContext);
@@ -46,10 +40,6 @@ const Wrapper = ({ label, isRequired, children, meta, validateOnMount, helperTex
   );
 };
 
-Wrapper.propTypes = {
-  ...wrapperProps,
-};
-
 const MultipleChoiceList = ({
   FormControlProps = {},
   FormLabelProps = {},
@@ -67,17 +57,4 @@ const MultipleChoiceList = ({
   </CheckboxContext.Provider>
 );
 
-MultipleChoiceList.propTypes = {
-  input: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-  }),
-  FormFieldGridProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  FormControlLabelProps: PropTypes.object,
-  CheckboxProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-};
-
 export default MultipleChoiceList;
diff --git a/packages/mui-component-mapper/src/plain-text/plain-text.js b/packages/mui-component-mapper/src/plain-text/plain-text.js
index 94b6a5631..dfd94baac 100644
--- a/packages/mui-component-mapper/src/plain-text/plain-text.js
+++ b/packages/mui-component-mapper/src/plain-text/plain-text.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Typography } from '@mui/material';
-import PropTypes from 'prop-types';
 
 const PlainText = ({ label, name, component, element, variant = 'body1', gutterBottom = true, ...props }) =>
   typeof label === 'string' ? (
@@ -15,13 +14,4 @@ const PlainText = ({ label, name, component, element, variant = 'body1', gutterB
     </Typography>
   );
 
-PlainText.propTypes = {
-  label: PropTypes.node.isRequired,
-  name: PropTypes.string.isRequired,
-  component: PropTypes.any,
-  element: PropTypes.elementType,
-  gutterBottom: PropTypes.bool,
-  variant: PropTypes.string,
-};
-
 export default PlainText;
diff --git a/packages/mui-component-mapper/src/radio/radio.js b/packages/mui-component-mapper/src/radio/radio.js
index 10262b737..0caf3811b 100644
--- a/packages/mui-component-mapper/src/radio/radio.js
+++ b/packages/mui-component-mapper/src/radio/radio.js
@@ -1,8 +1,6 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import { Radio as MUIRadio, FormControlLabel, FormControl, FormLabel, FormHelperText } from '@mui/material';
-import { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
@@ -47,15 +45,6 @@ const RadioOption = ({ name, option, isDisabled, isReadOnly, FormControlLabelPro
   );
 };
 
-RadioOption.propTypes = {
-  name: PropTypes.string.isRequired,
-  option: PropTypes.shape({ label: PropTypes.node.isRequired, value: PropTypes.any.isRequired }).isRequired,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  FormControlLabelProps: PropTypes.object,
-  RadioProps: PropTypes.object,
-};
-
 const Radio = ({ name, ...props }) => {
   const {
     options = [],
@@ -106,23 +95,4 @@ const Radio = ({ name, ...props }) => {
   );
 };
 
-Radio.propTypes = {
-  ...wrapperProps,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.any,
-      label: PropTypes.node,
-    })
-  ),
-  label: PropTypes.node.isRequired,
-  isDisabled: PropTypes.bool,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormControlLabelProps: PropTypes.object,
-  RadioProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-};
-
 export default Radio;
diff --git a/packages/mui-component-mapper/src/select/select.js b/packages/mui-component-mapper/src/select/select.js
index 782a85d45..c5b2b0b25 100644
--- a/packages/mui-component-mapper/src/select/select.js
+++ b/packages/mui-component-mapper/src/select/select.js
@@ -1,9 +1,7 @@
 import React, { useMemo } from 'react';
-import PropTypes from 'prop-types';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
-import { meta } from '@data-driven-forms/common/prop-types-templates';
 import DDFSelect from '@data-driven-forms/common/select';
 import parseInternalValue from '@data-driven-forms/common/select/parse-internal-value';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
@@ -129,36 +127,6 @@ const InternalSelect = ({
   );
 };
 
-InternalSelect.propTypes = {
-  meta,
-  placeholder: PropTypes.node,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isSearchable: PropTypes.bool,
-  options: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.any.isRequired, label: PropTypes.node.isRequired })).isRequired,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-  value: PropTypes.any,
-  isClearable: PropTypes.bool,
-  classNamePrefix: PropTypes.string,
-  isMulti: PropTypes.bool,
-  loadingMessage: PropTypes.node,
-  onInputChange: PropTypes.func,
-  isFetching: PropTypes.bool,
-  noOptionsMessage: PropTypes.func,
-  closeMenuOnSelect: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-  hideSelectedOptions: PropTypes.bool,
-  required: PropTypes.bool,
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func,
-  TextFieldProps: PropTypes.object,
-  inputProps: PropTypes.object,
-  isDisabled: PropTypes.bool,
-  loadingText: PropTypes.node,
-};
-
 const Select = (props) => {
   const {
     input,
diff --git a/packages/mui-component-mapper/src/slider/slider.js b/packages/mui-component-mapper/src/slider/slider.js
index b45980dc6..ea3217959 100644
--- a/packages/mui-component-mapper/src/slider/slider.js
+++ b/packages/mui-component-mapper/src/slider/slider.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormControl, FormGroup, FormHelperText, Slider as MUISlider, FormLabel, Grid } from '@mui/material';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
@@ -69,25 +68,4 @@ const Slider = (props) => {
   );
 };
 
-Slider.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  FormFieldGridProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-  before: PropTypes.node,
-  after: PropTypes.node,
-  InputGridProps: PropTypes.object,
-  BeforeGridProps: PropTypes.object,
-  SliderGridProps: PropTypes.object,
-  AfterGridProps: PropTypes.object,
-};
-
 export default Slider;
diff --git a/packages/mui-component-mapper/src/sub-form/sub-form.js b/packages/mui-component-mapper/src/sub-form/sub-form.js
index f1f48a20d..e84a161c0 100644
--- a/packages/mui-component-mapper/src/sub-form/sub-form.js
+++ b/packages/mui-component-mapper/src/sub-form/sub-form.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import { Typography, Grid } from '@mui/material';
 
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
@@ -54,16 +53,4 @@ const SubForm = ({
   );
 };
 
-SubForm.propTypes = {
-  fields: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
-  title: PropTypes.node,
-  description: PropTypes.node,
-  component: PropTypes.any,
-  TitleGridProps: PropTypes.object,
-  TitleProps: PropTypes.object,
-  DescriptionProps: PropTypes.object,
-  DescriptionGridProps: PropTypes.object,
-  ItemsGridProps: PropTypes.object,
-};
-
 export default SubForm;
diff --git a/packages/mui-component-mapper/src/switch/switch.js b/packages/mui-component-mapper/src/switch/switch.js
index 2a78278e9..04c1a038e 100644
--- a/packages/mui-component-mapper/src/switch/switch.js
+++ b/packages/mui-component-mapper/src/switch/switch.js
@@ -1,7 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormControlLabel, FormHelperText, FormControl, FormGroup, FormLabel, Switch as MUISwitch } from '@mui/material';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
@@ -60,25 +58,4 @@ export const Switch = (props) => {
   );
 };
 
-Switch.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  onText: PropTypes.node,
-  offText: PropTypes.node,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-  FormControlProps: PropTypes.object,
-  FormGroupProps: PropTypes.object,
-  FormControlLabelProps: PropTypes.object,
-  SwitchProps: PropTypes.object,
-  FormLabelProps: PropTypes.object,
-  FormHelperTextProps: PropTypes.object,
-};
-
 export default Switch;
diff --git a/packages/mui-component-mapper/src/tabs/tabs.js b/packages/mui-component-mapper/src/tabs/tabs.js
index cbb8e8da0..75e5112f3 100644
--- a/packages/mui-component-mapper/src/tabs/tabs.js
+++ b/packages/mui-component-mapper/src/tabs/tabs.js
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
 import { AppBar, Grid, Tab, Tabs } from '@mui/material';
 
 import FormFieldGrid from '../form-field-grid';
@@ -36,15 +35,6 @@ const FormTabs = ({ fields, AppBarProps = {}, TabsProps = {}, TabProps = {}, For
   );
 };
 
-FormTabs.propTypes = {
-  fields: PropTypes.array.isRequired,
-  AppBarProps: PropTypes.object,
-  TabsProps: PropTypes.object,
-  TabProps: PropTypes.object,
-  FormFieldGridProps: PropTypes.object,
-  GridItemProps: PropTypes.object,
-};
-
 export default FormTabs;
 
 /*
diff --git a/packages/mui-component-mapper/src/text-field/text-field.js b/packages/mui-component-mapper/src/text-field/text-field.js
index 394d71829..e81519e94 100644
--- a/packages/mui-component-mapper/src/text-field/text-field.js
+++ b/packages/mui-component-mapper/src/text-field/text-field.js
@@ -1,10 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { TextField as MuiTextField } from '@mui/material';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 const TextField = (props) => {
@@ -46,19 +44,4 @@ const TextField = (props) => {
   );
 };
 
-TextField.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  inputProps: PropTypes.object,
-  FormFieldGridProps: PropTypes.object,
-};
-
 export default TextField;
diff --git a/packages/mui-component-mapper/src/textarea/textarea.js b/packages/mui-component-mapper/src/textarea/textarea.js
index f379a2573..c8dc74d59 100644
--- a/packages/mui-component-mapper/src/textarea/textarea.js
+++ b/packages/mui-component-mapper/src/textarea/textarea.js
@@ -1,10 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { TextField as MuiTextField } from '@mui/material';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 
 const Textarea = (props) => {
@@ -46,19 +44,4 @@ const Textarea = (props) => {
   );
 };
 
-Textarea.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-  inputProps: PropTypes.object,
-};
-
 export default Textarea;
diff --git a/packages/mui-component-mapper/src/time-picker/time-picker.js b/packages/mui-component-mapper/src/time-picker/time-picker.js
index 3f03291ad..3e344f7db 100644
--- a/packages/mui-component-mapper/src/time-picker/time-picker.js
+++ b/packages/mui-component-mapper/src/time-picker/time-picker.js
@@ -1,10 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { TimePicker as MUITimePicker } from '@mui/x-date-pickers';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError } from '../validation-error/validation-error';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import { TextField } from '@mui/material';
 
@@ -65,18 +63,4 @@ const TimePicker = (props) => {
   );
 };
 
-TimePicker.propTypes = {
-  input,
-  meta,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  FormFieldGridProps: PropTypes.object,
-};
-
 export default TimePicker;
diff --git a/packages/mui-component-mapper/src/wizard/step-buttons.js b/packages/mui-component-mapper/src/wizard/step-buttons.js
index 448880258..e201dd1a5 100644
--- a/packages/mui-component-mapper/src/wizard/step-buttons.js
+++ b/packages/mui-component-mapper/src/wizard/step-buttons.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
 import selectNext from '@data-driven-forms/common/wizard/select-next';
@@ -51,17 +50,6 @@ const NextButton = ({ nextStep, valid, handleNext, nextLabel, getState, handleSu
   );
 };
 
-NextButton.propTypes = {
-  nextStep: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
-  handleSubmit: PropTypes.func.isRequired,
-  submitLabel: PropTypes.node.isRequired,
-  valid: PropTypes.bool,
-  handleNext: PropTypes.func.isRequired,
-  nextLabel: PropTypes.node.isRequired,
-  getState: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const WizardStepButtons = ({ buttons: Buttons, ...props }) => {
   if (Buttons) {
     return <Buttons classes={classes} {...props} />;
@@ -112,31 +100,4 @@ const WizardStepButtons = ({ buttons: Buttons, ...props }) => {
   );
 };
 
-WizardStepButtons.propTypes = {
-  ButtonContainerProps: PropTypes.object,
-  disableBack: PropTypes.bool,
-  handlePrev: PropTypes.func.isRequired,
-  handleNext: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-  nextStep: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.shape({
-      when: PropTypes.string.isRequired,
-      stepMapper: PropTypes.object.isRequired,
-    }),
-    PropTypes.func,
-  ]),
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node.isRequired,
-    cancel: PropTypes.node.isRequired,
-    back: PropTypes.node.isRequired,
-    next: PropTypes.node.isRequired,
-  }).isRequired,
-  buttons: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  formOptions: PropTypes.shape({
-    getState: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-  }),
-};
-
 export default WizardStepButtons;
diff --git a/packages/mui-component-mapper/src/wizard/wizard-nav.js b/packages/mui-component-mapper/src/wizard/wizard-nav.js
index 36b5e522f..b6c5b72b3 100644
--- a/packages/mui-component-mapper/src/wizard/wizard-nav.js
+++ b/packages/mui-component-mapper/src/wizard/wizard-nav.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
 import { Stepper, Step, StepLabel } from '@mui/material';
@@ -27,17 +26,4 @@ const WizardNav = ({ StepperProps = {}, stepsInfo, activeStepIndex }) => (
   </StyledStepper>
 );
 
-WizardNav.propTypes = {
-  StepperProps: PropTypes.object,
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-      label: PropTypes.node,
-      StepLabelProps: PropTypes.object,
-      StepProps: PropTypes.object,
-    })
-  ),
-  activeStepIndex: PropTypes.number,
-};
-
 export default WizardNav;
diff --git a/packages/mui-component-mapper/src/wizard/wizard.js b/packages/mui-component-mapper/src/wizard/wizard.js
index e7a72d399..fab6f988b 100644
--- a/packages/mui-component-mapper/src/wizard/wizard.js
+++ b/packages/mui-component-mapper/src/wizard/wizard.js
@@ -1,6 +1,5 @@
 import React, { useContext } from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
 import { WizardContext } from '@data-driven-forms/react-form-renderer';
@@ -63,23 +62,6 @@ const WizardInternal = ({
   );
 };
 
-WizardInternal.propTypes = {
-  buttonLabels: PropTypes.object,
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-      label: PropTypes.node,
-      StepLabelProps: PropTypes.object,
-      StepProps: PropTypes.object,
-    })
-  ),
-  ButtonContainerProps: PropTypes.object,
-  StepperProps: PropTypes.object,
-  WizardBodyProps: PropTypes.object,
-  WizardProps: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const MuiWizard = (props) => <Wizard Wizard={WizardInternal} {...props} />;
 
 export default MuiWizard;
diff --git a/packages/pf4-component-mapper/package.json b/packages/pf4-component-mapper/package.json
index 695444efb..3363f21bf 100644
--- a/packages/pf4-component-mapper/package.json
+++ b/packages/pf4-component-mapper/package.json
@@ -42,7 +42,6 @@
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
-    "prop-types": "^15.7.2",
     "downshift": "^5.4.3",
     "lodash": "^4.17.21"
   }
diff --git a/packages/pf4-component-mapper/src/checkbox/checkbox.js b/packages/pf4-component-mapper/src/checkbox/checkbox.js
index eacd78f09..d9f4eaf23 100644
--- a/packages/pf4-component-mapper/src/checkbox/checkbox.js
+++ b/packages/pf4-component-mapper/src/checkbox/checkbox.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import MultipleChoiceList from './multiple-choice-list';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group/form-group';
@@ -33,22 +32,6 @@ const SingleCheckbox = (props) => {
   );
 };
 
-SingleCheckbox.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 const Checkbox = ({ options, ...props }) => (options ? <MultipleChoiceList options={options} {...props} /> : <SingleCheckbox {...props} />);
 
-Checkbox.propTypes = {
-  options: PropTypes.arrayOf(PropTypes.shape({ label: PropTypes.node, value: PropTypes.any })),
-};
-
 export default Checkbox;
diff --git a/packages/pf4-component-mapper/src/checkbox/multiple-choice-list.js b/packages/pf4-component-mapper/src/checkbox/multiple-choice-list.js
index 240f70298..7c4c21391 100644
--- a/packages/pf4-component-mapper/src/checkbox/multiple-choice-list.js
+++ b/packages/pf4-component-mapper/src/checkbox/multiple-choice-list.js
@@ -1,31 +1,20 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Checkbox } from '@patternfly/react-core';
 
-import MultipleChoiceListCommon, { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
+import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
 import FormGroup from '../form-group/form-group';
 
 const FinalCheckbox = ({ option, ...props }) => (
   <Checkbox isChecked={props.checked} {...props} onChange={(e, _value) => props.onChange(e)} {...option} />
 );
 
-FinalCheckbox.propTypes = {
-  checked: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-  option: PropTypes.object,
-};
-
 const Wrapper = ({ meta, children, ...rest }) => (
   <FormGroup {...rest} id={rest.name || rest.id} meta={meta}>
     {children}
   </FormGroup>
 );
 
-Wrapper.propTypes = {
-  ...wrapperProps,
-};
-
 const MultipleChoiceList = (props) => <MultipleChoiceListCommon {...props} Wrapper={Wrapper} Checkbox={FinalCheckbox} />;
 
 export default MultipleChoiceList;
diff --git a/packages/pf4-component-mapper/src/date-picker/date-picker.js b/packages/pf4-component-mapper/src/date-picker/date-picker.js
index fdfe0d131..011fe4248 100644
--- a/packages/pf4-component-mapper/src/date-picker/date-picker.js
+++ b/packages/pf4-component-mapper/src/date-picker/date-picker.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { DatePicker as PF4DatePicker } from '@patternfly/react-core';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group/form-group';
 
@@ -30,17 +29,4 @@ const DatePicker = (props) => {
   );
 };
 
-DatePicker.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default DatePicker;
diff --git a/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js b/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
index b8bbd9ac4..d470e6984 100644
--- a/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/pf4-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
 import { DualListSelector } from '@patternfly/react-core/deprecated';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import isEqual from 'lodash/isEqual';
@@ -117,23 +116,6 @@ const DualList = (props) => {
   );
 };
 
-DualList.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  id: PropTypes.string,
-  getValueFromNode: PropTypes.func,
-  isSearchable: PropTypes.bool,
-  isSortable: PropTypes.bool,
-};
-
 const DualListWrapper = (props) => (props.isTree ? <DualListTree {...props} /> : <DualList {...props} />);
 
-DualListWrapper.propTypes = {
-  isTree: PropTypes.bool,
-};
-
 export default DualListWrapper;
diff --git a/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js b/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
index a3c978efa..c1d15b55e 100644
--- a/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
+++ b/packages/pf4-component-mapper/src/dual-list-sort-button/dual-list-sort-button.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 import { Button, ButtonVariant } from '@patternfly/react-core';
 
 import { PficonSortCommonAscIcon, PficonSortCommonDescIcon } from '@patternfly/react-icons';
@@ -24,8 +23,4 @@ const DualListSortButton = ({ position, ...rest }) => {
   );
 };
 
-DualListSortButton.propTypes = {
-  position: PropTypes.oneOf(['left', 'right']),
-};
-
 export default DualListSortButton;
diff --git a/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js b/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
index 390f74ea9..2e87380ef 100644
--- a/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
+++ b/packages/pf4-component-mapper/src/dual-list-tree-select/dual-list-tree-select.js
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
 import { DualListSelector } from '@patternfly/react-core/deprecated';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import isEqual from 'lodash/isEqual';
@@ -112,16 +111,4 @@ const DualListTreeSelect = (props) => {
   );
 };
 
-DualListTreeSelect.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  id: PropTypes.string,
-  isSearchable: PropTypes.bool,
-  isSortable: PropTypes.bool,
-};
-
 export default DualListTreeSelect;
diff --git a/packages/pf4-component-mapper/src/field-array/field-array.js b/packages/pf4-component-mapper/src/field-array/field-array.js
index 974aba937..25838fac5 100644
--- a/packages/pf4-component-mapper/src/field-array/field-array.js
+++ b/packages/pf4-component-mapper/src/field-array/field-array.js
@@ -1,6 +1,5 @@
 import React, { memo } from 'react';
 import isEqual from 'lodash/isEqual';
-import PropTypes from 'prop-types';
 import { useFormApi, FieldArray } from '@data-driven-forms/react-form-renderer';
 
 import { Bullseye, Button, Flex, FlexItem, FormFieldGroup, FormFieldGroupHeader, FormHelperText, Grid, GridItem } from '@patternfly/react-core';
@@ -47,19 +46,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  name: PropTypes.string,
-  fieldIndex: PropTypes.number.isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object),
-  remove: PropTypes.func.isRequired,
-  length: PropTypes.number,
-  minItems: PropTypes.number,
-  buttonLabels: PropTypes.shape({
-    remove: PropTypes.node,
-  }),
-  isLast: PropTypes.bool,
-};
-
 const DynamicArray = ({ ...props }) => {
   const {
     arrayValidator,
@@ -144,20 +130,4 @@ const DynamicArray = ({ ...props }) => {
   );
 };
 
-DynamicArray.propTypes = {
-  name: PropTypes.string,
-  label: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
-  defaultItem: PropTypes.any,
-  minItems: PropTypes.number,
-  maxItems: PropTypes.number,
-  noItemsMessage: PropTypes.node,
-  buttonLabels: PropTypes.shape({
-    add: PropTypes.node,
-    remove: PropTypes.node,
-    removeAll: PropTypes.node,
-  }),
-};
-
 export default DynamicArray;
diff --git a/packages/pf4-component-mapper/src/form-group/form-group.js b/packages/pf4-component-mapper/src/form-group/form-group.js
index 4ca0dfe52..5eacc57dc 100644
--- a/packages/pf4-component-mapper/src/form-group/form-group.js
+++ b/packages/pf4-component-mapper/src/form-group/form-group.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { FormGroup as Pf4FormGroup, Content, FormHelperText, HelperText, HelperTextItem } from '@patternfly/react-core';
-import PropTypes from 'prop-types';
 
 import showError from '../show-error/show-error';
 
@@ -26,17 +25,4 @@ const FormGroup = ({ label, isRequired, helperText, meta, validateOnMount, descr
   );
 };
 
-FormGroup.propTypes = {
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  meta: PropTypes.object.isRequired,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  validateOnMount: PropTypes.bool,
-  id: PropTypes.string.isRequired,
-  children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]).isRequired,
-  FormGroupProps: PropTypes.object,
-};
-
 export default FormGroup;
diff --git a/packages/pf4-component-mapper/src/form-template/form-template.js b/packages/pf4-component-mapper/src/form-template/form-template.js
index da064e7ba..28750ad79 100644
--- a/packages/pf4-component-mapper/src/form-template/form-template.js
+++ b/packages/pf4-component-mapper/src/form-template/form-template.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormTemplate from '@data-driven-forms/common/form-template';
 
@@ -12,20 +11,8 @@ export const Button = ({ label, bsStyle, children, disabled, buttonType, ...prop
   </PF4Button>
 );
 
-Button.propTypes = {
-  label: PropTypes.node.isRequired,
-  bsStyle: PropTypes.string,
-  disabled: PropTypes.bool,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  buttonType: PropTypes.string,
-};
-
 export const ButtonGroup = ({ children, ...props }) => <ActionGroup {...props}>{children}</ActionGroup>;
 
-ButtonGroup.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
-
 export const Title = ({ children, ...props }) => (
   <Content>
     <Content component={ContentVariants.h1} {...props}>
@@ -34,10 +21,6 @@ export const Title = ({ children, ...props }) => (
   </Content>
 );
 
-Title.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
-
 export const Description = ({ children, ...props }) => (
   <Content>
     <Content component={ContentVariants.p} {...props}>
@@ -46,10 +29,6 @@ export const Description = ({ children, ...props }) => (
   </Content>
 );
 
-Description.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-};
-
 export const FormError = ({ formError, alertProps }) => {
   if (typeof formError === 'object' && formError.title) {
     const { title, description, ...props } = formError;
@@ -68,11 +47,6 @@ export const FormError = ({ formError, alertProps }) => {
   return null;
 };
 
-FormError.propTypes = {
-  formError: PropTypes.any,
-  alertProps: PropTypes.object,
-};
-
 const PF4FormTemplate = (props) => (
   <FormTemplate
     BeforeError={FormError}
diff --git a/packages/pf4-component-mapper/src/is-required/is-required.js b/packages/pf4-component-mapper/src/is-required/is-required.js
index 33eed3cb3..e00ffa498 100644
--- a/packages/pf4-component-mapper/src/is-required/is-required.js
+++ b/packages/pf4-component-mapper/src/is-required/is-required.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { childrenPropTypes } from '@data-driven-forms/common/prop-types-templates';
 
 const IsRequired = ({ children }) => (
   <React.Fragment>
@@ -10,8 +9,4 @@ const IsRequired = ({ children }) => (
   </React.Fragment>
 );
 
-IsRequired.propTypes = {
-  children: childrenPropTypes,
-};
-
 export default IsRequired;
diff --git a/packages/pf4-component-mapper/src/plain-text/plain-text.js b/packages/pf4-component-mapper/src/plain-text/plain-text.js
index b36cfd8da..ca47811e4 100644
--- a/packages/pf4-component-mapper/src/plain-text/plain-text.js
+++ b/packages/pf4-component-mapper/src/plain-text/plain-text.js
@@ -1,8 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { Content } from '@patternfly/react-core';
-import validTextFields from '@data-driven-forms/common/utils/valid-text-fields';
 
 const PlainText = ({ component, label, name, variant = 'p', TextContentProps, ...rest }) => (
   <Content {...TextContentProps}>
@@ -16,12 +14,4 @@ const PlainText = ({ component, label, name, variant = 'p', TextContentProps, ..
   </Content>
 );
 
-PlainText.propTypes = {
-  variant: PropTypes.oneOf(validTextFields),
-  label: PropTypes.node.isRequired,
-  name: PropTypes.string.isRequired,
-  TextContentProps: PropTypes.object,
-  component: PropTypes.string,
-};
-
 export default PlainText;
diff --git a/packages/pf4-component-mapper/src/radio/radio.js b/packages/pf4-component-mapper/src/radio/radio.js
index 5a1dddf71..8a6c0a219 100644
--- a/packages/pf4-component-mapper/src/radio/radio.js
+++ b/packages/pf4-component-mapper/src/radio/radio.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import { Radio as Pf4Radio } from '@patternfly/react-core';
 import FormGroup from '../form-group/form-group';
@@ -22,14 +21,6 @@ const RadioOption = ({ name, option: { value, label, ...restOption }, isDisabled
   );
 };
 
-RadioOption.propTypes = {
-  name: PropTypes.string.isRequired,
-  option: PropTypes.shape({ label: PropTypes.node.isRequired, value: PropTypes.any.isRequired }).isRequired,
-  isDisabled: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  radioGroupValue: PropTypes.any,
-};
-
 const Radio = ({ name, type, ...props }) => {
   /**
    * You cannot assign type radio to PF4 radio buttons input. It will break and will not set input value, only checked property
@@ -59,20 +50,4 @@ const Radio = ({ name, type, ...props }) => {
   );
 };
 
-Radio.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  name: PropTypes.string.isRequired,
-  options: PropTypes.arrayOf(PropTypes.shape({ label: PropTypes.node, value: PropTypes.any })).isRequired,
-  type: PropTypes.any,
-  FormGroupProps: PropTypes.object,
-};
-
 export default Radio;
diff --git a/packages/pf4-component-mapper/src/select/select.js b/packages/pf4-component-mapper/src/select/select.js
index 49818ccf5..b0d9fee5b 100644
--- a/packages/pf4-component-mapper/src/select/select.js
+++ b/packages/pf4-component-mapper/src/select/select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group/form-group';
 import DataDrivenSelect from './select/select';
@@ -24,19 +23,6 @@ const Select = (props) => {
   );
 };
 
-Select.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default Select;
 
 export const InternalSelect = DataDrivenSelect;
diff --git a/packages/pf4-component-mapper/src/select/select/clear-indicator.js b/packages/pf4-component-mapper/src/select/select/clear-indicator.js
index 7f8e0981d..dfb9cf12f 100644
--- a/packages/pf4-component-mapper/src/select/select/clear-indicator.js
+++ b/packages/pf4-component-mapper/src/select/select/clear-indicator.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { TimesCircleIcon } from '@patternfly/react-icons';
 import './clear-indicator.css';
@@ -18,8 +17,4 @@ const ClearIndicator = ({ clearSelection }) => (
   </button>
 );
 
-ClearIndicator.propTypes = {
-  clearSelection: PropTypes.func.isRequired,
-};
-
 export default ClearIndicator;
diff --git a/packages/pf4-component-mapper/src/select/select/empty-options.js b/packages/pf4-component-mapper/src/select/select/empty-options.js
index 6ab042b34..e8401ad50 100644
--- a/packages/pf4-component-mapper/src/select/select/empty-options.js
+++ b/packages/pf4-component-mapper/src/select/select/empty-options.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 const EmptyOptions = ({ noOptionsMessage, noResultsMessage, getInputProps, isSearchable, isFetching }) => {
   const { value } = getInputProps();
@@ -7,12 +6,4 @@ const EmptyOptions = ({ noOptionsMessage, noResultsMessage, getInputProps, isSea
   return <div className="pf-v6-c-menu__item pf-m-disabled">{message}</div>;
 };
 
-EmptyOptions.propTypes = {
-  noOptionsMessage: PropTypes.func.isRequired,
-  noResultsMessage: PropTypes.node.isRequired,
-  getInputProps: PropTypes.func.isRequired,
-  isSearchable: PropTypes.bool,
-  isFetching: PropTypes.bool,
-};
-
 export default EmptyOptions;
diff --git a/packages/pf4-component-mapper/src/select/select/input.js b/packages/pf4-component-mapper/src/select/select/input.js
index c9645515e..fa9518663 100644
--- a/packages/pf4-component-mapper/src/select/select/input.js
+++ b/packages/pf4-component-mapper/src/select/select/input.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import '@patternfly/react-styles/css/components/TextInputGroup/text-input-group.css';
 
 import './input.css';
@@ -48,12 +47,4 @@ const Input = ({ inputRef, isSearchable, isDisabled, getInputProps, value, ...pr
   );
 };
 
-Input.propTypes = {
-  inputRef: PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
-  isSearchable: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  getInputProps: PropTypes.func.isRequired,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
-};
-
 export default Input;
diff --git a/packages/pf4-component-mapper/src/select/select/option.js b/packages/pf4-component-mapper/src/select/select/option.js
index 467fffb5b..a6df57eab 100644
--- a/packages/pf4-component-mapper/src/select/select/option.js
+++ b/packages/pf4-component-mapper/src/select/select/option.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import { CheckIcon } from '@patternfly/react-icons';
 
@@ -24,16 +23,4 @@ const Option = ({ item, isActive, isSelected, ...props }) => (
   </li>
 );
 
-Option.propTypes = {
-  item: PropTypes.shape({
-    label: PropTypes.node,
-    isDisabled: PropTypes.bool,
-    disabled: PropTypes.bool,
-    description: PropTypes.node,
-  }).isRequired,
-  isActive: PropTypes.bool,
-  isSelected: PropTypes.bool,
-  onClick: PropTypes.func.isRequired,
-};
-
 export default Option;
diff --git a/packages/pf4-component-mapper/src/select/select/select.js b/packages/pf4-component-mapper/src/select/select/select.js
index 95dd1580b..1bf8742b8 100644
--- a/packages/pf4-component-mapper/src/select/select/select.js
+++ b/packages/pf4-component-mapper/src/select/select/select.js
@@ -1,5 +1,4 @@
 import React, { useRef, useState } from 'react';
-import PropTypes from 'prop-types';
 
 import DataDrivenSelect, { flatOptions } from '@data-driven-forms/common/select';
 import parseInternalValue from '@data-driven-forms/common/select/parse-internal-value';
@@ -268,34 +267,6 @@ const InternalSelect = ({
   );
 };
 
-InternalSelect.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.any,
-      label: PropTypes.any,
-      divider: PropTypes.bool,
-    })
-  ).isRequired,
-  value: PropTypes.any,
-  simpleValue: PropTypes.bool,
-  placeholder: PropTypes.string,
-  isSearchable: PropTypes.bool,
-  id: PropTypes.string,
-  name: PropTypes.string.isRequired,
-  isDisabled: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  noResultsMessage: PropTypes.node,
-  noOptionsMessage: PropTypes.func,
-  isMulti: PropTypes.bool,
-  isFetching: PropTypes.bool,
-  onInputChange: PropTypes.func,
-  loadingMessage: PropTypes.node,
-  menuPortalTarget: PropTypes.any,
-  menuIsPortal: PropTypes.bool,
-  originalOptions: PropTypes.array,
-};
-
 const Select = ({
   showMoreLabel = 'more',
   showLessLabel = 'Show less',
@@ -335,28 +306,4 @@ const Select = ({
   );
 };
 
-Select.propTypes = {
-  isSearchable: PropTypes.bool,
-  showMoreLabel: PropTypes.node,
-  showLessLabel: PropTypes.node,
-  simpleValue: PropTypes.bool,
-  value: PropTypes.any,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.any,
-      label: PropTypes.any,
-    })
-  ),
-  onChange: PropTypes.func.isRequired,
-  isMulti: PropTypes.bool,
-  loadOptions: PropTypes.func,
-  loadingMessage: PropTypes.node,
-  updatingMessage: PropTypes.node,
-  menuIsPortal: PropTypes.bool,
-  placeholder: PropTypes.string,
-  noResultsMessage: PropTypes.node,
-  noOptionsMessage: PropTypes.node,
-  isClearable: PropTypes.bool,
-};
-
 export default Select;
diff --git a/packages/pf4-component-mapper/src/select/select/value-container.js b/packages/pf4-component-mapper/src/select/select/value-container.js
index 885b6af6a..593028b5c 100644
--- a/packages/pf4-component-mapper/src/select/select/value-container.js
+++ b/packages/pf4-component-mapper/src/select/select/value-container.js
@@ -1,5 +1,4 @@
 import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
 import Input from './input';
 
 const ValueContainer = ({ value, isMulti, placeholder, getInputProps, isSearchable, inputRef }) => {
@@ -19,13 +18,4 @@ const ValueContainer = ({ value, isMulti, placeholder, getInputProps, isSearchab
   return <span className="pf-v6-c-menu-toggle-text">{value || placeholder}</span>;
 };
 
-ValueContainer.propTypes = {
-  value: PropTypes.node,
-  placeholder: PropTypes.node,
-  isMulti: PropTypes.bool,
-  getInputProps: PropTypes.func.isRequired,
-  isSearchable: PropTypes.bool,
-  inputRef: PropTypes.object,
-};
-
 export default ValueContainer;
diff --git a/packages/pf4-component-mapper/src/slider/slider.js b/packages/pf4-component-mapper/src/slider/slider.js
index 327a9147e..0399e2c0d 100644
--- a/packages/pf4-component-mapper/src/slider/slider.js
+++ b/packages/pf4-component-mapper/src/slider/slider.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group';
 import { Slider as PF4Slider } from '@patternfly/react-core';
@@ -24,16 +23,4 @@ const Slider = (props) => {
   );
 };
 
-Slider.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default Slider;
diff --git a/packages/pf4-component-mapper/src/sub-form/sub-form.js b/packages/pf4-component-mapper/src/sub-form/sub-form.js
index 4745c40a3..aa59aac5c 100644
--- a/packages/pf4-component-mapper/src/sub-form/sub-form.js
+++ b/packages/pf4-component-mapper/src/sub-form/sub-form.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
 import { Title, Grid, GridItem, Content, ContentVariants } from '@patternfly/react-core';
@@ -30,13 +29,4 @@ const SubForm = ({ fields, title, description, validate: _validate, component, .
   );
 };
 
-SubForm.propTypes = {
-  fields: PropTypes.array.isRequired,
-  name: PropTypes.string,
-  title: PropTypes.node,
-  description: PropTypes.node,
-  validate: PropTypes.any,
-  component: PropTypes.any,
-};
-
 export default SubForm;
diff --git a/packages/pf4-component-mapper/src/switch/switch.js b/packages/pf4-component-mapper/src/switch/switch.js
index bd76aace6..f5b418236 100644
--- a/packages/pf4-component-mapper/src/switch/switch.js
+++ b/packages/pf4-component-mapper/src/switch/switch.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Switch as Pf4Switch } from '@patternfly/react-core';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormGroup from '../form-group/form-group';
@@ -33,17 +32,4 @@ const Switch = (props) => {
   );
 };
 
-Switch.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  onText: PropTypes.node,
-  FormGroupProps: PropTypes.object,
-};
-
 export default Switch;
diff --git a/packages/pf4-component-mapper/src/tabs/tabs.js b/packages/pf4-component-mapper/src/tabs/tabs.js
index 9730d39b3..637a00989 100644
--- a/packages/pf4-component-mapper/src/tabs/tabs.js
+++ b/packages/pf4-component-mapper/src/tabs/tabs.js
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
 import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
@@ -27,11 +26,4 @@ const FormTabs = ({ fields, dataType, validate, component, ...rest }) => {
   );
 };
 
-FormTabs.propTypes = {
-  fields: PropTypes.array.isRequired,
-  dataType: PropTypes.any,
-  validate: PropTypes.any,
-  component: PropTypes.any,
-};
-
 export default FormTabs;
diff --git a/packages/pf4-component-mapper/src/text-field/text-field.js b/packages/pf4-component-mapper/src/text-field/text-field.js
index ae99ee7ce..e32b5225f 100644
--- a/packages/pf4-component-mapper/src/text-field/text-field.js
+++ b/packages/pf4-component-mapper/src/text-field/text-field.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import FormGroup from '../form-group/form-group';
 import { TextInput } from '@patternfly/react-core';
-import PropTypes from 'prop-types';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import showError from '../show-error/show-error';
 
@@ -33,17 +32,4 @@ const TextField = (props) => {
   );
 };
 
-TextField.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default TextField;
diff --git a/packages/pf4-component-mapper/src/textarea/textarea.js b/packages/pf4-component-mapper/src/textarea/textarea.js
index 00258bcd4..3aec7bda9 100644
--- a/packages/pf4-component-mapper/src/textarea/textarea.js
+++ b/packages/pf4-component-mapper/src/textarea/textarea.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { TextArea as Pf4TextArea } from '@patternfly/react-core';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
-import PropTypes from 'prop-types';
 import FormGroup from '../form-group/form-group';
 import showError from '../show-error/show-error';
 
@@ -32,17 +31,4 @@ const Textarea = (props) => {
   );
 };
 
-Textarea.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default Textarea;
diff --git a/packages/pf4-component-mapper/src/time-picker/time-picker.js b/packages/pf4-component-mapper/src/time-picker/time-picker.js
index 7d8625021..b3c83dde1 100644
--- a/packages/pf4-component-mapper/src/time-picker/time-picker.js
+++ b/packages/pf4-component-mapper/src/time-picker/time-picker.js
@@ -2,7 +2,6 @@ import React from 'react';
 import FormGroup from '../form-group/form-group';
 import { TimePicker as PF4TimePicker } from '@patternfly/react-core';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
-import PropTypes from 'prop-types';
 
 const TimePicker = (props) => {
   const { label, isRequired, helperText, meta, validateOnMount, description, hideLabel, input, isReadOnly, isDisabled, id, FormGroupProps, ...rest } =
@@ -31,17 +30,4 @@ const TimePicker = (props) => {
   );
 };
 
-TimePicker.propTypes = {
-  label: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isReadOnly: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  hideLabel: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  id: PropTypes.string,
-  FormGroupProps: PropTypes.object,
-};
-
 export default TimePicker;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js b/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
index 56e3028fe..b6f8dc51a 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/step-buttons.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Button } from '@patternfly/react-core';
 import selectNext from '@data-driven-forms/common/wizard/select-next';
 import { FormSpy } from '@data-driven-forms/react-form-renderer';
@@ -19,17 +18,6 @@ const NextButton = ({ nextStep, valid, handleNext, nextLabel, getState, handleSu
   );
 };
 
-NextButton.propTypes = {
-  nextStep: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
-  handleSubmit: PropTypes.func.isRequired,
-  submitLabel: PropTypes.node.isRequired,
-  valid: PropTypes.bool,
-  handleNext: PropTypes.func.isRequired,
-  nextLabel: PropTypes.node.isRequired,
-  getState: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string,
-};
-
 const WizardStepButtons = ({
   buttons: Buttons,
   disableBack,
@@ -82,31 +70,4 @@ const WizardStepButtons = ({
   </footer>
 );
 
-WizardStepButtons.propTypes = {
-  disableBack: PropTypes.bool,
-  conditionalSubmitFlag: PropTypes.string,
-  handlePrev: PropTypes.func.isRequired,
-  handleNext: PropTypes.func.isRequired,
-  nextStep: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.shape({
-      when: PropTypes.string.isRequired,
-      stepMapper: PropTypes.object.isRequired,
-    }),
-    PropTypes.func,
-  ]),
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node.isRequired,
-    cancel: PropTypes.node.isRequired,
-    back: PropTypes.node.isRequired,
-    next: PropTypes.node.isRequired,
-  }).isRequired,
-  buttonsClassName: PropTypes.string,
-  buttons: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  formOptions: PropTypes.shape({
-    getState: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-  }),
-};
-
 export default WizardStepButtons;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js
index 8d66aeca4..f7dc19956 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-nav.js
@@ -4,7 +4,6 @@ import { WizardNav, WizardNavItem } from '@patternfly/react-core';
 
 import isEqual from 'lodash/isEqual';
 import get from 'lodash/get';
-import PropTypes from 'prop-types';
 
 const memoValues = (initialValue) => {
   let valueCache = initialValue;
@@ -68,15 +67,6 @@ const WizardNavigationInternal = React.memo(
   isEqual
 );
 
-WizardNavigationInternal.propTypes = {
-  activeStepIndex: PropTypes.number.isRequired,
-  maxStepIndex: PropTypes.number.isRequired,
-  jumpToStep: PropTypes.func.isRequired,
-  navSchema: PropTypes.array.isRequired,
-  valid: PropTypes.bool.isRequired,
-  validating: PropTypes.bool.isRequired,
-};
-
 const WizardNavigation = ({ setPrevSteps, crossroads, values, ...props }) => {
   const [memoValue] = useState(() =>
     memoValues(
@@ -111,10 +101,4 @@ const WizardNavigation = ({ setPrevSteps, crossroads, values, ...props }) => {
   return <WizardNavigationInternal {...props} />;
 };
 
-WizardNavigation.propTypes = {
-  setPrevSteps: PropTypes.func.isRequired,
-  values: PropTypes.object.isRequired,
-  crossroads: PropTypes.arrayOf(PropTypes.string),
-};
-
 export default WizardNavigation;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
index 43150f358..b298fee81 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-step.js
@@ -1,6 +1,5 @@
 import React, { Fragment, useEffect, useRef } from 'react';
 import { Title, WizardBody } from '@patternfly/react-core';
-import PropTypes from 'prop-types';
 import WizardStepButtons from './step-buttons';
 
 export const RenderTitle = ({ title, customTitle }) =>
@@ -12,11 +11,6 @@ export const RenderTitle = ({ title, customTitle }) =>
     </Title>
   );
 
-RenderTitle.propTypes = {
-  title: PropTypes.node,
-  customTitle: PropTypes.node,
-};
-
 const DefaultStepTemplate = ({ formFields, formRef, title, customTitle, showTitle, showTitles }) => (
   <div ref={formRef} className="pf-c-form">
     {((showTitles && showTitle !== false) || showTitle) && <RenderTitle title={title} customTitle={customTitle} />}
@@ -24,18 +18,6 @@ const DefaultStepTemplate = ({ formFields, formRef, title, customTitle, showTitl
   </div>
 );
 
-DefaultStepTemplate.propTypes = {
-  title: PropTypes.node,
-  formFields: PropTypes.array.isRequired,
-  formOptions: PropTypes.shape({
-    renderForm: PropTypes.func.isRequired,
-  }).isRequired,
-  showTitles: PropTypes.bool,
-  showTitle: PropTypes.bool,
-  customTitle: PropTypes.node,
-  formRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.instanceOf(Element) })]),
-};
-
 const WizardStep = ({
   name,
   title,
@@ -82,20 +64,4 @@ const WizardStep = ({
   );
 };
 
-WizardStep.propTypes = {
-  title: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.array.isRequired,
-  formOptions: PropTypes.shape({
-    renderForm: PropTypes.func.isRequired,
-  }).isRequired,
-  showTitles: PropTypes.bool,
-  showTitle: PropTypes.bool,
-  customTitle: PropTypes.node,
-  name: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  hasNoBodyPadding: PropTypes.bool,
-  StepTemplate: PropTypes.elementType,
-  conditionalSubmitFlag: PropTypes.string,
-};
-
 export default WizardStep;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
index 38a04bb25..118ca3df9 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard-components/wizard-toggle.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { AngleRightIcon, CaretDownIcon } from '@patternfly/react-icons';
 
 const WizardToggle = ({ activeStepIndex, currentStep, navSchema, isOpen, dispatch }) => {
@@ -33,12 +32,4 @@ const WizardToggle = ({ activeStepIndex, currentStep, navSchema, isOpen, dispatc
   );
 };
 
-WizardToggle.propTypes = {
-  activeStepIndex: PropTypes.number,
-  currentStep: PropTypes.object,
-  navSchema: PropTypes.array,
-  isOpen: PropTypes.bool,
-  dispatch: PropTypes.func,
-};
-
 export default WizardToggle;
diff --git a/packages/pf4-component-mapper/src/wizard/wizard.js b/packages/pf4-component-mapper/src/wizard/wizard.js
index e7cfe1337..f8294235f 100644
--- a/packages/pf4-component-mapper/src/wizard/wizard.js
+++ b/packages/pf4-component-mapper/src/wizard/wizard.js
@@ -1,5 +1,4 @@
 import React, { useReducer, useEffect, useContext } from 'react';
-import PropTypes from 'prop-types';
 import { FormSpy, WizardContext } from '@data-driven-forms/react-form-renderer';
 import Wizard from '@data-driven-forms/common/wizard/wizard';
 
@@ -22,12 +21,6 @@ const Modal = ({ children, container, inModal, ...rest }) =>
     children
   );
 
-Modal.propTypes = {
-  children: PropTypes.node,
-  container: PropTypes.instanceOf(Element),
-  inModal: PropTypes.bool,
-};
-
 const WizardInternal = ({
   inModal,
   title,
@@ -168,31 +161,6 @@ const WizardInternal = ({
   );
 };
 
-WizardInternal.propTypes = {
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node.isRequired,
-    cancel: PropTypes.node.isRequired,
-    back: PropTypes.node.isRequired,
-    next: PropTypes.node.isRequired,
-  }).isRequired,
-  buttonsClassName: PropTypes.string,
-  title: PropTypes.any,
-  description: PropTypes.any,
-  inModal: PropTypes.bool,
-  showTitles: PropTypes.bool,
-  hideClose: PropTypes.bool,
-  titleId: PropTypes.string,
-  descriptionId: PropTypes.string,
-  closeButtonAriaLabel: PropTypes.string,
-  hasNoBodyPadding: PropTypes.bool,
-  navAriaLabel: PropTypes.string,
-  container: PropTypes.instanceOf(Element),
-  StepTemplate: PropTypes.elementType,
-  className: PropTypes.string,
-  conditionalSubmitFlag: PropTypes.string,
-  ModalProps: PropTypes.object,
-};
-
 const defaultLabels = {
   submit: 'Submit',
   cancel: 'Cancel',
@@ -204,12 +172,4 @@ const WizardFunction = ({ buttonLabels = {}, ...props }) => (
   <Wizard Wizard={WizardInternal} {...props} buttonLabels={{ ...defaultLabels, ...buttonLabels }} />
 );
 
-WizardFunction.propTypes = {
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node,
-    cancel: PropTypes.node,
-    back: PropTypes.node,
-  }),
-};
-
 export default WizardFunction;
diff --git a/packages/react-form-renderer/package.json b/packages/react-form-renderer/package.json
index e3e5302e0..c94379f1e 100644
--- a/packages/react-form-renderer/package.json
+++ b/packages/react-form-renderer/package.json
@@ -35,12 +35,11 @@
     "final-form-arrays": "^3.0.2",
     "final-form-focus": "^1.1.2",
     "lodash": "^4.17.15",
-    "prop-types": "^15.7.2",
     "react-final-form": "^6.5.0",
     "react-final-form-arrays": "^3.1.1"
   },
   "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/packages/react-form-renderer/src/condition/condition.js b/packages/react-form-renderer/src/condition/condition.js
index 437860595..ed1a23a04 100644
--- a/packages/react-form-renderer/src/condition/condition.js
+++ b/packages/react-form-renderer/src/condition/condition.js
@@ -1,5 +1,4 @@
 import { useCallback, useContext, useEffect, useMemo, useReducer } from 'react';
-import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 
 import useFormApi from '../use-form-api';
@@ -105,55 +104,4 @@ const Condition = ({ condition, children, field }) => {
   return conditionResult.visible ? children : null;
 };
 
-const conditionProps = {
-  when: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string), PropTypes.func]),
-  is: PropTypes.oneOfType([PropTypes.array, PropTypes.string, PropTypes.object, PropTypes.number, PropTypes.bool, PropTypes.func]),
-  isNotEmpty: PropTypes.bool,
-  isEmpty: PropTypes.bool,
-  pattern: (props, name, componentName) => {
-    if (!props[name]) {
-      return;
-    }
-
-    if (typeof props[name] === 'string') {
-      return;
-    }
-
-    if (props[name] instanceof RegExp) {
-      return;
-    }
-
-    return new Error(`Invalid prop pattern supplied to condition in \`${componentName}\`. Validation failed.
-    pattern has to be RegExp or string. Received \`${typeof props[name]}\`.`);
-  },
-  notMatch: PropTypes.any,
-  then: PropTypes.shape({
-    visible: PropTypes.bool,
-    set: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
-  }),
-  else: PropTypes.shape({
-    visible: PropTypes.bool,
-    set: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
-  }),
-};
-
-const nestedConditions = {
-  or: PropTypes.oneOfType([PropTypes.shape(conditionProps), PropTypes.arrayOf(PropTypes.shape(conditionProps))]),
-  and: PropTypes.oneOfType([PropTypes.shape(conditionProps), PropTypes.arrayOf(PropTypes.shape(conditionProps))]),
-  not: PropTypes.oneOfType([PropTypes.shape(conditionProps), PropTypes.arrayOf(PropTypes.shape(conditionProps))]),
-  sequence: PropTypes.arrayOf(PropTypes.shape(conditionProps)),
-};
-
-const conditionsProps = {
-  ...conditionProps,
-  ...nestedConditions,
-};
-
-Condition.propTypes = {
-  condition: PropTypes.oneOfType([PropTypes.shape(conditionsProps), PropTypes.arrayOf(PropTypes.shape(conditionsProps))]),
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]).isRequired,
-  values: PropTypes.object.isRequired,
-  field: PropTypes.object.isRequired,
-};
-
 export default Condition;
diff --git a/packages/react-form-renderer/src/field-provider/field-provider.js b/packages/react-form-renderer/src/field-provider/field-provider.js
index 121ad0ee2..50f09b6af 100644
--- a/packages/react-form-renderer/src/field-provider/field-provider.js
+++ b/packages/react-form-renderer/src/field-provider/field-provider.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import useFieldApi from '../use-field-api';
 
@@ -16,9 +15,4 @@ const FieldProvider = ({ Component, render, ...props }) => {
   throw new Error('Field provider is missing either Component or render prop.');
 };
 
-FieldProvider.propTypes = {
-  Component: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.func]),
-  render: PropTypes.func,
-};
-
 export default FieldProvider;
diff --git a/packages/react-form-renderer/src/form-renderer/form-renderer.js b/packages/react-form-renderer/src/form-renderer/form-renderer.js
index 1ae907d72..d4ec60dd7 100644
--- a/packages/react-form-renderer/src/form-renderer/form-renderer.js
+++ b/packages/react-form-renderer/src/form-renderer/form-renderer.js
@@ -1,6 +1,5 @@
 import arrayMutators from 'final-form-arrays';
 import createFocusDecorator from 'final-form-focus';
-import PropTypes from 'prop-types';
 import React, { useCallback, useMemo, useRef, useState, cloneElement } from 'react';
 
 import defaultSchemaValidator from '../default-schema-validator';
@@ -189,44 +188,4 @@ const FormRenderer = ({
   );
 };
 
-FormRenderer.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
-  onSubmit: PropTypes.func,
-  onCancel: PropTypes.func,
-  onReset: PropTypes.func,
-  onError: PropTypes.func,
-  schema: PropTypes.object.isRequired,
-  clearOnUnmount: PropTypes.bool,
-  subscription: PropTypes.shape({ [PropTypes.string]: PropTypes.bool }),
-  clearedValue: PropTypes.any,
-  componentMapper: PropTypes.shape({
-    [PropTypes.string]: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.func, PropTypes.elementType]),
-  }).isRequired,
-  FormTemplate: PropTypes.elementType,
-  FormTemplateProps: PropTypes.object,
-  validatorMapper: PropTypes.shape({
-    [PropTypes.string]: PropTypes.func,
-  }),
-  actionMapper: PropTypes.shape({
-    [PropTypes.string]: PropTypes.func,
-  }),
-  schemaValidatorMapper: PropTypes.shape({
-    components: PropTypes.shape({
-      [PropTypes.string]: PropTypes.func,
-    }),
-    validators: PropTypes.shape({
-      [PropTypes.string]: PropTypes.func,
-    }),
-    actions: PropTypes.shape({
-      [PropTypes.string]: PropTypes.func,
-    }),
-  }),
-  initialValues: PropTypes.object,
-  decorators: PropTypes.array,
-  mutators: PropTypes.object,
-  conditionMapper: PropTypes.shape({
-    [PropTypes.string]: PropTypes.func,
-  }),
-};
-
 export default FormRenderer;
diff --git a/packages/react-form-renderer/src/form-renderer/render-form.js b/packages/react-form-renderer/src/form-renderer/render-form.js
index 1849124e4..326ae00e3 100644
--- a/packages/react-form-renderer/src/form-renderer/render-form.js
+++ b/packages/react-form-renderer/src/form-renderer/render-form.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 import setWith from 'lodash/setWith';
 import cloneDeep from 'lodash/cloneDeep';
 import { Field } from 'react-final-form';
@@ -10,24 +9,12 @@ import prepareComponentProps from '../prepare-component-props';
 
 const FormFieldHideWrapper = ({ hideField = false, children }) => (hideField ? <div hidden>{children}</div> : children);
 
-FormFieldHideWrapper.propTypes = {
-  hideField: PropTypes.bool,
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]).isRequired,
-};
-
 const ConditionTriggerWrapper = ({ condition, values, children, field }) => (
   <Condition condition={condition} values={values} field={field}>
     {children}
   </Condition>
 );
 
-ConditionTriggerWrapper.propTypes = {
-  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  children: PropTypes.node.isRequired,
-  field: PropTypes.object,
-  values: PropTypes.object.isRequired,
-};
-
 const ConditionTriggerDetector = ({ values = {}, triggers = [], children, condition, field }) => {
   const internalTriggers = [...triggers];
   if (internalTriggers.length === 0) {
@@ -55,14 +42,6 @@ const ConditionTriggerDetector = ({ values = {}, triggers = [], children, condit
   );
 };
 
-ConditionTriggerDetector.propTypes = {
-  values: PropTypes.object,
-  triggers: PropTypes.arrayOf(PropTypes.string),
-  children: PropTypes.node,
-  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  field: PropTypes.object.isRequired,
-};
-
 const FormConditionWrapper = ({ condition, children, field, conditionMapper }) => {
   if (condition) {
     const triggers = getConditionTriggers(condition, field, conditionMapper);
@@ -76,13 +55,6 @@ const FormConditionWrapper = ({ condition, children, field, conditionMapper }) =
   return children;
 };
 
-FormConditionWrapper.propTypes = {
-  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  children: PropTypes.node.isRequired,
-  field: PropTypes.object,
-  conditionMapper: PropTypes.object,
-};
-
 const SingleField = ({ component, ...rest }) => {
   const { actionMapper, componentMapper, conditionMapper } = useContext(RendererContext);
 
@@ -103,19 +75,6 @@ const SingleField = ({ component, ...rest }) => {
   );
 };
 
-SingleField.propTypes = {
-  component: PropTypes.string.isRequired,
-  condition: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-  hideField: PropTypes.bool,
-  dataType: PropTypes.string,
-  validate: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object])),
-  initialValue: PropTypes.any,
-  actions: PropTypes.shape({
-    [PropTypes.string]: PropTypes.func,
-  }),
-  resolveProps: PropTypes.func,
-};
-
 const renderForm = (fields) => fields.map((field) => (Array.isArray(field) ? renderForm(field) : <SingleField key={field.name} {...field} />));
 
 export default renderForm;
diff --git a/packages/react-form-renderer/src/form-renderer/schema-error-component.js b/packages/react-form-renderer/src/form-renderer/schema-error-component.js
index fe062a67c..5891ff212 100644
--- a/packages/react-form-renderer/src/form-renderer/schema-error-component.js
+++ b/packages/react-form-renderer/src/form-renderer/schema-error-component.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 const SchemaErrorComponent = ({ name, message }) => (
   <div
@@ -17,9 +16,4 @@ const SchemaErrorComponent = ({ name, message }) => (
   </div>
 );
 
-SchemaErrorComponent.propTypes = {
-  name: PropTypes.string.isRequired,
-  message: PropTypes.string.isRequired,
-};
-
 export default SchemaErrorComponent;
diff --git a/packages/react-renderer-demo/package.json b/packages/react-renderer-demo/package.json
index 90caf67ec..b479148ae 100644
--- a/packages/react-renderer-demo/package.json
+++ b/packages/react-renderer-demo/package.json
@@ -25,31 +25,27 @@
         "@data-driven-forms/react-form-renderer": "*",
         "@docsearch/css": "^3.2.1",
         "@docsearch/react": "^3.2.1",
-        "@emotion/cache": "^11.10.3",
-        "@emotion/react": "^11.10.4",
-        "@emotion/server": "^11.10.0",
-        "@emotion/styled": "^11.10.4",
-        "@emotion/utils": "^1.2.0",
+        "@emotion/cache": "^11.14.0",
+        "@emotion/server": "^11.11.0",
         "@mdx-js/loader": "^2.2.1",
         "@mdx-js/react": "^2.2.1",
         "@mui/icons-material": "^5.10.3",
         "@mui/material": "^5.10.4",
+        "@mui/material-nextjs": "^7.0.2",
         "@mui/system": "^5.10.4",
         "@mui/x-date-pickers": "^5.0.1",
-        "@next/bundle-analyzer": "13.1.1",
-        "@next/font": "^13.1.1",
+        "@next/bundle-analyzer": "^15.3.1",
         "@stackblitz/sdk": "^1.5.3",
         "clsx": "^1.1.1",
         "codesandbox": "2.2.3",
         "evergreen-ui": "^6.9.10",
         "markdown-to-jsx": "^7.1.6",
-        "next": "13.1.1",
-        "prism-react-renderer": "^1.2.1",
-        "prop-types": "^15.8.1",
+        "next": "^15.3.1",
+        "prism-react-renderer": "^2.4.1",
         "raw-loader": "^4.0.2",
-        "react": "18.2.0",
+        "react": "^19.1.0",
         "react-copy-to-clipboard": "^5.0.4",
-        "react-dom": "18.2.0",
+        "react-dom": "^19.1.0",
         "react-github-btn": "^1.2.2",
         "react-sticky-box": "^1.0.2",
         "webpack": "^5.66.0"
diff --git a/packages/react-renderer-demo/src/components/code-editor/index.js b/packages/react-renderer-demo/src/components/code-editor/index.js
index c8c3a470e..21d106960 100644
--- a/packages/react-renderer-demo/src/components/code-editor/index.js
+++ b/packages/react-renderer-demo/src/components/code-editor/index.js
@@ -1,9 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
-import Highlight, { defaultProps } from 'prism-react-renderer/';
-import ghTheme from 'prism-react-renderer/themes/github';
-import vsTheme from 'prism-react-renderer/themes/vsDark';
+import { Highlight, defaultProps, themes } from 'prism-react-renderer';
 import tranformImports from './transform-imports';
 import clsx from 'clsx';
 
@@ -29,10 +26,6 @@ const Pre = ({ children, ...props }) => (
   </StyledPre>
 );
 
-Pre.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]),
-};
-
 const Root = styled('div')(({ theme }) => ({
   '&.wrapper': {
     position: 'relative',
@@ -62,14 +55,14 @@ const CodeEditor = ({ value, children, className, inExample, editorClassname, ke
 
   return (
     <Root className={clsx('wrapper', editorClassname)}>
-      <Highlight {...defaultProps} theme={lang === 'bash' ? ghTheme : vsTheme} code={content} language={lang || 'jsx'}>
+      <Highlight {...defaultProps} theme={lang === 'bash' ? themes.github : themes.vsDark} code={content} language={lang || 'jsx'}>
         {({ className, style, tokens, getLineProps, getTokenProps }) => (
           <Pre className={className} style={style}>
             <React.Fragment>
               {tokens.map((line, i) => (
-                <div key={i} {...getLineProps({ line, key: i })}>
+                <div {...getLineProps({ line, key: i })} key={i}>
                   {line.map((token, key) => (
-                    <span key={key} {...getTokenProps({ token, key })} />
+                    <span {...getTokenProps({ token, key })} key={key} />
                   ))}
                 </div>
               ))}
@@ -81,13 +74,4 @@ const CodeEditor = ({ value, children, className, inExample, editorClassname, ke
   );
 };
 
-CodeEditor.propTypes = {
-  value: PropTypes.string,
-  children: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  className: PropTypes.string,
-  inExample: PropTypes.bool,
-  editorClassname: PropTypes.string,
-  keepLastLine: PropTypes.bool,
-};
-
 export default CodeEditor;
diff --git a/packages/react-renderer-demo/src/components/code-example.js b/packages/react-renderer-demo/src/components/code-example.js
index 5d72d9b85..7ae12b20b 100644
--- a/packages/react-renderer-demo/src/components/code-example.js
+++ b/packages/react-renderer-demo/src/components/code-example.js
@@ -9,7 +9,6 @@ import CodeIcon from '@mui/icons-material/Code';
 import CodeOffIcon from '@mui/icons-material/CodeOff';
 import Accordion from '@mui/material/Accordion';
 import MuiAccordionSummary from '@mui/material/AccordionSummary';
-import PropTypes from 'prop-types';
 import AccordionDetails from '@mui/material/AccordionDetails';
 import Paper from '@mui/material/Paper';
 import clsx from 'clsx';
@@ -303,9 +302,4 @@ const CodeExample = ({ source, mode = 'code' }) => {
   );
 };
 
-CodeExample.propTypes = {
-  source: PropTypes.string.isRequired,
-  mode: PropTypes.oneOf(['code', 'preview']),
-};
-
 export default CodeExample;
diff --git a/packages/react-renderer-demo/src/components/common/connected-links.js b/packages/react-renderer-demo/src/components/common/connected-links.js
index 1f10ba682..586ccc772 100644
--- a/packages/react-renderer-demo/src/components/common/connected-links.js
+++ b/packages/react-renderer-demo/src/components/common/connected-links.js
@@ -1,3 +1,5 @@
+'use client';
+
 import React, { useContext } from 'react';
 import { styled } from '@mui/material/styles';
 import Grid from '@mui/material/Grid';
diff --git a/packages/react-renderer-demo/src/components/common/doc-link.js b/packages/react-renderer-demo/src/components/common/doc-link.js
index f6c745c0b..e466cf4d7 100644
--- a/packages/react-renderer-demo/src/components/common/doc-link.js
+++ b/packages/react-renderer-demo/src/components/common/doc-link.js
@@ -4,7 +4,6 @@ import { useRouter } from 'next/router';
 import NextLink from 'next/link';
 import MuiLink from '@mui/material/Link';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 
 // Add support for the sx prop for consistency with the other branches.
 const Anchor = styled('span')({});
@@ -32,17 +31,6 @@ export const NextLinkComposed = React.forwardRef(function NextLinkComposed(props
   );
 });
 
-NextLinkComposed.propTypes = {
-  to: PropTypes.string,
-  linkAs: PropTypes.string,
-  replace: PropTypes.bool,
-  scroll: PropTypes.bool,
-  shallow: PropTypes.bool,
-  prefetch: PropTypes.bool,
-  legacyBehavior: PropTypes.bool,
-  locale: PropTypes.string,
-};
-
 // A styled version of the Next.js Link component:
 // https://nextjs.org/docs/api-reference/next/link
 const DocLink = React.forwardRef(function Link(props, ref) {
@@ -98,20 +86,4 @@ const DocLink = React.forwardRef(function Link(props, ref) {
   return <MuiLink component={NextLinkComposed} className={className} ref={ref} {...nextjsProps} {...other} />;
 });
 
-DocLink.propTypes = {
-  role: PropTypes.any,
-  noLinkStyle: PropTypes.bool,
-  activeClassName: PropTypes.string,
-  href: PropTypes.string.isRequired,
-  as: PropTypes.string,
-  linkAs: PropTypes.string,
-  replace: PropTypes.bool,
-  scroll: PropTypes.bool,
-  shallow: PropTypes.bool,
-  prefetch: PropTypes.bool,
-  legacyBehavior: PropTypes.bool,
-  locale: PropTypes.string,
-  className: PropTypes.string,
-};
-
 export default DocLink;
diff --git a/packages/react-renderer-demo/src/components/common/example-link.js b/packages/react-renderer-demo/src/components/common/example-link.js
index 08afe0824..d2325b9f0 100644
--- a/packages/react-renderer-demo/src/components/common/example-link.js
+++ b/packages/react-renderer-demo/src/components/common/example-link.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import RouterLink from 'next/link';
 import Button from '@mui/material/Button';
 
@@ -30,9 +29,4 @@ const ExampleLink = ({ to, text = 'To example' }) => (
   </React.Fragment>
 );
 
-ExampleLink.propTypes = {
-  to: PropTypes.string.isRequired,
-  text: PropTypes.node,
-};
-
 export default ExampleLink;
diff --git a/packages/react-renderer-demo/src/components/component-example-text.js b/packages/react-renderer-demo/src/components/component-example-text.js
index 13070a145..67d282dd6 100644
--- a/packages/react-renderer-demo/src/components/component-example-text.js
+++ b/packages/react-renderer-demo/src/components/component-example-text.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import ComponentExample from '@docs/components/component-example';
 
 import { Heading } from './mdx/mdx-components';
@@ -56,11 +55,4 @@ const ComponentExampleText = ({ linkText, schema, variants = [], schemaVariants
   );
 };
 
-ComponentExampleText.propTypes = {
-  linkText: PropTypes.string.isRequired,
-  schema: PropTypes.object.isRequired,
-  variants: PropTypes.arrayOf(PropTypes.object),
-  schemaVariants: PropTypes.object,
-};
-
 export default ComponentExampleText;
diff --git a/packages/react-renderer-demo/src/components/component-example.js b/packages/react-renderer-demo/src/components/component-example.js
index 0188c39e1..3100d98b4 100644
--- a/packages/react-renderer-demo/src/components/component-example.js
+++ b/packages/react-renderer-demo/src/components/component-example.js
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { styled } from '@mui/material/styles';
 import { useRouter } from 'next/router';
 import CircularProgress from '@mui/material/CircularProgress';
-import PropTypes from 'prop-types';
 import Card from '@mui/material/Card';
 import CardContent from '@mui/material/CardContent';
 import sdk from '@stackblitz/sdk';
@@ -387,19 +386,4 @@ const ComponentExample = ({ variants, schema, activeMapper, component, schemaVar
   );
 };
 
-ComponentExample.propTypes = {
-  component: PropTypes.string.isRequired,
-  activeMapper: PropTypes.string.isRequired,
-  schema: PropTypes.object.isRequired,
-  variants: PropTypes.arrayOf(
-    PropTypes.shape({
-      name: PropTypes.string.isRequired,
-      type: PropTypes.string.isRequired,
-      required: PropTypes.bool,
-    })
-  ).isRequired,
-  schemaVariants: PropTypes.object,
-  activeSchema: PropTypes.string,
-};
-
 export default ComponentExample;
diff --git a/packages/react-renderer-demo/src/components/component-mapper-bar.js b/packages/react-renderer-demo/src/components/component-mapper-bar.js
index 533be1a9d..932f5b5ce 100644
--- a/packages/react-renderer-demo/src/components/component-mapper-bar.js
+++ b/packages/react-renderer-demo/src/components/component-mapper-bar.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 
 import IconButton from '@mui/material/IconButton';
 
@@ -63,12 +62,4 @@ const ComponentMapperBar = ({ prefix, href, github, npm, npmSvg }) => {
   );
 };
 
-ComponentMapperBar.propTypes = {
-  prefix: PropTypes.string.isRequired,
-  href: PropTypes.string.isRequired,
-  github: PropTypes.string.isRequired,
-  npm: PropTypes.string.isRequired,
-  npmSvg: PropTypes.string.isRequired,
-};
-
 export default ComponentMapperBar;
diff --git a/packages/react-renderer-demo/src/components/doc-page.js b/packages/react-renderer-demo/src/components/doc-page.js
index 2577b8e2c..b1a08e6ea 100644
--- a/packages/react-renderer-demo/src/components/doc-page.js
+++ b/packages/react-renderer-demo/src/components/doc-page.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import { useRouter } from 'next/router';
 
 import Grid from '@mui/material/Grid';
@@ -60,8 +59,4 @@ const DocPage = ({ children }) => {
   );
 };
 
-DocPage.propTypes = {
-  children: PropTypes.node,
-};
-
 export default DocPage;
diff --git a/packages/react-renderer-demo/src/components/landing-page/formExample.js b/packages/react-renderer-demo/src/components/landing-page/formExample.js
index c8dfdf250..7009d65ff 100644
--- a/packages/react-renderer-demo/src/components/landing-page/formExample.js
+++ b/packages/react-renderer-demo/src/components/landing-page/formExample.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import Grid from '@mui/material/Grid';
 import Button from '@mui/material/Button';
 
@@ -47,10 +46,6 @@ const FormTemplate = ({ formFields }) => {
   );
 };
 
-FormTemplate.propTypes = {
-  formFields: PropTypes.any,
-};
-
 const FormExample = ({ setFormState }) => (
   <FormRenderer
     FormTemplate={FormTemplate}
@@ -112,8 +107,4 @@ const FormExample = ({ setFormState }) => (
   />
 );
 
-FormExample.propTypes = {
-  setFormState: PropTypes.func,
-};
-
 export default FormExample;
diff --git a/packages/react-renderer-demo/src/components/layout.js b/packages/react-renderer-demo/src/components/layout.js
index 519530a57..4b9f00aa8 100644
--- a/packages/react-renderer-demo/src/components/layout.js
+++ b/packages/react-renderer-demo/src/components/layout.js
@@ -1,6 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
 import clsx from 'clsx';
-import PropTypes from 'prop-types';
 import Drawer from '@mui/material/Drawer';
 import Toolbar from '@mui/material/Toolbar';
 import Divider from '@mui/material/Divider';
@@ -268,8 +267,4 @@ const Layout = ({ children }) => {
   );
 };
 
-Layout.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
-};
-
 export default Layout;
diff --git a/packages/react-renderer-demo/src/components/mdx/share-button.js b/packages/react-renderer-demo/src/components/mdx/share-button.js
index 4f24f7dbd..383721744 100644
--- a/packages/react-renderer-demo/src/components/mdx/share-button.js
+++ b/packages/react-renderer-demo/src/components/mdx/share-button.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import IconButton from '@mui/material/IconButton';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import SvgIcon from '@mui/material/SvgIcon';
@@ -25,8 +24,4 @@ const ShareButton = ({ path }) => (
   </CopyToClipboard>
 );
 
-ShareButton.propTypes = {
-  path: PropTypes.string.isRequired,
-};
-
 export default ShareButton;
diff --git a/packages/react-renderer-demo/src/components/navigation/mapper.js b/packages/react-renderer-demo/src/components/navigation/mapper.js
index f58f39fb1..c7b74af39 100644
--- a/packages/react-renderer-demo/src/components/navigation/mapper.js
+++ b/packages/react-renderer-demo/src/components/navigation/mapper.js
@@ -1,6 +1,5 @@
 /* eslint-disable react/prop-types */
 import React, { useState, forwardRef } from 'react';
-import PropTypes from 'prop-types';
 import List from '@mui/material/List';
 import ListItem from '@mui/material/ListItem';
 import ListItemText from '@mui/material/ListItemText';
@@ -57,13 +56,6 @@ const Item = ({ href, linkText, component, divider, level }) => {
   );
 };
 
-Item.propTypes = {
-  href: PropTypes.string.isRequired,
-  linkText: PropTypes.string,
-  component: PropTypes.node,
-  divider: PropTypes.bool,
-};
-
 const StyledList = styled(List)(() => ({
   '& .listItem': {
     padding: '8px 16px 8px 16px !important',
diff --git a/packages/react-renderer-demo/src/components/notification-panel.js b/packages/react-renderer-demo/src/components/notification-panel.js
index fd62a4cae..a6abb38b7 100644
--- a/packages/react-renderer-demo/src/components/notification-panel.js
+++ b/packages/react-renderer-demo/src/components/notification-panel.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
 import { styled } from '@mui/material/styles';
-import PropTypes from 'prop-types';
 import Popper from '@mui/material/Popper';
 import Grow from '@mui/material/Grow';
 import Paper from '@mui/material/Paper';
@@ -110,11 +109,4 @@ const NotificationPanel = ({ isOpen, onClose, anchorRef, setNewMessages }) => {
   );
 };
 
-NotificationPanel.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onClose: PropTypes.func.isRequired,
-  setNewMessages: PropTypes.func.isRequired,
-  anchorRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({ current: PropTypes.any })]).isRequired,
-};
-
 export default NotificationPanel;
diff --git a/packages/react-renderer-demo/src/doc-components/additional-component-text.js b/packages/react-renderer-demo/src/doc-components/additional-component-text.js
index ffc4b257e..4d8a544a4 100644
--- a/packages/react-renderer-demo/src/doc-components/additional-component-text.js
+++ b/packages/react-renderer-demo/src/doc-components/additional-component-text.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import GenericMuiComponent from '../helpers/generic-mui-component';
 
 const Checkbox = ({ activeMapper, component }) => {
@@ -11,9 +10,4 @@ const Checkbox = ({ activeMapper, component }) => {
   }
 };
 
-Checkbox.propTypes = {
-  activeMapper: PropTypes.string.isRequired,
-  component: PropTypes.string.isRequired,
-};
-
 export default Checkbox;
diff --git a/packages/react-renderer-demo/src/examples/components/examples/custom-wizard.js b/packages/react-renderer-demo/src/examples/components/examples/custom-wizard.js
index d37001553..0f7f87eab 100644
--- a/packages/react-renderer-demo/src/examples/components/examples/custom-wizard.js
+++ b/packages/react-renderer-demo/src/examples/components/examples/custom-wizard.js
@@ -1,3 +1,4 @@
+'use client';
 import React, { useContext, useState } from 'react';
 
 import FormRenderer from '@data-driven-forms/react-form-renderer/form-renderer';
diff --git a/packages/react-renderer-demo/src/helpers/generic-mui-component.js b/packages/react-renderer-demo/src/helpers/generic-mui-component.js
index e8b4bb2c6..9da131d03 100644
--- a/packages/react-renderer-demo/src/helpers/generic-mui-component.js
+++ b/packages/react-renderer-demo/src/helpers/generic-mui-component.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import Typography from '@mui/material/Typography';
 
-import PropTypes from 'prop-types';
 import originalComponentLink from './original-component-link';
 
 const GenericMuiComponent = ({ activeMapper = 'mui', component }) => (
@@ -14,9 +13,4 @@ const GenericMuiComponent = ({ activeMapper = 'mui', component }) => (
   </Typography>
 );
 
-GenericMuiComponent.propTypes = {
-  activeMapper: PropTypes.string,
-  component: PropTypes.string,
-};
-
 export default GenericMuiComponent;
diff --git a/packages/react-renderer-demo/src/helpers/list-of-contents-select.js b/packages/react-renderer-demo/src/helpers/list-of-contents-select.js
index a8a26554b..ce97aa343 100644
--- a/packages/react-renderer-demo/src/helpers/list-of-contents-select.js
+++ b/packages/react-renderer-demo/src/helpers/list-of-contents-select.js
@@ -1,5 +1,4 @@
 import React, { useState, useRef } from 'react';
-import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import { useRouter } from 'next/router';
 
@@ -35,11 +34,6 @@ const Item = ({ text, setOpen }) => {
   );
 };
 
-Item.propTypes = {
-  text: PropTypes.string.isRequired,
-  setOpen: PropTypes.func.isRequired,
-};
-
 const Root = styled('div')(() => ({
   '& .button': {
     paddingRight: 0,
@@ -97,8 +91,4 @@ const ListOfContents = ({ found }) => {
   );
 };
 
-ListOfContents.propTypes = {
-  found: PropTypes.array,
-};
-
 export default ListOfContents;
diff --git a/packages/react-renderer-demo/src/helpers/list-of-contents.js b/packages/react-renderer-demo/src/helpers/list-of-contents.js
index 4eb9322bc..bc845702f 100644
--- a/packages/react-renderer-demo/src/helpers/list-of-contents.js
+++ b/packages/react-renderer-demo/src/helpers/list-of-contents.js
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
 import clsx from 'clsx';
-import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import List from '@mui/material/List';
 import ListItem from '@mui/material/ListItem';
@@ -46,10 +45,6 @@ const ListHeader = ({ text }) => {
   );
 };
 
-ListHeader.propTypes = {
-  text: PropTypes.string.isRequired,
-};
-
 const StyledStickyBox = styled(StickyBox)(({ theme }) => ({
   '& .fixedContainer': {
     paddingLeft: 16,
@@ -139,8 +134,4 @@ const ListOfContents = ({ found = [] }) => {
   );
 };
 
-ListOfContents.propTypes = {
-  found: PropTypes.array,
-};
-
 export default ListOfContents;
diff --git a/packages/react-renderer-demo/src/next.config.mjs b/packages/react-renderer-demo/src/next.config.mjs
index d092c0ecc..68536770f 100644
--- a/packages/react-renderer-demo/src/next.config.mjs
+++ b/packages/react-renderer-demo/src/next.config.mjs
@@ -14,7 +14,6 @@ export default withBundleAnalyzer({
   crossOrigin: 'anonymous',
   pageExtensions: ['js', 'jsx', 'md', 'mdx'],
   distDir: '../dist',
-  swcMinify: true,
   webpack: (config, options) => {
     config.module.rules.push({
       test: /\.mdx?$/,
diff --git a/packages/react-renderer-demo/src/pages/_app.js b/packages/react-renderer-demo/src/pages/_app.js
index 48cd278f6..a3df04343 100644
--- a/packages/react-renderer-demo/src/pages/_app.js
+++ b/packages/react-renderer-demo/src/pages/_app.js
@@ -1,31 +1,25 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
 import Head from 'next/head';
 import { ThemeProvider } from '@mui/material/styles';
 import CssBaseline from '@mui/material/CssBaseline';
-import { CacheProvider } from '@emotion/react';
 import Layout from '@docs/components/layout';
 import { MDXProvider } from '@mdx-js/react';
 import MdxComponents from '@docs/components/mdx/mdx-components';
+import { AppCacheProvider } from '@mui/material-nextjs/v15-pagesRouter';
 
 import CookieModal from '../components/cookie-modal';
 import theme from '../theme';
-import createEmotionCache from '../utils/create-emotion-cache';
-
-// Client-side cache, shared for the whole session of the user in the browser.
-const clientSideEmotionCache = createEmotionCache();
 
 export default function App(props) {
-  const { Component, emotionCache = clientSideEmotionCache, pageProps } = props;
+  const { Component, pageProps } = props;
 
   return (
-    <CacheProvider value={emotionCache}>
+    <AppCacheProvider {...props}>
       <Head>
         <title>Data driven forms</title>
         <meta name="viewport" content="initial-scale=1, width=device-width" />
       </Head>
       <ThemeProvider theme={theme}>
-        {/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
         <CssBaseline />
         <MDXProvider components={MdxComponents}>
           <Layout>
@@ -34,12 +28,6 @@ export default function App(props) {
         </MDXProvider>
         <CookieModal />
       </ThemeProvider>
-    </CacheProvider>
+    </AppCacheProvider>
   );
 }
-
-App.propTypes = {
-  Component: PropTypes.elementType.isRequired,
-  emotionCache: PropTypes.object,
-  pageProps: PropTypes.object.isRequired,
-};
diff --git a/packages/react-renderer-demo/src/pages/_document.js b/packages/react-renderer-demo/src/pages/_document.js
index 6f12c06ca..8c9a9d1d2 100644
--- a/packages/react-renderer-demo/src/pages/_document.js
+++ b/packages/react-renderer-demo/src/pages/_document.js
@@ -1,84 +1,27 @@
 import * as React from 'react';
-import Document, { Html, Head, Main, NextScript } from 'next/document';
-import createEmotionServer from '@emotion/server/create-instance';
+import { Html, Head, Main, NextScript } from 'next/document';
 import theme, { roboto } from '../theme';
-import createEmotionCache from '../utils/create-emotion-cache';
+import { DocumentHeadTags, documentGetInitialProps } from '@mui/material-nextjs/v15-pagesRouter';
 
-export default class MyDocument extends Document {
-  render() {
-    return (
-      <Html lang="en" className={roboto.className}>
-        <Head>
-          {/* PWA primary color */}
-          <meta name="theme-color" content={theme.palette.primary.main} />
-          <link rel="shortcut icon" href="/favicon.ico" />
-          <meta name="emotion-insertion-point" content="" />
-          {this.props.emotionStyleTags}
-        </Head>
-        <body>
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    );
-  }
+export default function MyDocument(props) {
+  return (
+    <Html lang="en" className={roboto.className}>
+      <Head>
+        {/* PWA primary color */}
+        <meta name="theme-color" content={theme.palette.primary.main} />
+        <link rel="shortcut icon" href="/favicon.ico" />
+        <meta name="emotion-insertion-point" content="" />
+        <DocumentHeadTags {...props} />
+      </Head>
+      <body>
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
+  );
 }
 
-// `getInitialProps` belongs to `_document` (instead of `_app`),
-// it's compatible with static-site generation (SSG).
 MyDocument.getInitialProps = async (ctx) => {
-  // Resolution order
-  //
-  // On the server:
-  // 1. app.getInitialProps
-  // 2. page.getInitialProps
-  // 3. document.getInitialProps
-  // 4. app.render
-  // 5. page.render
-  // 6. document.render
-  //
-  // On the server with error:
-  // 1. document.getInitialProps
-  // 2. app.render
-  // 3. page.render
-  // 4. document.render
-  //
-  // On the client
-  // 1. app.getInitialProps
-  // 2. page.getInitialProps
-  // 3. app.render
-  // 4. page.render
-
-  const originalRenderPage = ctx.renderPage;
-
-  // You can consider sharing the same Emotion cache between all the SSR requests to speed up performance.
-  // However, be aware that it can have global side effects.
-  const cache = createEmotionCache();
-  const { extractCriticalToChunks } = createEmotionServer(cache);
-
-  ctx.renderPage = () =>
-    originalRenderPage({
-      enhanceApp: (App) =>
-        function EnhanceApp(props) {
-          return <App emotionCache={cache} {...props} />;
-        },
-    });
-
-  const initialProps = await Document.getInitialProps(ctx);
-  // This is important. It prevents Emotion to render invalid HTML.
-  // See https://github.com/mui/material-ui/issues/26561#issuecomment-855286153
-  const emotionStyles = extractCriticalToChunks(initialProps.html);
-  const emotionStyleTags = emotionStyles.styles.map((style) => (
-    <style
-      data-emotion={`${style.key} ${style.ids.join(' ')}`}
-      key={style.key}
-      // eslint-disable-next-line react/no-danger
-      dangerouslySetInnerHTML={{ __html: style.css }}
-    />
-  ));
-
-  return {
-    ...initialProps,
-    emotionStyleTags,
-  };
+  const finalProps = await documentGetInitialProps(ctx);
+  return finalProps;
 };
diff --git a/packages/react-renderer-demo/src/theme.js b/packages/react-renderer-demo/src/theme.js
index 8de7807c3..fbfa8ec92 100644
--- a/packages/react-renderer-demo/src/theme.js
+++ b/packages/react-renderer-demo/src/theme.js
@@ -1,5 +1,5 @@
 import { createTheme } from '@mui/material/styles';
-import { Roboto } from '@next/font/google';
+import { Roboto } from 'next/font/google';
 
 // eslint-disable-next-line new-cap
 export const roboto = Roboto({
diff --git a/packages/suir-component-mapper/package.json b/packages/suir-component-mapper/package.json
index f733f176e..0b2de0987 100644
--- a/packages/suir-component-mapper/package.json
+++ b/packages/suir-component-mapper/package.json
@@ -6,6 +6,7 @@
   "module": "esm/index.js",
   "typings": "index.d.ts",
   "license": "Apache-2.0",
+  "private": true,
   "scripts": {
     "start": "webpack-dev-server --config ./config/webpack.config.js --open --hot",
     "build": "yarn build:cjs && yarn build:esm && yarn build:typings && yarn build:packages",
@@ -28,16 +29,15 @@
   },
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "*",
-    "react": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.2 || ^18.0.0",
-    "semantic-ui-react": "^2.0.3"
+    "react": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0",
+    "semantic-ui-react": "^2.1.5"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
     "classnames": "^2.2.6",
     "clsx": "^1.0.4",
     "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
     "react-jss": "^10.1.1"
   }
 }
diff --git a/packages/suir-component-mapper/src/checkbox/checkbox.js b/packages/suir-component-mapper/src/checkbox/checkbox.js
index 25e49f5dd..ec856430e 100644
--- a/packages/suir-component-mapper/src/checkbox/checkbox.js
+++ b/packages/suir-component-mapper/src/checkbox/checkbox.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormCheckbox } from 'semantic-ui-react';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
@@ -49,26 +48,6 @@ export const SingleCheckbox = (props) => {
   );
 };
 
-SingleCheckbox.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  description: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-};
-
 const Checkbox = ({ options, ...props }) => (options ? <MultipleChoiceList options={options} {...props} /> : <SingleCheckbox {...props} />);
 
-Checkbox.propTypes = {
-  options: PropTypes.array,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-};
-
 export default Checkbox;
diff --git a/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js b/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
index e6e30853b..5385671bc 100644
--- a/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
+++ b/packages/suir-component-mapper/src/checkbox/multiple-choice-list.js
@@ -1,6 +1,5 @@
 import React, { createContext, useContext } from 'react';
-import PropTypes from 'prop-types';
-import MultipleChoiceListCommon, { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
+import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
 import { FormCheckbox, Header, FormField } from 'semantic-ui-react';
 import { createUseStyles } from 'react-jss';
 import clsx from 'clsx';
@@ -38,11 +37,6 @@ const FinalCheckbox = ({ label, isDisabled: _isDisabled, ...rest }) => {
   return <FormCheckbox {...rest} {...props} disabled={isDisabled} label={label} />;
 };
 
-FinalCheckbox.propTypes = {
-  isDisabled: PropTypes.bool,
-  label: PropTypes.node,
-};
-
 const Wrapper = ({ label, isRequired, children, meta, validateOnMount, helperText }) => {
   const invalid = validationError(meta, validateOnMount);
   const classes = useStyles();
@@ -79,9 +73,6 @@ const Wrapper = ({ label, isRequired, children, meta, validateOnMount, helperTex
   );
 };
 
-Wrapper.propTypes = {
-  ...wrapperProps,
-};
 const MultipleChoiceList = ({
   FormFieldGridProps = {},
   FormFieldProps = {},
@@ -95,12 +86,4 @@ const MultipleChoiceList = ({
   </CheckboxContext.Provider>
 );
 
-MultipleChoiceList.propTypes = {
-  FormFieldGridProps: PropTypes.object,
-  FormFieldProps: PropTypes.object,
-  HeaderProps: PropTypes.object,
-  OptionsListProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-};
-
 export default MultipleChoiceList;
diff --git a/packages/suir-component-mapper/src/date-picker/date-picker.js b/packages/suir-component-mapper/src/date-picker/date-picker.js
index c36664222..78457269c 100644
--- a/packages/suir-component-mapper/src/date-picker/date-picker.js
+++ b/packages/suir-component-mapper/src/date-picker/date-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError, validationWarning } from '../helpers/helpers';
@@ -42,18 +41,4 @@ const DatePicker = (props) => {
   );
 };
 
-DatePicker.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-};
-
 export default DatePicker;
diff --git a/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js b/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
index b25b53381..24cdc16a6 100644
--- a/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
+++ b/packages/suir-component-mapper/src/dual-list-select/dual-list-select.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import DualListSelectCommon from '@data-driven-forms/common/dual-list-select';
 import { Button, Grid, GridColumn, Input, Segment, Header } from 'semantic-ui-react';
@@ -52,21 +51,6 @@ const List = ({
   );
 };
 
-List.propTypes = {
-  value: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      label: PropTypes.string.isRequired,
-    })
-  ),
-  optionClick: PropTypes.func.isRequired,
-  noOptionsTitle: PropTypes.node,
-  filterValue: PropTypes.string,
-  filterValueText: PropTypes.node,
-  selectedValues: PropTypes.array,
-  OptionProps: PropTypes.shape({ className: PropTypes.string, selectedClassName: PropTypes.string }),
-};
-
 const Toolbar = ({
   sortTitle,
   onFilter,
@@ -95,18 +79,6 @@ const Toolbar = ({
   </div>
 );
 
-Toolbar.propTypes = {
-  sortTitle: PropTypes.node,
-  onFilter: PropTypes.func.isRequired,
-  onSort: PropTypes.func.isRequired,
-  sortDirection: PropTypes.bool,
-  value: PropTypes.string,
-  placeholder: PropTypes.string,
-  id: PropTypes.string,
-  sortUpIcon: PropTypes.string,
-  sortDownIcon: PropTypes.string,
-};
-
 const useDualListStyles = createUseStyles({
   dualListButtons: {
     display: 'flex !important',
@@ -323,61 +295,6 @@ const DualList = ({
   );
 };
 
-DualList.propTypes = {
-  leftTitle: PropTypes.node,
-  rightTitle: PropTypes.node,
-  moveLeftTitle: PropTypes.node,
-  moveRightTitle: PropTypes.node,
-  allToLeft: PropTypes.bool,
-  allToRight: PropTypes.bool,
-  moveAllLeftTitle: PropTypes.node,
-  moveAllRightTitle: PropTypes.node,
-  label: PropTypes.node,
-  isRequired: PropTypes.bool,
-  helperText: PropTypes.node,
-  noValueTitle: PropTypes.node,
-  noOptionsTitle: PropTypes.node,
-  filterOptionsTitle: PropTypes.node,
-  filterValueTitle: PropTypes.node,
-  filterValueText: PropTypes.node,
-  filterOptionsText: PropTypes.node,
-  id: PropTypes.string,
-  input: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-  }),
-  meta: PropTypes.any,
-  state: PropTypes.object,
-  sortOptions: PropTypes.func,
-  filterOptions: PropTypes.func,
-  handleOptionsClick: PropTypes.func,
-  leftValues: PropTypes.array,
-  handleMoveRight: PropTypes.func,
-  handleMoveLeft: PropTypes.func,
-  handleClearLeftValues: PropTypes.func,
-  handleClearRightValues: PropTypes.func,
-  sortValues: PropTypes.func,
-  filterValues: PropTypes.func,
-  rightValues: PropTypes.array,
-  handleValuesClick: PropTypes.func,
-  validateOnMount: PropTypes.bool,
-  leftSortTitle: PropTypes.node,
-  rightSortTitle: PropTypes.node,
-  /** Sub components customization API */
-  OptionsListProps: PropTypes.object,
-  OptionProps: PropTypes.object,
-  LabelProps: PropTypes.shape({ error: PropTypes.object, className: PropTypes.string }),
-  ToolbarProps: PropTypes.object,
-  ButtonGridProps: PropTypes.shape({ className: PropTypes.string }),
-  RightButtonProps: PropTypes.object,
-  DoubleRightButtonProps: PropTypes.object,
-  LeftButtonProps: PropTypes.object,
-  DoubleLeftButtonProps: PropTypes.object,
-  OptionsHeaderProps: PropTypes.object,
-  ValuesHeaderProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-  FormFieldGridProps: PropTypes.object,
-};
-
 const DualListSelectWrapper = (props) => <DualListSelectCommon {...props} DualListSelect={DualList} />;
 
 export default DualListSelectWrapper;
diff --git a/packages/suir-component-mapper/src/field-array/field-array.js b/packages/suir-component-mapper/src/field-array/field-array.js
index 3a502b6b7..f02113e9b 100644
--- a/packages/suir-component-mapper/src/field-array/field-array.js
+++ b/packages/suir-component-mapper/src/field-array/field-array.js
@@ -1,5 +1,4 @@
 import React, { memo, useReducer } from 'react';
-import PropTypes from 'prop-types';
 import isEqual from 'lodash/isEqual';
 import { useFormApi, FieldArray } from '@data-driven-forms/react-form-renderer';
 
@@ -80,19 +79,6 @@ const ArrayItem = memo(
   ({ remove: _prevRemove, ...prev }, { remove: _nextRemove, ...next }) => isEqual(prev, next)
 );
 
-ArrayItem.propTypes = {
-  name: PropTypes.string,
-  fieldIndex: PropTypes.number.isRequired,
-  fields: PropTypes.arrayOf(PropTypes.object),
-  remove: PropTypes.func.isRequired,
-  length: PropTypes.number,
-  minItems: PropTypes.number,
-  removeLabel: PropTypes.node.isRequired,
-  RemoveButtonProps: PropTypes.object,
-  ArrayItemGridProps: PropTypes.object,
-  ArrayItemFieldsGridProps: PropTypes.object,
-};
-
 const defaultButtonLabels = {
   add: 'ADD',
   remove: 'REMOVE',
@@ -289,29 +275,4 @@ const DynamicArray = ({ ...props }) => {
   );
 };
 
-DynamicArray.propTypes = {
-  label: PropTypes.node,
-  description: PropTypes.node,
-  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
-  defaultItem: PropTypes.any,
-  minItems: PropTypes.number,
-  maxItems: PropTypes.number,
-  noItemsMessage: PropTypes.node,
-  buttonLabels: PropTypes.object,
-  /** Sub components customization API */
-  FieldArrayGridProps: PropTypes.object,
-  FieldArrayHeaderProps: PropTypes.object,
-  FieldArrayButtonGridProps: PropTypes.object,
-  ButtonGroupProps: PropTypes.object,
-  UndoButtonProps: PropTypes.object,
-  RedoButtonProps: PropTypes.object,
-  AddButtonProps: PropTypes.object,
-  DescriptionProps: PropTypes.object,
-  ArrayItemsGridProps: PropTypes.object,
-  NoItemsProps: PropTypes.object,
-  RemoveButtonProps: PropTypes.object,
-  ArrayItemGridProps: PropTypes.object,
-  ArrayItemFieldsGridProps: PropTypes.object,
-};
-
 export default DynamicArray;
diff --git a/packages/suir-component-mapper/src/form-field-grid/form-field-grid.js b/packages/suir-component-mapper/src/form-field-grid/form-field-grid.js
index 22f0d4dae..76160dfe4 100644
--- a/packages/suir-component-mapper/src/form-field-grid/form-field-grid.js
+++ b/packages/suir-component-mapper/src/form-field-grid/form-field-grid.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { createUseStyles } from 'react-jss';
 import clsx from 'clsx';
 import HelperText from '../helper-text/helper-text';
@@ -21,11 +20,4 @@ const FormFieldGrid = ({ className, children, helperText, HelperTextProps }) =>
   );
 };
 
-FormFieldGrid.propTypes = {
-  className: PropTypes.string,
-  children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
-  helperText: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
-  HelperTextProps: PropTypes.object,
-};
-
 export default FormFieldGrid;
diff --git a/packages/suir-component-mapper/src/form-template/form-template.js b/packages/suir-component-mapper/src/form-template/form-template.js
index 0b20c8026..75b580b65 100644
--- a/packages/suir-component-mapper/src/form-template/form-template.js
+++ b/packages/suir-component-mapper/src/form-template/form-template.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Button as SuirButton, Header } from 'semantic-ui-react';
 
 import FormTemplate from '@data-driven-forms/common/form-template';
@@ -10,45 +9,22 @@ const Form = ({ children, ...props }) => (
   </form>
 );
 
-Form.propTypes = {
-  children: PropTypes.node,
-};
-
 const Description = ({ children, ...props }) => <span {...props}>{children}</span>;
 
-Description.propTypes = {
-  children: PropTypes.node,
-};
-
 const Title = ({ children, ...props }) => (
   <Header as="h3" {...props}>
     {children}
   </Header>
 );
 
-Title.propTypes = {
-  children: PropTypes.node,
-};
-
 const ButtonGroup = ({ children, ...props }) => <div {...props}>{children}</div>;
 
-ButtonGroup.propTypes = {
-  children: PropTypes.node,
-};
-
 const Button = ({ label, children, buttonType, variant, ...props }) => (
   <SuirButton color={variant === 'primary' ? 'blue' : undefined} {...props}>
     {label || children}
   </SuirButton>
 );
 
-Button.propTypes = {
-  children: PropTypes.node,
-  label: PropTypes.node,
-  variant: PropTypes.string,
-  buttonType: PropTypes.string,
-};
-
 const MuiFormTemplate = (props) => (
   <FormTemplate FormWrapper={Form} Button={Button} ButtonGroup={ButtonGroup} Title={Title} Description={Description} {...props} />
 );
diff --git a/packages/suir-component-mapper/src/helper-text/helper-text.js b/packages/suir-component-mapper/src/helper-text/helper-text.js
index dc1b8dc7a..2e55a268c 100644
--- a/packages/suir-component-mapper/src/helper-text/helper-text.js
+++ b/packages/suir-component-mapper/src/helper-text/helper-text.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import clsx from 'clsx';
-import PropTypes from 'prop-types';
 import { createUseStyles } from 'react-jss';
 
 const useStyles = createUseStyles({
@@ -18,9 +17,4 @@ const HelperText = ({ className, children }) => {
   );
 };
 
-HelperText.propTypes = {
-  className: PropTypes.string,
-  children: PropTypes.node,
-};
-
 export default HelperText;
diff --git a/packages/suir-component-mapper/src/plain-text/plain-text.js b/packages/suir-component-mapper/src/plain-text/plain-text.js
index 7c54e848b..4d7c22608 100644
--- a/packages/suir-component-mapper/src/plain-text/plain-text.js
+++ b/packages/suir-component-mapper/src/plain-text/plain-text.js
@@ -1,16 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import validTextFields from '@data-driven-forms/common/utils/valid-text-fields';
 
 const PlainText = ({ variant = 'p', label, name, ...rest }) =>
   typeof label === 'string'
     ? label.split('\n').map((paragraph, index) => React.createElement(variant, { key: `${name}-${index}`, ...rest }, paragraph))
     : { label };
 
-PlainText.propTypes = {
-  variant: PropTypes.oneOf(validTextFields),
-  label: PropTypes.node.isRequired,
-  name: PropTypes.string.isRequired,
-};
-
 export default PlainText;
diff --git a/packages/suir-component-mapper/src/radio/radio.js b/packages/suir-component-mapper/src/radio/radio.js
index 5c3a2914b..4469075a0 100644
--- a/packages/suir-component-mapper/src/radio/radio.js
+++ b/packages/suir-component-mapper/src/radio/radio.js
@@ -1,7 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormRadio, FormField } from 'semantic-ui-react';
-import { wrapperProps } from '@data-driven-forms/common/multiple-choice-list';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError, validationWarning } from '../helpers/helpers';
@@ -22,13 +20,6 @@ const RadioOption = ({ name, option, isDisabled, isReadOnly, ...props }) => {
   );
 };
 
-RadioOption.propTypes = {
-  name: PropTypes.string.isRequired,
-  option: PropTypes.shape({ label: PropTypes.node.isRequired, value: PropTypes.any.isRequired }).isRequired,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-};
-
 const Radio = ({ name, ...props }) => {
   const {
     options = [],
@@ -66,22 +57,4 @@ const Radio = ({ name, ...props }) => {
   );
 };
 
-Radio.propTypes = {
-  ...wrapperProps,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.any,
-      label: PropTypes.node,
-    })
-  ),
-  label: PropTypes.node.isRequired,
-  isDisabled: PropTypes.bool,
-  children: PropTypes.any,
-  description: PropTypes.node,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  FormFieldProps: PropTypes.object,
-  HelperTextProps: PropTypes.object,
-};
-
 export default Radio;
diff --git a/packages/suir-component-mapper/src/select/select.js b/packages/suir-component-mapper/src/select/select.js
index 5f6c2bc1e..4c1c8adaf 100644
--- a/packages/suir-component-mapper/src/select/select.js
+++ b/packages/suir-component-mapper/src/select/select.js
@@ -1,11 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import CommonSelect from '@data-driven-forms/common/select';
 import parseInternalValue from '@data-driven-forms/common/select/parse-internal-value';
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError, validationWarning } from '../helpers/helpers';
-import { meta, input } from '@data-driven-forms/common/prop-types-templates';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import { Dropdown } from 'semantic-ui-react';
 import FormField from '../form-field/form-field';
@@ -76,34 +74,6 @@ const SuirSelect = ({
   );
 };
 
-SuirSelect.propTypes = {
-  input,
-  meta,
-  placeholder: PropTypes.node,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  isSearchable: PropTypes.bool,
-  options: PropTypes.arrayOf(PropTypes.shape({ value: PropTypes.any.isRequired, label: PropTypes.node.isRequired })),
-  description: PropTypes.node,
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-  value: PropTypes.any,
-  isMulti: PropTypes.bool,
-  isClearable: PropTypes.bool,
-  noOptionsMessage: PropTypes.func,
-  isRequired: PropTypes.bool,
-  classNamePrefix: PropTypes.string,
-  onInputChange: PropTypes.func,
-  isFetching: PropTypes.bool,
-  hideSelectedOptions: PropTypes.bool,
-  closeMenuOnSelect: PropTypes.bool,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelpertextProps: PropTypes.object,
-};
-
 const Select = (props) => {
   const { input, ...formProps } = useFieldApi(props);
   return <CommonSelect simpleValue {...input} {...formProps} SelectComponent={SuirSelect} />;
diff --git a/packages/suir-component-mapper/src/sub-form/sub-form.js b/packages/suir-component-mapper/src/sub-form/sub-form.js
index 05d8ca95e..662db7a4d 100644
--- a/packages/suir-component-mapper/src/sub-form/sub-form.js
+++ b/packages/suir-component-mapper/src/sub-form/sub-form.js
@@ -1,5 +1,4 @@
 import React, { createElement } from 'react';
-import PropTypes from 'prop-types';
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 import { Header } from 'semantic-ui-react';
 
@@ -24,14 +23,4 @@ const SubForm = ({
   );
 };
 
-SubForm.propTypes = {
-  fields: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
-  title: PropTypes.node,
-  description: PropTypes.node,
-  component: PropTypes.any,
-  HeaderProps: PropTypes.object,
-  DescriptionProps: PropTypes.shape({ element: PropTypes.string.isRequired }),
-  FormFieldsGridProps: PropTypes.shape({ element: PropTypes.string.isRequired }),
-};
-
 export default SubForm;
diff --git a/packages/suir-component-mapper/src/switch/switch.js b/packages/suir-component-mapper/src/switch/switch.js
index 1bf90e9f1..bfacf6d9a 100644
--- a/packages/suir-component-mapper/src/switch/switch.js
+++ b/packages/suir-component-mapper/src/switch/switch.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormCheckbox } from 'semantic-ui-react';
 import { useFieldApi } from '@data-driven-forms/react-form-renderer';
 import FormFieldGrid from '../form-field-grid/form-field-grid';
@@ -72,19 +71,4 @@ export const Switch = (props) => {
   );
 };
 
-Switch.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  onText: PropTypes.node,
-  offText: PropTypes.node,
-  description: PropTypes.node,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelpertextProps: PropTypes.object,
-};
-
 export default Switch;
diff --git a/packages/suir-component-mapper/src/tabs/tabs.js b/packages/suir-component-mapper/src/tabs/tabs.js
index 91a0efbc8..121d7f4ca 100644
--- a/packages/suir-component-mapper/src/tabs/tabs.js
+++ b/packages/suir-component-mapper/src/tabs/tabs.js
@@ -1,17 +1,10 @@
 import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
 import { Tab, TabPane } from 'semantic-ui-react';
 
 import { useFormApi } from '@data-driven-forms/react-form-renderer';
 
 const TabContent = ({ name, fields, formOptions }) => <Fragment key={name}>{formOptions.renderForm(fields, formOptions)}</Fragment>;
 
-TabContent.propTypes = {
-  name: PropTypes.string.isRequired,
-  fields: PropTypes.array.isRequired,
-  formOptions: PropTypes.shape({ renderForm: PropTypes.func.isRequired }).isRequired,
-};
-
 const FormTabs = ({ fields, TabProps = {}, TabPaneProps = {} }) => {
   const formOptions = useFormApi();
 
@@ -26,10 +19,4 @@ const FormTabs = ({ fields, TabProps = {}, TabPaneProps = {} }) => {
   return <Tab renderActiveOnly={false} {...TabProps} panes={panes} />;
 };
 
-FormTabs.propTypes = {
-  fields: PropTypes.array.isRequired,
-  TabProps: PropTypes.object,
-  TabPaneProps: PropTypes.object,
-};
-
 export default FormTabs;
diff --git a/packages/suir-component-mapper/src/text-field/text-field.js b/packages/suir-component-mapper/src/text-field/text-field.js
index 5d70c176a..052c757e3 100644
--- a/packages/suir-component-mapper/src/text-field/text-field.js
+++ b/packages/suir-component-mapper/src/text-field/text-field.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Input } from 'semantic-ui-react';
 
 import { validationError, validationWarning } from '../helpers/helpers';
@@ -45,17 +44,4 @@ const TextField = (props) => {
   );
 };
 
-TextField.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  /** Sub component customization */
-  FormFieldGridProps: PropTypes.object,
-  HelpertextProps: PropTypes.object,
-};
-
 export default TextField;
diff --git a/packages/suir-component-mapper/src/textarea/textarea.js b/packages/suir-component-mapper/src/textarea/textarea.js
index ed773e7ee..41c9ce34b 100644
--- a/packages/suir-component-mapper/src/textarea/textarea.js
+++ b/packages/suir-component-mapper/src/textarea/textarea.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { FormTextArea } from 'semantic-ui-react';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
@@ -37,18 +36,4 @@ const Textarea = (props) => {
   );
 };
 
-Textarea.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  description: PropTypes.node,
-  /** Sub components customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelpertextProps: PropTypes.object,
-};
-
 export default Textarea;
diff --git a/packages/suir-component-mapper/src/time-picker/time-picker.js b/packages/suir-component-mapper/src/time-picker/time-picker.js
index 9dfc277b5..c645be81d 100644
--- a/packages/suir-component-mapper/src/time-picker/time-picker.js
+++ b/packages/suir-component-mapper/src/time-picker/time-picker.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import FormFieldGrid from '../form-field-grid/form-field-grid';
 import { validationError, validationWarning } from '../helpers/helpers';
@@ -41,19 +40,4 @@ const TimePicker = (props) => {
   );
 };
 
-TimePicker.propTypes = {
-  isReadOnly: PropTypes.bool,
-  isDisabled: PropTypes.bool,
-  placeholder: PropTypes.node,
-  isRequired: PropTypes.bool,
-  label: PropTypes.node,
-  helperText: PropTypes.node,
-  validateOnMount: PropTypes.bool,
-  locale: PropTypes.string,
-  description: PropTypes.node,
-  /** Sub component customization API */
-  FormFieldGridProps: PropTypes.object,
-  HelpertextProps: PropTypes.object,
-};
-
 export default TimePicker;
diff --git a/packages/suir-component-mapper/src/wizard/step-buttons.js b/packages/suir-component-mapper/src/wizard/step-buttons.js
index 99f6167ae..adf399e7c 100644
--- a/packages/suir-component-mapper/src/wizard/step-buttons.js
+++ b/packages/suir-component-mapper/src/wizard/step-buttons.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { createUseStyles } from 'react-jss';
 
 import selectNext from '@data-driven-forms/common/wizard/select-next';
@@ -29,17 +28,6 @@ const NextButton = ({ nextStep, valid, handleNext, nextLabel, getState, handleSu
   );
 };
 
-NextButton.propTypes = {
-  nextStep: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.object]),
-  handleSubmit: PropTypes.func.isRequired,
-  submitLabel: PropTypes.node.isRequired,
-  valid: PropTypes.bool,
-  handleNext: PropTypes.func.isRequired,
-  nextLabel: PropTypes.node.isRequired,
-  getState: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-};
-
 const WizardStepButtons = ({ conditionalSubmitFlag, buttons: Buttons, ...props }) => {
   const classes = useStyles();
   if (Buttons) {
@@ -79,30 +67,4 @@ const WizardStepButtons = ({ conditionalSubmitFlag, buttons: Buttons, ...props }
   );
 };
 
-WizardStepButtons.propTypes = {
-  disableBack: PropTypes.bool,
-  handlePrev: PropTypes.func.isRequired,
-  handleNext: PropTypes.func.isRequired,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-  nextStep: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.shape({
-      when: PropTypes.string.isRequired,
-      stepMapper: PropTypes.object.isRequired,
-    }),
-    PropTypes.func,
-  ]),
-  buttonLabels: PropTypes.shape({
-    submit: PropTypes.node.isRequired,
-    cancel: PropTypes.node.isRequired,
-    back: PropTypes.node.isRequired,
-    next: PropTypes.node.isRequired,
-  }).isRequired,
-  buttons: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  formOptions: PropTypes.shape({
-    getState: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
-  }),
-};
-
 export default WizardStepButtons;
diff --git a/packages/suir-component-mapper/src/wizard/wizard-nav.js b/packages/suir-component-mapper/src/wizard/wizard-nav.js
index 9921146e1..e122b90f4 100644
--- a/packages/suir-component-mapper/src/wizard/wizard-nav.js
+++ b/packages/suir-component-mapper/src/wizard/wizard-nav.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Step, Icon } from 'semantic-ui-react';
 
 const WizardNav = ({ stepsInfo, activeStepIndex }) => {
@@ -18,16 +17,4 @@ const WizardNav = ({ stepsInfo, activeStepIndex }) => {
   );
 };
 
-WizardNav.propTypes = {
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-      label: PropTypes.node,
-      StepLabelProps: PropTypes.object,
-      StepProps: PropTypes.object,
-    })
-  ),
-  activeStepIndex: PropTypes.number,
-};
-
 export default WizardNav;
diff --git a/packages/suir-component-mapper/src/wizard/wizard.js b/packages/suir-component-mapper/src/wizard/wizard.js
index e11eae0a7..d5235fca2 100644
--- a/packages/suir-component-mapper/src/wizard/wizard.js
+++ b/packages/suir-component-mapper/src/wizard/wizard.js
@@ -1,5 +1,4 @@
 import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
 import { WizardContext } from '@data-driven-forms/react-form-renderer';
 import Wizard from '@data-driven-forms/common/wizard/wizard';
 import WizardNav from './wizard-nav';
@@ -35,19 +34,6 @@ const WizardInternal = ({ buttonLabels, stepsInfo, conditionalSubmitFlag }) => {
   );
 };
 
-WizardInternal.propTypes = {
-  buttonLabels: PropTypes.object,
-  conditionalSubmitFlag: PropTypes.string.isRequired,
-  stepsInfo: PropTypes.arrayOf(
-    PropTypes.shape({
-      title: PropTypes.node,
-      label: PropTypes.node,
-      StepLabelProps: PropTypes.object,
-      StepProps: PropTypes.object,
-    })
-  ),
-};
-
 const SuirWizard = (props) => <Wizard Wizard={WizardInternal} {...props} />;
 
 export default SuirWizard;
diff --git a/templates/component-mapper/package.json b/templates/component-mapper/package.json
index 6020ca9a6..8d610d946 100644
--- a/templates/component-mapper/package.json
+++ b/templates/component-mapper/package.json
@@ -30,9 +30,8 @@
   },
   "peerDependencies": {
     "@data-driven-forms/react-form-renderer": "*",
-    "prop-types": "^15.7.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
   },
   "dependencies": {
     "@data-driven-forms/common": "*",
diff --git a/yarn.lock b/yarn.lock
index 9f3a84542..6530e292a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1304,6 +1304,11 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.27.0":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.1.tgz#9fce313d12c9a77507f264de74626e87fd0dc541"
+  integrity sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==
+
 "@babel/template@^7.16.7", "@babel/template@^7.3.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
@@ -1564,6 +1569,11 @@
     tar "^2.2.2"
     tar-stream "^2.1.4"
 
+"@discoveryjs/json-ext@0.5.7":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
@@ -1584,6 +1594,13 @@
     "@docsearch/css" "3.2.1"
     algoliasearch "^4.0.0"
 
+"@emnapi/runtime@^1.4.0":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.3.tgz#c0564665c80dc81c448adac23f9dfbed6c838f7d"
+  integrity sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emotion/babel-plugin@^11.10.0":
   version "11.10.2"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz#879db80ba622b3f6076917a1e6f648b1c7d008c7"
@@ -1613,6 +1630,17 @@
     "@emotion/weak-memoize" "^0.3.0"
     stylis "4.0.13"
 
+"@emotion/cache@^11.14.0":
+  version "11.14.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76"
+  integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/sheet" "^1.4.0"
+    "@emotion/utils" "^1.4.2"
+    "@emotion/weak-memoize" "^0.4.0"
+    stylis "4.2.0"
+
 "@emotion/hash@^0.7.1":
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz#f14932887422c9056b15a8d222a9074a7dfa2831"
@@ -1647,6 +1675,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
   integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
 
+"@emotion/memoize@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102"
+  integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
+
 "@emotion/react@^11.10.4":
   version "11.10.4"
   resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.4.tgz#9dc6bccbda5d70ff68fdb204746c0e8b13a79199"
@@ -1672,12 +1705,12 @@
     "@emotion/utils" "^1.2.0"
     csstype "^3.0.2"
 
-"@emotion/server@^11.10.0":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@emotion/server/-/server-11.10.0.tgz#3edc075b672c75426f682d56aadc6404fb1f6648"
-  integrity sha512-MTvJ21JPo9aS02GdjFW4nhdwOi2tNNpMmAM/YED0pkxzjDNi5WbiTwXqaCnvLc2Lr8NFtjhT0az1vTJyLIHYcw==
+"@emotion/server@^11.11.0":
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/@emotion/server/-/server-11.11.0.tgz#35537176a2a5ed8aed7801f254828e636ec3bd6e"
+  integrity sha512-6q89fj2z8VBTx9w93kJ5n51hsmtYuFPtZgnc1L8VzRx9ti4EU6EyvF6Nn1H1x3vcCQCF7u2dB2lY4AYJwUW4PA==
   dependencies:
-    "@emotion/utils" "^1.2.0"
+    "@emotion/utils" "^1.2.1"
     html-tokenize "^2.0.0"
     multipipe "^1.0.2"
     through "^2.3.8"
@@ -1687,6 +1720,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.0.tgz#771b1987855839e214fc1741bde43089397f7be5"
   integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==
 
+"@emotion/sheet@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c"
+  integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
+
 "@emotion/styled@^11.10.4":
   version "11.10.4"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.4.tgz#e93f84a4d54003c2acbde178c3f97b421fce1cd4"
@@ -1714,11 +1752,21 @@
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
   integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
 
+"@emotion/utils@^1.2.1", "@emotion/utils@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.2.tgz#6df6c45881fcb1c412d6688a311a98b7f59c1b52"
+  integrity sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==
+
 "@emotion/weak-memoize@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
   integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
 
+"@emotion/weak-memoize@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6"
+  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -1892,6 +1940,124 @@
     update-notifier "^2.2.0"
     yargs "^8.0.2"
 
+"@img/sharp-darwin-arm64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.1.tgz#e79a4756bea9a06a7aadb4391ee53cb154a4968c"
+  integrity sha512-pn44xgBtgpEbZsu+lWf2KNb6OAf70X68k+yk69Ic2Xz11zHR/w24/U49XT7AeRwJ0Px+mhALhU5LPci1Aymk7A==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-arm64" "1.1.0"
+
+"@img/sharp-darwin-x64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.1.tgz#f1f1d386719f6933796415d84937502b7199a744"
+  integrity sha512-VfuYgG2r8BpYiOUN+BfYeFo69nP/MIwAtSJ7/Zpxc5QF3KS22z8Pvg3FkrSFJBPNQ7mmcUcYQFBmEQp7eu1F8Q==
+  optionalDependencies:
+    "@img/sharp-libvips-darwin-x64" "1.1.0"
+
+"@img/sharp-libvips-darwin-arm64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz#843f7c09c7245dc0d3cfec2b3c83bb08799a704f"
+  integrity sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==
+
+"@img/sharp-libvips-darwin-x64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz#1239c24426c06a8e833815562f78047a3bfbaaf8"
+  integrity sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==
+
+"@img/sharp-libvips-linux-arm64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz#20d276cefd903ee483f0441ba35961679c286315"
+  integrity sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==
+
+"@img/sharp-libvips-linux-arm@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz#067c0b566eae8063738cf1b1db8f8a8573b5465c"
+  integrity sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==
+
+"@img/sharp-libvips-linux-ppc64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz#682334595f2ca00e0a07a675ba170af165162802"
+  integrity sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==
+
+"@img/sharp-libvips-linux-s390x@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz#82fcd68444b3666384235279c145c2b28d8ee302"
+  integrity sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==
+
+"@img/sharp-libvips-linux-x64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.1.0.tgz#65b2b908bf47156b0724fde9095676c83a18cf5a"
+  integrity sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==
+
+"@img/sharp-libvips-linuxmusl-arm64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz#72accf924e80b081c8db83b900b444a67c203f01"
+  integrity sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==
+
+"@img/sharp-libvips-linuxmusl-x64@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz#1fa052737e203f46bf44192acd01f9faf11522d7"
+  integrity sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==
+
+"@img/sharp-linux-arm64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.1.tgz#c36ef964499b8cfc2d2ed88fe68f27ce41522c80"
+  integrity sha512-kX2c+vbvaXC6vly1RDf/IWNXxrlxLNpBVWkdpRq5Ka7OOKj6nr66etKy2IENf6FtOgklkg9ZdGpEu9kwdlcwOQ==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm64" "1.1.0"
+
+"@img/sharp-linux-arm@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.1.tgz#c96e38ff028d645912bb0aa132a7178b96997866"
+  integrity sha512-anKiszvACti2sGy9CirTlNyk7BjjZPiML1jt2ZkTdcvpLU1YH6CXwRAZCA2UmRXnhiIftXQ7+Oh62Ji25W72jA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm" "1.1.0"
+
+"@img/sharp-linux-s390x@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.1.tgz#8ac58d9a49dcb08215e76c8d450717979b7815c3"
+  integrity sha512-7s0KX2tI9mZI2buRipKIw2X1ufdTeaRgwmRabt5bi9chYfhur+/C1OXg3TKg/eag1W+6CCWLVmSauV1owmRPxA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-s390x" "1.1.0"
+
+"@img/sharp-linux-x64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.1.tgz#3d8652efac635f0dba39d5e3b8b49515a2b2dee1"
+  integrity sha512-wExv7SH9nmoBW3Wr2gvQopX1k8q2g5V5Iag8Zk6AVENsjwd+3adjwxtp3Dcu2QhOXr8W9NusBU6XcQUohBZ5MA==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-x64" "1.1.0"
+
+"@img/sharp-linuxmusl-arm64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.1.tgz#b267e6a3e06f9e4d345cde471e5480c5c39e6969"
+  integrity sha512-DfvyxzHxw4WGdPiTF0SOHnm11Xv4aQexvqhRDAoD00MzHekAj9a/jADXeXYCDFH/DzYruwHbXU7uz+H+nWmSOQ==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-arm64" "1.1.0"
+
+"@img/sharp-linuxmusl-x64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.1.tgz#a8dee4b6227f348c4bbacaa6ac3dc584a1a80391"
+  integrity sha512-pax/kTR407vNb9qaSIiWVnQplPcGU8LRIJpDT5o8PdAx5aAA7AS3X9PS8Isw1/WfqgQorPotjrZL3Pqh6C5EBg==
+  optionalDependencies:
+    "@img/sharp-libvips-linuxmusl-x64" "1.1.0"
+
+"@img/sharp-wasm32@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.1.tgz#f7dfd66b6c231269042d3d8750c90f28b9ddcba1"
+  integrity sha512-YDybQnYrLQfEpzGOQe7OKcyLUCML4YOXl428gOOzBgN6Gw0rv8dpsJ7PqTHxBnXnwXr8S1mYFSLSa727tpz0xg==
+  dependencies:
+    "@emnapi/runtime" "^1.4.0"
+
+"@img/sharp-win32-ia32@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.1.tgz#4bc293705df76a5f0a02df66ca3dc12e88f61332"
+  integrity sha512-WKf/NAZITnonBf3U1LfdjoMgNO5JYRSlhovhRhMxXVdvWYveM4kM3L8m35onYIdh75cOMCo1BexgVQcCDzyoWw==
+
+"@img/sharp-win32-x64@0.34.1":
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.1.tgz#8a7922fec949f037c204c79f6b83238d2482384b"
+  integrity sha512-hw1iIAHpNE8q3uMIRCgGOeDoz9KtFNarFLQclLxr/LK1VBkj8nby18RjFvr6aP7USRYAjTZW6yisnBWMX571Tw==
+
 "@isaacs/string-locale-compare@^1.0.1", "@isaacs/string-locale-compare@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
@@ -2945,6 +3111,13 @@
   dependencies:
     "@babel/runtime" "^7.18.9"
 
+"@mui/material-nextjs@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@mui/material-nextjs/-/material-nextjs-7.0.2.tgz#72c2d2f00479ed83619b9f5b4566896a600bf189"
+  integrity sha512-hjm0MFSjx7HWbORMRldbwfKrQPHTSMXD6dkCCSTQZ2XX8fkKlnOXNnoXUFzlzFtMKMzs9QOfe3dHooTvnDEfuQ==
+  dependencies:
+    "@babel/runtime" "^7.27.0"
+
 "@mui/material@^5.10.4":
   version "5.10.4"
   resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.4.tgz#a3a72f438614fe4319a6ee805542bb599fd6ec02"
@@ -3057,87 +3230,57 @@
     prop-types "^15.8.1"
     react-transition-group "^4.4.5"
 
-"@next/bundle-analyzer@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-13.1.1.tgz#f36108dcb953ea518253df5eb9e175642f78b04a"
-  integrity sha512-zxC/MOj7gDjvQffHT4QZqcPe1Ny+e6o3wethCZn3liSElMA+kxgEopbziTUXdrvJcd/porq+3Itc8P+gxE/xog==
-  dependencies:
-    webpack-bundle-analyzer "4.7.0"
-
-"@next/env@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.1.1.tgz#6ff26488dc7674ef2bfdd1ca28fe43eed1113bea"
-  integrity sha512-vFMyXtPjSAiOXOywMojxfKIqE3VWN5RCAx+tT3AS3pcKjMLFTCJFUWsKv8hC+87Z1F4W3r68qTwDFZIFmd5Xkw==
-
-"@next/font@^13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/font/-/font-13.1.1.tgz#a0cb38bf8a181560f195d82f13f9f92fd0b0dd20"
-  integrity sha512-amygRorS05hYK1/XQRZo5qBl7l2fpHnezeKU/cNveWU5QJg+sg8gMGkUXHtvesNKpiKIJshBRH1TzvO+2sKpvQ==
-
-"@next/swc-android-arm-eabi@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.1.tgz#b5c3cd1f79d5c7e6a3b3562785d4e5ac3555b9e1"
-  integrity sha512-qnFCx1kT3JTWhWve4VkeWuZiyjG0b5T6J2iWuin74lORCupdrNukxkq9Pm+Z7PsatxuwVJMhjUoYz7H4cWzx2A==
-
-"@next/swc-android-arm64@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.1.1.tgz#e2ca9ccbba9ef770cb19fbe96d1ac00fe4cb330d"
-  integrity sha512-eCiZhTzjySubNqUnNkQCjU3Fh+ep3C6b5DCM5FKzsTH/3Gr/4Y7EiaPZKILbvnXmhWtKPIdcY6Zjx51t4VeTfA==
-
-"@next/swc-darwin-arm64@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.1.tgz#4af00877332231bbd5a3703435fdd0b011e74767"
-  integrity sha512-9zRJSSIwER5tu9ADDkPw5rIZ+Np44HTXpYMr0rkM656IvssowPxmhK0rTreC1gpUCYwFsRbxarUJnJsTWiutPg==
-
-"@next/swc-darwin-x64@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.1.tgz#bf4cb09e7e6ec6d91e031118dde2dd17078bcbbc"
-  integrity sha512-qWr9qEn5nrnlhB0rtjSdR00RRZEtxg4EGvicIipqZWEyayPxhUu6NwKiG8wZiYZCLfJ5KWr66PGSNeDMGlNaiA==
-
-"@next/swc-freebsd-x64@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.1.tgz#6933ea1264328e8523e28818f912cd53824382d4"
-  integrity sha512-UwP4w/NcQ7V/VJEj3tGVszgb4pyUCt3lzJfUhjDMUmQbzG9LDvgiZgAGMYH6L21MoyAATJQPDGiAMWAPKsmumA==
-
-"@next/swc-linux-arm-gnueabihf@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.1.tgz#b5896967aaba3873d809c3ad2e2039e89acde419"
-  integrity sha512-CnsxmKHco9sosBs1XcvCXP845Db+Wx1G0qouV5+Gr+HT/ZlDYEWKoHVDgnJXLVEQzq4FmHddBNGbXvgqM1Gfkg==
-
-"@next/swc-linux-arm64-gnu@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.1.tgz#91b3e9ea8575b1ded421c0ea0739b7bccf228469"
-  integrity sha512-JfDq1eri5Dif+VDpTkONRd083780nsMCOKoFG87wA0sa4xL8LGcXIBAkUGIC1uVy9SMsr2scA9CySLD/i+Oqiw==
-
-"@next/swc-linux-arm64-musl@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.1.tgz#83149ea05d7d55f3664d608dbe004c0d125f9147"
-  integrity sha512-GA67ZbDq2AW0CY07zzGt07M5b5Yaq5qUpFIoW3UFfjOPgb0Sqf3DAW7GtFMK1sF4ROHsRDMGQ9rnT0VM2dVfKA==
-
-"@next/swc-linux-x64-gnu@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.1.tgz#d7d0777b56de0dd82b78055772e13e18594a15ca"
-  integrity sha512-nnjuBrbzvqaOJaV+XgT8/+lmXrSCOt1YYZn/irbDb2fR2QprL6Q7WJNgwsZNxiLSfLdv+2RJGGegBx9sLBEzGA==
-
-"@next/swc-linux-x64-musl@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.1.tgz#41655722b127133cd95ab5bc8ca1473e9ab6876f"
-  integrity sha512-CM9xnAQNIZ8zf/igbIT/i3xWbQZYaF397H+JroF5VMOCUleElaMdQLL5riJml8wUfPoN3dtfn2s4peSr3azz/g==
-
-"@next/swc-win32-arm64-msvc@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.1.tgz#f10da3dfc9b3c2bbd202f5d449a9b807af062292"
-  integrity sha512-pzUHOGrbgfGgPlOMx9xk3QdPJoRPU+om84hqVoe6u+E0RdwOG0Ho/2UxCgDqmvpUrMab1Deltlt6RqcXFpnigQ==
-
-"@next/swc-win32-ia32-msvc@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.1.tgz#4c0102b9b18ece15c818056d07e3917ee9dade78"
-  integrity sha512-WeX8kVS46aobM9a7Xr/kEPcrTyiwJqQv/tbw6nhJ4fH9xNZ+cEcyPoQkwPo570dCOLz3Zo9S2q0E6lJ/EAUOBg==
-
-"@next/swc-win32-x64-msvc@13.1.1":
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.1.tgz#c209a37da13be27b722f9c40c40ab4b094866244"
-  integrity sha512-mVF0/3/5QAc5EGVnb8ll31nNvf3BWpPY4pBb84tk+BfQglWLqc5AC9q1Ht/YMWiEgs8ALNKEQ3GQnbY0bJF2Gg==
+"@next/bundle-analyzer@^15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-15.3.1.tgz#7c5197743646fbb907dff38d20b7fa8d53f2d045"
+  integrity sha512-NqUZrjVruGbdQaPE3OSEXP+ZuULqumeHVTuU9pOX1V0/9BWY9FOck3jgQGFdBtG41nOYuO8+CoHKDQAVIPQJrw==
+  dependencies:
+    webpack-bundle-analyzer "4.10.1"
+
+"@next/env@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.3.1.tgz#fca98dcb90d92d555972cdbf03adf9aa982e2115"
+  integrity sha512-cwK27QdzrMblHSn9DZRV+DQscHXRuJv6MydlJRpFSqJWZrTYMLzKDeyueJNN9MGd8NNiUKzDQADAf+dMLXX7YQ==
+
+"@next/swc-darwin-arm64@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.1.tgz#8f9589aed9f6816687440aa36a86376b3a16af58"
+  integrity sha512-hjDw4f4/nla+6wysBL07z52Gs55Gttp5Bsk5/8AncQLJoisvTBP0pRIBK/B16/KqQyH+uN4Ww8KkcAqJODYH3w==
+
+"@next/swc-darwin-x64@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.1.tgz#2df013226d848394ed7307188c141f0e6da4ab3e"
+  integrity sha512-q+aw+cJ2ooVYdCEqZVk+T4Ni10jF6Fo5DfpEV51OupMaV5XL6pf3GCzrk6kSSZBsMKZtVC1Zm/xaNBFpA6bJ2g==
+
+"@next/swc-linux-arm64-gnu@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.1.tgz#d1c4e24b2b27c36a7ebc21ae0573e9e98f794143"
+  integrity sha512-wBQ+jGUI3N0QZyWmmvRHjXjTWFy8o+zPFLSOyAyGFI94oJi+kK/LIZFJXeykvgXUk1NLDAEFDZw/NVINhdk9FQ==
+
+"@next/swc-linux-arm64-musl@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.1.tgz#bce27533f9f046800f850a9c20832e8c15b10955"
+  integrity sha512-IIxXEXRti/AulO9lWRHiCpUUR8AR/ZYLPALgiIg/9ENzMzLn3l0NSxVdva7R/VDcuSEBo0eGVCe3evSIHNz0Hg==
+
+"@next/swc-linux-x64-gnu@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.1.tgz#f90558d93bc25e01b0b271725e291863286753c4"
+  integrity sha512-bfI4AMhySJbyXQIKH5rmLJ5/BP7bPwuxauTvVEiJ/ADoddaA9fgyNNCcsbu9SlqfHDoZmfI6g2EjzLwbsVTr5A==
+
+"@next/swc-linux-x64-musl@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.1.tgz#639f143bd0f3fd6e1bde4b383dc6cd8a8ff12628"
+  integrity sha512-FeAbR7FYMWR+Z+M5iSGytVryKHiAsc0x3Nc3J+FD5NVbD5Mqz7fTSy8CYliXinn7T26nDMbpExRUI/4ekTvoiA==
+
+"@next/swc-win32-arm64-msvc@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.1.tgz#52ee1e63b192fec8f0230caf839cfc308d0d44d1"
+  integrity sha512-yP7FueWjphQEPpJQ2oKmshk/ppOt+0/bB8JC8svPUZNy0Pi3KbPx2Llkzv1p8CoQa+D2wknINlJpHf3vtChVBw==
+
+"@next/swc-win32-x64-msvc@15.3.1":
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.1.tgz#df5ceb9c3b97bf0d61cb6e84f79bbf9e91a89d29"
+  integrity sha512-3PMvF2zRJAifcRNni9uMk/gulWfWS+qVI/pagd+4yLF5bcXPZPPH2xlYRYOsUjmCJOXSTAC2PjRzbhsRzR2fDQ==
 
 "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
   version "2.1.8-no-fsevents.3"
@@ -3596,10 +3739,10 @@
   resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.0.0.tgz#403e73d1febe561abd50887abaf0a09643c3a18f"
   integrity sha512-xd0ynDkiIW2rp8jz4TNvR4Dyaw9kSMkZdsuYcLlFXCVmvX//Mnl4rhBnid/2j2TaqK0NbkyTTPnPY/BU7SfLVQ==
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.29"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.29.tgz#5a40109a1ab5f84d6fd8fc928b19f367cbe7e7b1"
+  integrity sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==
 
 "@popperjs/core@^2.11.6":
   version "2.11.6"
@@ -3822,12 +3965,17 @@
   resolved "https://registry.yarnpkg.com/@stackblitz/sdk/-/sdk-1.5.3.tgz#b0f189d4b231d644bf34d125c79fae1ebe5ef1a5"
   integrity sha512-4fCa1YGdGXiWsCEsFQN+O6RP4JibmEMO58S9wzbFSko6lu1zLqkTBomRt1LCF7TImWeJaSSMDMqin58bey+N9Q==
 
-"@swc/helpers@0.4.14":
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.4.14.tgz#1352ac6d95e3617ccb7c1498ff019654f1e12a74"
-  integrity sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==
+"@swc/counter@0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
+  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
+
+"@swc/helpers@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7"
+  integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==
   dependencies:
-    tslib "^2.4.0"
+    tslib "^2.8.0"
 
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
@@ -4190,6 +4338,11 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.3.tgz#a3c65525b91fca7da00ab1a3ac2b5a2a4afbffbf"
   integrity sha512-QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w==
 
+"@types/prismjs@^1.26.0":
+  version "1.26.5"
+  resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.26.5.tgz#72499abbb4c4ec9982446509d2f14fb8483869d6"
+  integrity sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==
+
 "@types/prop-types@*":
   version "15.7.4"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
@@ -4210,13 +4363,18 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.6":
+"@types/react-dom@^18.0.0":
   version "18.0.6"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1"
   integrity sha512-/5OFZgfIPSwy+YuIBP/FgJnQnsxhZhjjrnxudMddeblOouIodEQ75X14Rr4wGSG/bknL+Omy9iWlLo1u/9GzAA==
   dependencies:
     "@types/react" "*"
 
+"@types/react-dom@^19.1.3":
+  version "19.1.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.3.tgz#3f0c60804441bf34d19f8dd0d44405c0c0e21bfa"
+  integrity sha512-rJXC08OG0h3W6wDMFxQrZF00Kq6qQvw0djHRdzl3U5DnIERz0MRce3WVc7IS6JYBwtaP/DwYtRRjVlvivNveKg==
+
 "@types/react-is@^16.7.1 || ^17.0.0":
   version "17.0.3"
   resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a"
@@ -4281,13 +4439,11 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@^18.0.18":
-  version "18.0.18"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.18.tgz#9f16f33d57bc5d9dca848d12c3572110ff9429ac"
-  integrity sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==
+"@types/react@^19.1.2":
+  version "19.1.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.2.tgz#11df86f66f188f212c90ecb537327ec68bfd593f"
+  integrity sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw==
   dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/responselike@*", "@types/responselike@^1.0.0":
@@ -5769,6 +5925,13 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
+busboy@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+  dependencies:
+    streamsearch "^1.1.0"
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
@@ -5995,10 +6158,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001406:
-  version "1.0.30001442"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz#40337f1cf3be7c637b061e2f78582dc1daec0614"
-  integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
+caniuse-lite@^1.0.30001579:
+  version "1.0.30001716"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001716.tgz#39220dfbc58c85d9d4519e7090b656aa11ca4b85"
+  integrity sha512-49/c1+x3Kwz7ZIWt+4DvK3aMJy9oYXXG6/97JKsnjdCk/6n9vVyWL8NAwVt95Lwt9eigI10Hl782kDfZUUlRXw==
 
 caniuse-lite@^1.0.30001646:
   version "1.0.30001655"
@@ -6588,6 +6751,14 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-string@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color-support@^1.1.2, color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
@@ -6601,6 +6772,14 @@ color@^3.1.3:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colorette@^2.0.10, colorette@^2.0.14:
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
@@ -7213,6 +7392,11 @@ dayjs@1.x:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
   integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
 
+debounce@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
+  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -7436,6 +7620,11 @@ detect-indent@^6.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
+detect-libc@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8"
+  integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==
+
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -9760,7 +9949,7 @@ html-entities@^2.3.2:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
   integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
-html-escaper@^2.0.0:
+html-escaper@^2.0.0, html-escaper@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
@@ -12441,7 +12630,7 @@ longest-streak@^3.0.0:
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
   integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -13434,11 +13623,16 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
+minimist@~1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -13631,10 +13825,10 @@ mri@^1.1.0:
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
   integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
-mrmime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b"
-  integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==
+mrmime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.1.tgz#bc3e87f7987853a54c9850eeb1f1078cd44adddc"
+  integrity sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==
 
 ms@2.0.0:
   version "2.0.0"
@@ -13708,10 +13902,10 @@ nanoid@^3.1.30:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
   integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -13760,30 +13954,28 @@ nerf-dart@^1.0.0:
   resolved "https://registry.yarnpkg.com/nerf-dart/-/nerf-dart-1.0.0.tgz#e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"
   integrity sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo=
 
-next@13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.1.1.tgz#42b825f650410649aff1017d203a088d77c80b5b"
-  integrity sha512-R5eBAaIa3X7LJeYvv1bMdGnAVF4fVToEjim7MkflceFPuANY3YyvFxXee/A+acrSYwYPvOvf7f6v/BM/48ea5w==
-  dependencies:
-    "@next/env" "13.1.1"
-    "@swc/helpers" "0.4.14"
-    caniuse-lite "^1.0.30001406"
-    postcss "8.4.14"
-    styled-jsx "5.1.1"
+next@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.3.1.tgz#69cf2c124e504db64e14fc75eb29bd64c0c787a7"
+  integrity sha512-8+dDV0xNLOgHlyBxP1GwHGVaNXsmp+2NhZEYrXr24GWLHtt27YrBPbPuHvzlhi7kZNYjeJNR93IF5zfFu5UL0g==
+  dependencies:
+    "@next/env" "15.3.1"
+    "@swc/counter" "0.1.3"
+    "@swc/helpers" "0.5.15"
+    busboy "1.6.0"
+    caniuse-lite "^1.0.30001579"
+    postcss "8.4.31"
+    styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-android-arm-eabi" "13.1.1"
-    "@next/swc-android-arm64" "13.1.1"
-    "@next/swc-darwin-arm64" "13.1.1"
-    "@next/swc-darwin-x64" "13.1.1"
-    "@next/swc-freebsd-x64" "13.1.1"
-    "@next/swc-linux-arm-gnueabihf" "13.1.1"
-    "@next/swc-linux-arm64-gnu" "13.1.1"
-    "@next/swc-linux-arm64-musl" "13.1.1"
-    "@next/swc-linux-x64-gnu" "13.1.1"
-    "@next/swc-linux-x64-musl" "13.1.1"
-    "@next/swc-win32-arm64-msvc" "13.1.1"
-    "@next/swc-win32-ia32-msvc" "13.1.1"
-    "@next/swc-win32-x64-msvc" "13.1.1"
+    "@next/swc-darwin-arm64" "15.3.1"
+    "@next/swc-darwin-x64" "15.3.1"
+    "@next/swc-linux-arm64-gnu" "15.3.1"
+    "@next/swc-linux-arm64-musl" "15.3.1"
+    "@next/swc-linux-x64-gnu" "15.3.1"
+    "@next/swc-linux-x64-musl" "15.3.1"
+    "@next/swc-win32-arm64-msvc" "15.3.1"
+    "@next/swc-win32-x64-msvc" "15.3.1"
+    sharp "^0.34.1"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -15479,12 +15671,12 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.14:
-  version "8.4.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
-  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+postcss@8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -15546,10 +15738,13 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.4.6:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-prism-react-renderer@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.1.tgz#392460acf63540960e5e3caa699d851264e99b89"
-  integrity sha512-w23ch4f75V1Tnz8DajsYKvY5lF7H1+WvzvLUcF0paFxkTHSp42RS0H5CttdN2Q8RR3DRGZ9v5xD/h3n8C8kGmg==
+prism-react-renderer@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-2.4.1.tgz#ac63b7f78e56c8f2b5e76e823a976d5ede77e35f"
+  integrity sha512-ey8Ls/+Di31eqzUxC46h8MksNuGx/n0AAC8uKpwFau4RPDYLuE3EXTp8N8G2vX2N7UC/+IXeNUnlWBGGcAG+Ig==
+  dependencies:
+    "@types/prismjs" "^1.26.0"
+    clsx "^2.0.0"
 
 proc-log@^1.0.0:
   version "1.0.0"
@@ -15629,7 +15824,7 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
-prop-types@>=15.7.2, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -16228,13 +16423,12 @@ react-display-name@^0.2.4:
   resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.5.tgz#304c7cbfb59ee40389d436e1a822c17fe27936c6"
   integrity sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg==
 
-react-dom@18.2.0, react-dom@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
-  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
+react-dom@^19.1.0:
+  version "19.1.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.0.tgz#133558deca37fa1d682708df8904b25186793623"
+  integrity sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==
   dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.0"
+    scheduler "^0.26.0"
 
 react-dropzone@^14.2.3:
   version "14.2.3"
@@ -16367,12 +16561,10 @@ react-transition-group@^4.4.5:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@18.2.0, react@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
-  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
-  dependencies:
-    loose-envify "^1.1.0"
+react@^19.1.0:
+  version "19.1.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75"
+  integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==
 
 read-cmd-shim@^1.0.1, read-cmd-shim@^1.0.5:
   version "1.0.5"
@@ -17089,12 +17281,10 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
-  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
-  dependencies:
-    loose-envify "^1.1.0"
+scheduler@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337"
+  integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==
 
 schema-utils@^2.6.5:
   version "2.7.1"
@@ -17237,6 +17427,11 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.7.1:
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
+  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
+
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -17361,6 +17556,36 @@ shallowequal@^1.1.0:
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
+sharp@^0.34.1:
+  version "0.34.1"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.1.tgz#e5922894b0cc7ddf159eeabc6d5668e4e8b11d61"
+  integrity sha512-1j0w61+eVxu7DawFJtnfYcvSv6qPFvfTaqzTQ2BLknVhHTwGS8sc63ZBF4rzkWMBVKybo4S5OBtDdZahh2A1xg==
+  dependencies:
+    color "^4.2.3"
+    detect-libc "^2.0.3"
+    semver "^7.7.1"
+  optionalDependencies:
+    "@img/sharp-darwin-arm64" "0.34.1"
+    "@img/sharp-darwin-x64" "0.34.1"
+    "@img/sharp-libvips-darwin-arm64" "1.1.0"
+    "@img/sharp-libvips-darwin-x64" "1.1.0"
+    "@img/sharp-libvips-linux-arm" "1.1.0"
+    "@img/sharp-libvips-linux-arm64" "1.1.0"
+    "@img/sharp-libvips-linux-ppc64" "1.1.0"
+    "@img/sharp-libvips-linux-s390x" "1.1.0"
+    "@img/sharp-libvips-linux-x64" "1.1.0"
+    "@img/sharp-libvips-linuxmusl-arm64" "1.1.0"
+    "@img/sharp-libvips-linuxmusl-x64" "1.1.0"
+    "@img/sharp-linux-arm" "0.34.1"
+    "@img/sharp-linux-arm64" "0.34.1"
+    "@img/sharp-linux-s390x" "0.34.1"
+    "@img/sharp-linux-x64" "0.34.1"
+    "@img/sharp-linuxmusl-arm64" "0.34.1"
+    "@img/sharp-linuxmusl-x64" "0.34.1"
+    "@img/sharp-wasm32" "0.34.1"
+    "@img/sharp-win32-ia32" "0.34.1"
+    "@img/sharp-win32-x64" "0.34.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -17442,14 +17667,14 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+sirv@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
+  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
   dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
+    totalist "^3.0.0"
 
 sisteransi@^1.0.5:
   version "1.0.5"
@@ -17904,6 +18129,11 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
+streamsearch@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -18117,10 +18347,10 @@ style-to-object@^0.3.0:
   dependencies:
     inline-style-parser "0.1.1"
 
-styled-jsx@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f"
-  integrity sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==
+styled-jsx@5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499"
+  integrity sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==
   dependencies:
     client-only "0.0.1"
 
@@ -18129,6 +18359,11 @@ stylis@4.0.13:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
   integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
 
+stylis@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
+  integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
+
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -18528,10 +18763,10 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+totalist@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
 tough-cookie@^4.0.0:
   version "4.0.0"
@@ -18651,7 +18886,7 @@ tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
-tslib@^2.7.0:
+tslib@^2.7.0, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -19317,19 +19552,23 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-bundle-analyzer@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz#33c1c485a7fcae8627c547b5c3328b46de733c66"
-  integrity sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==
+webpack-bundle-analyzer@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454"
+  integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==
   dependencies:
+    "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
     acorn-walk "^8.0.0"
-    chalk "^4.1.0"
     commander "^7.2.0"
+    debounce "^1.2.1"
+    escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
-    lodash "^4.17.20"
+    html-escaper "^2.0.2"
+    is-plain-object "^5.0.0"
     opener "^1.5.2"
-    sirv "^1.0.7"
+    picocolors "^1.0.0"
+    sirv "^2.0.3"
     ws "^7.3.1"
 
 webpack-cli@^4.9.1: