TASK: fix Build (use one version of react)

sitegeist · Jan 21, 2025 · 5585f7c · 5585f7c
1 parent 3d8ba51
commit 5585f7c
Show file tree

Hide file tree

Showing 7 changed files with 13,578 additions and 17,441 deletions.
diff --git a/Neos.Ui/core/package.json b/Neos.Ui/core/package.json
@@ -16,12 +16,9 @@
         "@sitegeist/archaeopteryx-neos-bridge": "^0.0.0",
         "final-form": "^4.20.2",
         "libphonenumber-js": "^1.9.52",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.2",
         "react-final-form": "^6.5.3",
         "react-use": "^17.2.4",
         "rxjs": "^6.6.7",
-        "styled-components": "^5.3.0",
         "ts-toolbelt": "^9.6.0",
         "typesafe-actions": "^5.1.0",
         "verror": "^1.10.0"

diff --git a/Neos.Ui/core/src/framework/Form/Field.tsx b/Neos.Ui/core/src/framework/Form/Field.tsx
@@ -5,18 +5,14 @@ const FieldGroupContext = React.createContext<null | string>(null);
 
 export function Field<
     FieldValue = any,
-    RP extends FieldRenderProps<FieldValue, T> = FieldRenderProps<
-        FieldValue,
-        HTMLElement
-    >,
     T extends HTMLElement = HTMLElement
->(props: FieldProps<FieldValue, RP, T>): React.ReactElement {
+>(props: FieldProps<FieldValue, FieldRenderProps<FieldValue, T>, T>): React.ReactElement {
     const groupPrefix = React.useContext(FieldGroupContext);
     const name = groupPrefix !== null
         ? `${groupPrefix}.${props.name}`
         : props.name;
 
-    return (<FinalFormField<FieldValue, RP, T> {...props} name={name}/>);
+    return (<FinalFormField<FieldValue, T> {...props} name={name}/>);
 };
 
 export const FieldGroup: React.FC<{
@@ -27,4 +23,4 @@ export const FieldGroup: React.FC<{
             {props.children}
         </FieldGroupContext.Provider>
     );
-};
+};
diff --git a/Neos.Ui/error-handling/package.json b/Neos.Ui/error-handling/package.json
@@ -10,7 +10,6 @@
     },
     "dependencies": {
         "react-error-boundary": "^3.1.3",
-        "styled-components": "^5.3.0",
         "verror": "^1.10.0"
     },
     "devDependencies": {

diff --git a/Resources/Public/JavaScript/Plugin.js b/Resources/Public/JavaScript/Plugin.js
diff --git a/Resources/Public/JavaScript/Plugin.js.LICENSE.txt b/Resources/Public/JavaScript/Plugin.js.LICENSE.txt
@@ -1,9 +1,3 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
 /*!
  * JavaScript Cookie v2.2.1
  * https://github.com/js-cookie/js-cookie
@@ -28,7 +22,7 @@ object-assign
 
 /*!
 * screenfull
-* v5.1.0 - 2020-12-24
+* v5.2.0 - 2021-11-03
 * (c) Sindre Sorhus; MIT License
 */
 

diff --git a/package.json b/package.json
@@ -28,5 +28,8 @@
     "ts-jest": "^26.5.5",
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
+  },
+  "resolutions": {
+    "@types/react": "^17.0.3"
   }
 }