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
2 changes: 1 addition & 1 deletion src/commands/open.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {listCustomDomains, type CustomDomain} from '@junobuild/admin';
import {assertAnswerCtrlC, hasArgs, nextArg} from '@junobuild/cli-tools';
import prompts from 'prompts';
import {consoleUrl, defaultSatelliteDomain} from '../utils/domain.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';
import {openUrl} from '../utils/open.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';

export const open = async (args?: string[]) => {
const {satellite} = await assertConfigAndLoadSatelliteContext();
Expand Down
2 changes: 1 addition & 1 deletion src/commands/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {checkVersion, getSatelliteVersion} from '../services/version.services';
import type {AssetKey} from '../types/asset-key';
import {toAssetKeys} from '../utils/asset-key.utils';
import {orbiterKey, satelliteKey} from '../utils/cli.config.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';
import {lastRelease} from '../utils/upgrade.utils';

export const status = async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/services/assert.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {satelliteMemorySize, satelliteVersion} from '@junobuild/admin';
import {yellow} from 'kleur';
import {compare} from 'semver';
import {MEMORY_HEAP_WARNING, MEMORY_SIZE_ENDPOINT_VERSION} from '../constants/deploy.constants';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';
import {isHeadless} from '../utils/process.utils';
import {NEW_CMD_LINE, confirmAndExit} from '../utils/prompt.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';

export const assertSatelliteMemorySize = async () => {
const {satellite, satelliteConfig} = await assertConfigAndLoadSatelliteContext();
Expand Down
2 changes: 1 addition & 1 deletion src/services/assets/_deploy/deploy.execute.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
type UploadParams
} from '../../../types/deploy';
import type {SatelliteParametersWithId} from '../../../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils';
import {assertSatelliteMemorySize} from '../../assert.services';
import {listAssets} from './deploy.list.services';

Expand Down
2 changes: 1 addition & 1 deletion src/services/assets/clear.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {deleteAsset} from '@junobuild/core';
import {green, yellow} from 'kleur';
import ora from 'ora';
import {noJunoConfig} from '../../configs/juno.config';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
import {consoleNoConfigFound} from '../../utils/msg.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';

export const clear = async (args?: string[]) => {
if (await noJunoConfig()) {
Expand Down
2 changes: 1 addition & 1 deletion src/services/auth/login.emulator.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {saveCliConfig} from '../../configs/cli.config';
import {readEmulatorConfig} from '../../configs/emulator.config';
import {ENV} from '../../env';
import {generateToken} from '../../utils/auth.utils';
import {assertConfigAndReadSatelliteId} from '../../utils/satellite.utils';
import {assertConfigAndReadSatelliteId} from '../../utils/juno.config.utils';
import {dispatchRequest} from '../emulator/admin.services';

export const loginEmulatorOnly = async () => {
Expand Down
2 changes: 1 addition & 1 deletion src/services/changes/changes.apply.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {hasArgs} from '@junobuild/cli-tools';
import ora from 'ora';
import type {SatelliteParametersWithId} from '../../types/satellite';
import {readChangesIdAndHash} from '../../utils/changes.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';

export const applyChanges = async (args?: string[]) => {
const {satellite} = await assertConfigAndLoadSatelliteContext();
Expand Down
2 changes: 1 addition & 1 deletion src/services/changes/changes.clear.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {deleteProposalAssets} from '@junobuild/cdn';
import {hasArgs} from '@junobuild/cli-tools';
import {green} from 'kleur';
import ora from 'ora';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';

export const clearProposalStagedAssets = async ({
args,
Expand Down
2 changes: 1 addition & 1 deletion src/services/changes/changes.list.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {listProposals as listProposalsLib, type Proposal, type ProposalKey} from
import {hasArgs} from '@junobuild/cli-tools';
import {type SatelliteParametersWithId} from '../../types/satellite';
import {formatDate} from '../../utils/format.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';

export const listChanges = async (args?: string[]) => {
const {satellite} = await assertConfigAndLoadSatelliteContext();
Expand Down
2 changes: 1 addition & 1 deletion src/services/changes/changes.reject.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {hasArgs} from '@junobuild/cli-tools';
import ora from 'ora';
import type {SatelliteParametersWithId} from '../../types/satellite';
import {readChangesIdAndHash} from '../../utils/changes.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';

export const rejectChanges = async (args?: string[]) => {
const {satellite} = await assertConfigAndLoadSatelliteContext();
Expand Down
2 changes: 1 addition & 1 deletion src/services/config/apply.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ import {
type SettingsHash
} from '../../types/cli.state';
import type {SatelliteParametersWithId} from '../../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
import {objHash} from '../../utils/obj.utils';
import {isHeadless} from '../../utils/process.utils';
import {confirmAndExit} from '../../utils/prompt.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {getSettings, setSettings} from './settings.services';

type SetConfigResults = [
Expand Down
2 changes: 1 addition & 1 deletion src/services/functions/publish.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {CDN_RELEASES_FULL_PATH} from '../../constants/functions.constants';
import {ENV} from '../../env';
import type {UploadFileFnParamsWithProposal} from '../../types/deploy';
import type {SatelliteParametersWithId} from '../../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
import {readWasmFileMetadata} from '../../utils/wasm.utils';
import {assertSatelliteMemorySize} from '../assert.services';
import {clearProposalStagedAssets} from '../changes/changes.clear.services';
Expand Down
2 changes: 1 addition & 1 deletion src/services/functions/upgrade/upgrade.services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {hasArgs, nextArg} from '@junobuild/cli-tools';
import {SATELLITE_OUTPUT} from '../../../constants/dev.constants';
import {type SatelliteParametersWithId} from '../../../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils';
import {upgradeSatelliteWithSrc} from '../../modules/upgrade/upgrade.satellite.services';
import {upgradeWithCdn} from './upgrade.cdn.services';

Expand Down
2 changes: 1 addition & 1 deletion src/services/links.services.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {listCustomDomains} from '@junobuild/admin';
import {yellow} from 'kleur';
import {consoleUrl, defaultSatelliteDomain} from '../utils/domain.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';
import {terminalLink} from '../utils/links.utils';
import {isHeadless} from '../utils/process.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';

export const links = async () => {
const {satellite} = await assertConfigAndLoadSatelliteContext();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {assertNonNullish} from '@dfinity/utils';
import {noJunoConfig} from '../../../configs/juno.config';
import type {AssetKey} from '../../../types/asset-key';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils';
import {consoleNoConfigFound} from '../../../utils/msg.utils';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils';
import {
createSnapshot,
deleteSnapshot,
Expand Down
2 changes: 1 addition & 1 deletion src/services/modules/start-stop.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {canisterStart, canisterStop} from '../../api/ic.api';
import {getCliMissionControl, getCliOrbiters} from '../../configs/cli.config';
import type {AssetKey} from '../../types/asset-key';
import type {StartStopAction} from '../../types/start-stop';
import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';

export const startStopMissionControl = async ({
action
Expand Down
2 changes: 1 addition & 1 deletion src/services/modules/upgrade/upgrade.satellite.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
type UpgradeWasmParams
} from '../../../types/upgrade';
import {satelliteKey} from '../../../utils/cli.config.utils';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils';
import {NEW_CMD_LINE} from '../../../utils/prompt.utils';
import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils';
import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils';
import {assertSatelliteBuildType} from './upgrade-assert.services';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/services/run.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {buildScript, nextArg} from '@junobuild/cli-tools';
import {OnRunSchema, type RunFnOrObject, RunFnOrObjectSchema} from '@junobuild/config';
import {red, yellow} from 'kleur';
import {ENV} from '../env';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';

export const run = async (args?: string[]) => {
const infile = nextArg({args, option: '-s'}) ?? nextArg({args, option: '--src'});
Expand Down
2 changes: 1 addition & 1 deletion src/services/version.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {cyan, green, red, yellow} from 'kleur';
import ora from 'ora';
import {compare} from 'semver';
import type {SatelliteParametersWithId} from '../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';
import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils';

export const getSatelliteVersion = async (): Promise<
{result: 'success'; version: string} | {result: 'error'}
Expand Down
File renamed without changes.