Skip to content

Commit

Permalink
update to angular 9
Browse files Browse the repository at this point in the history
  • Loading branch information
JanneAalto committed Mar 20, 2020
1 parent c029077 commit 1cd8e42
Show file tree
Hide file tree
Showing 10 changed files with 13,422 additions and 60 deletions.
19 changes: 18 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/firebase-ngrx-user-management-example",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -23,12 +24,19 @@
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
Expand Down Expand Up @@ -72,6 +80,7 @@
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.css"
],
"scripts": [],
Expand Down Expand Up @@ -133,6 +142,11 @@
"options": {
"tsConfig": "projects/xtream/firebase-ngrx-user-management/tsconfig.lib.json",
"project": "projects/xtream/firebase-ngrx-user-management/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/xtream/firebase-ngrx-user-management/tsconfig.lib.prod.json"
}
}
},
"test": {
Expand All @@ -158,5 +172,8 @@
}
}
},
"defaultProject": "firebase-ngrx-user-management-example"
"defaultProject": "firebase-ngrx-user-management-example",
"cli": {
"analytics": false
}
}
71 changes: 35 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,53 @@
},
"private": false,
"dependencies": {
"@angular/animations": "^8.0.0",
"@angular/cdk": "^8.0.0",
"@angular/common": "^8.0.0",
"@angular/compiler": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/animations": "~9.0.7",
"@angular/cdk": "^9.1.3",
"@angular/common": "~9.0.7",
"@angular/compiler": "~9.0.7",
"@angular/core": "~9.0.7",
"@angular/fire": "^5.2.1",
"@angular/forms": "^8.0.0",
"@angular/material": "^8.0.0",
"@angular/platform-browser": "^8.0.0",
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/router": "^8.0.0",
"@ngrx/effects": "^8.0.0",
"@ngrx/entity": "^8.0.0",
"@ngrx/store": "^8.0.0",
"@ngrx/store-devtools": "^8.0.0",
"@angular/forms": "~9.0.7",
"@angular/material": "^9.1.3",
"@angular/platform-browser": "~9.0.7",
"@angular/platform-browser-dynamic": "~9.0.7",
"@angular/router": "~9.0.7",
"@ngrx/effects": "^9.0.0",
"@ngrx/entity": "^9.0.0",
"@ngrx/store": "^9.0.0",
"@ngrx/store-devtools": "^9.0.0",
"core-js": "^3.2.1",
"firebase": "^6.6.1",
"rxjs": "^6.0.0",
"zone.js": "^0.10.2"
"firebase": "^7.8.0",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.4",
"@angular-devkit/build-ng-packagr": "~0.803.4",
"@angular/cli": "^8.0.0",
"@angular/compiler-cli": "^8.0.0",
"@angular/language-service": "^8.0.0",
"@types/jasmine": "~3.4.0",
"@types/jasminewd2": "~2.0.6",
"@types/node": "^10.14.18",
"codelyzer": "^5.1.0",
"@angular-devkit/build-angular": "~0.900.7",
"@angular-devkit/build-ng-packagr": "~0.900.7",
"@angular/cli": "~9.0.7",
"@angular/compiler-cli": "~9.0.7",
"@angular/language-service": "~9.0.7",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"commitizen": "^4.0.3",
"cz-conventional-changelog": "^3.0.2",
"jasmine-core": "~3.4.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"ng-packagr": "^5.5.1",
"protractor": "~5.4.0",
"ng-packagr": "^9.0.0",
"protractor": "~5.4.3",
"semantic-release": "^15.12.5",
"semantic-release-cli": "^5.2.1",
"ts-node": "^8.3.0",
"tsickle": "~0.37.0",
"tslib": "^1.9.0",
"tslint": "~5.11.0",
"typescript": "~3.5.3"
"ts-node": "~8.3.0",
"tslint": "~5.18.0",
"typescript": "~3.7.5"
},
"repository": {
"type": "git",
Expand All @@ -77,4 +76,4 @@
"path": "./node_modules/cz-conventional-changelog"
}
}
}
}
14 changes: 7 additions & 7 deletions projects/xtream/firebase-ngrx-user-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"url": "https://github.com/xtreamsrl/firebase-ngrx-user-management/issues"
},
"peerDependencies": {
"@angular/common": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/common": "^9.0.7",
"@angular/core": "^9.0.7",
"@angular/fire": "^5.2.1",
"@angular/platform-browser-dynamic": "^8.0.0",
"@ngrx/effects": "^8.0.0",
"@ngrx/entity": "^8.0.0",
"@ngrx/store": "^8.0.0",
"@angular/platform-browser-dynamic": "^9.0.7",
"@ngrx/effects": "^9.0.0",
"@ngrx/entity": "^9.0.0",
"@ngrx/store": "^9.0.0",
"core-js": "^3.2.1",
"firebase": "^6.6.1",
"rxjs": "^6.0.0",
"zone.js": "^0.10.2"
"zone.js": "~0.10.2"
},
"devDependencies": {
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import {Action} from '@ngrx/store';
import * as customEmailHandlerActions from '../actions/custom-email-handler.actions';
import {catchError, map, mapTo, switchMap} from 'rxjs/operators';

export type Action = customEmailHandlerActions.CustomEmailHandlerActionsUnion;

@Injectable()
export class CustomEmailHandlerEffects {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.lib.json",
"angularCompilerOptions": {
"enableIvy": false
}
}
19 changes: 10 additions & 9 deletions src/app/core/custom-material-module/custom-material.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {
MatButtonModule,
MatCardModule, MatCheckboxModule,
MatDialogModule,
MatIconModule,
MatInputModule,
MatMenuModule, MatProgressSpinnerModule, MatTableModule,
MatToolbarModule
} from '@angular/material';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatTableModule } from '@angular/material/table';
import { MatToolbarModule } from '@angular/material/toolbar';

@NgModule({
imports: [
Expand Down
9 changes: 6 additions & 3 deletions src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
"outDir": "../out-tsc/app",
"types": []
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand Down
Loading

0 comments on commit 1cd8e42

Please sign in to comment.