add catalog (#223)

Signed-off-by: Timo Glastra <[email protected]>
animo · Nov 22, 2024 · ad21974 · ad21974
1 parent 29f01f4
commit ad21974
Show file tree

Hide file tree

Showing 13 changed files with 556 additions and 702 deletions.
diff --git a/.github/workflows/continuous-deployment.yaml b/.github/workflows/continuous-deployment.yaml
@@ -39,11 +39,9 @@ jobs:
       - name: 🏗 Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: 🏗 Setup EAS
         uses: expo/expo-github-action@v8

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -19,11 +19,9 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: 9
 
       - name: Install dependencies
         run: pnpm install

diff --git a/apps/easypid/package.json b/apps/easypid/package.json
@@ -10,21 +10,21 @@
 		"prebuild": "APP_VARIANT=development expo prebuild --no-install"
 	},
 	"dependencies": {
-		"@animo-id/expo-ausweis-sdk": "*",
-		"@animo-id/expo-mdoc-data-transfer": "*",
-		"@animo-id/expo-secure-environment": "*",
-		"@credo-ts/core": "*",
+		"@animo-id/expo-ausweis-sdk": "catalog:",
+		"@animo-id/expo-mdoc-data-transfer": "catalog:",
+		"@animo-id/expo-secure-environment": "catalog:",
+		"@credo-ts/core": "catalog:",
 		"@expo-google-fonts/open-sans": "^0.2.3",
 		"@expo-google-fonts/raleway": "^0.2.3",
-		"@hyperledger/anoncreds-react-native": "*",
-		"@hyperledger/aries-askar-react-native": "*",
-		"@hyperledger/indy-vdr-react-native": "*",
+		"@hyperledger/anoncreds-react-native": "catalog:",
+		"@hyperledger/aries-askar-react-native": "catalog:",
+		"@hyperledger/indy-vdr-react-native": "catalog:",
 		"@package/agent": "workspace:*",
 		"@package/app": "workspace:*",
 		"@package/secure-store": "workspace:*",
 		"@package/ui": "workspace:*",
 		"@package/utils": "workspace:*",
-		"@protokoll/mdoc-client": "*",
+		"@animo-id/mdoc": "catalog:",
 		"@react-native-community/blur": "^4.3.2",
 		"@react-native-community/netinfo": "11.3.1",
 		"@react-native-masked-view/masked-view": "0.3.1",
@@ -49,8 +49,8 @@
 		"expo-system-ui": "~3.0.6",
 		"expo-updates": "~0.25.16",
 		"expo-web-browser": "~13.0.3",
-		"react": "*",
-		"react-native": "*",
+		"react": "catalog:",
+		"react-native": "catalog:",
 		"react-native-argon2": "^2.0.1",
 		"react-native-fs": "^2.20.0",
 		"react-native-gesture-handler": "~2.16.2",
@@ -68,6 +68,6 @@
 		"@tamagui/babel-plugin": "1.109.5",
 		"babel-plugin-syntax-hermes-parser": "^0.25.1",
 		"expo-build-properties": "^0.12.5",
-		"typescript": "*"
+		"typescript": "catalog:"
 	}
 }
diff --git a/apps/easypid/src/features/proximity/mdocProximity.ts b/apps/easypid/src/features/proximity/mdocProximity.ts
@@ -1,15 +1,8 @@
 import { mdocDataTransfer } from '@animo-id/expo-mdoc-data-transfer'
+import { COSEKey, DeviceRequest, DeviceResponse, MDoc, type MdocContext, parseIssuerSigned } from '@animo-id/mdoc'
 import { TypedArrayEncoder } from '@credo-ts/core'
 import { getMdocContext } from '@credo-ts/core/build/modules/mdoc/MdocContext'
 import type { EasyPIDAppAgent } from '@package/agent'
-import {
-  COSEKey,
-  DeviceRequest,
-  DeviceResponse,
-  MDoc,
-  type MdocContext,
-  parseIssuerSigned,
-} from '@protokoll/mdoc-client'
 import { type Permission, PermissionsAndroid, Platform } from 'react-native'
 
 type ShareDeviceResponseOptions = {

diff --git a/apps/paradym/package.json b/apps/paradym/package.json
@@ -10,10 +10,10 @@
 		"prebuild": "APP_VARIANT=development pnpm expo prebuild --no-install"
 	},
 	"dependencies": {
-		"@animo-id/expo-secure-environment": "*",
-		"@hyperledger/anoncreds-react-native": "*",
-		"@hyperledger/aries-askar-react-native": "*",
-		"@hyperledger/indy-vdr-react-native": "*",
+		"@animo-id/expo-secure-environment": "catalog:",
+		"@hyperledger/anoncreds-react-native": "catalog:",
+		"@hyperledger/aries-askar-react-native": "catalog:",
+		"@hyperledger/indy-vdr-react-native": "catalog:",
 		"@package/agent": "workspace:*",
 		"@package/app": "workspace:*",
 		"@package/ui": "workspace:*",
@@ -39,8 +39,8 @@
 		"expo-status-bar": "~1.12.1",
 		"expo-system-ui": "~3.0.6",
 		"expo-updates": "~0.25.16",
-		"react": "*",
-		"react-native": "*",
+		"react": "catalog:",
+		"react-native": "catalog:",
 		"react-native-fs": "^2.20.0",
 		"react-native-gesture-handler": "~2.16.2",
 		"react-native-get-random-values": "~1.11.0",
@@ -52,6 +52,6 @@
 	"devDependencies": {
 		"@babel/core": "^7.24.4",
 		"@tamagui/babel-plugin": "1.109.5",
-		"typescript": "*"
+		"typescript": "catalog:"
 	}
 }
diff --git a/apps/storybook/package.json b/apps/storybook/package.json
@@ -35,9 +35,9 @@
 		"expo-splash-screen": "~0.27.7",
 		"expo-status-bar": "~1.12.1",
 		"expo-system-ui": "~3.0.6",
-		"react": "*",
+		"react": "catalog:",
 		"react-device-frameset": "^1.3.4",
-		"react-native": "*",
+		"react-native": "catalog:",
 		"react-native-gesture-handler": "~2.16.2",
 		"react-native-get-random-values": "~1.11.0",
 		"react-native-reanimated": "~3.10.1",
@@ -68,6 +68,6 @@
 		"cross-env": "^7.0.3",
 		"storybook": "^7.6.18",
 		"tamagui-loader": "1.109.5",
-		"typescript": "*"
+		"typescript": "catalog:"
 	}
 }
diff --git a/package.json b/package.json
@@ -13,45 +13,27 @@
 		"style:fix": "biome check --write --unsafe"
 	},
 	"engines": {
-		"node": ">=18.0.0"
+		"node": ">=20.0.0"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "1.8.1",
 		"check-dependency-version-consistency": "^3.0.3",
-		"typescript": "*"
+		"typescript": "catalog:"
 	},
 	"pnpm": {
 		"overrides": {
-			"typescript": "~5.3.3",
-			"@unimodules/react-native-adapter": "./noop",
-			"@unimodules/core": "./noop",
-			"@hyperledger/anoncreds-react-native": "^0.2.4",
-			"@hyperledger/aries-askar-react-native": "^0.2.3",
-			"@hyperledger/indy-vdr-react-native": "^0.2.0",
-			"@credo-ts/anoncreds": "0.6.0-alpha-20241120153226",
-			"@credo-ts/askar": "0.6.0-alpha-20241120153226",
-			"@credo-ts/cheqd": "0.6.0-alpha-20241120153226",
-			"@credo-ts/core": "0.6.0-alpha-20241120153226",
-			"@credo-ts/indy-vdr": "0.6.0-alpha-20241120153226",
-			"@credo-ts/openid4vc": "0.6.0-alpha-20241120153226",
-			"@credo-ts/question-answer": "0.6.0-alpha-20241120153226",
-			"@credo-ts/react-native": "0.6.0-alpha-20241120153226",
-			"@credo-ts/react-hooks": "0.6.1",
-			"@animo-id/expo-ausweis-sdk": "0.0.1-alpha.14",
-			"@animo-id/oid4vci": "0.1.4-alpha-20241120145259",
-			"@animo-id/oauth2": "0.1.4-alpha-20241120145259",
-			"@animo-id/oauth2-utils": "0.1.4-alpha-20241120145259",
-			"@animo-id/expo-secure-environment": "0.1.0-alpha.11",
-			"@animo-id/expo-mdoc-data-transfer": "0.0.3-alpha.7",
-			"@types/react": "~18.2.79",
-			"react-docgen-typescript": "2.2.2",
-			"react": "18.3.1",
-			"react-native": "~0.74.5"
+			"@unimodules/react-native-adapter": "catalog:",
+			"@unimodules/core": "catalog:",
+			"react-docgen-typescript": "catalog:",
+			"@animo-id/oid4vci": "catalog:",
+			"@animo-id/oauth2": "catalog:",
+			"@animo-id/oauth2-utils": "catalog:"
 		},
 		"patchedDependencies": {
 			"@hyperledger/[email protected]": "patches/@[email protected]",
 			"@credo-ts/[email protected]": "patches/@[email protected]",
 			"@animo-id/[email protected]": "patches/@[email protected]"
 		}
-	}
+	},
+	"packageManager": "[email protected]+sha256.24235772cc4ac82a62627cd47f834c72667a2ce87799a846ec4e8e555e2d4b8b"
 }
diff --git a/packages/agent/package.json b/packages/agent/package.json
@@ -4,17 +4,17 @@
 	"private": true,
 	"main": "src/index.ts",
 	"dependencies": {
-		"@animo-id/oid4vci": "*",
-		"@animo-id/oauth2": "*",
-		"@credo-ts/anoncreds": "*",
-		"@credo-ts/askar": "*",
-		"@credo-ts/cheqd": "*",
-		"@credo-ts/core": "*",
-		"@credo-ts/indy-vdr": "*",
-		"@credo-ts/openid4vc": "*",
-		"@credo-ts/question-answer": "*",
-		"@credo-ts/react-hooks": "*",
-		"@credo-ts/react-native": "*",
+		"@animo-id/oid4vci": "catalog:",
+		"@animo-id/oauth2": "catalog:",
+		"@credo-ts/anoncreds": "catalog:",
+		"@credo-ts/askar": "catalog:",
+		"@credo-ts/cheqd": "catalog:",
+		"@credo-ts/core": "catalog:",
+		"@credo-ts/indy-vdr": "catalog:",
+		"@credo-ts/openid4vc": "catalog:",
+		"@credo-ts/question-answer": "catalog:",
+		"@credo-ts/react-hooks": "catalog:",
+		"@credo-ts/react-native": "catalog:",
 		"@package/utils": "workspace:*",
 		"@tanstack/react-query": "^5",
 		"credo-ts-didweb-anoncreds": "0.0.1-alpha.13",
@@ -23,10 +23,10 @@
 		"rxjs": "^7.8.1"
 	},
 	"peerDependencies": {
-		"@hyperledger/anoncreds-react-native": "*",
-		"@hyperledger/aries-askar-react-native": "*",
-		"@hyperledger/indy-vdr-react-native": "*",
-		"expo": "*"
+		"@hyperledger/anoncreds-react-native": "catalog:",
+		"@hyperledger/aries-askar-react-native": "catalog:",
+		"@hyperledger/indy-vdr-react-native": "catalog:",
+		"expo": "catalog:"
 	},
 	"devDependencies": {
 		"@types/fast-text-encoding": "^1.0.3"

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -24,7 +24,7 @@
 		"expo-navigation-bar": "~3.0.6",
 		"expo-router": "~3.5.24",
 		"fast-text-encoding": "^1.0.6",
-		"react": "*",
+		"react": "catalog:",
 		"react-native-reanimated": "~3.10.1",
 		"react-native-safe-area-context": "4.10.5",
 		"solito": "^3.0.0"
@@ -33,6 +33,6 @@
 		"@types/fast-text-encoding": "^1.0.3"
 	},
 	"peerDependencies": {
-		"expo": "*"
+		"expo": "catalog:"
 	}
 }
diff --git a/packages/scanner/package.json b/packages/scanner/package.json
@@ -10,11 +10,11 @@
 		"@react-native-masked-view/masked-view": "0.3.1",
 		"@types/react": "~18.2.79",
 		"expo-barcode-scanner": "~13.0.1",
-		"react-native": "*"
+		"react-native": "catalog:"
 	},
 	"peerDependencies": {
 		"@react-native-masked-view/masked-view": "0.3.1",
 		"expo-barcode-scanner": "~13.0.1",
-		"react-native": "*"
+		"react-native": "catalog:"
 	}
 }
diff --git a/packages/secure-store/package.json b/packages/secure-store/package.json
@@ -3,9 +3,9 @@
 	"version": "0.0.0",
 	"private": true,
 	"peerDependencies": {
-		"@hyperledger/aries-askar-react-native": "*",
+		"@hyperledger/aries-askar-react-native": "catalog:",
 		"expo-secure-store": "~13.0.1",
-		"react-native": "*",
+		"react-native": "catalog:",
 		"react-native-argon2": "^2.0.1",
 		"react-native-get-random-values": "~1.11.0",
 		"react-native-keychain": "^8.2.0",