Skip to content

Commit 3c3a343

Browse files
authored
feat(core): mark ng 14 as allowed peer (#3230)
* Mark ng 14 as peer * Bump firebase * Bump version * Lint * Cleanup actions
1 parent 8d5bc12 commit 3c3a343

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ jobs:
7070
os: [ ubuntu-latest, macos-latest, windows-latest ]
7171
node: [ "14", "16"]
7272
firebase: ["9"]
73-
firebaseTools: ["10"]
74-
rxjs: ["6", "7"]
75-
ng: ["12", "13"]
73+
firebaseTools: ["11"]
74+
rxjs: ["7"]
75+
ng: ["12", "13", "14"]
7676
exclude:
7777
# TODO investigate failures
7878
# https://github.com/angular/angularfire/runs/4174069788
@@ -150,7 +150,7 @@ jobs:
150150
yarn test:node-esm
151151
if: matrix.ng != '12' && matrix.rxjs == '7'
152152
- name: Test browser
153-
if: matrix.os == 'ubuntu-latest' && matrix.node == '14' && matrix.firebaseTools == '10'
153+
if: matrix.os == 'ubuntu-latest' && matrix.node == '14' && matrix.firebaseTools == '11'
154154
run: yarn test:chrome-headless
155155
- name: ng-build yarn install
156156
run: |
@@ -185,9 +185,9 @@ jobs:
185185
os: [ ubuntu-latest ]
186186
node: ["14"]
187187
firebase: ["9", "canary", "next"]
188-
firebaseTools: ["10"]
188+
firebaseTools: ["11"]
189189
rxjs: ["7"]
190-
ng: ["12", "13", "next"]
190+
ng: ["12", "13", "14", "next"]
191191
exclude:
192192
# standard configurations
193193
- firebase: 9
@@ -278,7 +278,7 @@ jobs:
278278
run: |
279279
cd ./test/ng-build
280280
npx @angular/cli@13 update @angular/core@13 @angular/cli@13 @nguniversal/express-engine@13 --allow-dirty --force
281-
if: matrix.ng == 'next'
281+
if: matrix.ng == '14' || matrix.ng == 'next'
282282
- name: Update ng-build to ng@${{ matrix.ng }}
283283
run: |
284284
cd ./test/ng-build
@@ -309,6 +309,12 @@ jobs:
309309
with:
310310
node-version: ${{ matrix.node }}
311311
check-latest: true
312+
- name: Setup java
313+
uses: actions/setup-java@v3
314+
with:
315+
distribution: 'temurin'
316+
java-version: '11'
317+
if: matrix.os == 'macos-latest' && matrix.node == '14'
312318
- name: node_modules cache
313319
uses: actions/cache@v2
314320
id: node_modules_cache

src/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"author": "angular,firebase",
2424
"license": "MIT",
2525
"peerDependencies": {
26-
"@angular/common": "^12.0.0 || ^13.0.0",
27-
"@angular/core": "^12.0.0 || ^13.0.0",
28-
"@angular/platform-browser": "^12.0.0 || ^13.0.0",
29-
"@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0",
26+
"@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0",
27+
"@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0",
28+
"@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0",
29+
"@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0",
3030
"rxjs": "~6.6.0 || ^7.0.0",
3131
"firebase-tools": "^9.9.0 || ^10.0.0"
3232
},
@@ -36,8 +36,8 @@
3636
"dependencies": {
3737
"firebase": "^9.5.0",
3838
"rxfire": "^6.0.0",
39-
"@angular-devkit/schematics": "^12.0.0 || ^13.0.0",
40-
"@schematics/angular": "^12.0.0 || ^13.0.0",
39+
"@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0",
40+
"@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0",
4141
"tslib": "^2.0.0",
4242
"fuzzy": "^0.1.3",
4343
"inquirer-autocomplete-prompt": "^1.0.1",

src/performance/performance.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ export class PerformanceModule {
5757
}
5858
}
5959

60-
export function providePerformance(fn: (injector: Injector) => FirebasePerformance, ...deps: any[]): ModuleWithProviders<PerformanceModule> {
60+
export function providePerformance(
61+
fn: (injector: Injector) => FirebasePerformance, ...deps: any[]
62+
): ModuleWithProviders<PerformanceModule> {
6163
return {
6264
ngModule: PerformanceModule,
6365
providers: [{

src/remote-config/remote-config.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ export class RemoteConfigModule {
5757
}
5858
}
5959

60-
export function provideRemoteConfig(fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]): ModuleWithProviders<RemoteConfigModule> {
60+
export function provideRemoteConfig(
61+
fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]
62+
): ModuleWithProviders<RemoteConfigModule> {
6163
return {
6264
ngModule: RemoteConfigModule,
6365
providers: [{

test/ng-build/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"declaration": false,
1313
"downlevelIteration": true,
1414
"experimentalDecorators": true,
15-
"skipLibCheck": false,
15+
"skipLibCheck": true,
1616
"moduleResolution": "node",
1717
"importHelpers": true,
1818
"target": "es2017",

0 commit comments

Comments
 (0)