commit caab7f2cae9550cba36f9ad1b26b972c7c924835
parent 2992eec4c940c527adbab327d649a44a8e9acb59
Author: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 19 May 2018 11:36:58 +0200
Merge branch 'master' into renovate/angular-cdk-6.x
Diffstat:
| M | package.json | | | 29 | +++++++++++++++++------------ |
| M | yarn.lock | | | 150 | +++++++++++++++++++++++++++++++++++++++++-------------------------------------- |
2 files changed, 94 insertions(+), 85 deletions(-)
diff --git a/package.json b/package.json
@@ -19,15 +19,20 @@
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/core": "^5.0.0",
+ "@angular/animations": "^6.0.0",
+ "@angular/cdk": "^6.0.0",
+ "@angular/common": "^6.0.0",
+ "@angular/compiler": "^6.0.0",
+ "@angular/core": "^6.0.0",
"@angular/flex-layout": "^5.0.0-beta.13",
- "@angular/forms": "^5.0.0",
- "@angular/http": "^5.0.0",
- "@angular/material": "^5.2.4",
- "@angular/platform-browser": "^5.0.0",
- "@angular/platform-browser-dynamic": "^5.0.0",
- "@angular/platform-server": "^5.2.4",
- "@angular/router": "^5.0.0",
- "@angular/service-worker": "^5.2.4",
+ "@angular/forms": "^6.0.0",
+ "@angular/http": "^6.0.0",
+ "@angular/material": "^6.0.0",
+ "@angular/platform-browser": "^6.0.0",
+ "@angular/platform-browser-dynamic": "^6.0.0",
+ "@angular/platform-server": "^6.0.0",
+ "@angular/router": "^6.0.0",
+ "@angular/service-worker": "^6.0.0",
"@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.8",
"chart.js": "^2.7.2",
"core-js": "^2.4.1",
@@ -43,10 +48,10 @@
"zone.js": "^0.8.14"
},
"devDependencies": {
- "@angular-devkit/core": "^0.5.0",
+ "@angular-devkit/core": "^0.6.0",
"@angular/cli": "^1.7.3",
- "@angular/compiler-cli": "^5.0.0",
- "@angular/language-service": "^5.0.0",
+ "@angular/compiler-cli": "^6.0.0",
+ "@angular/language-service": "^6.0.0",
"@types/express": "^4.11.1",
"@types/jasmine": "^2.8.6",
"@types/jasminewd2": "~2.0.2",
@@ -56,7 +61,7 @@
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.1.1",
"karma-cli": "^1.0.1",
- "karma-coverage-istanbul-reporter": "^1.2.1",
+ "karma-coverage-istanbul-reporter": "^2.0.0",
"karma-jasmine": "^1.1.0",
"karma-jasmine-html-reporter": "^1.0.0",
"protractor": "^5.1.2",
diff --git a/yarn.lock b/yarn.lock
@@ -20,13 +20,13 @@
rxjs "^5.5.6"
source-map "^0.5.6"
-"@angular-devkit/core@^0.5.0":
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.0.tgz#d59f2f36546c021edfce0d1a7350b241d5699a54"
+"@angular-devkit/core@^0.6.0":
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.6.0.tgz#d1a7275ff0f93de5cf007c4a549d1ebd00776fd0"
dependencies:
- ajv "~5.5.1"
- chokidar "^1.7.0"
- rxjs "^6.0.0-beta.3"
+ ajv "~6.4.0"
+ chokidar "^2.0.3"
+ rxjs "^6.0.0"
source-map "^0.5.6"
"@angular-devkit/schematics@0.3.2":
@@ -36,11 +36,11 @@
"@ngtools/json-schema" "^1.1.0"
rxjs "^5.5.6"
-"@angular/animations@^5.2.9":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.9.tgz#220db9fb5a52a193db0023d721b23ddd25a75770"
+"@angular/animations@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0.tgz#cfc825dbfdf33bf3bf75962d1e12495aed5e3c32"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
"@angular/cdk@^6.0.0":
version "6.0.0"
@@ -113,32 +113,32 @@
optionalDependencies:
node-sass "^4.7.2"
-"@angular/common@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.9.tgz#beb25d4434498abae56bd8dc2c01ade3f6c45e81"
+"@angular/common@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0.tgz#ca3b6b6b96837fe048861da897c31991aa04954f"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/compiler-cli@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.9.tgz#36a069937d50a8a294eda233b5b1b2c71139751f"
+"@angular/compiler-cli@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0.tgz#be50277faaa5ac08f3002c2c8cb8c39d220c76d5"
dependencies:
chokidar "^1.4.2"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
tsickle "^0.27.2"
-"@angular/compiler@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.9.tgz#1d03bc1e8b38c259bc58114d691c2140d244f8f5"
+"@angular/compiler@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0.tgz#9092a0f02f33dd1108276ab93cc48142e36a1e95"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/core@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.9.tgz#3daf13ef9aa754b9954ed21da3eb322e8b20f667"
+"@angular/core@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0.tgz#785cc8a37b7fb784a6b7dcbd0984abb4f10e5dfe"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
"@angular/flex-layout@^5.0.0-beta.13":
version "5.0.0-beta.14"
@@ -146,59 +146,59 @@
dependencies:
tslib "^1.7.1"
-"@angular/forms@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.9.tgz#12c45b3a02c398b354f09cc740d914cd904c0c9c"
+"@angular/forms@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.0.tgz#436e2df39dc57db124da5a5c02bc63909fdf7046"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/http@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.9.tgz#2ffea536e181bc97e2867593d57425ea7853285b"
+"@angular/http@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0.tgz#f409e35cd2f4990b43a37beab915ffdcd9c7c992"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/language-service@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.2.9.tgz#4838bb6319c99e8f5beb08bdfb392ee9a1173766"
+"@angular/language-service@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.0.tgz#85bf577fd7f45eff13128d4f5f0125078d610aec"
-"@angular/material@^5.2.4":
- version "5.2.4"
- resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.2.4.tgz#9e823798324283d23ea839156fac5bcb73443d55"
+"@angular/material@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.0.0.tgz#9704ced8ba2eca59b04c6c6ed032a1f36f685667"
dependencies:
tslib "^1.7.1"
-"@angular/platform-browser-dynamic@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.9.tgz#86075b7bb694861f722ceda29aae186b045c6b7d"
+"@angular/platform-browser-dynamic@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0.tgz#66a34b65136446cb3ec39362fd6d2dbb5482ba70"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/platform-browser@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.9.tgz#9ee76327b1b3affad68ffa839058661b7704bc2c"
+"@angular/platform-browser@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0.tgz#848b687ea46786483fddcdbbbd17b29c7adcc768"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/platform-server@^5.2.4":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.9.tgz#9905cc152242472da2557bf9fec73685449b92c4"
+"@angular/platform-server@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0.tgz#482878cc538a80caa3962e9376e4225b20c2a4bd"
dependencies:
- domino "^1.0.29"
- tslib "^1.7.1"
+ domino "^2.0.1"
+ tslib "^1.9.0"
xhr2 "^0.1.4"
-"@angular/router@^5.0.0":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.9.tgz#0369df6e60c6da3a5842c6eb35e3958d4ffe727e"
+"@angular/router@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.0.tgz#09a5c6f6220084c3575df81e8b36cbe9fff10d1f"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
-"@angular/service-worker@^5.2.4":
- version "5.2.9"
- resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-5.2.9.tgz#47ee439f2f896ac701fee271d046589a6c46b6af"
+"@angular/service-worker@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.0.0.tgz#35a187554d33e05911544080fafc281ff1b322e0"
dependencies:
- tslib "^1.7.1"
+ tslib "^1.9.0"
"@ngtools/json-schema@1.2.0":
version "1.2.0"
@@ -384,7 +384,7 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@~5.5.1:
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"
-ajv@^6.1.0, ajv@^6.1.1:
+ajv@^6.1.0, ajv@^6.1.1, ajv@~6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
dependencies:
@@ -1261,7 +1261,7 @@ chokidar@^1.4.1, chokidar@^1.4.2, chokidar@^1.7.0:
optionalDependencies:
fsevents "^1.0.0"
-chokidar@^2.0.0, chokidar@^2.0.2:
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
dependencies:
@@ -1998,9 +1998,9 @@ domhandler@2.1:
dependencies:
domelementtype "1"
-domino@^1.0.29:
- version "1.0.30"
- resolved "https://registry.yarnpkg.com/domino/-/domino-1.0.30.tgz#54a4154ecae968616680f8feba3cedff355c71f4"
+domino@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.2.tgz#fa2da6ace8381cf64089079470ee33c53901010f"
domutils@1.1:
version "1.1.6"
@@ -3627,7 +3627,7 @@ isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-istanbul-api@^1.1.14:
+istanbul-api@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
dependencies:
@@ -3843,11 +3843,11 @@ karma-cli@^1.0.1:
dependencies:
resolve "^1.1.6"
-karma-coverage-istanbul-reporter@^1.2.1:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.2.tgz#a8d0c8815c7d6f6cea15a394a7c4b39ef151a939"
+karma-coverage-istanbul-reporter@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.0.tgz#28ceeda1754ced5a9cb0aa8fef29118e73f4a7d6"
dependencies:
- istanbul-api "^1.1.14"
+ istanbul-api "^1.3.1"
minimatch "^3.0.4"
karma-jasmine-html-reporter@^1.0.0:
@@ -5758,9 +5758,9 @@ rxjs@^5.5.2, rxjs@^5.5.6:
dependencies:
symbol-observable "1.0.1"
-rxjs@^6.0.0-beta.3:
- version "6.0.0-smoosh.2"
- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-smoosh.2.tgz#2fbec8bce211ac6cdb21e630f17df2358562b6cc"
+rxjs@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
dependencies:
tslib "^1.9.0"
@@ -6679,6 +6679,10 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+tslib@^1.9.0:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.1.tgz#a5d1f0532a49221c87755cfcc89ca37197242ba7"
+
tslint@^5.7.0:
version "5.9.1"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae"
