Skip to content
This repository has been archived by the owner on Oct 10, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into greenkeeper/tslint-5.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Burak Tasci authored Jan 24, 2018
2 parents eb6e2c2 + 8acd70e commit a942fe0
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 47 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Burak Tasci
Copyright (c) 2018 Burak Tasci

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ If you want to file a bug, contribute some code, or improve documentation, pleas
- [Coding rules](CONTRIBUTING.md#rules)
- [Change log](CHANGELOG.md)

#### Thanks to
- [JetBrains], for their support to this open source project with free [WebStorm] licenses.

## License
The MIT License (MIT)

Copyright (c) 2017 [Burak Tasci]
Copyright (c) 2018 [Burak Tasci]

[angular-cli]: https://github.com/angular/angular-cli
[@types]: https://www.npmjs.com/~types
Expand All @@ -81,4 +84,6 @@ Copyright (c) 2017 [Burak Tasci]
[angular-tslint-rules]: https://github.com/fulls1z3/angular-tslint-rules
[TSLint]: https://github.com/palantir/tslint
[codelyzer]: https://github.com/mgechev/codelyzer
[JetBrains]: https://www.jetbrains.com/community/opensource
[WebStorm]: https://www.jetbrains.com/webstorm
[Burak Tasci]: https://github.com/fulls1z3
52 changes: 25 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,54 +28,52 @@
"release": "standard-version"
},
"dependencies": {
"@angular/animations": "~4.4.1",
"@angular/common": "~4.4.1",
"@angular/compiler": "~4.4.1",
"@angular/core": "~4.4.1",
"@angular/forms": "~4.4.1",
"@angular/http": "~4.4.1",
"@angular/platform-browser": "~4.4.1",
"@angular/platform-browser-dynamic": "~4.4.1",
"@angular/router": "~4.4.1",
"@angular/animations": "~5.2.1",
"@angular/common": "~5.2.1",
"@angular/compiler": "~5.2.0",
"@angular/core": "~5.2.1",
"@angular/forms": "~5.2.1",
"@angular/http": "~5.2.1",
"@angular/platform-browser": "~5.2.1",
"@angular/platform-browser-dynamic": "~5.2.1",
"@angular/router": "~5.2.1",
"core-js": "^2.4.1",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14",
"lodash": "~4.17.4",
"@ngx-config/core": "4.0.1",
"@ngx-config/http-loader": "4.0.1",
"@ngx-config/core": "5.0.0",
"@ngx-config/http-loader": "5.0.0",
"@ngx-translate/core": "~6.0.1",
"@ngx-translate/http-loader": "~0.0.3",
"@ngx-meta/core": "4.0.1"
"@ngx-meta/core": "5.0.0"
},
"devDependencies": {
"@angular/cli": "1.4.7",
"@angular/compiler-cli": "~4.4.1",
"@angular/language-service": "~4.4.1",
"@types/jasmine": "~2.6.0",
"@angular/compiler-cli": "~5.2.1",
"@angular/language-service": "~5.2.1",
"@types/jasmine": "~2.8.5",
"@types/jasminewd2": "~2.0.2",
"@types/lodash": "4.14.55",
"@types/node": "~8.0.27",
"angular-tslint-rules": "1.0.4",
"codelyzer": "~3.2.0",
"jasmine-core": "~2.8.0",
"@types/node": "~9.3.0",
"angular-tslint-rules": "1.2.0",
"codelyzer": "~4.1.0",
"jasmine-core": "~2.9.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.0",
"karma": "~2.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2",
"protractor": "~5.2.2",
"standard-version": "^4.2.0",
"ts-node": "~3.3.0",
"tslint": "~5.8.0",
"typescript": "~2.5.2"
"ts-node": "~4.0.1",
"tslint": "~5.9.1",
"typescript": "~2.6.2"
},
"greenkeeper": {
"ignore": [
"@types/lodash",
"@ngx-translate/core",
"@ngx-translate/http-loader"
"@types/lodash"
]
}
}
83 changes: 65 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@
version "2.5.54"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.54.tgz#a6b5f2ae2afb6e0307774e8c7c608e037d491c63"

"@types/jasmine@~2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.0.tgz#997b41a27752b4850af2683bc4a8d8222c25bd02"
"@types/jasmine@2.8.0":
version "2.8.0"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.0.tgz#caa5395081143e419d3f4b0277c66b26fc783e68"

"@types/jasminewd2@~2.0.2":
version "2.0.3"
Expand Down Expand Up @@ -329,9 +329,9 @@ amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"

angular-tslint-rules@1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/angular-tslint-rules/-/angular-tslint-rules-1.0.4.tgz#68cfa1c4ec26114d569d9b82e6bb752dd007645c"
angular-tslint-rules@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/angular-tslint-rules/-/angular-tslint-rules-1.1.0.tgz#5015e86f9f83cc2619b7ab67fd872b033b6e638f"

ansi-html@0.0.7:
version "0.0.7"
Expand Down Expand Up @@ -984,9 +984,9 @@ code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

codelyzer@~3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.2.0.tgz#68eb0a67771ea73006b517053c3035c1838abf14"
codelyzer@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.0.0.tgz#1a684364a0f20dc14c43df155980fce9c6390304"
dependencies:
app-root-path "^2.0.1"
css-selector-tokenizer "^0.7.0"
Expand Down Expand Up @@ -1305,6 +1305,10 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"

core-js@~2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"

core-object@^3.1.0:
version "3.1.5"
resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
Expand Down Expand Up @@ -1908,6 +1912,10 @@ es6-map@^0.1.3:
es6-symbol "~3.1.1"
event-emitter "~0.3.5"

es6-promise@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"

es6-set@~0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
Expand Down Expand Up @@ -2700,6 +2708,10 @@ img-stats@^0.5.2:
dependencies:
xmldom "^0.1.19"

immediate@~3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"

in-publish@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
Expand Down Expand Up @@ -3180,6 +3192,16 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"

jszip@^3.1.3:
version "3.1.4"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.4.tgz#fc323fe41bb1730348d20dd022aa4d8b57cbbcf9"
dependencies:
core-js "~2.3.0"
es6-promise "~3.0.2"
lie "~3.1.0"
pako "~1.0.2"
readable-stream "~2.0.6"

karma-chrome-launcher@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
Expand Down Expand Up @@ -3307,6 +3329,12 @@ license-webpack-plugin@^1.0.0:
dependencies:
ejs "^2.5.7"

lie@~3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
dependencies:
immediate "~3.0.5"

load-json-file@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
Expand Down Expand Up @@ -3978,6 +4006,10 @@ pako@~0.2.0:
version "0.2.9"
resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"

pako@~1.0.2:
version "1.0.6"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"

param-case@2.1.x:
version "2.1.1"
resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
Expand Down Expand Up @@ -4442,9 +4474,9 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

protractor@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.1.2.tgz#9b221741709a4c62d5cd53c6aadd54a71137e95f"
protractor@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.2.0.tgz#d3f39b195e85f3539ad9d8cb6560a9d2b63297c4"
dependencies:
"@types/node" "^6.0.46"
"@types/q" "^0.0.32"
Expand All @@ -4457,7 +4489,7 @@ protractor@~5.1.2:
optimist "~0.6.0"
q "1.4.1"
saucelabs "~1.3.0"
selenium-webdriver "3.0.1"
selenium-webdriver "3.6.0"
source-map-support "~0.4.0"
webdriver-js-extender "^1.0.0"
webdriver-manager "^12.0.6"
Expand Down Expand Up @@ -4627,6 +4659,17 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
string_decoder "~1.0.3"
util-deprecate "~1.0.1"

readable-stream@~2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readdirp@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
Expand Down Expand Up @@ -4867,11 +4910,11 @@ select-hose@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"

selenium-webdriver@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
selenium-webdriver@3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
dependencies:
adm-zip "^0.4.7"
jszip "^3.1.3"
rimraf "^2.5.4"
tmp "0.0.30"
xml2js "^0.4.17"
Expand Down Expand Up @@ -5566,7 +5609,11 @@ typedarray@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3, typescript@~2.5.2:
typescript@2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"

"typescript@>=2.0.0 <2.6.0", typescript@^2.3.3:
version "2.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"

Expand Down

0 comments on commit a942fe0

Please sign in to comment.