Skip to content

Commit 390691b

Browse files
authored
feat(core): NG13 peer (#3057)
* Bump version * Bump deps * Clean up deps a bit more * Support ng13 * upgrade samples * Switch tools/jasmine.js to imports * Drop webpack resolution * Drop the failing tests for now * changelog
1 parent bbb97de commit 390691b

23 files changed

+5580
-8328
lines changed

.github/workflows/test.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
id: node_modules_cache
3232
with:
3333
path: ./node_modules
34-
key: ${{ runner.os }}-14-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
34+
key: ${{ runner.os }}-14-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
3535
restore-keys: |
3636
${{ runner.os }}-14-12-9-9-6-node_modules-
3737
${{ runner.os }}-14-12-9-9-
@@ -71,7 +71,14 @@ jobs:
7171
firebase: ["9"]
7272
firebaseTools: ["9"]
7373
rxjs: ["6", "7"]
74-
ng: ["12"]
74+
ng: ["12", "13"]
75+
exclude:
76+
# TODO investigate failures
77+
# https://github.com/angular/angularfire/runs/4174069788
78+
# Can't resolve 'core-js/proposals/reflect-metadata'
79+
- os: ubuntu-latest
80+
node: 14
81+
ng: 13
7582
fail-fast: false
7683
name: Test firebase@${{ matrix.firebase }} firebase-tools@${{ matrix.firebaseTools }} ng@${{ matrix.ng }} rxjs@${{ matrix.rxjs}} on ${{ matrix.os }} Node.js ${{ matrix.node }}
7784
steps:
@@ -142,11 +149,13 @@ jobs:
142149
firebase: ["9", "canary", "next"]
143150
firebaseTools: ["9"]
144151
rxjs: ["7"]
145-
ng: ["12", "next"]
152+
ng: ["12", "13", "next"]
146153
exclude:
147-
# standard configuration
154+
# standard configurations
148155
- firebase: 9
149156
ng: 12
157+
- firebase: 9
158+
ng: 13
150159
fail-fast: false
151160
name: Canary firebase@${{ matrix.firebase }} firebase-tools@${{ matrix.firebaseTools }} ng@${{ matrix.ng }} rxjs@${{ matrix.rxjs}} on ${{ matrix.os }} Node.js ${{ matrix.node }}
152161
steps:

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<a name="7.2.0"></a>
2+
# [7.2.0](https://github.com/angular/angularfire/compare/7.1.1...7.2.0) (2021-11-11)
3+
4+
### Features
5+
6+
* **core:** marking as compatible with Angular 13 peer ([#3057](https://github.com/angular/angularfire/pull/3057))
7+
8+
### Bug Fixes
9+
10+
* **schematics:** ng-add should pass if sourceRoot is relative to workspace root ([#3052](https://github.com/angular/angularfire/issues/3052)) ([7e931cb](https://github.com/angular/angularfire/commit/7e931cb))
11+
112
<a name="7.1.1"></a>
213
# [7.1.1](https://github.com/angular/angularfire/compare/7.1.0...7.1.1) (2021-10-18)
314

package.json

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular/fire",
3-
"version": "7.1.1",
3+
"version": "7.2.0",
44
"description": "The official Angular library for Firebase.",
55
"private": true,
66
"scripts": {
@@ -12,7 +12,7 @@
1212
"test:chrome-headless": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=ChromeHeadless\"",
1313
"test:firefox-headless": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=FirefoxHeadless\"",
1414
"lint": "ng lint",
15-
"test:node": "node -r tsconfig-paths/register ./tools/jasmine.js",
15+
"test:node": "node -r tsconfig-paths/register ./tools/load-jasmine.js",
1616
"test:typings": "node ./tools/run-typings-test.js",
1717
"test:build": "bash ./test/ng-build/build.sh",
1818
"test:all": "npm run test:node && npm run test:chrome-headless && npm run test:typings && npm run test:build",
@@ -53,7 +53,7 @@
5353
"@angular/platform-browser-dynamic": "^12.0.0",
5454
"@angular/router": "^12.0.0",
5555
"@schematics/angular": "^12.0.0",
56-
"firebase": "^9.1.0",
56+
"firebase": "^9.4.0",
5757
"firebase-admin": "^9.11.1",
5858
"firebase-functions": "^3.6.0",
5959
"firebase-tools": "^9.0.0",
@@ -110,7 +110,7 @@
110110
"ng-packagr": "^12.0.0",
111111
"pretty-size": "^2.0.0",
112112
"protractor": "~7.0.0",
113-
"reflect-metadata": "0.1.2",
113+
"reflect-metadata": "^0.1.2",
114114
"replace-in-file": "^5.0.2",
115115
"rimraf": "^2.5.4",
116116
"rollup": "^2.22.0",
@@ -127,8 +127,5 @@
127127
"typedoc": "^0.16.4",
128128
"typescript": ">=4.2.3 <4.3.0"
129129
},
130-
"typings": "index.d.ts",
131-
"resolutions": {
132-
"webpack": "^5.35.0"
133-
}
130+
"typings": "index.d.ts"
134131
}

samples/advanced/.gitignore

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/advanced/package.json

+20-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/advanced/src/polyfills.ts

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/advanced/src/test.ts

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)