Skip to content

Commit c1a2c19

Browse files
Merge pull request #72 from angular/master
Off-by-one in generated
2 parents baac252 + fdf6c9b commit c1a2c19

File tree

4 files changed

+57
-31
lines changed

4 files changed

+57
-31
lines changed

docs/auth/router-guards.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ Example use:
3131
```ts
3232
import { AngularFireAuthGuard, hasCustomClaim, redirectUnauthorizedTo, redirectLoggedInTo } from '@angular/fire/auth-guard';
3333

34-
const adminOnly = hasCustomClaim('admin');
35-
const redirectUnauthorizedToLogin = redirectUnauthorizedTo(['login']);
36-
const redirectLoggedInToItems = redirectLoggedInTo(['items']);
34+
const adminOnly = () => hasCustomClaim('admin');
35+
const redirectUnauthorizedToLogin = () => redirectUnauthorizedTo(['login']);
36+
const redirectLoggedInToItems = () => redirectLoggedInTo(['items']);
3737
const belongsToAccount = (next) => hasCustomClaim(`account-${next.params.id}`);
3838

3939
export const routes: Routes = [

docs/functions/functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class AppModule {}
119119

120120
### Firebase Hosting integration
121121

122-
If you serve your app using [Firebase Hosting](https://firebase.google.com/docs/hosting/), you can configure Functions to be served from the same domain as your app. This will avoid an extra round-trip per function call due to [CORS preflight request](https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request).
122+
If you serve your app using [Firebase Hosting](https://firebase.google.com/docs/hosting/), you can configure Functions to be served from the same domain as your app. This will avoid an extra round-trip per function call due to [CORS preflight request](https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request). This only applies to sites hosted via firebase on `us-central1`.
123123

124124
To set this up, you first need to update your `hosting` section in `firebase.json` and add one `rewrite` rule per function:
125125

test/ng-build/ng6/yarn.lock

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ babylon@^6.18.0:
701701
balanced-match@^1.0.0:
702702
version "1.0.0"
703703
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
704+
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
704705

705706
base64-js@^1.0.2:
706707
version "1.2.1"
@@ -848,8 +849,9 @@ boxen@^1.2.1:
848849
widest-line "^2.0.0"
849850

850851
brace-expansion@^1.1.7:
851-
version "1.1.8"
852-
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
852+
version "1.1.11"
853+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
854+
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
853855
dependencies:
854856
balanced-match "^1.0.0"
855857
concat-map "0.0.1"
@@ -1487,6 +1489,7 @@ compression@^1.7.0:
14871489
14881490
version "0.0.1"
14891491
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
1492+
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
14901493

14911494
concat-stream@^1.5.0:
14921495
version "1.6.0"
@@ -2796,6 +2799,7 @@ fs-write-stream-atomic@^1.0.8:
27962799
fs.realpath@^1.0.0:
27972800
version "1.0.0"
27982801
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
2802+
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
27992803

28002804
fsevents@^1.0.0:
28012805
version "1.1.2"
@@ -2828,8 +2832,9 @@ fstream-ignore@^1.0.5:
28282832
minimatch "^3.0.0"
28292833

28302834
fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
2831-
version "1.0.11"
2832-
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
2835+
version "1.0.12"
2836+
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
2837+
integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
28332838
dependencies:
28342839
graceful-fs "^4.1.2"
28352840
inherits "~2.0.0"
@@ -2969,7 +2974,7 @@ glob@^6.0.4:
29692974
once "^1.3.0"
29702975
path-is-absolute "^1.0.0"
29712976

2972-
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
2977+
glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1:
29732978
version "7.1.2"
29742979
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
29752980
dependencies:
@@ -2980,6 +2985,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
29802985
once "^1.3.0"
29812986
path-is-absolute "^1.0.0"
29822987

2988+
glob@^7.1.3:
2989+
version "7.1.4"
2990+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
2991+
integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
2992+
dependencies:
2993+
fs.realpath "^1.0.0"
2994+
inflight "^1.0.4"
2995+
inherits "2"
2996+
minimatch "^3.0.4"
2997+
once "^1.3.0"
2998+
path-is-absolute "^1.0.0"
2999+
29833000
global-dirs@^0.1.0:
29843001
version "0.1.1"
29853002
resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -3064,14 +3081,10 @@ got@^6.7.1:
30643081
unzip-response "^2.0.1"
30653082
url-parse-lax "^1.0.0"
30663083

3067-
graceful-fs@^4.1.0, graceful-fs@^4.1.9:
3068-
version "4.1.15"
3069-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
3070-
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
3071-
3072-
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
3073-
version "4.1.11"
3074-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
3084+
graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
3085+
version "4.2.2"
3086+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
3087+
integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
30753088

30763089
gtoken@^1.2.1:
30773090
version "1.2.3"
@@ -3449,18 +3462,24 @@ [email protected]:
34493462
inflight@^1.0.4:
34503463
version "1.0.6"
34513464
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
3465+
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
34523466
dependencies:
34533467
once "^1.3.0"
34543468
wrappy "1"
34553469

3456-
inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
3457-
version "2.0.3"
3458-
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
3470+
inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
3471+
version "2.0.4"
3472+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
3473+
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
34593474

34603475
34613476
version "2.0.1"
34623477
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
34633478

3479+
3480+
version "2.0.3"
3481+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
3482+
34643483
ini@^1.3.4:
34653484
version "1.3.5"
34663485
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -4270,8 +4289,9 @@ lodash.keys@~2.4.1:
42704289
lodash.isobject "~2.4.1"
42714290

42724291
lodash.mergewith@^4.6.0:
4273-
version "4.6.0"
4274-
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
4292+
version "4.6.2"
4293+
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
4294+
integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
42754295

42764296
lodash.noop@^3.0.1:
42774297
version "3.0.1"
@@ -4562,12 +4582,14 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
45624582
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
45634583
version "3.0.4"
45644584
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
4585+
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
45654586
dependencies:
45664587
brace-expansion "^1.1.7"
45674588

45684589
45694590
version "0.0.8"
45704591
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
4592+
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
45714593

45724594
minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
45734595
version "1.2.0"
@@ -5096,6 +5118,7 @@ on-headers@~1.0.1:
50965118
[email protected], once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
50975119
version "1.4.0"
50985120
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
5121+
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
50995122
dependencies:
51005123
wrappy "1"
51015124

@@ -5324,6 +5347,7 @@ path-exists@^3.0.0:
53245347
path-is-absolute@^1.0.0:
53255348
version "1.0.1"
53265349
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
5350+
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
53275351

53285352
path-is-inside@^1.0.1:
53295353
version "1.0.2"
@@ -6105,10 +6129,11 @@ right-align@^0.1.1:
61056129
align-text "^0.1.1"
61066130

61076131
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
6108-
version "2.6.2"
6109-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
6132+
version "2.7.1"
6133+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
6134+
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
61106135
dependencies:
6111-
glob "^7.0.5"
6136+
glob "^7.1.3"
61126137

61136138
ripemd160@^2.0.0, ripemd160@^2.0.1:
61146139
version "2.0.1"
@@ -7645,6 +7670,7 @@ wrap-ansi@^2.0.0:
76457670
wrappy@1:
76467671
version "1.0.2"
76477672
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
7673+
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
76487674

76497675
write-file-atomic@^1.1.2:
76507676
version "1.3.4"

test/universal-test/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,8 +1685,8 @@ form-data@~2.1.1:
16851685
mime-types "^2.1.12"
16861686

16871687
forwarded@~0.1.0:
1688-
version "0.1.0"
1689-
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
1688+
version "0.1.2"
1689+
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
16901690

16911691
16921692
version "0.5.0"
@@ -2582,8 +2582,8 @@ lodash.memoize@^4.1.2:
25822582
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
25832583

25842584
lodash.mergewith@^4.6.0:
2585-
version "4.6.0"
2586-
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
2585+
version "4.6.2"
2586+
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
25872587

25882588
lodash.tail@^4.1.1:
25892589
version "4.1.1"
@@ -2626,8 +2626,8 @@ lru-cache@^4.0.1:
26262626
yallist "^2.1.2"
26272627

26282628
macaddress@^0.2.8:
2629-
version "0.2.8"
2630-
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
2629+
version "0.2.9"
2630+
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.9.tgz#3579b8b9acd5b96b4553abf0f394185a86813cb3"
26312631

26322632
magic-string@^0.22.3:
26332633
version "0.22.4"

0 commit comments

Comments
 (0)