Skip to content

fix: dev server urls not passed to msha correctly #957

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: dev server urls not passed to msha correctly #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/cli/commands/start/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ export async function start(options: SWACLIConfig) {
SWA_CLI_VERSION: packageInfo.version,
SWA_CLI_SERVER_TIMEOUT: `${devserverTimeout}`,
SWA_CLI_OPEN_BROWSER: open ? "true" : "false",
SWA_CLI_APP_DEVSERVER_URL: appDevserverUrl,
SWA_CLI_API_DEVSERVER_URL: useApiDevServer,
SWA_CLI_DATA_API_DEVSERVER_URL: useDataApiDevServer,
};

// merge SWA CLI env variables with process.env
Expand Down
12 changes: 6 additions & 6 deletions src/core/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export const GIT_IGNORE_FILENAME = ".gitignore";

export const SWA_CLI_APP_PROTOCOL = DEFAULT_CONFIG.ssl ? `https` : `http`;
export const SWA_PUBLIC_DIR = path.resolve(__dirname, "..", "public"); //SWA_PUBLIC_DIR = "../public"
export const HAS_API = Boolean(DEFAULT_CONFIG.apiLocation && SWA_CLI_API_URI());
export const HAS_API = Boolean((DEFAULT_CONFIG.apiLocation || DEFAULT_CONFIG.apiDevserverUrl) && SWA_CLI_API_URI());

export const SWA_CONFIG_FILENAME = "staticwebapp.config.json";
export const SWA_CONFIG_FILENAME_LEGACY = "routes.json";
Expand Down Expand Up @@ -318,21 +318,21 @@ export const DEFAULT_RUNTIME_LANGUAGE = "node";
// The reason for this is that these function depend on values set by environment variables which are set
// during the startup of the CLI (see src/cli/commands/start.ts)
export function IS_APP_DEV_SERVER() {
return isHttpUrl(DEFAULT_CONFIG.outputLocation);
return isHttpUrl(DEFAULT_CONFIG.appDevserverUrl) || isHttpUrl(DEFAULT_CONFIG.outputLocation);
}
export function IS_API_DEV_SERVER() {
return isHttpUrl(DEFAULT_CONFIG.apiLocation);
return isHttpUrl(DEFAULT_CONFIG.apiDevserverUrl);
}
export function SWA_CLI_API_URI() {
return IS_API_DEV_SERVER() ? DEFAULT_CONFIG.apiLocation : address(DEFAULT_CONFIG.host, DEFAULT_CONFIG.apiPort);
return IS_API_DEV_SERVER() ? DEFAULT_CONFIG.apiDevserverUrl : address(DEFAULT_CONFIG.host, DEFAULT_CONFIG.apiPort);
}

export function IS_DATA_API_DEV_SERVER() {
return isHttpUrl(DEFAULT_CONFIG.dataApiLocation);
return isHttpUrl(DEFAULT_CONFIG.dataApiDevserverUrl);
}

export function SWA_CLI_DATA_API_URI() {
return IS_DATA_API_DEV_SERVER() ? DEFAULT_CONFIG.dataApiLocation : address(DEFAULT_CONFIG.host, DEFAULT_CONFIG.dataApiPort, "http");
return IS_DATA_API_DEV_SERVER() ? DEFAULT_CONFIG.dataApiDevserverUrl : address(DEFAULT_CONFIG.host, DEFAULT_CONFIG.dataApiPort, "http");
}

// Constants related to swa login
Expand Down
Loading