Skip to content
This repository has been archived by the owner on Sep 4, 2020. It is now read-only.

Commit

Permalink
angular 7 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
clouless committed Nov 6, 2018
1 parent 4be6112 commit 0a4d294
Show file tree
Hide file tree
Showing 7 changed files with 1,812 additions and 1,389 deletions.
23 changes: 15 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
Expand Down Expand Up @@ -77,7 +84,7 @@
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"styles.css"
"src/styles.css"
],
"scripts": [],
"assets": [
Expand Down Expand Up @@ -109,6 +116,11 @@
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "dropout-demo:serve"
},
"configurations": {
"production": {
"devServerTarget": "dropout-demo:serve:production"
}
}
},
"lint": {
Expand All @@ -133,11 +145,6 @@
"options": {
"tsConfig": "projects/cloukit/dropout/tsconfig.lib.json",
"project": "projects/cloukit/dropout/ng-package.json"
},
"configurations": {
"production": {
"project": "projects/cloukit/dropout/ng-package.prod.json"
}
}
},
"test": {
Expand All @@ -164,4 +171,4 @@
}
},
"defaultProject": "dropout-demo"
}
}
70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,45 @@
},
"private": true,
"dependencies": {
"@angular/common": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/compiler": "^6.0.0",
"@angular/animations": "^6.0.0",
"@angular/forms": "^6.0.0",
"@angular/http": "^6.0.0",
"@angular/platform-browser": "^6.0.0",
"@angular/platform-browser-dynamic": "^6.0.0",
"@angular/router": "^6.0.0",
"@cloukit/story": "6.0.0",
"@cloukit/story": "7.0.0",
"@types/prismjs": "1.9.0",
"core-js": "^2.5.4",
"prismjs": "1.14.0",
"rxjs": "^6.0.0",
"zone.js": "^0.8.26"
"prismjs": "1.15.0",
"@angular/animations": "~7.0.0",
"@angular/common": "~7.0.0",
"@angular/compiler": "~7.0.0",
"@angular/core": "~7.0.0",
"@angular/forms": "~7.0.0",
"@angular/http": "~7.0.0",
"@angular/platform-browser": "~7.0.0",
"@angular/platform-browser-dynamic": "~7.0.0",
"@angular/router": "~7.0.0",
"core-js": "^2.5.7",
"rxjs": "~6.3.3",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular/compiler-cli": "^6.0.0",
"@angular-devkit/build-ng-packagr": "~0.6.1",
"@angular-devkit/build-angular": "~0.6.0",
"ng-packagr": "^3.0.0-rc.2",
"tsickle": ">=0.25.5",
"tslib": "^1.7.1",
"typescript": "~2.7.2",
"@angular/cli": "~6.0.0",
"@angular/language-service": "^6.0.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.99.1",
"@angular-devkit/build-angular": "~0.10.0",
"@angular-devkit/build-ng-packagr": "~0.10.0",
"@angular/cli": "~7.0.4",
"@angular/compiler-cli": "~7.0.0",
"@angular/language-service": "~7.0.0",
"@types/node": "~10.12.2",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.6",
"codelyzer": "~4.5.0",
"jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma": "~3.1.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1"
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^1.4.0",
"ng-packagr": "^4.2.0",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tsickle": ">=0.29.0",
"tslib": "^1.9.3",
"tslint": "~5.11.0",
"typescript": "~3.1.1"
}
}
7 changes: 0 additions & 7 deletions projects/cloukit/dropout/ng-package.prod.json

This file was deleted.

6 changes: 3 additions & 3 deletions projects/cloukit/dropout/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@cloukit/dropout",
"version": "6.0.0",
"version": "7.0.0",
"peerDependencies": {
"@angular/common": "^6.0.0-rc.0 || ^6.0.0",
"@angular/core": "^6.0.0-rc.0 || ^6.0.0"
"@angular/common": "^7.0.0-rc.0 || ^7.0.0",
"@angular/core": "^7.0.0-rc.0 || ^7.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* https://github.com/cloukit/legal
*/
import { Component, HostListener, Input, OnInit, TemplateRef } from '@angular/core';
import { isNullOrUndefined } from 'util';
import {
DropoutOutletDimensions, DropoutPlacement, DropoutTriggerElementDimensions,
DropoutViewPortDimensions,
Expand Down Expand Up @@ -52,7 +51,7 @@ export class CloukitDropoutContainerComponent implements OnInit {
}

public repositionRelativeToTriggerElement(viewPortDimensions: DropoutViewPortDimensions) {
if (!isNullOrUndefined(this.dropoutTriggerElement)) {
if (this.dropoutTriggerElement !== undefined && this.dropoutTriggerElement !== null) {
const triggerElementDimensions = DropoutTriggerElementDimensions.from(this.dropoutTriggerElement);
const coordinates = DropoutPositioningHelper
.calculate(this.dropoutPlacement, triggerElementDimensions, viewPortDimensions, DropoutOutletDimensions.from(this.outlet));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { ComponentRef, Injectable, ViewContainerRef, ComponentFactoryResolver } from '@angular/core';
import { Subject } from 'rxjs';
import {
DropoutComponentCreationRequest, DropoutComponentRefId, DropoutOutletDimensions,
DropoutComponentCreationRequest, DropoutComponentRefId,
DropoutViewPortDimensions,
} from '../dropout.model';
import { CloukitDropoutContainerComponent } from '../children/dropout-container.component';
Expand Down
Loading

0 comments on commit 0a4d294

Please sign in to comment.