Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jikun/start or deploy from outside #740

Merged
merged 5 commits into from
Aug 22, 2023
Merged

Jikun/start or deploy from outside #740

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e594e5
fix: accept apiDevserverUrl with non-ok response
Aug 2, 2023
c9bfcbd
Merge branch 'main' of https://github.com/Azure/static-web-apps-cli i…
Aug 15, 2023
610459f
feat: support start or deploy outside app folder
Aug 18, 2023
735fc94
introducing prompts
Aug 21, 2023
03d034a
remove prompts
Aug 22, 2023
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
29 changes: 20 additions & 9 deletions src/core/utils/cli-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,33 @@ export function matchLoadedConfigName(name: string) {
* @returns An object with the `{@link SWACLIOptions}` config or an empty object if the config file, or the config entry were not found.
*/
export async function getConfigFileOptions(configName: string | undefined, configFilePath: string): Promise<SWACLIConfig> {
logger.silly(`Getting config file options from ${configFilePath}...`);
logger.silly(`Getting config file options from "${configFilePath}"...`);

configFilePath = path.resolve(configFilePath);
if (!swaCliConfigFileExists(configFilePath)) {
logger.silly(`Config file does not exist at ${configFilePath}`);
return {};
let configFilePathResolved = path.resolve(configFilePath);
if (!swaCliConfigFileExists(configFilePathResolved)) {
logger.silly(`Config file does not exist at "${configFilePath}"`);

// Handle the case when the user runs the command outside the project path
if (!configName || !swaCliConfigFileExists(path.resolve(configName, swaCliConfigFilename))) {
return {};
}
logger.warn(
`WARNING: Config file does not exist at "${configFilePath}", but can be detected at "${path.join(
configName,
swaCliConfigFilename
)}". Do you mean "swa --config ${path.join(configName, swaCliConfigFilename)} <command> ${configName} [options]"?`
);
configFilePathResolved = path.resolve(configName, swaCliConfigFilename);
}

const cliConfig = await tryParseSwaCliConfig(configFilePath);
const cliConfig = await tryParseSwaCliConfig(configFilePathResolved);
if (!cliConfig.configurations) {
logger.warn(`${swaCliConfigFilename} is missing the "configurations" property. No options will be loaded.`);
return {};
}

// Use configuration root path as the outputLocation
const configDir = path.dirname(configFilePath);
const configDir = path.dirname(configFilePathResolved);
process.chdir(configDir);

logger.silly(`Changed directory to ${configDir}`);
Expand All @@ -76,10 +87,10 @@ export async function getConfigFileOptions(configName: string | undefined, confi
}

const [configName, config] = Object.entries(cliConfig.configurations)[0];
printConfigMsg(configName, configFilePath);
printConfigMsg(configName, configFilePathResolved);
currentSwaCliConfigFromFile = {
name: configName,
filePath: configFilePath,
filePath: configFilePathResolved,
config,
};
return { ...config };
Expand Down