Skip to content

Commit b8ef5fa

Browse files
jamesdanielsjamesxabregasalexastrum
authored
Update ALLOWED_SSR_REGIONS constant for web frameworks (#6591)
Update list of `ALLOWED_SSR_REGIONS` in web frameworks config to include the current list of regions that support gen 2 Cloud Functions. --------- Co-authored-by: James Xabregas <[email protected]> Co-authored-by: Alex Astrum <[email protected]>
1 parent 49ec949 commit b8ef5fa

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
- Fixed an issue preventing Angular apps using ng-deploy from being emulated or deployed. (#6584)
44
- Warn if a Web Framework is outside a well known version range on deploy/emulate. (#6562)
55
- Use Web Framework's well known version range in `firebase init hosting`. (#6562)
6+
- Permit use of more SSR regions in Web Frameworks deploys. (#6086)
67
- Limit Web Framework's generated Cloud Function name to 23 characters, fixing deploys for some. (#6260)

src/frameworks/constants.ts

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,35 @@ export const VALID_LOCALE_FORMATS = [/^ALL_[a-z]+$/, /^[a-z]+_ALL$/, /^[a-z]+(_[
4040

4141
export const DEFAULT_REGION = "us-central1";
4242
export const ALLOWED_SSR_REGIONS = [
43-
{ name: "us-central1 (Iowa)", value: "us-central1" },
44-
{ name: "us-west1 (Oregon)", value: "us-west1" },
45-
{ name: "us-east1 (South Carolina)", value: "us-east1" },
46-
{ name: "europe-west1 (Belgium)", value: "europe-west1" },
47-
{ name: "asia-east1 (Taiwan)", value: "asia-east1" },
43+
{ name: "us-central1 (Iowa)", value: "us-central1", recommended: true },
44+
{ name: "us-east1 (South Carolina)", value: "us-east1", recommended: true },
45+
{ name: "us-east4 (Northern Virginia)", value: "us-east4" },
46+
{ name: "us-west1 (Oregon)", value: "us-west1", recommended: true },
47+
{ name: "us-west2 (Los Angeles)", value: "us-west2" },
48+
{ name: "us-west3 (Salt Lake City)", value: "us-west3" },
49+
{ name: "us-west4 (Las Vegas)", value: "us-west4" },
50+
{ name: "asia-east1 (Taiwan)", value: "asia-east1", recommended: true },
51+
{ name: "asia-east2 (Hong Kong)", value: "asia-east2" },
52+
{ name: "asia-northeast1 (Tokyo)", value: "asia-northeast1" },
53+
{ name: "asia-northeast2 (Osaka)", value: "asia-northeast2" },
54+
{ name: "asia-northeast3 (Seoul)", value: "asia-northeast3" },
55+
{ name: "asia-south1 (Mumbai)", value: "asia-south1" },
56+
{ name: "asia-south2 (Delhi)", value: "asia-south2" },
57+
{ name: "asia-southeast1 (Singapore)", value: "asia-southeast1" },
58+
{ name: "asia-southeast2 (Jakarta)", value: "asia-southeast2" },
59+
{ name: "australia-southeast1 (Sydney)", value: "australia-southeast1" },
60+
{ name: "australia-southeast2 (Melbourne)", value: "australia-southeast2" },
61+
{ name: "europe-central2 (Warsaw)", value: "europe-central2" },
62+
{ name: "europe-north1 (Finland)", value: "europe-north1" },
63+
{ name: "europe-west1 (Belgium)", value: "europe-west1", recommended: true },
64+
{ name: "europe-west2 (London)", value: "europe-west2" },
65+
{ name: "europe-west3 (Frankfurt)", value: "europe-west3" },
66+
{ name: "europe-west4 (Netherlands)", value: "europe-west4" },
67+
{ name: "europe-west6 (Zurich)", value: "europe-west6" },
68+
{ name: "northamerica-northeast1 (Montreal)", value: "northamerica-northeast1" },
69+
{ name: "northamerica-northeast2 (Toronto)", value: "northamerica-northeast2" },
70+
{ name: "southamerica-east1 (São Paulo)", value: "southamerica-east1" },
71+
{ name: "southamerica-west1 (Santiago)", value: "southamerica-west1" },
4872
];
4973

5074
export const I18N_ROOT = "/";

src/init/features/hosting/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export async function doSetup(setup: any, config: any, options: Options): Promis
160160
type: "list",
161161
message: "In which region would you like to host server-side content, if applicable?",
162162
default: DEFAULT_REGION,
163-
choices: ALLOWED_SSR_REGIONS,
163+
choices: ALLOWED_SSR_REGIONS.filter((region) => region.recommended),
164164
},
165165
setup.hosting
166166
);

0 commit comments

Comments
 (0)