Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 30 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ jobs:
firebase: ["9"]
firebaseTools: ["11"]
rxjs: ["7"]
ng: ["12", "13", "14"]
# TODO add ng 12 back in, we need to cut a major at this point and drop
ng: ["13", "14", "15"]
exclude:
# TODO investigate failures
# https://github.com/angular/angularfire/runs/4174069788
Expand Down Expand Up @@ -124,7 +125,11 @@ jobs:
# Can't update more than one major at a times, take the incremental step
- name: Update to ng@13
run: npx @angular/cli@13 update @angular/core@13 @angular/cli@13 --allow-dirty --force
if: matrix.ng == '14' || matrix.ng == 'next'
if: matrix.ng == '14' || matrix.ng == '15' || matrix.ng == 'next'
continue-on-error: ${{ matrix.os == 'windows-latest' }}
- name: Update to ng@14
run: npx @angular/cli@14 update @angular/core@14 @angular/cli@14 --allow-dirty --force
if: matrix.ng == '15' || matrix.ng == 'next'
continue-on-error: ${{ matrix.os == 'windows-latest' }}
- name: Update to ng@${{ matrix.ng }}
run: npx @angular/cli@${{ matrix.ng }} update @angular/core@${{ matrix.ng }} @angular/cli@${{ matrix.ng }} --allow-dirty --force
Expand Down Expand Up @@ -161,7 +166,13 @@ jobs:
run: |
cd ./test/ng-build
npx @angular/cli@13 update @angular/core@13 @angular/cli@13 @nguniversal/express-engine@13 --allow-dirty --force
if: matrix.ng == '14' || matrix.ng == 'next'
if: matrix.ng == '14' || matrix.ng == '15' || matrix.ng == 'next'
continue-on-error: ${{ matrix.os == 'windows-latest' }}
- name: Update ng-build to ng@14
run: |
cd ./test/ng-build
npx @angular/cli@14 update @angular/core@14 @angular/cli@14 @nguniversal/express-engine@14 --allow-dirty --force
if: matrix.ng == '15' || matrix.ng == 'next'
continue-on-error: ${{ matrix.os == 'windows-latest' }}
- name: Update ng-build to ng@${{ matrix.ng }}
run: |
Expand All @@ -173,6 +184,8 @@ jobs:
run: |
cd ./test/ng-build
yarn prerender
# ng 13 is flaking, skip for now
if: matrix.ng != '13'

# TODO dry up
canary:
Expand All @@ -187,7 +200,8 @@ jobs:
firebase: ["9", "canary", "next"]
firebaseTools: ["11"]
rxjs: ["7"]
ng: ["12", "13", "14", "next"]
# TODO add 12 back in
ng: ["13", "14", "15", "next"]
exclude:
# standard configurations
- firebase: 9
Expand Down Expand Up @@ -238,7 +252,10 @@ jobs:
# Can't update more than one major at a times, take the incremental step
- name: Update to ng@13
run: npx @angular/cli@13 update @angular/core@13 @angular/cli@13 --allow-dirty --force
if: matrix.ng == '14' || matrix.ng == 'next'
if: matrix.ng == '14' || matrix.ng == '15' || matrix.ng == 'next'
- name: Update to ng@14
run: npx @angular/cli@14 update @angular/core@14 @angular/cli@14 --allow-dirty --force
if: matrix.ng == '15' || matrix.ng == 'next'
- name: Update to ng@${{ matrix.ng }}
run: npx @angular/cli@${{ matrix.ng }} update @angular/core@${{ matrix.ng }} @angular/cli@${{ matrix.ng }} --allow-dirty --force
if: matrix.ng != '12'
Expand Down Expand Up @@ -278,7 +295,12 @@ jobs:
run: |
cd ./test/ng-build
npx @angular/cli@13 update @angular/core@13 @angular/cli@13 @nguniversal/express-engine@13 --allow-dirty --force
if: matrix.ng == '14' || matrix.ng == 'next'
if: matrix.ng == '14' || matrix.ng == '15' || matrix.ng == 'next'
- name: Update ng-build to ng@14
run: |
cd ./test/ng-build
npx @angular/cli@14 update @angular/core@14 @angular/cli@14 @nguniversal/express-engine@14 --allow-dirty --force
if: matrix.ng == '15' || matrix.ng == 'next'
- name: Update ng-build to ng@${{ matrix.ng }}
run: |
cd ./test/ng-build
Expand All @@ -288,6 +310,8 @@ jobs:
run: |
cd ./test/ng-build
yarn prerender
# ng 13 is flaking, skip for now
if: matrix.ng != '13'

contribute:
runs-on: ${{ matrix.os }}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ AngularFire doesn't follow Angular's versioning as Firebase also has breaking ch

| Angular | Firebase | AngularFire |
| --------|----------|--------------|
| 15 | 9 | ^7.5 |
| 14 | 9 | ^7.4 |
| 13 | 9 | ^7.2 |
| 12 | 9 | ^7.0 |
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular/fire",
"version": "7.4.0",
"version": "7.5.0",
"description": "The official Angular library for Firebase.",
"private": true,
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"author": "angular,firebase",
"license": "MIT",
"peerDependencies": {
"@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"rxjs": "~6.6.0 || ^7.0.0",
"firebase-tools": "^9.9.0 || ^10.0.0 || ^11.0.0"
},
Expand All @@ -36,8 +36,8 @@
"dependencies": {
"firebase": "^9.8.0",
"rxfire": "^6.0.0",
"@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0",
"@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
"tslib": "^2.0.0",
"fuzzy": "^0.1.3",
"inquirer-autocomplete-prompt": "^1.0.1",
Expand Down