diff --git a/package-lock.json b/package-lock.json index 0fe1a743..324d001c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,14 +16,15 @@ "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", "@dfinity/zod-schemas": "^1.0.0", - "@junobuild/admin": "^1.0.0", - "@junobuild/cdn": "^0.2.3", - "@junobuild/cli-tools": "^0.4.1", + "@junobuild/admin": "^1.0.0-next-2025-08-11.8", + "@junobuild/cdn": "^0.2.3-next-2025-08-11.8", + "@junobuild/cli-tools": "^0.4.1-next-2025-08-11.8", "@junobuild/config": "^1.1.1", "@junobuild/config-loader": "^0.4.1", - "@junobuild/core": "^1.0.3", + "@junobuild/core": "^1.0.3-next-2025-08-11.8", "@junobuild/did-tools": "^0.2.4", - "@junobuild/storage": "^0.2.4", + "@junobuild/ic-client": "^0.0.1-next-2025-08-11.8", + "@junobuild/storage": "^0.2.4-next-2025-08-11.8", "@junobuild/utils": "^0.1.4", "chokidar": "^4.0.3", "conf": "^14.0.0", @@ -1425,43 +1426,45 @@ } }, "node_modules/@junobuild/admin": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-1.0.0.tgz", - "integrity": "sha512-5qeclSPynJU7dT94ENBg2J/tMFWZAY3aftXCjIViKvV+hyIwE3p046jEJy0+ZgEITCfWm7pS98Pz+RCCD0eCng==", + "version": "1.0.0-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-1.0.0-next-2025-08-11.8.tgz", + "integrity": "sha512-yY9vXAVABdUa0gnd8X+dHdeAbIFQqfZrd+tsETz6rdI07bE1crLdY/R8xeIM2EcPesVIntlNH2y2cMSX7oBF/A==", "license": "MIT", "peerDependencies": { - "@dfinity/agent": "^2.3.0", - "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6.2", - "@dfinity/identity": "^2.3.0", - "@dfinity/principal": "^2.3.0", - "@dfinity/utils": "^2", + "@dfinity/agent": "*", + "@dfinity/candid": "*", + "@dfinity/ic-management": "*", + "@dfinity/identity": "*", + "@dfinity/principal": "*", + "@dfinity/utils": "*", "@junobuild/config": "*", - "semver": "7.*", - "zod": "^3.25" + "@junobuild/ic-client": "*", + "semver": "*", + "zod": "*" } }, "node_modules/@junobuild/cdn": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.2.3.tgz", - "integrity": "sha512-2sFFoVeqrr25Zm/bhvZw2KsB/lz2DINQjwZ0NJJh4hmTNPzhfS9UtCHq9NQChKP673rSfaf/nltUlOsvv60ctg==", + "version": "0.2.3-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.2.3-next-2025-08-11.8.tgz", + "integrity": "sha512-+zdWncHzjsVZT/v1Iq/OwB5u7PNQmxhCKAAn0fA1lz1Qu7tYMUR7zOSGuu2pxyh9/QeaBBNSx7tDwk/egNZqaQ==", "license": "MIT", "peerDependencies": { - "@dfinity/agent": "^2.3.0", - "@dfinity/candid": "^2.3.0", - "@dfinity/ic-management": "^6.2", - "@dfinity/identity": "^2.3.0", - "@dfinity/principal": "^2.3.0", - "@dfinity/utils": "^2", + "@dfinity/agent": "*", + "@dfinity/candid": "*", + "@dfinity/ic-management": "*", + "@dfinity/identity": "*", + "@dfinity/principal": "*", + "@dfinity/utils": "*", "@junobuild/config": "*", + "@junobuild/ic-client": "*", "@junobuild/storage": "*", - "semver": "7.*" + "semver": "*" } }, "node_modules/@junobuild/cli-tools": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.4.1.tgz", - "integrity": "sha512-UVCg01uAzoWeW3BAl075EmhFpBYj9PeCz8YKUh5Ba79WVY1CFIZt8/jS8RKb2+xlo2S7z2oyw5zlkJWYirG78g==", + "version": "0.4.1-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.4.1-next-2025-08-11.8.tgz", + "integrity": "sha512-v4z3d0iX/kBcVWTfnCjashlzWxYFXeSSk928uej24wEu6TM3RwcnVJRJRxptOdgGS8ed5JNx0M30N9WU0V1ZGQ==", "license": "MIT", "dependencies": { "file-type": "^21.0.0", @@ -1470,10 +1473,11 @@ "minimatch": "^10.0.3" }, "peerDependencies": { - "@dfinity/utils": "^2", + "@dfinity/utils": "*", "@junobuild/cdn": "*", "@junobuild/config": "*", - "esbuild": "^0.25.1" + "@junobuild/storage": "*", + "esbuild": "*" } }, "node_modules/@junobuild/config": { @@ -1499,22 +1503,23 @@ } }, "node_modules/@junobuild/core": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-1.0.3.tgz", - "integrity": "sha512-Twm5U27tqf8kQT9Tvj9eCJ4uR0qv4PbaqnswAjPYloa5m18Tjk2FJe2bZekllCIf75WRTD1iz760NmMIZkcGew==", + "version": "1.0.3-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-1.0.3-next-2025-08-11.8.tgz", + "integrity": "sha512-wZjFH2vHttkRvaYjFs0GbjN5FIDBlFXANL3cx0ziaon4yuvDDoRb0wORyVsNL+laBQdIABXw8w9UsofQFzqXAw==", "license": "MIT", "dependencies": { "@junobuild/errors": "*", + "@junobuild/ic-client": "*", "@junobuild/storage": "*", "@junobuild/utils": "*" }, "peerDependencies": { - "@dfinity/agent": "^2.3.0", - "@dfinity/auth-client": "^2.3.0", - "@dfinity/candid": "^2.3.0", - "@dfinity/identity": "^2.3.0", - "@dfinity/principal": "^2.3.0", - "@dfinity/utils": "^2" + "@dfinity/agent": "*", + "@dfinity/auth-client": "*", + "@dfinity/candid": "*", + "@dfinity/identity": "*", + "@dfinity/principal": "*", + "@dfinity/utils": "*" } }, "node_modules/@junobuild/did-tools": { @@ -1553,17 +1558,30 @@ "zod": "^3.25" } }, + "node_modules/@junobuild/ic-client": { + "version": "0.0.1-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-0.0.1-next-2025-08-11.8.tgz", + "integrity": "sha512-gsEvPAiZhrkZCTs494oOqkRx3VbhpAJtPszK3Xgmd+j6rlqscIP27GqZsiX00bo1OjkEHyhtDql16e35G1/aTw==", + "license": "MIT", + "peerDependencies": { + "@dfinity/agent": "*", + "@dfinity/candid": "*", + "@dfinity/identity": "*", + "@dfinity/principal": "*" + } + }, "node_modules/@junobuild/storage": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.4.tgz", - "integrity": "sha512-5DfJz8g8659ReKhU8FazLkWO55lp1K66NH7LaLSi/fuenjPQpzdenrxplV4fZ5cjDyV8U1lxr+Edp9wtuaxLOQ==", + "version": "0.2.4-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.4-next-2025-08-11.8.tgz", + "integrity": "sha512-RWudnfO0upcWORS9HcDyNCjcPZ1BP4+eJBx/U3dr1+ijaZmV64h7Zxf1JJPf9JWL+LmG2VhTB6uyGmx6hujqkQ==", "license": "MIT", "peerDependencies": { - "@dfinity/agent": "^2.3.0", - "@dfinity/candid": "^2.3.0", - "@dfinity/identity": "^2.3.0", - "@dfinity/principal": "^2.3.0", - "@dfinity/utils": "^2", + "@dfinity/agent": "*", + "@dfinity/candid": "*", + "@dfinity/identity": "*", + "@dfinity/principal": "*", + "@dfinity/utils": "*", + "@junobuild/ic-client": "*", "@junobuild/utils": "*" } }, @@ -7892,21 +7910,21 @@ } }, "@junobuild/admin": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-1.0.0.tgz", - "integrity": "sha512-5qeclSPynJU7dT94ENBg2J/tMFWZAY3aftXCjIViKvV+hyIwE3p046jEJy0+ZgEITCfWm7pS98Pz+RCCD0eCng==", + "version": "1.0.0-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-1.0.0-next-2025-08-11.8.tgz", + "integrity": "sha512-yY9vXAVABdUa0gnd8X+dHdeAbIFQqfZrd+tsETz6rdI07bE1crLdY/R8xeIM2EcPesVIntlNH2y2cMSX7oBF/A==", "requires": {} }, "@junobuild/cdn": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.2.3.tgz", - "integrity": "sha512-2sFFoVeqrr25Zm/bhvZw2KsB/lz2DINQjwZ0NJJh4hmTNPzhfS9UtCHq9NQChKP673rSfaf/nltUlOsvv60ctg==", + "version": "0.2.3-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-0.2.3-next-2025-08-11.8.tgz", + "integrity": "sha512-+zdWncHzjsVZT/v1Iq/OwB5u7PNQmxhCKAAn0fA1lz1Qu7tYMUR7zOSGuu2pxyh9/QeaBBNSx7tDwk/egNZqaQ==", "requires": {} }, "@junobuild/cli-tools": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.4.1.tgz", - "integrity": "sha512-UVCg01uAzoWeW3BAl075EmhFpBYj9PeCz8YKUh5Ba79WVY1CFIZt8/jS8RKb2+xlo2S7z2oyw5zlkJWYirG78g==", + "version": "0.4.1-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/cli-tools/-/cli-tools-0.4.1-next-2025-08-11.8.tgz", + "integrity": "sha512-v4z3d0iX/kBcVWTfnCjashlzWxYFXeSSk928uej24wEu6TM3RwcnVJRJRxptOdgGS8ed5JNx0M30N9WU0V1ZGQ==", "requires": { "file-type": "^21.0.0", "listr": "^0.14.3", @@ -7927,11 +7945,12 @@ "requires": {} }, "@junobuild/core": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-1.0.3.tgz", - "integrity": "sha512-Twm5U27tqf8kQT9Tvj9eCJ4uR0qv4PbaqnswAjPYloa5m18Tjk2FJe2bZekllCIf75WRTD1iz760NmMIZkcGew==", + "version": "1.0.3-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/core/-/core-1.0.3-next-2025-08-11.8.tgz", + "integrity": "sha512-wZjFH2vHttkRvaYjFs0GbjN5FIDBlFXANL3cx0ziaon4yuvDDoRb0wORyVsNL+laBQdIABXw8w9UsofQFzqXAw==", "requires": { "@junobuild/errors": "*", + "@junobuild/ic-client": "*", "@junobuild/storage": "*", "@junobuild/utils": "*" } @@ -7954,10 +7973,16 @@ "dev": true, "requires": {} }, + "@junobuild/ic-client": { + "version": "0.0.1-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/ic-client/-/ic-client-0.0.1-next-2025-08-11.8.tgz", + "integrity": "sha512-gsEvPAiZhrkZCTs494oOqkRx3VbhpAJtPszK3Xgmd+j6rlqscIP27GqZsiX00bo1OjkEHyhtDql16e35G1/aTw==", + "requires": {} + }, "@junobuild/storage": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.4.tgz", - "integrity": "sha512-5DfJz8g8659ReKhU8FazLkWO55lp1K66NH7LaLSi/fuenjPQpzdenrxplV4fZ5cjDyV8U1lxr+Edp9wtuaxLOQ==", + "version": "0.2.4-next-2025-08-11.8", + "resolved": "https://registry.npmjs.org/@junobuild/storage/-/storage-0.2.4-next-2025-08-11.8.tgz", + "integrity": "sha512-RWudnfO0upcWORS9HcDyNCjcPZ1BP4+eJBx/U3dr1+ijaZmV64h7Zxf1JJPf9JWL+LmG2VhTB6uyGmx6hujqkQ==", "requires": {} }, "@junobuild/utils": { diff --git a/package.json b/package.json index d2e1eb0d..38bf72ee 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,15 @@ "@dfinity/identity": "^2.3.0", "@dfinity/principal": "^2.3.0", "@dfinity/zod-schemas": "^1.0.0", - "@junobuild/admin": "^1.0.0", - "@junobuild/cdn": "^0.2.3", - "@junobuild/cli-tools": "^0.4.1", + "@junobuild/admin": "^1.0.0-next-2025-08-11.8", + "@junobuild/cdn": "^0.2.3-next-2025-08-11.8", + "@junobuild/cli-tools": "^0.4.1-next-2025-08-11.8", "@junobuild/config": "^1.1.1", "@junobuild/config-loader": "^0.4.1", - "@junobuild/core": "^1.0.3", + "@junobuild/core": "^1.0.3-next-2025-08-11.8", "@junobuild/did-tools": "^0.2.4", - "@junobuild/storage": "^0.2.4", + "@junobuild/ic-client": "^0.0.1-next-2025-08-11.8", + "@junobuild/storage": "^0.2.4-next-2025-08-11.8", "@junobuild/utils": "^0.1.4", "chokidar": "^4.0.3", "conf": "^14.0.0", diff --git a/src/api/actor.api.ts b/src/api/actor.api.ts index 4473099f..658176dd 100644 --- a/src/api/actor.api.ts +++ b/src/api/actor.api.ts @@ -1,6 +1,6 @@ import {Ed25519KeyIdentity} from '@dfinity/identity/lib/cjs/identity/ed25519'; import {isNullish, nonNullish} from '@dfinity/utils'; -import {type ActorParameters} from '@junobuild/admin'; +import type {ActorParameters} from '@junobuild/ic-client'; import {green, red} from 'kleur'; import {getToken} from '../configs/cli.config'; import {ENV} from '../env'; diff --git a/src/api/agent.api.ts b/src/api/agent.api.ts index 6741184f..6a3aa6e2 100644 --- a/src/api/agent.api.ts +++ b/src/api/agent.api.ts @@ -1,6 +1,6 @@ import {HttpAgent} from '@dfinity/agent'; import {isNullish, nonNullish} from '@dfinity/utils'; -import type {ActorParameters} from '@junobuild/admin'; +import type {ActorParameters} from '@junobuild/ic-client'; import {REVOKED_CONTROLLERS} from '../constants/constants'; import {actorParameters} from './actor.api'; diff --git a/src/services/deploy.services.ts b/src/services/deploy.services.ts index 19386641..a16392d3 100644 --- a/src/services/deploy.services.ts +++ b/src/services/deploy.services.ts @@ -108,7 +108,6 @@ const deployWithProposal = async ({ asset: { filename, fullPath, - // @ts-expect-error type incompatibility NodeJS vs bundle data, collection, headers, @@ -162,7 +161,6 @@ const deployImmediate = async ({ satellite, filename, fullPath, - // @ts-expect-error type incompatibility NodeJS vs bundle data, collection, headers, diff --git a/src/services/functions/publish.services.ts b/src/services/functions/publish.services.ts index 55756596..024209f3 100644 --- a/src/services/functions/publish.services.ts +++ b/src/services/functions/publish.services.ts @@ -106,7 +106,6 @@ const publishWasmWithProposal = async ({ proposalId, asset: { ...restAsset, - // @ts-expect-error type incompatibility NodeJS vs bundle data, fullPath: storagePath ?? fullPath, headers: [...headers, ['Access-Control-Allow-Origin', ENV.console.urls.root]], diff --git a/src/services/modules/upgrade/upgrade-assert.services.ts b/src/services/modules/upgrade/upgrade-assert.services.ts index 6a8f47bf..8402abe1 100644 --- a/src/services/modules/upgrade/upgrade-assert.services.ts +++ b/src/services/modules/upgrade/upgrade-assert.services.ts @@ -1,5 +1,6 @@ import {isNullish} from '@dfinity/utils'; -import {satelliteBuildType, type SatelliteParameters} from '@junobuild/admin'; +import {satelliteBuildType} from '@junobuild/admin'; +import type {SatelliteParameters} from '@junobuild/ic-client'; import {cyan, magenta, yellow} from 'kleur'; import type {AssetKey} from '../../../types/asset-key'; import type {AssertWasmModule, UpgradeWasm} from '../../../types/upgrade'; diff --git a/src/services/modules/upgrade/upgrade.mission-control.services.ts b/src/services/modules/upgrade/upgrade.mission-control.services.ts index baa1672b..10bfc352 100644 --- a/src/services/modules/upgrade/upgrade.mission-control.services.ts +++ b/src/services/modules/upgrade/upgrade.mission-control.services.ts @@ -1,10 +1,11 @@ import {isNullish} from '@dfinity/utils'; +import type {PrincipalText} from '@dfinity/zod-schemas'; import { missionControlVersion, - upgradeMissionControl as upgradeMissionControlAdmin, - type MissionControlParameters + upgradeMissionControl as upgradeMissionControlAdmin } from '@junobuild/admin'; import {hasArgs, nextArg} from '@junobuild/cli-tools'; +import type {MissionControlParameters} from '@junobuild/ic-client'; import {cyan, red} from 'kleur'; import {actorParameters} from '../../../api/actor.api'; import {getCliMissionControl} from '../../../configs/cli.config'; @@ -14,8 +15,9 @@ import {NEW_CMD_LINE} from '../../../utils/prompt.utils'; import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils'; import {selectVersion, upgradeWasmJunoCdn, upgradeWasmLocal} from './upgrade.services'; -type MissionControl = Omit & - Required>; +type MissionControl = Omit & { + missionControlId: PrincipalText; +}; export const upgradeMissionControl = async (args?: string[]) => { const missionControl = await getCliMissionControl(); diff --git a/src/services/modules/upgrade/upgrade.orbiter.services.ts b/src/services/modules/upgrade/upgrade.orbiter.services.ts index 4f345883..9a2c1a8b 100644 --- a/src/services/modules/upgrade/upgrade.orbiter.services.ts +++ b/src/services/modules/upgrade/upgrade.orbiter.services.ts @@ -1,9 +1,7 @@ -import { - orbiterVersion, - upgradeOrbiter as upgradeOrbiterAdmin, - type OrbiterParameters -} from '@junobuild/admin'; +import type {PrincipalText} from '@dfinity/zod-schemas'; +import {orbiterVersion, upgradeOrbiter as upgradeOrbiterAdmin} from '@junobuild/admin'; import {hasArgs, nextArg} from '@junobuild/cli-tools'; +import type {OrbiterParameters} from '@junobuild/ic-client'; import {cyan, red} from 'kleur'; import {actorParameters} from '../../../api/actor.api'; import {getCliOrbiters} from '../../../configs/cli.config'; @@ -19,8 +17,7 @@ import { upgradeWasmLocal } from './upgrade.services'; -type Orbiter = Required> & - Omit; +type Orbiter = Omit & {orbiterId: PrincipalText}; export const upgradeOrbiters = async (args?: string[]) => { const authOrbiters = await getCliOrbiters(); diff --git a/src/services/modules/upgrade/upgrade.satellite.services.ts b/src/services/modules/upgrade/upgrade.satellite.services.ts index 497ac48a..28a88873 100644 --- a/src/services/modules/upgrade/upgrade.satellite.services.ts +++ b/src/services/modules/upgrade/upgrade.satellite.services.ts @@ -2,13 +2,13 @@ import {isNullish} from '@dfinity/utils'; import { listCustomDomains, satelliteVersion, - upgradeSatellite as upgradeSatelliteAdmin, - type SatelliteParameters + upgradeSatellite as upgradeSatelliteAdmin } from '@junobuild/admin'; import {hasArgs, nextArg} from '@junobuild/cli-tools'; import {cyan, red} from 'kleur'; import {compare} from 'semver'; import {SATELLITE_WASM_NAME} from '../../../constants/constants'; +import {type SatelliteParametersWithId} from '../../../types/satellite'; import { type AssertWasmModule, type UpgradeCdn, @@ -28,9 +28,6 @@ import { upgradeWasmLocal } from './upgrade.services'; -type Satellite = Omit & - Required>; - export const upgradeSatellite = async (args?: string[]) => { const {satellite} = await assertConfigAndLoadSatelliteContext(); const {satelliteId} = satellite; @@ -59,7 +56,7 @@ const upgradeSatelliteCustom = async ({ satellite, args }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; args?: string[]; }): Promise<{success: boolean; err?: unknown}> => { const src = nextArg({args, option: '-s'}) ?? nextArg({args, option: '--src'}); @@ -81,7 +78,7 @@ export const upgradeSatelliteWithSrc = async ({ satellite, ...rest }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; src: string; args?: string[]; }): Promise<{success: boolean; err?: unknown}> => { @@ -106,7 +103,7 @@ export const upgradeSatelliteWithCdn = async ({ satellite, ...rest }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; cdn: UpgradeCdn; args?: string[]; }): Promise<{success: boolean; err?: unknown}> => { @@ -131,7 +128,7 @@ const upgradeSatelliteWithUpgradeFn = async ({ args, upgradeFn }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; args?: string[]; upgradeFn: (params: UpgradeWasmParams) => Promise<{success: boolean; err?: unknown}>; }): Promise<{success: boolean; err?: unknown}> => { @@ -156,7 +153,7 @@ const upgradeSatelliteRelease = async ({ satellite, args }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; args?: string[]; }): Promise<{success: boolean; err?: unknown}> => { const currentVersion = await satelliteVersion({ @@ -199,7 +196,7 @@ const executeUpgradeSatellite = async ({ preClearChunks, noSnapshot }: { - satellite: Satellite; + satellite: SatelliteParametersWithId; args?: string[]; currentVersion: string; preClearChunks: boolean; diff --git a/src/services/modules/upgrade/upgrade.services.ts b/src/services/modules/upgrade/upgrade.services.ts index 4d23f40e..6caae30c 100644 --- a/src/services/modules/upgrade/upgrade.services.ts +++ b/src/services/modules/upgrade/upgrade.services.ts @@ -5,10 +5,10 @@ import { UpgradeCodeProgressStep, UpgradeCodeUnchangedError, type CustomDomain, - type SatelliteParameters, type UpgradeCodeProgress } from '@junobuild/admin'; import {assertAnswerCtrlC, downloadFromURL, hasArgs} from '@junobuild/cli-tools'; +import {type SatelliteParameters} from '@junobuild/ic-client'; import {green, red, yellow} from 'kleur'; import {createHash} from 'node:crypto'; import {readFile} from 'node:fs/promises'; diff --git a/src/types/satellite.ts b/src/types/satellite.ts index 7621c6e6..39476711 100644 --- a/src/types/satellite.ts +++ b/src/types/satellite.ts @@ -1,4 +1,6 @@ -import {type SatelliteParameters} from '@junobuild/admin'; +import type {PrincipalText} from '@dfinity/zod-schemas'; +import type {SatelliteParameters} from '@junobuild/ic-client'; -export type SatelliteParametersWithId = Omit & - Required>; +export type SatelliteParametersWithId = Omit & { + satelliteId: PrincipalText; +};