Skip to content

Commit

Permalink
feat(core): NG13 peer (#3057)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jamesdaniels authored Nov 11, 2021
1 parent bbb97de commit 390691b
Show file tree
Hide file tree
Showing 23 changed files with 5,580 additions and 8,328 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
id: node_modules_cache
with:
path: ./node_modules
key: ${{ runner.os }}-14-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
key: ${{ runner.os }}-14-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-14-12-9-9-6-node_modules-
${{ runner.os }}-14-12-9-9-
Expand Down Expand Up @@ -71,7 +71,14 @@ jobs:
firebase: ["9"]
firebaseTools: ["9"]
rxjs: ["6", "7"]
ng: ["12"]
ng: ["12", "13"]
exclude:
# TODO investigate failures
# https://github.com/angular/angularfire/runs/4174069788
# Can't resolve 'core-js/proposals/reflect-metadata'
- os: ubuntu-latest
node: 14
ng: 13
fail-fast: false
name: Test firebase@${{ matrix.firebase }} firebase-tools@${{ matrix.firebaseTools }} ng@${{ matrix.ng }} rxjs@${{ matrix.rxjs}} on ${{ matrix.os }} Node.js ${{ matrix.node }}
steps:
Expand Down Expand Up @@ -142,11 +149,13 @@ jobs:
firebase: ["9", "canary", "next"]
firebaseTools: ["9"]
rxjs: ["7"]
ng: ["12", "next"]
ng: ["12", "13", "next"]
exclude:
# standard configuration
# standard configurations
- firebase: 9
ng: 12
- firebase: 9
ng: 13
fail-fast: false
name: Canary firebase@${{ matrix.firebase }} firebase-tools@${{ matrix.firebaseTools }} ng@${{ matrix.ng }} rxjs@${{ matrix.rxjs}} on ${{ matrix.os }} Node.js ${{ matrix.node }}
steps:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="7.2.0"></a>
# [7.2.0](https://github.com/angular/angularfire/compare/7.1.1...7.2.0) (2021-11-11)

### Features

* **core:** marking as compatible with Angular 13 peer ([#3057](https://github.com/angular/angularfire/pull/3057))

### Bug Fixes

* **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))

<a name="7.1.1"></a>
# [7.1.1](https://github.com/angular/angularfire/compare/7.1.0...7.1.1) (2021-10-18)

Expand Down
13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular/fire",
"version": "7.1.1",
"version": "7.2.0",
"description": "The official Angular library for Firebase.",
"private": true,
"scripts": {
Expand All @@ -12,7 +12,7 @@
"test:chrome-headless": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=ChromeHeadless\"",
"test:firefox-headless": "firebase emulators:exec --project=angularfire2-test \"ng test --watch=false --browsers=FirefoxHeadless\"",
"lint": "ng lint",
"test:node": "node -r tsconfig-paths/register ./tools/jasmine.js",
"test:node": "node -r tsconfig-paths/register ./tools/load-jasmine.js",
"test:typings": "node ./tools/run-typings-test.js",
"test:build": "bash ./test/ng-build/build.sh",
"test:all": "npm run test:node && npm run test:chrome-headless && npm run test:typings && npm run test:build",
Expand Down Expand Up @@ -53,7 +53,7 @@
"@angular/platform-browser-dynamic": "^12.0.0",
"@angular/router": "^12.0.0",
"@schematics/angular": "^12.0.0",
"firebase": "^9.1.0",
"firebase": "^9.4.0",
"firebase-admin": "^9.11.1",
"firebase-functions": "^3.6.0",
"firebase-tools": "^9.0.0",
Expand Down Expand Up @@ -110,7 +110,7 @@
"ng-packagr": "^12.0.0",
"pretty-size": "^2.0.0",
"protractor": "~7.0.0",
"reflect-metadata": "0.1.2",
"reflect-metadata": "^0.1.2",
"replace-in-file": "^5.0.2",
"rimraf": "^2.5.4",
"rollup": "^2.22.0",
Expand All @@ -127,8 +127,5 @@
"typedoc": "^0.16.4",
"typescript": ">=4.2.3 <4.3.0"
},
"typings": "index.d.ts",
"resolutions": {
"webpack": "^5.35.0"
}
"typings": "index.d.ts"
}
1 change: 1 addition & 0 deletions samples/advanced/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 20 additions & 23 deletions samples/advanced/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions samples/advanced/src/polyfills.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion samples/advanced/src/test.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 390691b

Please sign in to comment.