Resolve correct modules

examples/eSealing/package.json

@@ -27,7 +27,7 @@
         "live-server": "^1.2.2",
         "process": "^0.11.10",
         "ts-node": "^10.8.0",
-        "typescript": "^4.7.2"
+        "typescript": "^5.2.2"
     },
     "scripts": {
         "build": "node --loader ts-node/esm ./esbuild.config.ts; cp ./src/assets/* ./dist",

examples/nft-minting/package.json

@@ -19,7 +19,7 @@
         "esbuild-plugin-svgr": "^1.0.1",
         "live-server": "^1.2.2",
         "ts-node": "^10.8.0",
-        "typescript": "^4.8.3"
+        "typescript": "^5.2.2"
     },
     "scripts": {
         "build": "node --loader ts-node/esm ./esbuild.config.ts",

examples/piggybank/package.json

@@ -16,7 +16,7 @@
         "esbuild-plugin-svgr": "^1.0.1",
         "live-server": "^1.2.2",
         "ts-node": "^10.8.0",
-        "typescript": "^4.7.2"
+        "typescript": "^5.2.2"
     },
     "scripts": {
         "build": "node --loader ts-node/esm ./esbuild.config.ts",

examples/voting/package.json

@@ -25,7 +25,7 @@
         "esbuild-plugin-svgr": "^1.0.1",
         "express": "^4.18.1",
         "ts-node": "^10.8.0",
-        "typescript": "^4.7.2"
+        "typescript": "^5.2.2"
     },
     "resolutions": {
         "@concordium/web-sdk": "^6.0.0"

examples/wCCD/package.json

@@ -24,7 +24,7 @@
         "live-server": "^1.2.2",
         "process": "^0.11.10",
         "ts-node": "^10.8.0",
-        "typescript": "^4.7.2"
+        "typescript": "^5.2.2"
     },
     "scripts": {
         "build": "NETWORK='testnet' node --loader ts-node/esm ./esbuild.config.ts; cp ./src/assets/* ./dist",

package.json

@@ -37,8 +37,8 @@
         "@types/jest": "^28.1.7",
         "@types/node": "^17.0.25",
         "@types/pbkdf2": "^3.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.20.0",
-        "@typescript-eslint/parser": "^5.20.0",
+        "@typescript-eslint/eslint-plugin": "^6.7.0",
+        "@typescript-eslint/parser": "^6.7.0",
         "eslint": "7",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-config-airbnb-typescript": "^17.0.0",
@@ -61,6 +61,6 @@
         "ts-node": "^10.7.0",
         "tsc-files": "^1.1.3",
         "tsconfig-paths": "^3.14.1",
-        "typescript": "^4.6.3"
+        "typescript": "^5.2.2"
     }
 }

packages/browser-wallet-api-helpers/package.json

@@ -35,7 +35,7 @@
         "@babel/plugin-transform-modules-commonjs": "^7.12.1",
         "@babel/plugin-transform-runtime": "^7.12.1",
         "@babel/preset-env": "^7.12.1",
-        "typescript": "^4.3.5",
+        "typescript": "^5.2.2",
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2"
     },

packages/browser-wallet-api/package.json

@@ -15,7 +15,7 @@
     },
     "devDependencies": {
         "@types/json-bigint": "^1.0.1",
-        "typescript": "^4.3.5"
+        "typescript": "^5.2.2"
     },
     "scripts": {
         "build": "tsc"

packages/browser-wallet/package.json

@@ -87,6 +87,6 @@
         "style-loader": "^3.3.1",
         "ts-jest": "^29.0.5",
         "tsconfig-paths-webpack-plugin": "^3.5.2",
-        "typescript": "^4.3.5"
+        "typescript": "^5.2.2"
     }
 }

packages/browser-wallet/src/popup/pages/AddWeb3IdCredential/AddWeb3IdCredential.tsx

@@ -27,9 +27,8 @@ import {
     getCredentialRegistryContractAddress,
     withIdRemovedFromSchema,
 } from '@shared/utils/verifiable-credential-helpers';
-import { APIVerifiableCredential } from '@concordium/browser-wallet-api-helpers';
+import { APIVerifiableCredential, MetadataUrl } from '@concordium/browser-wallet-api-helpers';
 import { grpcClientAtom, networkConfigurationAtom } from '@popup/store/settings';
-import { MetadataUrl } from '@concordium/browser-wallet-api-helpers/lib/wallet-api-types';
 import { parse } from '@shared/utils/payload-helpers';
 import { logError } from '@shared/utils/log-helpers';
 import { addToastAtom } from '@popup/state';

packages/browser-wallet/src/popup/shared/Form/Form.tsx

@@ -23,7 +23,7 @@ export const useForm = <TFormValues extends FieldValues = FieldValues>(
     props?: UseFormProps<TFormValues>
 ): UseFormReturn<TFormValues> => useFormLib<TFormValues>({ ...useFormDefaults, ...props });
 
-type FormProps<TFormValues> = ClassName & {
+type FormProps<TFormValues extends FieldValues = FieldValues> = ClassName & {
     /**
      * Submit handler, receiving the values of the form as arg.
      */

packages/browser-wallet/src/popup/shared/Form/common/utils.tsx

@@ -121,7 +121,7 @@ export const makeUncontrolled = <E, P extends RequiredUncontrolledFieldProps<E>>
         // Filter away all props required for form registration, leaving the props for the input '<Field />'
         const { name, rules, register, onChange: ownOnChange = noOp, onBlur: ownOnBlur = noOp, ...ownProps } = props;
         const registerProps = register(name, rules);
-        const { errors, touchedFields, isSubmitted } = useFormState<TFieldValues>(name);
+        const { errors, touchedFields, isSubmitted } = useFormState<TFieldValues>({ name });
 
         const error = errors[name];
         const isTouched = touchedFields[name];

packages/browser-wallet/src/shared/utils/types.ts

@@ -1,8 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import {
-    SchemaWithContext,
-    SmartContractParameters,
-} from '@concordium/browser-wallet-api-helpers/lib/wallet-api-types';
+import { SchemaWithContext, SmartContractParameters } from '@concordium/browser-wallet-api-helpers';
 import type { SchemaVersion, AccountTransactionType } from '@concordium/web-sdk';
 import { RefAttributes } from 'react';
 /**

tsconfig.json

@@ -10,7 +10,7 @@
         "strict": true,
         "noFallthroughCasesInSwitch": true,
         "module": "esnext",
-        "moduleResolution": "node16",
+        "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
         "downlevelIteration": true,