diff --git a/src/commands/base-command.ts b/src/commands/base-command.ts index d3b40a27b6e..a56fd0b40ca 100644 --- a/src/commands/base-command.ts +++ b/src/commands/base-command.ts @@ -727,6 +727,10 @@ export default class BaseCommand extends Command { siteData = result } + if (siteData.id) { + actionCommand.siteId = siteData.id + } + const globalConfig = await getGlobalConfigStore() // ================================================== @@ -769,10 +773,11 @@ export default class BaseCommand extends Command { root: buildDir, configPath, get id() { - return state.get('siteId') + return actionCommand.siteId || state.get('siteId') }, set id(id) { state.set('siteId', id) + actionCommand.siteId = id }, }, // Site information retrieved using the API (api.getSite()) diff --git a/src/commands/env/env.ts b/src/commands/env/env.ts index 5f733196241..baa2f06e1ab 100644 --- a/src/commands/env/env.ts +++ b/src/commands/env/env.ts @@ -20,6 +20,7 @@ export const createEnvCommand = (program: BaseCommand) => { ) .option('--json', 'Output environment variables as JSON') .option('--site ', 'A project name or ID to target') + .addOption(new Option('--site-id ').hideHelp(true)) .addOption( new Option('-s, --scope ', 'Specify a scope') .choices(['builds', 'functions', 'post-processing', 'runtime', 'any']) @@ -47,6 +48,7 @@ export const createEnvCommand = (program: BaseCommand) => { ) .option('--json', 'Output environment variables as JSON') .option('-s, --site ', 'A project name or ID to target') + .addOption(new Option('--site-id ').hideHelp(true)) .description('Import and set environment variables from .env file') .action(async (fileName: string, options: OptionValues, command: BaseCommand) => { const { envImport } = await import('./env-import.js') @@ -63,6 +65,7 @@ export const createEnvCommand = (program: BaseCommand) => { ) .option('--json', 'Output environment variables as JSON') .option('--site ', 'A project name or ID to target') + .addOption(new Option('--site-id ').hideHelp(true)) .addOption(new Option('--plain', 'Output environment variables as plaintext').conflicts('json')) .addOption( new Option('-s, --scope ', 'Specify a scope') @@ -94,6 +97,7 @@ export const createEnvCommand = (program: BaseCommand) => { ) .option('--json', 'Output environment variables as JSON') .option('--site ', 'A project name or ID to target') + .addOption(new Option('--site-id ').hideHelp(true)) .addOption( new Option('-s, --scope ', 'Specify a scope (default: all scopes)').choices([ 'builds', @@ -131,6 +135,7 @@ export const createEnvCommand = (program: BaseCommand) => { ) .option('--json', 'Output environment variables as JSON') .option('-s, --site ', 'A project name or ID to target') + .addOption(new Option('--site-id ').hideHelp(true)) .addExamples([ 'netlify env:unset VAR_NAME # unset in all contexts', 'netlify env:unset VAR_NAME --context production',