Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ng14 #3230

Merged
merged 5 commits into from
Jun 4, 2022
Merged

Ng14 #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea0a4be
Adding ng 14 peer
jamesdaniels Jun 3, 2022
01340ac
Lint
jamesdaniels Jun 3, 2022
0e8b7d7
firebase-tools 11, skip lib check
jamesdaniels Jun 3, 2022
b7b790b
Canary upgrade to ng13
jamesdaniels Jun 3, 2022
da2b698
Setup java on contribute macos node 14
jamesdaniels Jun 3, 2022
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
20 changes: 13 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/package.json
View file
Open in desktop
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",
"@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"
},
Expand All @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion src/performance/performance.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export class PerformanceModule {
}
}

export function providePerformance(fn: (injector: Injector) => FirebasePerformance, ...deps: any[]): ModuleWithProviders<PerformanceModule> {
export function providePerformance(
fn: (injector: Injector) => FirebasePerformance, ...deps: any[]
): ModuleWithProviders<PerformanceModule> {
return {
ngModule: PerformanceModule,
providers: [{
Expand Down
4 changes: 3 additions & 1 deletion src/remote-config/remote-config.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export class RemoteConfigModule {
}
}

export function provideRemoteConfig(fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]): ModuleWithProviders<RemoteConfigModule> {
export function provideRemoteConfig(
fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]
): ModuleWithProviders<RemoteConfigModule> {
return {
ngModule: RemoteConfigModule,
providers: [{
Expand Down
2 changes: 1 addition & 1 deletion test/ng-build/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"skipLibCheck": false,
"skipLibCheck": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2017",
Expand Down