Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 88 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/api/actor.api.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/api/agent.api.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 0 additions & 2 deletions src/services/deploy.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ const deployWithProposal = async ({
asset: {
filename,
fullPath,
// @ts-expect-error type incompatibility NodeJS vs bundle
data,
collection,
headers,
Expand Down Expand Up @@ -162,7 +161,6 @@ const deployImmediate = async ({
satellite,
filename,
fullPath,
// @ts-expect-error type incompatibility NodeJS vs bundle
data,
collection,
headers,
Expand Down
1 change: 0 additions & 1 deletion src/services/functions/publish.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]],
Expand Down
3 changes: 2 additions & 1 deletion src/services/modules/upgrade/upgrade-assert.services.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
10 changes: 6 additions & 4 deletions src/services/modules/upgrade/upgrade.mission-control.services.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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<MissionControlParameters, 'missionControlId'> &
Required<Pick<MissionControlParameters, 'missionControlId'>>;
type MissionControl = Omit<MissionControlParameters, 'missionControlId'> & {
missionControlId: PrincipalText;
};

export const upgradeMissionControl = async (args?: string[]) => {
const missionControl = await getCliMissionControl();
Expand Down
11 changes: 4 additions & 7 deletions src/services/modules/upgrade/upgrade.orbiter.services.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -19,8 +17,7 @@ import {
upgradeWasmLocal
} from './upgrade.services';

type Orbiter = Required<Pick<OrbiterParameters, 'orbiterId'>> &
Omit<OrbiterParameters, 'orbiterId'>;
type Orbiter = Omit<OrbiterParameters, 'orbiterId'> & {orbiterId: PrincipalText};

export const upgradeOrbiters = async (args?: string[]) => {
const authOrbiters = await getCliOrbiters();
Expand Down
Loading