From b9786da6e95f7a846d2f6f8bcf681a8df6c74490 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Mon, 23 Jun 2025 18:06:24 +0200 Subject: [PATCH] feat: bump Juno configuration --- package-lock.json | 153 ++++++++++++++++++++--------------- package.json | 16 ++-- src/utils/satellite.utils.ts | 13 ++- 3 files changed, 106 insertions(+), 76 deletions(-) diff --git a/package-lock.json b/package-lock.json index d6602fc5..f6763065 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,17 +12,17 @@ "@dfinity/agent": "^2.3.0", "@dfinity/auth-client": "^2.3.0", "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6.1.1", + "@dfinity/ic-management": "^6.2.0", "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", - "@junobuild/admin": "^0.5.0", - "@junobuild/cdn": "^0.1.1", - "@junobuild/cli-tools": "^0.2.2", - "@junobuild/config": "^0.1.8", + "@junobuild/admin": "^0.5.1", + "@junobuild/cdn": "^0.1.2", + "@junobuild/cli-tools": "^0.2.3", + "@junobuild/config": "^0.2.0", "@junobuild/config-loader": "^0.2.1", - "@junobuild/core": "^0.1.15", + "@junobuild/core": "^0.1.16", "@junobuild/did-tools": "^0.2.1", - "@junobuild/storage": "^0.2.0", + "@junobuild/storage": "^0.2.1", "@junobuild/utils": "^0.1.3", "chokidar": "^4.0.3", "conf": "^13.1.0", @@ -39,7 +39,7 @@ "devDependencies": { "@eslint/eslintrc": "^3.3.1", "@eslint/js": "^9.27.0", - "@junobuild/functions": "^0.1.1", + "@junobuild/functions": "^0.1.2", "@types/node": "^22.15.27", "@types/prompts": "^2.4.9", "@types/semver": "^7.7.0", @@ -648,9 +648,9 @@ } }, "node_modules/@dfinity/ic-management": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-6.1.1.tgz", - "integrity": "sha512-0P5nynS5vyGaYoWKjTwkGKaV+udESBC6C0O/z2Of+V3cvdqZlnnndfVs6ZvWd0JdvTfR4AgcpmPXYkxCpZqVQg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-6.2.0.tgz", + "integrity": "sha512-I/WaNvKvsqiYnt/BAGJ07FIQly7BucVUP/a4OValSYnzD9Bg1MJRscPxIO3Fk+ag9ZNDIT+OWy6o1rBaUAzfig==", "license": "Apache-2.0", "peerDependencies": { "@dfinity/agent": "^2.0.0", @@ -695,6 +695,17 @@ "@dfinity/principal": "^2.0.0" } }, + "node_modules/@dfinity/zod-schemas": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@dfinity/zod-schemas/-/zod-schemas-1.0.0.tgz", + "integrity": "sha512-5ApkpRO8hqTb7B9GH4H8FljY/r6hh3zpA/HFeeozIHieyebAzB748+4T9/oL6T7udkvlfWPMulbmjSHerm3B9A==", + "license": "Apache-2.0", + "peer": true, + "peerDependencies": { + "@dfinity/principal": "^2.0.0", + "zod": "^3.25" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.5", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz", @@ -1484,31 +1495,31 @@ } }, "node_modules/@junobuild/admin": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.5.0.tgz", - "integrity": "sha512-6NbAb6EVRXooDb87GoVDTyr7nLbLQoRO5mSanqhNmGtKMULlRhdThzWqJzGix4iO8v6u0OHtQIJwmc8NFEOYXA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.5.1.tgz", + "integrity": "sha512-Ul5qqGQ/DKa40Zz+J5l009ZSt1iJEH65UGhgaGGPkWr8h6yPjJC+9wIi/otWsl1StK3rdZBt5MPzUjLJ2FgE9A==", "license": "MIT", "peerDependencies": { "@dfinity/agent": "^2.3.0", "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6.1", + "@dfinity/ic-management": "^6.2", "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", "@dfinity/utils": "^2", "@junobuild/config": "*", "semver": "7.*", - "zod": "^3" + "zod": "^3.25" } }, "node_modules/@junobuild/cdn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.1.1.tgz", - "integrity": "sha512-ktnDCLotmJB0p1AobQKvCQvPFCBHCHJwvpO6XQbyUK7iviRQBZPsuyA3T76ab134+nbUVvm8PVNqTw2xFZFCkg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.1.2.tgz", + "integrity": "sha512-aoCY00dq2D0hBawUnGOkbScTJqyAjPq6bhpFikvYt7UgN8v3Xi/i7d0TqMf/TbbwbDxXBSVSrangfiUxltHJ+Q==", "license": "MIT", "peerDependencies": { "@dfinity/agent": "^2.3.0", "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6", + "@dfinity/ic-management": "^6.2", "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", "@dfinity/utils": "^2", @@ -1518,9 +1529,9 @@ } }, "node_modules/@junobuild/cli-tools": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.2.2.tgz", - "integrity": "sha512-0eIzxI/934fu2GRgCVa+olR13aMfTRsDSvKytxl7GKHIY+8TCFEFyycKRtJ7t2qXi3WZe0j3BKtCoYuMijyJIA==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.2.3.tgz", + "integrity": "sha512-Jt33eKHgjUfFGVrCXPDXgg1Vl/rOOXaeByuq0X2rvCCiF1y7zeGf5tGjq/qaheFlTbMJHp90PCYcbwjJ00pjPA==", "license": "MIT", "dependencies": { "file-type": "^21.0.0", @@ -1536,12 +1547,13 @@ } }, "node_modules/@junobuild/config": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-0.1.8.tgz", - "integrity": "sha512-25FN9nh0X4cauAQx9JlnUAbC4ZIdAoAtqBhYLBORrGXybFRT+48ber7LoXpws4BF5N8//tH4PwCuvl+aRaOWAQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-0.2.0.tgz", + "integrity": "sha512-PxAD7JF1DGj9bP3+fJXFAdgbOQRNL/ZwwHDyCbcSpWZ1vYCXleK/U8dIOno8oDfzwynNZeb72AmZoiMqbDUzxQ==", "license": "MIT", "peerDependencies": { - "zod": "^3" + "@dfinity/zod-schemas": "^1.0.0", + "zod": "^3.25" } }, "node_modules/@junobuild/config-loader": { @@ -1557,9 +1569,9 @@ } }, "node_modules/@junobuild/core": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-0.1.15.tgz", - "integrity": "sha512-5pZkewKi5R3dIIa+PtTLGovDt48zEpoZHOvpmVC0bECHHEd0NaPweaaxu4tLHdEyEeNMv8r7bKLKvSwtUwqKAg==", + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-0.1.16.tgz", + "integrity": "sha512-eY2RVDVG89b4UqmrByDzFeebsbsck1g30s8C0xzuqDj8dVLGwl7iO3kp/7Duy3Ggdps1l8mQyoNsgSw2zFv5SA==", "license": "MIT", "dependencies": { "@junobuild/errors": "*", @@ -1597,9 +1609,9 @@ "license": "MIT" }, "node_modules/@junobuild/functions": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.1.1.tgz", - "integrity": "sha512-lzWsq49fLrRzbpXiwU+anSmD23kttHO9XXbnyYK/8JmPm3J8geR3QW1RXT4ADXQLYXns0pSCu6Q2fZnN2CB3Jg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.1.2.tgz", + "integrity": "sha512-9k6pmDNrhcMW0nwixIHsxHJruLyPhZQ7pJ1JDrmF0i2TluhoKVCgx0tUXbYU9q/yqST4eBArl7AcN7rZ7MJzDA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -1608,13 +1620,13 @@ "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", "@dfinity/utils": "^2", - "zod": "^3" + "zod": "^3.25" } }, "node_modules/@junobuild/storage": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.0.tgz", - "integrity": "sha512-yWbYoeYKwCo+ppSmx2r/9iKaxQAYCXFnWKssNKMrJ12HPlsIsD227sCxzIbqMJbQZeVV4OWlkbXxYrs+wDclNg==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.1.tgz", + "integrity": "sha512-RI+ALDSzXvV2+E0gsbDPF1MntvYagowAa1CXKHXC9201X0NRjnyQWgIAc+0muhOyvZb/LYtZ7ooy+ugXjwpVgQ==", "license": "MIT", "peerDependencies": { "@dfinity/agent": "^2.3.0", @@ -7192,9 +7204,9 @@ } }, "node_modules/zod": { - "version": "3.24.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", - "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "version": "3.25.67", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz", + "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==", "license": "MIT", "peer": true, "funding": { @@ -7587,9 +7599,9 @@ "requires": {} }, "@dfinity/ic-management": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-6.1.1.tgz", - "integrity": "sha512-0P5nynS5vyGaYoWKjTwkGKaV+udESBC6C0O/z2Of+V3cvdqZlnnndfVs6ZvWd0JdvTfR4AgcpmPXYkxCpZqVQg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-6.2.0.tgz", + "integrity": "sha512-I/WaNvKvsqiYnt/BAGJ07FIQly7BucVUP/a4OValSYnzD9Bg1MJRscPxIO3Fk+ag9ZNDIT+OWy6o1rBaUAzfig==", "requires": {} }, "@dfinity/identity": { @@ -7617,6 +7629,13 @@ "peer": true, "requires": {} }, + "@dfinity/zod-schemas": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@dfinity/zod-schemas/-/zod-schemas-1.0.0.tgz", + "integrity": "sha512-5ApkpRO8hqTb7B9GH4H8FljY/r6hh3zpA/HFeeozIHieyebAzB748+4T9/oL6T7udkvlfWPMulbmjSHerm3B9A==", + "peer": true, + "requires": {} + }, "@esbuild/aix-ppc64": { "version": "0.25.5", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz", @@ -8020,21 +8039,21 @@ } }, "@junobuild/admin": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.5.0.tgz", - "integrity": "sha512-6NbAb6EVRXooDb87GoVDTyr7nLbLQoRO5mSanqhNmGtKMULlRhdThzWqJzGix4iO8v6u0OHtQIJwmc8NFEOYXA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-0.5.1.tgz", + "integrity": "sha512-Ul5qqGQ/DKa40Zz+J5l009ZSt1iJEH65UGhgaGGPkWr8h6yPjJC+9wIi/otWsl1StK3rdZBt5MPzUjLJ2FgE9A==", "requires": {} }, "@junobuild/cdn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.1.1.tgz", - "integrity": "sha512-ktnDCLotmJB0p1AobQKvCQvPFCBHCHJwvpO6XQbyUK7iviRQBZPsuyA3T76ab134+nbUVvm8PVNqTw2xFZFCkg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.1.2.tgz", + "integrity": "sha512-aoCY00dq2D0hBawUnGOkbScTJqyAjPq6bhpFikvYt7UgN8v3Xi/i7d0TqMf/TbbwbDxXBSVSrangfiUxltHJ+Q==", "requires": {} }, "@junobuild/cli-tools": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.2.2.tgz", - "integrity": "sha512-0eIzxI/934fu2GRgCVa+olR13aMfTRsDSvKytxl7GKHIY+8TCFEFyycKRtJ7t2qXi3WZe0j3BKtCoYuMijyJIA==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.2.3.tgz", + "integrity": "sha512-Jt33eKHgjUfFGVrCXPDXgg1Vl/rOOXaeByuq0X2rvCCiF1y7zeGf5tGjq/qaheFlTbMJHp90PCYcbwjJ00pjPA==", "requires": { "file-type": "^21.0.0", "listr": "^0.14.3", @@ -8043,9 +8062,9 @@ } }, "@junobuild/config": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-0.1.8.tgz", - "integrity": "sha512-25FN9nh0X4cauAQx9JlnUAbC4ZIdAoAtqBhYLBORrGXybFRT+48ber7LoXpws4BF5N8//tH4PwCuvl+aRaOWAQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@junobuild/config/-/config-0.2.0.tgz", + "integrity": "sha512-PxAD7JF1DGj9bP3+fJXFAdgbOQRNL/ZwwHDyCbcSpWZ1vYCXleK/U8dIOno8oDfzwynNZeb72AmZoiMqbDUzxQ==", "requires": {} }, "@junobuild/config-loader": { @@ -8055,9 +8074,9 @@ "requires": {} }, "@junobuild/core": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-0.1.15.tgz", - "integrity": "sha512-5pZkewKi5R3dIIa+PtTLGovDt48zEpoZHOvpmVC0bECHHEd0NaPweaaxu4tLHdEyEeNMv8r7bKLKvSwtUwqKAg==", + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-0.1.16.tgz", + "integrity": "sha512-eY2RVDVG89b4UqmrByDzFeebsbsck1g30s8C0xzuqDj8dVLGwl7iO3kp/7Duy3Ggdps1l8mQyoNsgSw2zFv5SA==", "requires": { "@junobuild/errors": "*", "@junobuild/storage": "*", @@ -8076,16 +8095,16 @@ "integrity": "sha512-FQ2NSwyawYpSCZpFSrHBeQdpTuoS7NdrtLMsbzR2LZjvvFqxtfp7PXoUB3bNN6zLRDHPxoRRbN0yy9vOszMMCw==" }, "@junobuild/functions": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.1.1.tgz", - "integrity": "sha512-lzWsq49fLrRzbpXiwU+anSmD23kttHO9XXbnyYK/8JmPm3J8geR3QW1RXT4ADXQLYXns0pSCu6Q2fZnN2CB3Jg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@junobuild/functions/-/functions-0.1.2.tgz", + "integrity": "sha512-9k6pmDNrhcMW0nwixIHsxHJruLyPhZQ7pJ1JDrmF0i2TluhoKVCgx0tUXbYU9q/yqST4eBArl7AcN7rZ7MJzDA==", "dev": true, "requires": {} }, "@junobuild/storage": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.0.tgz", - "integrity": "sha512-yWbYoeYKwCo+ppSmx2r/9iKaxQAYCXFnWKssNKMrJ12HPlsIsD227sCxzIbqMJbQZeVV4OWlkbXxYrs+wDclNg==", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.1.tgz", + "integrity": "sha512-RI+ALDSzXvV2+E0gsbDPF1MntvYagowAa1CXKHXC9201X0NRjnyQWgIAc+0muhOyvZb/LYtZ7ooy+ugXjwpVgQ==", "requires": {} }, "@junobuild/utils": { @@ -11591,9 +11610,9 @@ "dev": true }, "zod": { - "version": "3.24.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", - "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "version": "3.25.67", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz", + "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==", "peer": true } } diff --git a/package.json b/package.json index e84beb2f..2252f3eb 100644 --- a/package.json +++ b/package.json @@ -26,17 +26,17 @@ "@dfinity/agent": "^2.3.0", "@dfinity/auth-client": "^2.3.0", "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6.1.1", + "@dfinity/ic-management": "^6.2.0", "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", - "@junobuild/admin": "^0.5.0", - "@junobuild/cdn": "^0.1.1", - "@junobuild/cli-tools": "^0.2.2", - "@junobuild/config": "^0.1.8", + "@junobuild/admin": "^0.5.1", + "@junobuild/cdn": "^0.1.2", + "@junobuild/cli-tools": "^0.2.3", + "@junobuild/config": "^0.2.0", "@junobuild/config-loader": "^0.2.1", - "@junobuild/core": "^0.1.15", + "@junobuild/core": "^0.1.16", "@junobuild/did-tools": "^0.2.1", - "@junobuild/storage": "^0.2.0", + "@junobuild/storage": "^0.2.1", "@junobuild/utils": "^0.1.3", "chokidar": "^4.0.3", "conf": "^13.1.0", @@ -50,7 +50,7 @@ "devDependencies": { "@eslint/eslintrc": "^3.3.1", "@eslint/js": "^9.27.0", - "@junobuild/functions": "^0.1.1", + "@junobuild/functions": "^0.1.2", "@types/node": "^22.15.27", "@types/prompts": "^2.4.9", "@types/semver": "^7.7.0", diff --git a/src/utils/satellite.utils.ts b/src/utils/satellite.utils.ts index b0da38e2..ba8b259d 100644 --- a/src/utils/satellite.utils.ts +++ b/src/utils/satellite.utils.ts @@ -30,9 +30,20 @@ export const assertConfigAndLoadSatelliteContext = async (): Promise<{ }; const satelliteParameters = async ({ - satellite: {satelliteId: deprecatedSatelliteId, id, ids}, + satellite, env: {mode} }: SatelliteConfigEnv): Promise => { + const {id, ids} = satellite; + + // Originally, the config used `satelliteId`, but we later migrated to `id` and `ids`. + // We kept `satelliteId` in the configuration types for a while, but it is now deprecated there as well. + // For backwards compatibility, we still read it here. + const deprecatedSatelliteId = + 'satelliteId' in satellite + ? // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion + (satellite as unknown as {satelliteId: string}).satelliteId + : undefined; + const satelliteId = ids?.[mode] ?? id ?? deprecatedSatelliteId; if (isNullish(satelliteId)) {