diff --git a/.travis.yml b/.travis.yml index f9a544e5..09355539 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,6 @@ language: node_js node_js: - "6" -cache: - directories: - - node_modules - - $HOME/.npm - - $HOME/.cache/yarn - addons: apt: sources: @@ -30,8 +24,7 @@ install: - yarn script: - - yarn run build:prod - - yarn run build:aot + - yarn run build:ci notifications: slack: akveo:q559HckfZMSyZRb803aiLcjH diff --git a/config/webpack.common.js b/config/webpack.common.js index c896fc51..84138ad4 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -162,9 +162,9 @@ module.exports = function (options) { { test: /initial\.scss$/, - loader: ExtractTextPlugin.extract({ - fallbackLoader: 'style-loader', - loader: 'css-loader!sass-loader?sourceMap' + use: ExtractTextPlugin.extract({ + fallback: 'style-loader', + use: 'css-loader!sass-loader?sourceMap' }) }, diff --git a/config/webpack.dev.js b/config/webpack.dev.js index cbef45a3..471358ab 100644 --- a/config/webpack.dev.js +++ b/config/webpack.dev.js @@ -119,6 +119,7 @@ module.exports = function (options) { name: 'zone.js', path: 'zone.js/dist/long-stack-trace-zone.js' }, + 'ts-helpers', ], vendor: [ '@angular/platform-browser', diff --git a/package.json b/package.json index 21eba1cc..6a5013f7 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "core-js": "2.4.1", "easy-pie-chart": "2.1.7", "font-awesome": "4.7.0", - "font-awesome-sass-loader": "1.0.3", "fullcalendar": "2.9.1", "google-maps": "3.2.1", "http-server": "0.9.0", @@ -45,10 +44,10 @@ "ng2-completer": "1.1.0", "ng2-smart-table": "0.5.3-0", "ng2-tree": "2.0.0-alpha.3", - "ngx-uploader": "2.1.6", - "normalize.css": "5.0.0", + "ngx-uploader": "2.2.0", + "normalize.css": "4.2.0", "reflect-metadata": "0.1.9", - "rxjs": "5.1.1", + "rxjs": "5.0.2", "tether": "1.4.0", "zone.js": "0.7.7" }, @@ -59,7 +58,7 @@ "@types/hammerjs": "2.0.34", "@types/jquery ": "2.0.40", "@types/jquery.slimscroll": "1.3.30", - "@types/lodash": "4.14.52", + "@types/lodash": "ts2.0", "@types/node": "6.0.63", "@types/source-map": "0.5.0", "@types/uglify-js": "2.6.28", @@ -68,7 +67,7 @@ "angular2-template-loader": "0.6.0", "assets-webpack-plugin": "3.5.1", "awesome-typescript-loader": "3.0.4", - "bootstrap-loader": "2.0.0-beta.18", + "bootstrap-loader": "2.0.0-beta.21", "codelyzer": "2.0.0", "copy-webpack-plugin": "4.0.1", "css-loader": "0.26.1", @@ -81,34 +80,35 @@ "extract-text-webpack-plugin": "2.0.0-rc.3", "file-loader": "0.10.0", "find-root": "1.0.0", + "font-awesome-sass-loader": "1.0.3", "gh-pages": "0.12.0", "html-webpack-plugin": "2.28.0", "imports-loader": "0.7.0", "json-loader": "0.5.4", "ng-router-loader": "2.1.0", - "ngc-webpack": "1.1.0", + "ngc-webpack": "1.2.0", "node-sass": "4.5.0", "npm-run-all": "4.0.1", "optimize-js-plugin": "0.0.4", - "postcss-loader": "1.3.0", + "postcss-loader": "1.3.1", "raw-loader": "0.5.1", "resolve-url-loader": "1.6.1", "rimraf": "2.5.4", - "sass-loader": "6.0.0", + "sass-loader": "4.1.1", "script-ext-html-webpack-plugin": "1.7.1", "source-map-loader": "0.1.6", "string-replace-loader": "1.0.5", "style-loader": "0.13.1", "to-string-loader": "1.1.5", + "ts-helpers": "1.1.2", "ts-node": "2.1.0", - "tslib": "1.5.0", "tslint": "4.4.2", "typedoc": "0.5.6", - "typescript": "2.1.6", + "typescript": "2.0.10", "url-loader": "0.5.7", "webpack": "2.2.0", - "webpack-dev-middleware": "1.10.0", - "webpack-dev-server": "2.3.0", + "webpack-dev-middleware": "1.9.0", + "webpack-dev-server": "2.2.0", "webpack-dll-bundles-plugin": "1.0.0-beta.5", "webpack-merge": "2.6.1" }, @@ -163,7 +163,8 @@ "electron:start": "electron build", "build:aot:prod": "npm run clean:dist && npm run clean:aot && webpack --config config/webpack.prod.js --progress --profile --bail", "build:aot": "npm run build:aot:prod", - "clean:aot": "npm run rimraf -- compiled" + "clean:aot": "npm run rimraf -- compiled", + "build:ci": "npm run build:prod && npm run build:aot" }, "repository": { "type": "git", diff --git a/src/polyfills.browser.ts b/src/polyfills.browser.ts index 042373cd..a4037ba9 100644 --- a/src/polyfills.browser.ts +++ b/src/polyfills.browser.ts @@ -28,6 +28,9 @@ import 'core-js/es6/reflect'; import 'core-js/es7/reflect'; import 'zone.js/dist/zone'; +// Typescript emit helpers polyfill +import 'ts-helpers'; + if ('production' === ENV) { // Production diff --git a/tsconfig.json b/tsconfig.json index 32c9705a..1cf4dc4d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,6 @@ "sourceMap": true, "noEmit": true, "noEmitHelpers": true, - "importHelpers": true, "strictNullChecks": false, "lib": [ "dom", diff --git a/tsconfig.webpack.json b/tsconfig.webpack.json index 80975f56..5b31fd4c 100644 --- a/tsconfig.webpack.json +++ b/tsconfig.webpack.json @@ -9,7 +9,6 @@ "sourceMap": true, "noEmit": true, "noEmitHelpers": true, - "importHelpers": true, "strictNullChecks": false, "lib": [ "es2015", diff --git a/yarn.lock b/yarn.lock index 9f9fabbb..07f92498 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,12 +48,6 @@ version "3.4.7" resolved "https://registry.yarnpkg.com/@angular/router/-/router-3.4.7.tgz#e9583eed5a1d50cc1628b2526244555444a746b8" -"@angular/tsc-wrapped@0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.0.tgz#e50f81af02c6817dcaba22032e49ba8060d628b4" - dependencies: - tsickle "^0.2" - "@angular/tsc-wrapped@0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-0.5.2.tgz#2eddf472c467fcb334ea94deddaaa71990c5a482" @@ -118,9 +112,9 @@ dependencies: "@types/jquery" "*" -"@types/lodash@4.14.52", "@types/lodash@^4.14.37": - version "4.14.52" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.52.tgz#de5c7ab14da1289733233c9b0ec6f9e377db90f5" +"@types/lodash@^4.14.37", "@types/lodash@ts2.0": + version "4.14.50" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.50.tgz#2227da4d65fafe249bccd59c7b9396e27674c8f7" "@types/marked@0.0.28": version "0.0.28" @@ -244,10 +238,6 @@ ansi-align@^1.1.0: dependencies: string-width "^1.0.1" -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -403,8 +393,8 @@ async@^1.4.0, async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.0.1, async@^2.1.2: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" + version "2.1.5" + resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" dependencies: lodash "^4.14.0" @@ -421,14 +411,14 @@ atob@~1.1.0: resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" autoprefixer@^6.3.1: - version "6.7.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.3.tgz#bc2c28018e9a226f24f0ded36ce81014dccec817" + version "6.7.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.4.tgz#b4405a263325c04a7c2b1c86fc603ad7bbfe01c6" dependencies: - browserslist "^1.7.2" - caniuse-db "^1.0.30000623" + browserslist "^1.7.4" + caniuse-db "^1.0.30000624" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^5.2.13" + postcss "^5.2.14" postcss-value-parser "^3.2.3" awesome-typescript-loader@3.0.4: @@ -513,9 +503,9 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bootstrap-loader@2.0.0-beta.18: - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/bootstrap-loader/-/bootstrap-loader-2.0.0-beta.18.tgz#dc8c472271e65338fb5c13555bc36140c0929974" +bootstrap-loader@2.0.0-beta.21: + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/bootstrap-loader/-/bootstrap-loader-2.0.0-beta.21.tgz#2a0b1445385f5284d526030fbcf5be99b342b733" dependencies: chalk "^1.1.3" escape-regexp "0.0.1" @@ -617,11 +607,11 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^1.0.1, browserslist@^1.5.2, browserslist@^1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.3.tgz#25ead9c917b278ad668b83f39c8025697797b2ab" +browserslist@^1.0.1, browserslist@^1.5.2, browserslist@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.4.tgz#56a12da876f787223743a866224ccd8f97014628" dependencies: - caniuse-db "^1.0.30000623" + caniuse-db "^1.0.30000624" electron-to-chromium "^1.2.2" buffer-shims@^1.0.0: @@ -687,9 +677,9 @@ caniuse-api@^1.5.2: lodash.memoize "^4.1.0" lodash.uniq "^4.3.0" -caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000623: - version "1.0.30000623" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000623.tgz#6e9dc4385d00a8f587efbb23fcbed7916f186e5d" +caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000624: + version "1.0.30000624" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000624.tgz#554b87547895e36f5fe128f4b7448a2ea5bf2213" capture-stack-trace@^1.0.0: version "1.0.0" @@ -1462,8 +1452,8 @@ esprima@^3.1.1, esprima@~3.1.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" estree-walker@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.0.tgz#f67ca8f57b9ed66d886af816c099c779b315d4db" + version "0.3.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" esutils@^2.0.2: version "2.0.2" @@ -1750,8 +1740,8 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.0.17" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" + version "1.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" @@ -2032,13 +2022,9 @@ html-comment-regex@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" -html-entities@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2" - html-minifier@^3.2.3: - version "3.3.1" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.3.1.tgz#dd38e60571537bf34a8171889c64fce73c45edad" + version "3.3.3" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.3.3.tgz#5e85516b2aff3c3fb9bda351879375868386d6f6" dependencies: camel-case "3.0.x" clean-css "4.0.x" @@ -2324,8 +2310,10 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" is-regex@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637" + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + dependencies: + has "^1.0.1" is-retry-allowed@^1.0.0: version "1.1.0" @@ -2535,8 +2523,8 @@ loader-runner@^2.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5: - version "0.2.16" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: big.js "^3.1.3" emojis-list "^2.0.0" @@ -2676,10 +2664,6 @@ lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - lodash.toplainobject@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d" @@ -2931,18 +2915,17 @@ ng2-tree@2.0.0-alpha.3: version "2.0.0-alpha.3" resolved "https://registry.yarnpkg.com/ng2-tree/-/ng2-tree-2.0.0-alpha.3.tgz#e3f0d43e71ce67bf4626dfa1f2186b69654ea384" -ngc-webpack@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-1.1.0.tgz#d95b934ff04fa1b9f899c7d32d0d6e6592f9b479" +ngc-webpack@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-1.2.0.tgz#d4b71f733997b8ee26c669ffb77dbfae21c221ba" dependencies: - "@angular/tsc-wrapped" "0.5.0" minimist "^1.2.0" reflect-metadata "^0.1.2" ts-node "^2.0.0" -ngx-uploader@2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/ngx-uploader/-/ngx-uploader-2.1.6.tgz#8b695adacfc07ec9b9a2063b546b4b8392f1179b" +ngx-uploader@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ngx-uploader/-/ngx-uploader-2.2.0.tgz#ce058a13fdc93415a7cc6a27385f70acf5d5d93b" no-case@^2.2.0: version "2.3.1" @@ -3075,9 +3058,9 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize.css@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-5.0.0.tgz#7cec875ce8178a5333c4de80b68ea9c18b9d7c37" +normalize.css@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.2.0.tgz#21d66cc557154d4379fd1e079ec7de58a379b099" npm-run-all@4.0.1: version "4.0.1" @@ -3341,7 +3324,7 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -pify@^2.0.0, pify@^2.3.0: +pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -3431,7 +3414,7 @@ postcss-filter-plugins@^2.0.0: postcss "^5.0.4" uniqid "^4.0.0" -postcss-load-config@^1.1.0: +postcss-load-config@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a" dependencies: @@ -3454,14 +3437,14 @@ postcss-load-plugins@^2.3.0: cosmiconfig "^2.1.1" object-assign "^4.1.0" -postcss-loader@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.3.0.tgz#b073d425cd260fb0281f5c9be4cef070698eb8d2" +postcss-loader@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.3.1.tgz#7907bdfe5e953cf4b6d97cbd8edcd17956369030" dependencies: loader-utils "^0.2.16" object-assign "^4.1.1" - postcss "^5.2.12" - postcss-load-config "^1.1.0" + postcss "^5.2.14" + postcss-load-config "^1.2.0" postcss-merge-idents@^2.1.5: version "2.1.7" @@ -3478,8 +3461,8 @@ postcss-merge-longhand@^2.0.1: postcss "^5.0.4" postcss-merge-rules@^2.0.3: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.1.tgz#5e5640020ce43cddd343c73bba91c9a358d1fe0f" + version "2.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721" dependencies: browserslist "^1.5.2" caniuse-api "^1.5.2" @@ -3631,9 +3614,9 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.12, postcss@^5.2.13: - version "5.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.13.tgz#1be52a32cf2ef58c0d75f1aedb3beabcf257cef3" +postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.14: + version "5.2.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.14.tgz#47b4fbde363fd4f81e547f7e0e43d6d300267330" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" @@ -3794,13 +3777,13 @@ raw-loader@0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9" + version "1.1.7" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" dependencies: deep-extend "~0.4.0" ini "~1.3.0" minimist "^1.2.0" - strip-json-comments "~1.0.4" + strip-json-comments "~2.0.1" read-all-stream@^3.0.0: version "3.1.0" @@ -4096,9 +4079,9 @@ ripemd160@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" -rxjs@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.1.tgz#fc48922965bc6c5efbcc0fe46e90a3af64137a7b" +rxjs@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.2.tgz#cc6513756daa93cab4085c1b5a19a3e28fb6c6bf" dependencies: symbol-observable "^1.0.1" @@ -4110,14 +4093,21 @@ sass-graph@^2.1.1: lodash "^4.0.0" yargs "^4.7.1" -sass-loader@*, sass-loader@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.0.tgz#f7ce02901e6c19c99af313fe3377c9c2bbe050a2" +sass-loader@*: + version "4.0.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-4.0.1.tgz#2c8cf96306363bdd82ffc620e238bfb8a77c4c14" dependencies: async "^2.0.1" loader-utils "^0.2.15" - lodash.tail "^4.1.1" - pify "^2.3.0" + object-assign "^4.1.0" + +sass-loader@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-4.1.1.tgz#79ef9468cf0bf646c29529e1f2cba6bd6e51c7bc" + dependencies: + async "^2.0.1" + loader-utils "^0.2.15" + object-assign "^4.1.0" sax@~1.2.1: version "1.2.2" @@ -4475,14 +4465,10 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@^2.0.0, strip-json-comments@^2.0.1: +strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -strip-json-comments@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" - style-loader@*, style-loader@0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9" @@ -4600,6 +4586,10 @@ trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" +ts-helpers@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/ts-helpers/-/ts-helpers-1.1.2.tgz#fc69be9f1f3baed01fb1a0ef8d4cfe748814d835" + ts-node@2.1.0, ts-node@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-2.1.0.tgz#aa2bf4b2e25c5fb6a7c54701edc3666d3a9db25d" @@ -4635,10 +4625,6 @@ tsickle@^0.2: source-map "^0.5.6" source-map-support "^0.4.2" -tslib@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.5.0.tgz#3bb50f871e5fdf9a4555a9ff237b730860048fea" - tslint@4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/tslint/-/tslint-4.4.2.tgz#b14cb79ae039c72471ab4c2627226b940dda19c6" @@ -4701,6 +4687,10 @@ typedoc@0.5.6: typedoc-default-themes "^0.4.2" typescript "2.1.6" +typescript@2.0.10: + version "2.0.10" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd" + typescript@2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.6.tgz#40c7e6e9e5da7961b7718b55505f9cac9487a607" @@ -4796,8 +4786,8 @@ url-parse@1.0.x: requires-port "1.0.x" url-parse@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a" + version "1.1.8" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" dependencies: querystringify "0.0.x" requires-port "1.0.x" @@ -4902,25 +4892,23 @@ weak-map@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.0.tgz#b66e56a9df0bd25a76bbf1b514db129080614a37" -webpack-dev-middleware@1.10.0, webpack-dev-middleware@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.0.tgz#7d5be2651e692fddfafd8aaed177c16ff51f0eb8" +webpack-dev-middleware@1.9.0, webpack-dev-middleware@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.9.0.tgz#a1c67a3dfd8a5c5d62740aa0babe61758b4c84aa" dependencies: memory-fs "~0.4.1" mime "^1.3.4" path-is-absolute "^1.0.0" range-parser "^1.0.3" -webpack-dev-server@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.3.0.tgz#0437704bbd4d941a6e4c061eb3cc232ed7d06101" +webpack-dev-server@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.2.0.tgz#364967eccaf8ff1d7e1681b7a8cc24fab4ced8a6" dependencies: - ansi-html "0.0.7" chokidar "^1.6.0" compression "^1.5.2" connect-history-api-fallback "^1.3.0" express "^4.13.3" - html-entities "^1.2.0" http-proxy-middleware "~0.17.1" opn "4.0.2" portfinder "^1.0.9"