Revert "Revert "feature/GW-1602/Updated-dependencies""

ConductionNL · Nov 22, 2023 · 78c7113 · 78c7113
1 parent 9425dae
commit 78c7113
Show file tree

Hide file tree

Showing 8 changed files with 6,142 additions and 5,273 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,9 @@
 
 - **Version 2.2 (breaking changes from 2.1.x)**
 
-  - 2.2.27: Updated Checkbox component to NLDS.
+  - 2.2.27:
+    - Updated dependencies to latest versions.
+    - Updated Checkbox component to NLDS.
   - 2.2.26: Updated NotificationPopUp secondary button to have hover and href.
   - 2.2.25:
     - Added box-shadow to CardWrapper.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,27 +20,27 @@
   },
   "homepage": "https://github.com/ConductionNL/conduction-components#readme",
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@utrecht/component-library-react": "1.0.0-alpha.394",
-    "clsx": "^1.1.1",
-    "gatsby": "^4.11.1",
+    "@utrecht/component-library-react": "2.0.0",
+    "clsx": "^2.0.0",
+    "gatsby": "^5.12.9",
     "react": "^18.2.0",
-    "react-datepicker": "^4.10.0",
-    "react-hook-form": "7.29.0",
+    "react-datepicker": "^4.23.0",
+    "react-hook-form": "7.48.2",
     "react-paginate": "^8.2.0",
-    "react-select": "5.3.2",
+    "react-select": "5.8.0",
     "react-tabs": "^6.0.2",
-    "react-tooltip": "^5.21.3"
+    "react-tooltip": "^5.23.0"
   },
   "devDependencies": {
-    "@types/node": "^17.0.23",
-    "@types/react": "^18.2.0",
-    "@types/react-datepicker": "^4.8.0",
-    "@types/react-dom": "^18.2.0",
-    "rimraf": "^4.4.0",
-    "tsc-hooks": "^1.1.1",
-    "typescript": "^4.6.3"
+    "@types/node": "^20.9.3",
+    "@types/react": "^18.2.38",
+    "@types/react-datepicker": "^4.19.3",
+    "@types/react-dom": "^18.2.16",
+    "rimraf": "^5.0.5",
+    "tsc-hooks": "^1.1.2",
+    "typescript": "^5.3.2"
   }
 }
diff --git a/src/components/formFields/createKeyValue/CreateKeyValue.tsx b/src/components/formFields/createKeyValue/CreateKeyValue.tsx
@@ -1,5 +1,6 @@
 import * as React from "react";
 import * as styles from "./CreateKeyValue.module.css";
+import clsx from "clsx";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { IReactHookFormProps } from "../types";
 import {
@@ -12,7 +13,6 @@ import {
   Textbox,
   Button,
 } from "@utrecht/component-library-react/dist/css-module";
-import clsx from "clsx";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCopy, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { ErrorMessage } from "../errorMessage/ErrorMessage";
@@ -55,7 +55,7 @@ export const CreateKeyValue = ({
         return (
           <>
             <KeyValueComponent handleChange={onChange} {...{ defaultValue, errors, disabled, copyValue }} />
-            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
           </>
         );
       }}

diff --git a/src/components/formFields/input.tsx b/src/components/formFields/input.tsx
@@ -29,10 +29,10 @@ export const InputPassword: React.FC<IInputProps & IReactHookFormProps> = ({
         type="password"
         {...{ disabled, placeholder }}
         {...register(name, { ...validation })}
-        invalid={errors[name]}
+        invalid={!!errors[name]}
         aria-label={ariaLabel}
       />
-      {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+      {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
     </>
   );
 };
@@ -54,10 +54,10 @@ export const InputText: React.FC<IInputProps & IReactHookFormProps> = ({
       type="text"
       {...{ defaultValue, disabled, placeholder, icon }}
       {...register(name, { ...validation })}
-      invalid={errors[name]}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
 
@@ -79,10 +79,10 @@ export const InputEmail: React.FC<IInputProps & IReactHookFormProps> = ({
       required={!!validation?.required}
       {...{ defaultValue, disabled, placeholder, icon }}
       {...register(name, { ...validation })}
-      invalid={errors[name]}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
 
@@ -103,10 +103,10 @@ export const InputURL: React.FC<IInputProps & IReactHookFormProps> = ({
       type="url"
       {...{ defaultValue, disabled, placeholder, icon }}
       {...register(name, { ...validation })}
-      invalid={errors[name]}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
 
@@ -126,11 +126,11 @@ export const InputNumber: React.FC<IInputProps & IReactHookFormProps> = ({
     <Textbox
       type="number"
       {...{ defaultValue, disabled, placeholder, icon }}
-      {...register(name, { ...validation, valueAsNumber: true })}
-      invalid={errors[name]}
+      {...register(name, { ...{ validation }, valueAsNumber: true })}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
 
@@ -151,11 +151,11 @@ export const InputFloat: React.FC<IInputProps & IReactHookFormProps> = ({
       type="number"
       step=".01"
       {...{ disabled, placeholder, icon, defaultValue }}
-      {...register(name, { ...validation, valueAsNumber: true })}
-      invalid={errors[name]}
+      {...register(name, { ...{ validation }, valueAsNumber: true })}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
 

diff --git a/src/components/formFields/select/select.tsx b/src/components/formFields/select/select.tsx
@@ -1,10 +1,10 @@
 import * as React from "react";
 import * as styles from "./select.module.css";
-import { Control, Controller, FieldValues } from "react-hook-form";
-import ReactSelect, { MenuPlacement, StylesConfig } from "react-select";
+import clsx from "clsx";
 import CreatableSelect from "react-select/creatable";
+import ReactSelect, { MenuPlacement, StylesConfig } from "react-select";
+import { Control, Controller, FieldValues } from "react-hook-form";
 import { IReactHookFormProps } from "../types";
-import clsx from "clsx";
 import { ErrorMessage } from "../errorMessage/ErrorMessage";
 
 interface ISelectProps {
@@ -104,7 +104,7 @@ export const SelectMultiple = ({
               styles={selectStyles}
               placeholder={disabled ? "Disabled..." : placeholder ?? "Select one or more options..."}
             />
-            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
           </>
         );
       }}
@@ -149,7 +149,7 @@ export const SelectCreate = ({
               menuPlacement={menuPlacement}
               styles={selectStyles}
             />
-            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
           </>
         );
       }}
@@ -194,7 +194,7 @@ export const SelectSingle = ({
               styles={selectStyles}
               placeholder={disabled ? "Disabled..." : placeholder ?? "Select one or more options..."}
             />
-            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+            {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
           </>
         );
       }}

diff --git a/src/components/formFields/textarea.tsx b/src/components/formFields/textarea.tsx
@@ -1,3 +1,4 @@
+import _ from "lodash";
 import { IReactHookFormProps } from "./types";
 import { ErrorMessage } from "./errorMessage/ErrorMessage";
 import { Textarea as UtrechtTextarea } from "@utrecht/component-library-react/dist/css-module";
@@ -24,9 +25,9 @@ export const Textarea = ({
     <UtrechtTextarea
       {...register(name, { ...validation })}
       {...{ disabled, defaultValue }}
-      invalid={errors[name]}
+      invalid={!!errors[name]}
       aria-label={ariaLabel}
     />
-    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name].message} />}
+    {errors[name] && !hideErrorMessage && <ErrorMessage message={errors[name]?.message as string} />}
   </>
 );
diff --git a/tsconfig.json b/tsconfig.json
@@ -15,15 +15,7 @@
     "strict": true,
     "skipLibCheck": true
   },
-  "hooks": [
-    "copy-files"
-  ],
-  "include": [
-    "src",
-    "src/**/*.css"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/__tests__/*"
-  ]
+  "hooks": ["copy-files"],
+  "include": ["src", "src/**/*.css"],
+  "exclude": ["node_modules", "**/__tests__/*", "lib/**/*"]
 }