Skip to content

Commit

Permalink
Upgrade to Angular 11
Browse files Browse the repository at this point in the history
Closes #62
  • Loading branch information
PowerKiKi committed Dec 1, 2020
1 parent 1ded5ca commit a300533
Show file tree
Hide file tree
Showing 6 changed files with 906 additions and 969 deletions.
3 changes: 1 addition & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand Down Expand Up @@ -111,7 +110,7 @@
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/fab-speed-dial/tsconfig.lib.json",
"project": "projects/fab-speed-dial/ng-package.json"
Expand Down
41 changes: 20 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,37 @@
"build-demo": "yarn build-lib && ng build demo --prod --aot --base-href /fab-speed-dial/ && cp dist/demo/index.html dist/demo/404.html"
},
"dependencies": {
"@angular/animations": "~10.2.3",
"@angular/cdk": "10.2.7",
"@angular/common": "~10.2.3",
"@angular/compiler": "~10.2.3",
"@angular/core": "~10.2.3",
"@angular/forms": "~10.2.3",
"@angular/material": "~10.2.7",
"@angular/platform-browser": "~10.2.3",
"@angular/platform-browser-dynamic": "~10.2.3",
"@angular/animations": "~11.0.2",
"@angular/cdk": "11.0.1",
"@angular/common": "~11.0.2",
"@angular/compiler": "~11.0.2",
"@angular/core": "~11.0.2",
"@angular/forms": "~11.0.2",
"@angular/material": "~11.0.1",
"@angular/platform-browser": "~11.0.2",
"@angular/platform-browser-dynamic": "~11.0.2",
"rxjs": "~6.6.0",
"tslib": "^2.0.3",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular-devkit/build-ng-packagr": "~0.1002.0",
"@angular/cli": "~10.2.0",
"@angular/compiler-cli": "~10.2.3",
"@angular/language-service": "~10.2.3",
"@types/jasmine": "~3.6.1",
"@angular-devkit/build-angular": "~0.1100.2",
"@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.14.7",
"codelyzer": "^6.0.1",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~6.0.0",
"karma": "~5.2.3",
"karma": "~5.1.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.1",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.0.0",
"prettier": "2.2.0",
"ng-packagr": "^11.0.3",
"prettier": "2.2.1",
"protractor": "~7.0.0",
"puppeteer": "^5.4.1",
"ts-node": "~9.0.0",
Expand Down
6 changes: 3 additions & 3 deletions projects/fab-speed-dial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"license": "MIT",
"repository": "github:Ecodev/fab-speed-dial",
"peerDependencies": {
"@angular/common": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/material": "^10.0.0",
"@angular/common": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/material": "^11.0.0",
"rxjs": "^6.5.3"
},
"dependencies": {
Expand Down
26 changes: 14 additions & 12 deletions projects/fab-speed-dial/src/lib/fab-speed-dial.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, TestBed} from '@angular/core/testing';
import {TestBed, waitForAsync} from '@angular/core/testing';

import {
EcoFabSpeedDialActionsComponent,
Expand All @@ -9,17 +9,19 @@ import {By} from '@angular/platform-browser';
import {Component, ViewChild} from '@angular/core';

describe('FabSpeedDial', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [],
declarations: [
EcoFabSpeedDialComponent,
EcoFabSpeedDialTriggerComponent,
EcoFabSpeedDialActionsComponent,
TestAppComponent,
],
});
}));
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
imports: [],
declarations: [
EcoFabSpeedDialComponent,
EcoFabSpeedDialTriggerComponent,
EcoFabSpeedDialActionsComponent,
TestAppComponent,
],
});
}),
);

it('should apply direction class based on direction', () => {
const fixture = TestBed.createComponent(TestAppComponent);
Expand Down
42 changes: 22 additions & 20 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import {FormsModule} from '@angular/forms';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
Expand All @@ -18,26 +18,28 @@ describe('AppComponent', () => {
let component: AppComponent;
let fixture: ComponentFixture<AppComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
EcoFabSpeedDialModule,
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
EcoFabSpeedDialModule,

MatIconModule,
MatButtonModule,
MatButtonToggleModule,
MatInputModule,
MatRadioModule,
MatCardModule,
MatCheckboxModule,
MatSlideToggleModule,
MatTooltipModule,
MatToolbarModule,
FormsModule,
],
declarations: [AppComponent],
}).compileComponents();
}));
MatIconModule,
MatButtonModule,
MatButtonToggleModule,
MatInputModule,
MatRadioModule,
MatCardModule,
MatCheckboxModule,
MatSlideToggleModule,
MatTooltipModule,
MatToolbarModule,
FormsModule,
],
declarations: [AppComponent],
}).compileComponents();
}),
);

beforeEach(() => {
fixture = TestBed.createComponent(AppComponent);
Expand Down
Loading

0 comments on commit a300533

Please sign in to comment.