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/cli/env.loader.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {notEmptyString} from '@dfinity/utils';
import {nextArg} from '@junobuild/cli-tools';
import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli.env';
import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli/cli.env';

export const loadEnv = (): JunoCliEnv => {
const [_, ...args] = process.argv.slice(2);
Expand Down
2 changes: 1 addition & 1 deletion src/configs/cli.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type Conf from 'conf';
import {red, yellow} from 'kleur';
import {askForPassword} from '../services/cli.settings.services';
import {getSettingsStore} from '../stores/settings.store';
import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli.config';
import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli/cli.config';
import {loadConfig} from '../utils/cli.config.utils';

// Save in https://github.com/sindresorhus/env-paths#pathsconfig
Expand Down
2 changes: 1 addition & 1 deletion src/configs/cli.settings.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Conf, {type Schema} from 'conf';
import {ENV} from '../env';
import {type CliSettings} from '../types/cli.settings';
import {type CliSettings} from '../types/cli/cli.settings';

const schema: Schema<CliSettings> = {
encryption: {
Expand Down
2 changes: 1 addition & 1 deletion src/configs/cli.state.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
type CliState,
type CliStateSatellite,
type CliStateSatelliteAppliedConfigHashes
} from '../types/cli.state';
} from '../types/cli/cli.state';

export const getStateConfig = (): Conf<CliState> =>
new Conf<CliState>({projectName: ENV.config.projectStateName});
Expand Down
4 changes: 2 additions & 2 deletions src/constants/config.constants.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {Schema} from 'conf';
import {ENV} from '../env';
import {type CliConfig} from '../types/cli.config';
import {type CliDefaultOptions, type CliOptions} from '../types/cli.options';
import {type CliConfig} from '../types/cli/cli.config';
import {type CliDefaultOptions, type CliOptions} from '../types/cli/cli.options';

const schema: Schema<CliConfig> = {
token: {
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 @@ -42,7 +42,7 @@ import {
type ConfigHash,
type RuleHash,
type SettingsHash
} from '../../types/cli.state';
} from '../../types/cli/cli.state';
import type {SatelliteParametersWithId} from '../../types/satellite';
import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils';
import {objHash} from '../../utils/obj.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/services/config/init.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
writeJunoConfig,
writeJunoConfigPlaceholder
} from '../../configs/juno.config';
import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli.config';
import type {CliOrbiterConfig, CliSatelliteConfig} from '../../types/cli/cli.config';
import {type EmulatorConfigWithoutConsole} from '../../types/emulator';
import type {PackageManager} from '../../types/pm';
import {detectPackageManager} from '../../utils/pm.utils';
Expand Down
2 changes: 1 addition & 1 deletion src/stores/settings.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type Conf from 'conf';
import {yellow} from 'kleur';
import {getSettingsConfig, saveEncryption} from '../configs/cli.settings.config';
import {askForPassword} from '../services/cli.settings.services';
import type {CliSettings} from '../types/cli.settings';
import type {CliSettings} from '../types/cli/cli.settings';
import {configFileExists, loadConfig} from '../utils/cli.config.utils';
import {isHeadless} from '../utils/process.utils';
import {confirm} from '../utils/prompt.utils';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/utils/cli.config.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {existsSync} from 'node:fs';
import {resolve} from 'node:path';
import {getCliOrbiters, getCliSatellites} from '../configs/cli.config';
import {CONFIG_OPTIONS} from '../constants/config.constants';
import type {CliConfig} from '../types/cli.config';
import type {CliConfig} from '../types/cli/cli.config';

export const loadConfig = (encryptionKey: string | undefined): Conf<CliConfig> => {
return new Conf<CliConfig>({
Expand Down
Loading