diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ed6cd3a0..49479f87e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,9 +70,9 @@ jobs: os: [ ubuntu-latest, macos-latest, windows-latest ] node: [ "14", "16"] firebase: ["9"] - firebaseTools: ["10"] - rxjs: ["6", "7"] - ng: ["12", "13"] + firebaseTools: ["11"] + rxjs: ["7"] + ng: ["12", "13", "14"] exclude: # TODO investigate failures # https://github.com/angular/angularfire/runs/4174069788 @@ -150,7 +150,7 @@ jobs: yarn test:node-esm if: matrix.ng != '12' && matrix.rxjs == '7' - name: Test browser - if: matrix.os == 'ubuntu-latest' && matrix.node == '14' && matrix.firebaseTools == '10' + if: matrix.os == 'ubuntu-latest' && matrix.node == '14' && matrix.firebaseTools == '11' run: yarn test:chrome-headless - name: ng-build yarn install run: | @@ -185,9 +185,9 @@ jobs: os: [ ubuntu-latest ] node: ["14"] firebase: ["9", "canary", "next"] - firebaseTools: ["10"] + firebaseTools: ["11"] rxjs: ["7"] - ng: ["12", "13", "next"] + ng: ["12", "13", "14", "next"] exclude: # standard configurations - firebase: 9 @@ -278,7 +278,7 @@ 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 == 'next' + if: matrix.ng == '14' || matrix.ng == 'next' - name: Update ng-build to ng@${{ matrix.ng }} run: | cd ./test/ng-build @@ -309,6 +309,12 @@ jobs: with: node-version: ${{ matrix.node }} check-latest: true + - name: Setup java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '11' + if: matrix.os == 'macos-latest' && matrix.node == '14' - name: node_modules cache uses: actions/cache@v2 id: node_modules_cache diff --git a/src/package.json b/src/package.json index 3d4acd3d5..9c6faf1e1 100644 --- a/src/package.json +++ b/src/package.json @@ -23,10 +23,10 @@ "author": "angular,firebase", "license": "MIT", "peerDependencies": { - "@angular/common": "^12.0.0 || ^13.0.0", - "@angular/core": "^12.0.0 || ^13.0.0", - "@angular/platform-browser": "^12.0.0 || ^13.0.0", - "@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0", + "@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", "rxjs": "~6.6.0 || ^7.0.0", "firebase-tools": "^9.9.0 || ^10.0.0" }, @@ -36,8 +36,8 @@ "dependencies": { "firebase": "^9.5.0", "rxfire": "^6.0.0", - "@angular-devkit/schematics": "^12.0.0 || ^13.0.0", - "@schematics/angular": "^12.0.0 || ^13.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", "tslib": "^2.0.0", "fuzzy": "^0.1.3", "inquirer-autocomplete-prompt": "^1.0.1", diff --git a/src/performance/performance.module.ts b/src/performance/performance.module.ts index 9a0cbc4a5..ed3a08865 100644 --- a/src/performance/performance.module.ts +++ b/src/performance/performance.module.ts @@ -57,7 +57,9 @@ export class PerformanceModule { } } -export function providePerformance(fn: (injector: Injector) => FirebasePerformance, ...deps: any[]): ModuleWithProviders { +export function providePerformance( + fn: (injector: Injector) => FirebasePerformance, ...deps: any[] +): ModuleWithProviders { return { ngModule: PerformanceModule, providers: [{ diff --git a/src/remote-config/remote-config.module.ts b/src/remote-config/remote-config.module.ts index d6e92a67a..4a26bd2e1 100644 --- a/src/remote-config/remote-config.module.ts +++ b/src/remote-config/remote-config.module.ts @@ -57,7 +57,9 @@ export class RemoteConfigModule { } } -export function provideRemoteConfig(fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]): ModuleWithProviders { +export function provideRemoteConfig( + fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[] +): ModuleWithProviders { return { ngModule: RemoteConfigModule, providers: [{ diff --git a/test/ng-build/tsconfig.json b/test/ng-build/tsconfig.json index 771f7b720..258813959 100644 --- a/test/ng-build/tsconfig.json +++ b/test/ng-build/tsconfig.json @@ -12,7 +12,7 @@ "declaration": false, "downlevelIteration": true, "experimentalDecorators": true, - "skipLibCheck": false, + "skipLibCheck": true, "moduleResolution": "node", "importHelpers": true, "target": "es2017",