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

Commit 418f9ee

Browse files
author
clouless
committed
angular 7 upgrade
1 parent af81a89 commit 418f9ee

File tree

6 files changed

+1825
-1415
lines changed

6 files changed

+1825
-1415
lines changed

angular.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@
4848
"aot": true,
4949
"extractLicenses": true,
5050
"vendorChunk": false,
51-
"buildOptimizer": true
51+
"buildOptimizer": true,
52+
"budgets": [
53+
{
54+
"type": "initial",
55+
"maximumWarning": "2mb",
56+
"maximumError": "5mb"
57+
}
58+
]
5259
}
5360
}
5461
},
@@ -77,7 +84,7 @@
7784
"tsConfig": "src/tsconfig.spec.json",
7885
"karmaConfig": "src/karma.conf.js",
7986
"styles": [
80-
"styles.css"
87+
"src/styles.css"
8188
],
8289
"scripts": [],
8390
"assets": [
@@ -109,6 +116,11 @@
109116
"options": {
110117
"protractorConfig": "e2e/protractor.conf.js",
111118
"devServerTarget": "tooltip-demo:serve"
119+
},
120+
"configurations": {
121+
"production": {
122+
"devServerTarget": "story-demo:serve:production"
123+
}
112124
}
113125
},
114126
"lint": {
@@ -133,11 +145,6 @@
133145
"options": {
134146
"tsConfig": "projects/cloukit/tooltip/tsconfig.lib.json",
135147
"project": "projects/cloukit/tooltip/ng-package.json"
136-
},
137-
"configurations": {
138-
"production": {
139-
"project": "projects/cloukit/tooltip/ng-package.prod.json"
140-
}
141148
}
142149
},
143150
"test": {
@@ -164,4 +171,4 @@
164171
}
165172
},
166173
"defaultProject": "tooltip-demo"
167-
}
174+
}

package.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,47 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "^6.0.0",
16-
"@angular/core": "^6.0.0",
17-
"@angular/compiler": "^6.0.0",
18-
"@angular/animations": "^6.0.0",
19-
"@angular/forms": "^6.0.0",
20-
"@angular/http": "^6.0.0",
21-
"@angular/platform-browser": "^6.0.0",
22-
"@angular/platform-browser-dynamic": "^6.0.0",
23-
"@angular/router": "^6.0.0",
24-
"@cloukit/dropout": "^6.0.0",
25-
"@cloukit/story": "6.0.0",
26-
"@cloukit/theme": "^6.0.1",
15+
"@cloukit/theme": "7.0.1",
16+
"@cloukit/dropout": "7.0.0",
17+
"@cloukit/story": "7.0.0",
2718
"@types/prismjs": "1.9.0",
28-
"core-js": "^2.5.4",
29-
"prismjs": "1.14.0",
30-
"rxjs": "^6.0.0",
31-
"zone.js": "^0.8.26"
19+
"prismjs": "1.15.0",
20+
"@angular/animations": "~7.0.0",
21+
"@angular/common": "~7.0.0",
22+
"@angular/compiler": "~7.0.0",
23+
"@angular/core": "~7.0.0",
24+
"@angular/forms": "~7.0.0",
25+
"@angular/http": "~7.0.0",
26+
"@angular/platform-browser": "~7.0.0",
27+
"@angular/platform-browser-dynamic": "~7.0.0",
28+
"@angular/router": "~7.0.0",
29+
"core-js": "^2.5.7",
30+
"rxjs": "~6.3.3",
31+
"zone.js": "~0.8.26"
3232
},
3333
"devDependencies": {
34-
"@angular/compiler-cli": "^6.0.0",
35-
"@angular-devkit/build-ng-packagr": "~0.6.1",
36-
"@angular-devkit/build-angular": "~0.6.0",
37-
"ng-packagr": "^3.0.0-rc.2",
38-
"tsickle": ">=0.25.5",
39-
"tslib": "^1.7.1",
40-
"typescript": "~2.7.2",
41-
"@angular/cli": "~6.0.0",
42-
"@angular/language-service": "^6.0.0",
43-
"@types/jasmine": "~2.8.6",
44-
"@types/jasminewd2": "~2.0.3",
45-
"@types/node": "~8.9.4",
46-
"codelyzer": "~4.2.1",
47-
"jasmine-core": "~2.99.1",
34+
"@angular-devkit/build-angular": "~0.10.0",
35+
"@angular-devkit/build-ng-packagr": "~0.10.0",
36+
"@angular/cli": "~7.0.4",
37+
"@angular/compiler-cli": "~7.0.0",
38+
"@angular/language-service": "~7.0.0",
39+
"@types/node": "~10.12.2",
40+
"@types/jasmine": "~2.8.8",
41+
"@types/jasminewd2": "~2.0.6",
42+
"codelyzer": "~4.5.0",
43+
"jasmine-core": "~3.3.0",
4844
"jasmine-spec-reporter": "~4.2.1",
49-
"karma": "~1.7.1",
45+
"karma": "~3.1.1",
5046
"karma-chrome-launcher": "~2.2.0",
51-
"karma-coverage-istanbul-reporter": "~1.4.2",
52-
"karma-jasmine": "~1.1.1",
53-
"karma-jasmine-html-reporter": "^0.2.2",
54-
"protractor": "~5.3.0",
55-
"ts-node": "~5.0.1",
56-
"tslint": "~5.9.1"
47+
"karma-coverage-istanbul-reporter": "~2.0.1",
48+
"karma-jasmine": "~1.1.2",
49+
"karma-jasmine-html-reporter": "^1.4.0",
50+
"ng-packagr": "^4.2.0",
51+
"protractor": "~5.4.0",
52+
"ts-node": "~7.0.0",
53+
"tsickle": ">=0.29.0",
54+
"tslib": "^1.9.3",
55+
"tslint": "~5.11.0",
56+
"typescript": "~3.1.1"
5757
}
5858
}

projects/cloukit/tooltip/ng-package.prod.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@cloukit/tooltip",
3-
"version": "6.0.1",
3+
"version": "7.0.0",
44
"peerDependencies": {
5-
"@angular/common": "^6.0.0-rc.0 || ^6.0.0",
6-
"@angular/core": "^6.0.0-rc.0 || ^6.0.0",
7-
"@cloukit/dropout": "^6.0.0",
8-
"@cloukit/theme": "^6.0.0"
5+
"@angular/common": "^7.0.0-rc.0 || ^7.0.0",
6+
"@angular/core": "^7.0.0-rc.0 || ^7.0.0",
7+
"@cloukit/dropout": "^7.0.0",
8+
"@cloukit/theme": "^7.0.1"
99
}
1010
}

projects/cloukit/tooltip/src/lib/tooltip.theme.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
* Copyright (c) 2017 Bernhard Grünewaldt - codeclou.io
44
* https://github.com/cloukit/legal
55
*/
6-
import {
7-
CloukitComponentTheme,
8-
CloukitStatefulAndModifierAwareElementThemeStyleDefinition,
9-
} from '@cloukit/theme';
6+
import { CloukitComponentTheme } from '@cloukit/theme';
107

118
/**
129
* The default theme
@@ -28,7 +25,7 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
2825
opacity 300ms ease-in-out`,
2926
opacity: 0,
3027
}
31-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition);
28+
});
3229

3330
this.createStyle('wrapper', 'ready', 'left',
3431
this.merge(this.getStyle('wrapper', 'init', 'base'), {
@@ -37,7 +34,7 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
3734
transform: 'translate(0, -50%)',
3835
opacity: 1,
3936
}
40-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition));
37+
}));
4138

4239
this.createStyle('wrapper', 'ready', 'right',
4340
this.merge(this.getStyle('wrapper', 'init', 'base'), {
@@ -46,7 +43,7 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
4643
transform: 'translate(0, -50%)',
4744
opacity: 1,
4845
}
49-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition));
46+
}));
5047

5148
this.createStyle('wrapper', 'ready', 'up',
5249
this.merge(this.getStyle('wrapper', 'init', 'base'), {
@@ -55,7 +52,7 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
5552
transform: 'translate(-50%, 0)',
5653
opacity: 1,
5754
}
58-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition));
55+
}));
5956

6057
this.createStyle('wrapper', 'ready', 'down',
6158
this.merge(this.getStyle('wrapper', 'init', 'base'), {
@@ -64,7 +61,7 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
6461
transform: 'translate(-50%, 0)',
6562
opacity: 1,
6663
}
67-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition));
64+
}));
6865

6966
//
7067
// TOOLTIP
@@ -75,13 +72,13 @@ export class CloukitTooltipComponentThemeDefault extends CloukitComponentTheme {
7572
padding: '5px 8px 5px 8px',
7673
color: '#fff',
7774
}
78-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition);
75+
});
7976

8077
this.createStyle('tooltip', 'ready', 'base',
8178
this.merge(this.getStyle('tooltip', 'init', 'base'), {
8279
style: {
8380
}
84-
} as CloukitStatefulAndModifierAwareElementThemeStyleDefinition));
81+
}));
8582
}
8683

8784
}

0 commit comments

Comments
 (0)