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
1 change: 0 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
CLI_PROJECT_NAME=juno-dev
1 change: 0 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
CLI_PROJECT_NAME=juno
17 changes: 15 additions & 2 deletions src/cli/env.loader.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {notEmptyString} from '@dfinity/utils';
import {nextArg} from '@junobuild/cli-tools';
import {JunoCliEnv, JunoConsole} from '../types/cli.env';
import {type JunoCliConfig, type JunoCliEnv, type JunoConsole} from '../types/cli.env';

export const loadEnv = (): JunoCliEnv => {
const [_, ...args] = process.argv.slice(2);
Expand All @@ -13,7 +14,8 @@ export const loadEnv = (): JunoCliEnv => {
return {
mode: mode ?? 'production',
containerUrl: envContainerUrl,
console: loadEnvConsole({args, mode})
console: loadEnvConsole({args, mode}),
config: loadEnvConfig({mode})
};
};

Expand All @@ -31,3 +33,14 @@ const loadEnvConsole = ({args, mode}: {args?: string[]; mode: string | undefined
}
};
};

const loadEnvConfig = ({mode}: {mode: string | undefined}): JunoCliConfig => {
// Historically we used "juno" - without environment reference - for production.
// That is why we keep this approach for backwards compatibility.
const projectName = notEmptyString(mode) && mode !== 'production' ? `juno-${mode}` : 'juno';

return {
projectName,
projectSettingsName: `${projectName}-cli-settings`
};
};
4 changes: 2 additions & 2 deletions src/configs/cli.settings.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Conf, {type Schema} from 'conf';
import {CLI_SETTINGS_NAME} from '../constants/constants';
import {ENV} from '../env';

export interface CliSettingsConfig {
encryption: boolean;
Expand All @@ -12,7 +12,7 @@ const schema: Schema<CliSettingsConfig> = {
} as const;

export const getSettingsConfig = (): Conf<CliSettingsConfig> =>
new Conf<CliSettingsConfig>({projectName: CLI_SETTINGS_NAME, schema});
new Conf<CliSettingsConfig>({projectName: ENV.config.projectSettingsName, schema});

export const saveEncryption = (encryption: boolean) => {
getSettingsConfig().set('encryption', encryption);
Expand Down
8 changes: 4 additions & 4 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 {CLI_PROJECT_NAME} from './constants';
import {CliConfig} from '../types/cli.config';
import {CliDefaultOptions, CliOptions} from '../types/cli.options';
import {ENV} from '../env';
import {type CliConfig} from '../types/cli.config';
import {type CliDefaultOptions, type CliOptions} from '../types/cli.options';

const schema: Schema<CliConfig> = {
token: {
Expand All @@ -22,6 +22,6 @@ const DEFAULT_CONF_OPTIONS: CliDefaultOptions = {

export const CONFIG_OPTIONS: CliOptions = {
...DEFAULT_CONF_OPTIONS,
projectName: CLI_PROJECT_NAME,
projectName: ENV.config.projectName,
schema
};
2 changes: 0 additions & 2 deletions src/constants/constants.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export const CLI_PROJECT_NAME = process.env.CLI_PROJECT_NAME ?? 'juno';
export const CLI_SETTINGS_NAME = `${CLI_PROJECT_NAME}-cli-settings`;
export const REDIRECT_URL = 'http://localhost:{port}';
export const JUNO_CONFIG_FILENAME = 'juno.config'; // .json | .js | .mjs | .cjs | .ts
export const JUNO_DEV_CONFIG_FILENAME = 'juno.dev.config'; // .json | .js | .mjs | .cjs | .ts
Expand Down
12 changes: 10 additions & 2 deletions src/types/cli.env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,22 @@ import type {JunoConfigEnv} from '@junobuild/config';
export type JunoCliEnv = JunoConfigEnv & {
containerUrl: string | undefined;
console: JunoConsole;
config: JunoCliConfig;
};

interface JunoConsole {
export interface JunoConsole {
urls: JunoConsoleUrls;
}

interface JunoConsoleUrls {
export interface JunoConsoleUrls {
root: string;
satellite: string;
auth: string;
}

export interface JunoCliConfig {
// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
projectName: string | 'juno';
// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
projectSettingsName: string | 'juno-cli-settings';
}
9 changes: 6 additions & 3 deletions src/types/cli.options.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import type {Options as ConfOptions} from 'conf';
import {CliConfig} from './cli.config';
import {type CliConfig} from './cli.config';

type CliConfigRequiredOptions = Required<ConfOptions<CliConfig>>;

export type CliDefaultOptions = Pick<CliConfigRequiredOptions, 'fileExtension' | 'projectSuffix' | 'configName'>;
export type CliDefaultOptions = Pick<
CliConfigRequiredOptions,
'fileExtension' | 'projectSuffix' | 'configName'
>;

// TODO: We do not inherit the type of projectName from RequiredOptions because somehow TypeScript does not checks it's a defined string once made required
export type CliOptions = {projectName: string} & Pick<CliConfigRequiredOptions, 'schema'> &
CliDefaultOptions;
CliDefaultOptions;