aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-07-06 14:39:39 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-07-06 14:39:39 +0200
commit80624154988f6270a353269c5e76f334e631b349 (patch)
tree146b590a5e0c68acddda38fb31173e47820c04ec
parent6fcd19ba737f1f5614a56c6925adb882dea43b8d (diff)
downloadPeerTube-80624154988f6270a353269c5e76f334e631b349.tar.gz
PeerTube-80624154988f6270a353269c5e76f334e631b349.tar.zst
PeerTube-80624154988f6270a353269c5e76f334e631b349.zip
Update videojs -> 6
-rw-r--r--client/config/webpack.common.js29
-rw-r--r--client/package.json10
-rw-r--r--client/src/app/videos/video-watch/video-watch.component.ts2
-rw-r--r--client/yarn.lock306
-rw-r--r--package.json2
-rwxr-xr-xscripts/clean/client/dist.sh2
-rwxr-xr-xscripts/clean/server/dist.sh3
7 files changed, 221 insertions, 133 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 61347dba2..da900da85 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -260,12 +260,33 @@ module.exports = function (options) {
260 * 260 *
261 * See: https://www.npmjs.com/package/copy-webpack-plugin 261 * See: https://www.npmjs.com/package/copy-webpack-plugin
262 */ 262 */
263
263 // Used by embed.html 264 // Used by embed.html
264 new CopyWebpackPlugin([ 265 new CopyWebpackPlugin([
265 // { 266 {
266 // from: 'src/assets', 267 from: 'src/assets',
267 // to: 'assets' 268 to: 'assets'
268 // }, 269 },
270 {
271 from: 'node_modules/webtorrent/webtorrent.min.js',
272 to: 'assets/webtorrent'
273 },
274 {
275 from: 'node_modules/video.js/dist/video.min.js',
276 to: 'assets/video-js'
277 },
278 {
279 from: 'node_modules/video.js/dist/video-js.min.css',
280 to: 'assets/video-js'
281 },
282 {
283 from: 'node_modules/videojs-dock/dist/videojs-dock.min.js',
284 to: 'assets/video-js'
285 },
286 {
287 from: 'node_modules/videojs-dock/dist/videojs-dock.css',
288 to: 'assets/video-js'
289 },
269 { 290 {
270 from: 'src/standalone', 291 from: 'src/standalone',
271 to: 'standalone' 292 to: 'standalone'
diff --git a/client/package.json b/client/package.json
index 301b29872..fbfe5ae26 100644
--- a/client/package.json
+++ b/client/package.json
@@ -30,7 +30,7 @@
30 "@angular/platform-browser": "~4.2.0", 30 "@angular/platform-browser": "~4.2.0",
31 "@angular/platform-browser-dynamic": "~4.2.0", 31 "@angular/platform-browser-dynamic": "~4.2.0",
32 "@angular/router": "~4.2.0", 32 "@angular/router": "~4.2.0",
33 "@angularclass/hmr": "^1.2.0", 33 "@angularclass/hmr": "^2.1.0",
34 "@angularclass/hmr-loader": "^3.0.2", 34 "@angularclass/hmr-loader": "^3.0.2",
35 "@nglibs/meta": "^0.4.0-rc.1", 35 "@nglibs/meta": "^0.4.0-rc.1",
36 "@types/core-js": "^0.9.28", 36 "@types/core-js": "^0.9.28",
@@ -64,7 +64,7 @@
64 "ng2-file-upload": "^1.1.4-2", 64 "ng2-file-upload": "^1.1.4-2",
65 "ng2-smart-table": "1.2.1", 65 "ng2-smart-table": "1.2.1",
66 "ng2-tag-input": "1.3.3", 66 "ng2-tag-input": "1.3.3",
67 "ngc-webpack": "2.0.0", 67 "ngc-webpack": "3.0.0",
68 "ngx-bootstrap": "1.6.6", 68 "ngx-bootstrap": "1.6.6",
69 "node-sass": "^4.1.1", 69 "node-sass": "^4.1.1",
70 "normalize.css": "^7.0.0", 70 "normalize.css": "^7.0.0",
@@ -72,7 +72,7 @@
72 "raw-loader": "^0.5.1", 72 "raw-loader": "^0.5.1",
73 "reflect-metadata": "^0.1.9", 73 "reflect-metadata": "^0.1.9",
74 "resolve-url-loader": "^2.0.0", 74 "resolve-url-loader": "^2.0.0",
75 "rxjs": "~5.0.0-rc.5", 75 "rxjs": "^5.4.2",
76 "sass-loader": "^6.0.3", 76 "sass-loader": "^6.0.3",
77 "sass-resources-loader": "^1.2.1", 77 "sass-resources-loader": "^1.2.1",
78 "script-ext-html-webpack-plugin": "^1.3.2", 78 "script-ext-html-webpack-plugin": "^1.3.2",
@@ -80,11 +80,11 @@
80 "string-replace-loader": "^1.0.3", 80 "string-replace-loader": "^1.0.3",
81 "style-loader": "^0.18.2", 81 "style-loader": "^0.18.2",
82 "tslib": "^1.5.0", 82 "tslib": "^1.5.0",
83 "tslint": "~5.4.3", 83 "tslint": "^5.4.3",
84 "tslint-loader": "^3.3.0", 84 "tslint-loader": "^3.3.0",
85 "typescript": "~2.4.0", 85 "typescript": "~2.4.0",
86 "url-loader": "^0.5.7", 86 "url-loader": "^0.5.7",
87 "video.js": "^5.19.2", 87 "video.js": "^6.2.0",
88 "videojs-dock": "^2.0.2", 88 "videojs-dock": "^2.0.2",
89 "webpack": "^3.0.0", 89 "webpack": "^3.0.0",
90 "webpack-merge": "~4.1.0", 90 "webpack-merge": "~4.1.0",
diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 9882ddce8..34dbc9a88 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'
3import { Observable } from 'rxjs/Observable' 3import { Observable } from 'rxjs/Observable'
4import { Subscription } from 'rxjs/Subscription' 4import { Subscription } from 'rxjs/Subscription'
5 5
6import * as videojs from 'video.js' 6import videojs from 'video.js'
7import { MetaService } from '@nglibs/meta' 7import { MetaService } from '@nglibs/meta'
8import { NotificationsService } from 'angular2-notifications' 8import { NotificationsService } from 'angular2-notifications'
9 9
diff --git a/client/yarn.lock b/client/yarn.lock
index b763a65fd..3b1184f58 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -3,70 +3,70 @@
3 3
4 4
5"@angular/animations@~4.2.0": 5"@angular/animations@~4.2.0":
6 version "4.2.4" 6 version "4.2.5"
7 resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.2.4.tgz#552d361fff163c56d0dfda4f963a16bfe4e44e98" 7 resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.2.5.tgz#1230f6bc6a18f2abb23e27f1d9ae9efafd1a6031"
8 dependencies: 8 dependencies:
9 tslib "^1.7.1" 9 tslib "^1.7.1"
10 10
11"@angular/common@~4.2.0": 11"@angular/common@~4.2.0":
12 version "4.2.4" 12 version "4.2.5"
13 resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.2.4.tgz#9b7ee0e692ab03191a7cd9af331d0f492d3cefeb" 13 resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.2.5.tgz#4d50a95b444cd58cf706f0da9dd1407d3b83362e"
14 dependencies: 14 dependencies:
15 tslib "^1.7.1" 15 tslib "^1.7.1"
16 16
17"@angular/compiler-cli@~4.2.0": 17"@angular/compiler-cli@~4.2.0":
18 version "4.2.4" 18 version "4.2.5"
19 resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.2.4.tgz#cce941a28362fc1c042ab85890fcaab1e233dd57" 19 resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.2.5.tgz#3b396d65ade8380f371201d4361fc962a49ac76a"
20 dependencies: 20 dependencies:
21 "@angular/tsc-wrapped" "4.2.4" 21 "@angular/tsc-wrapped" "4.2.5"
22 minimist "^1.2.0" 22 minimist "^1.2.0"
23 reflect-metadata "^0.1.2" 23 reflect-metadata "^0.1.2"
24 24
25"@angular/compiler@~4.2.0": 25"@angular/compiler@~4.2.0":
26 version "4.2.4" 26 version "4.2.5"
27 resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.2.4.tgz#7936a87b2d483abcef840b868c1fcf67221c4914" 27 resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.2.5.tgz#b48674c7456b2b0df1072d70e4e667af86cddf83"
28 dependencies: 28 dependencies:
29 tslib "^1.7.1" 29 tslib "^1.7.1"
30 30
31"@angular/core@~4.2.0": 31"@angular/core@~4.2.0":
32 version "4.2.4" 32 version "4.2.5"
33 resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.2.4.tgz#e8df7a8dd5de5a327784dfc35b5da6344281cf1b" 33 resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.2.5.tgz#61c1b5885c262332d737fbe0f5d71151759a8464"
34 dependencies: 34 dependencies:
35 tslib "^1.7.1" 35 tslib "^1.7.1"
36 36
37"@angular/forms@~4.2.0": 37"@angular/forms@~4.2.0":
38 version "4.2.4" 38 version "4.2.5"
39 resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.2.4.tgz#ae09755332ea463f561df01aac2bd369e5d35dc9" 39 resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.2.5.tgz#a7e55c8d1f5a4e8537efe1edd7834e4a1f59c6e4"
40 dependencies: 40 dependencies:
41 tslib "^1.7.1" 41 tslib "^1.7.1"
42 42
43"@angular/http@~4.2.0": 43"@angular/http@~4.2.0":
44 version "4.2.4" 44 version "4.2.5"
45 resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.2.4.tgz#ed039c0d53a587d24575f4cabfd1db8e7f1e3f8b" 45 resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.2.5.tgz#3fff8e5cf8e88262bacd1c996304312c3c5a3aef"
46 dependencies: 46 dependencies:
47 tslib "^1.7.1" 47 tslib "^1.7.1"
48 48
49"@angular/platform-browser-dynamic@~4.2.0": 49"@angular/platform-browser-dynamic@~4.2.0":
50 version "4.2.4" 50 version "4.2.5"
51 resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.2.4.tgz#5190fda79425ae49a49224985614c9780a370761" 51 resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.2.5.tgz#8076ec4a885cc3a1a23c5e540c40a7fdd3f7e7b2"
52 dependencies: 52 dependencies:
53 tslib "^1.7.1" 53 tslib "^1.7.1"
54 54
55"@angular/platform-browser@~4.2.0": 55"@angular/platform-browser@~4.2.0":
56 version "4.2.4" 56 version "4.2.5"
57 resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.2.4.tgz#00a44dcb2fd777b54bc17c1ce734aa18fe9fd039" 57 resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.2.5.tgz#d9ddfe0f81084e98ef24a79f485dbb112e78a0c4"
58 dependencies: 58 dependencies:
59 tslib "^1.7.1" 59 tslib "^1.7.1"
60 60
61"@angular/router@~4.2.0": 61"@angular/router@~4.2.0":
62 version "4.2.4" 62 version "4.2.5"
63 resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.2.4.tgz#2f193f3a36da19b11a08c9b40e391bd8fde59c56" 63 resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.2.5.tgz#7f364089493ab1a06eac5f0c628c0f9fdb11008f"
64 dependencies: 64 dependencies:
65 tslib "^1.7.1" 65 tslib "^1.7.1"
66 66
67"@angular/tsc-wrapped@4.2.4": 67"@angular/tsc-wrapped@4.2.5":
68 version "4.2.4" 68 version "4.2.5"
69 resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.2.4.tgz#956ff14ccf2043243b0cc82336b221dbe6315aef" 69 resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.2.5.tgz#0a2fc233061780d2be402996187878c27838b7e3"
70 dependencies: 70 dependencies:
71 tsickle "^0.21.0" 71 tsickle "^0.21.0"
72 72
@@ -76,9 +76,9 @@
76 dependencies: 76 dependencies:
77 loader-utils "^0.2.15" 77 loader-utils "^0.2.15"
78 78
79"@angularclass/hmr@^1.2.0": 79"@angularclass/hmr@^2.1.0":
80 version "1.2.2" 80 version "2.1.1"
81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-1.2.2.tgz#46a18f89a1e94d05c268b83c9480e005f73fc265" 81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.1.tgz#2a797f5d282ec0513b8a2c29ac9e316376c563ef"
82 82
83"@nglibs/meta@^0.4.0-rc.1": 83"@nglibs/meta@^0.4.0-rc.1":
84 version "0.4.0-rc.1" 84 version "0.4.0-rc.1"
@@ -87,14 +87,22 @@
87 tslib "^1.6.0" 87 tslib "^1.6.0"
88 88
89"@types/core-js@^0.9.28": 89"@types/core-js@^0.9.28":
90 version "0.9.41" 90 version "0.9.42"
91 resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.41.tgz#cfeceb63c2beaa29f882252c7c18e0e9471ff4e2" 91 resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.42.tgz#dd6da92cd7d5ab5ca0b4477524537c3e633b6bce"
92
93"@types/node@*":
94 version "8.0.7"
95 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.7.tgz#fb0ad04b5b6f6eabe0372a32a8f1fbba5c130cae"
92 96
93"@types/node@*", "@types/node@^6.0.38": 97"@types/node@^6.0.38":
94 version "6.0.78" 98 version "6.0.79"
95 resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470" 99 resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.79.tgz#5efe7d4a6d8c453c7e9eaf55d931f4a22fac5169"
96 100
97"@types/source-map@*", "@types/source-map@^0.1.26": 101"@types/source-map@*":
102 version "0.5.0"
103 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.0.tgz#dd34bbd8e32fe4e74f2e3d8ac07f8aa5b45a47ac"
104
105"@types/source-map@^0.1.26":
98 version "0.1.29" 106 version "0.1.29"
99 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.1.29.tgz#d7048a60180b09f8aa6d53bda311c6b51cbd7018" 107 resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.1.29.tgz#d7048a60180b09f8aa6d53bda311c6b51cbd7018"
100 108
@@ -152,8 +160,8 @@ acorn@^4.0.3:
152 resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" 160 resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
153 161
154acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3: 162acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
155 version "5.0.3" 163 version "5.1.1"
156 resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" 164 resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
157 165
158add-asset-html-webpack-plugin@^2.0.1: 166add-asset-html-webpack-plugin@^2.0.1:
159 version "2.0.1" 167 version "2.0.1"
@@ -244,10 +252,20 @@ ansi-regex@^2.0.0:
244 version "2.1.1" 252 version "2.1.1"
245 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" 253 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
246 254
255ansi-regex@^3.0.0:
256 version "3.0.0"
257 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
258
247ansi-styles@^2.2.1: 259ansi-styles@^2.2.1:
248 version "2.2.1" 260 version "2.2.1"
249 resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" 261 resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
250 262
263ansi-styles@^3.1.0:
264 version "3.1.0"
265 resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
266 dependencies:
267 color-convert "^1.0.0"
268
251ansicolors@~0.2.1: 269ansicolors@~0.2.1:
252 version "0.2.1" 270 version "0.2.1"
253 resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" 271 resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -287,8 +305,8 @@ arr-diff@^2.0.0:
287 arr-flatten "^1.0.1" 305 arr-flatten "^1.0.1"
288 306
289arr-flatten@^1.0.1: 307arr-flatten@^1.0.1:
290 version "1.0.3" 308 version "1.1.0"
291 resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1" 309 resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
292 310
293array-find-index@^1.0.1: 311array-find-index@^1.0.1:
294 version "1.0.2" 312 version "1.0.2"
@@ -384,8 +402,8 @@ async@^1.5.2:
384 resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" 402 resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
385 403
386async@^2.1.2, async@^2.1.4, async@^2.1.5: 404async@^2.1.2, async@^2.1.4, async@^2.1.5:
387 version "2.4.1" 405 version "2.5.0"
388 resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7" 406 resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
389 dependencies: 407 dependencies:
390 lodash "^4.14.0" 408 lodash "^4.14.0"
391 409
@@ -575,8 +593,8 @@ babel-helpers@^6.24.1:
575 babel-template "^6.24.1" 593 babel-template "^6.24.1"
576 594
577babel-loader@^7.1.0: 595babel-loader@^7.1.0:
578 version "7.1.0" 596 version "7.1.1"
579 resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144" 597 resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
580 dependencies: 598 dependencies:
581 find-cache-dir "^1.0.0" 599 find-cache-dir "^1.0.0"
582 loader-utils "^1.0.2" 600 loader-utils "^1.0.2"
@@ -804,8 +822,8 @@ babel-plugin-transform-strict-mode@^6.24.1:
804 babel-types "^6.24.1" 822 babel-types "^6.24.1"
805 823
806babel-preset-env@^1.5.2: 824babel-preset-env@^1.5.2:
807 version "1.5.2" 825 version "1.6.0"
808 resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef" 826 resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
809 dependencies: 827 dependencies:
810 babel-plugin-check-es2015-constants "^6.22.0" 828 babel-plugin-check-es2015-constants "^6.22.0"
811 babel-plugin-syntax-trailing-function-commas "^6.22.0" 829 babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1264,12 +1282,12 @@ caniuse-api@^1.5.2:
1264 lodash.uniq "^4.5.0" 1282 lodash.uniq "^4.5.0"
1265 1283
1266caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: 1284caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
1267 version "1.0.30000694" 1285 version "1.0.30000697"
1268 resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000694.tgz#02009f4f82d2f0126e4c691b7cd5adb351935c01" 1286 resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000697.tgz#20ce6a9ceeef4ef4a15dc8e80f2e8fb9049e8d77"
1269 1287
1270caniuse-lite@^1.0.30000684: 1288caniuse-lite@^1.0.30000684:
1271 version "1.0.30000694" 1289 version "1.0.30000697"
1272 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000694.tgz#1492dab7c10c608c9d37a723e6e3e7873e0ce94f" 1290 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000697.tgz#125fb00604b63fbb188db96a667ce2922dcd6cdd"
1273 1291
1274cardinal@^1.0.0: 1292cardinal@^1.0.0:
1275 version "1.0.0" 1293 version "1.0.0"
@@ -1299,6 +1317,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
1299 strip-ansi "^3.0.0" 1317 strip-ansi "^3.0.0"
1300 supports-color "^2.0.0" 1318 supports-color "^2.0.0"
1301 1319
1320chalk@^2.0.1:
1321 version "2.0.1"
1322 resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
1323 dependencies:
1324 ansi-styles "^3.1.0"
1325 escape-string-regexp "^1.0.5"
1326 supports-color "^4.0.0"
1327
1302chokidar@^1.4.3, chokidar@^1.6.0: 1328chokidar@^1.4.3, chokidar@^1.6.0:
1303 version "1.7.0" 1329 version "1.7.0"
1304 resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" 1330 resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1343,8 +1369,8 @@ clap@^1.0.9:
1343 chalk "^1.1.3" 1369 chalk "^1.1.3"
1344 1370
1345clean-css@4.1.x: 1371clean-css@4.1.x:
1346 version "4.1.4" 1372 version "4.1.5"
1347 resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.4.tgz#eec8811db27457e0078d8ca921fa81b72fa82bf4" 1373 resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.5.tgz#d09a87a02a5375117589796ae76a063cacdb541a"
1348 dependencies: 1374 dependencies:
1349 source-map "0.5.x" 1375 source-map "0.5.x"
1350 1376
@@ -1419,8 +1445,8 @@ code-point-at@^1.0.0:
1419 resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" 1445 resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
1420 1446
1421codelyzer@^3.0.0-beta.4: 1447codelyzer@^3.0.0-beta.4:
1422 version "3.1.1" 1448 version "3.1.2"
1423 resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.1.1.tgz#66dbdca8b17660472bb4d79153c0f92e63bb28b6" 1449 resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.1.2.tgz#9ff1f041fb9b5ee5dbeb45ba866dfaf04983af04"
1424 dependencies: 1450 dependencies:
1425 app-root-path "^2.0.1" 1451 app-root-path "^2.0.1"
1426 css-selector-tokenizer "^0.7.0" 1452 css-selector-tokenizer "^0.7.0"
@@ -1429,7 +1455,7 @@ codelyzer@^3.0.0-beta.4:
1429 source-map "^0.5.6" 1455 source-map "^0.5.6"
1430 sprintf-js "^1.0.3" 1456 sprintf-js "^1.0.3"
1431 1457
1432color-convert@^1.3.0: 1458color-convert@^1.0.0, color-convert@^1.3.0:
1433 version "1.9.0" 1459 version "1.9.0"
1434 resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" 1460 resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
1435 dependencies: 1461 dependencies:
@@ -1482,10 +1508,8 @@ commander@2.9.x, commander@~2.9.0:
1482 graceful-readlink ">= 1.0.0" 1508 graceful-readlink ">= 1.0.0"
1483 1509
1484commander@^2.9.0: 1510commander@^2.9.0:
1485 version "2.10.0" 1511 version "2.11.0"
1486 resolved "https://registry.yarnpkg.com/commander/-/commander-2.10.0.tgz#e1f5d3245de246d1a5ca04702fa1ad1bd7e405fe" 1512 resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
1487 dependencies:
1488 graceful-readlink ">= 1.0.0"
1489 1513
1490commondir@^1.0.1: 1514commondir@^1.0.1:
1491 version "1.0.1" 1515 version "1.0.1"
@@ -1812,7 +1836,7 @@ debug@2.6.7:
1812 dependencies: 1836 dependencies:
1813 ms "2.0.0" 1837 ms "2.0.0"
1814 1838
1815debug@2.6.8, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.5.2, debug@^2.6.3, debug@^2.6.8: 1839debug@2.6.8, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.5.2, debug@^2.6.8:
1816 version "2.6.8" 1840 version "2.6.8"
1817 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" 1841 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
1818 dependencies: 1842 dependencies:
@@ -1919,8 +1943,8 @@ detect-node@^2.0.3:
1919 resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" 1943 resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
1920 1944
1921diff@^3.1.0, diff@^3.2.0: 1945diff@^3.1.0, diff@^3.2.0:
1922 version "3.2.0" 1946 version "3.3.0"
1923 resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" 1947 resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9"
1924 1948
1925diffie-hellman@^5.0.0: 1949diffie-hellman@^5.0.0:
1926 version "5.0.2" 1950 version "5.0.2"
@@ -2035,8 +2059,8 @@ ejs@^2.5.6:
2035 resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" 2059 resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
2036 2060
2037electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14: 2061electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
2038 version "1.3.14" 2062 version "1.3.15"
2039 resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43" 2063 resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz#08397934891cbcfaebbd18b82a95b5a481138369"
2040 2064
2041elliptic@^6.0.0: 2065elliptic@^6.0.0:
2042 version "6.4.0" 2066 version "6.4.0"
@@ -2065,8 +2089,8 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
2065 once "^1.4.0" 2089 once "^1.4.0"
2066 2090
2067enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0: 2091enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0:
2068 version "3.1.0" 2092 version "3.3.0"
2069 resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec" 2093 resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
2070 dependencies: 2094 dependencies:
2071 graceful-fs "^4.1.2" 2095 graceful-fs "^4.1.2"
2072 memory-fs "^0.4.0" 2096 memory-fs "^0.4.0"
@@ -2538,8 +2562,8 @@ find-cache-dir@^1.0.0:
2538 pkg-dir "^2.0.0" 2562 pkg-dir "^2.0.0"
2539 2563
2540find-root@^1.0.0: 2564find-root@^1.0.0:
2541 version "1.0.0" 2565 version "1.1.0"
2542 resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.0.0.tgz#962ff211aab25c6520feeeb8d6287f8f6e95807a" 2566 resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
2543 2567
2544find-up@^1.0.0: 2568find-up@^1.0.0:
2545 version "1.1.2" 2569 version "1.1.2"
@@ -2766,7 +2790,7 @@ global@4.3.0:
2766 min-document "^2.6.1" 2790 min-document "^2.6.1"
2767 process "~0.5.1" 2791 process "~0.5.1"
2768 2792
2769global@^4.3.2, global@~4.3.0: 2793global@4.3.2, global@^4.3.1, global@^4.3.2, global@~4.3.0:
2770 version "4.3.2" 2794 version "4.3.2"
2771 resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" 2795 resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
2772 dependencies: 2796 dependencies:
@@ -2870,8 +2894,8 @@ hash-base@^2.0.0:
2870 inherits "^2.0.1" 2894 inherits "^2.0.1"
2871 2895
2872hash.js@^1.0.0, hash.js@^1.0.3: 2896hash.js@^1.0.0, hash.js@^1.0.3:
2873 version "1.1.1" 2897 version "1.1.3"
2874 resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.1.tgz#5cb2e796499224e69fd0b00ed01d2d4a16e7a323" 2898 resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
2875 dependencies: 2899 dependencies:
2876 inherits "^2.0.3" 2900 inherits "^2.0.3"
2877 minimalistic-assert "^1.0.0" 2901 minimalistic-assert "^1.0.0"
@@ -2909,8 +2933,8 @@ home-or-tmp@^2.0.0:
2909 os-tmpdir "^1.0.1" 2933 os-tmpdir "^1.0.1"
2910 2934
2911hosted-git-info@^2.1.4: 2935hosted-git-info@^2.1.4:
2912 version "2.4.2" 2936 version "2.5.0"
2913 resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67" 2937 resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
2914 2938
2915hpack.js@^2.1.6: 2939hpack.js@^2.1.6:
2916 version "2.1.6" 2940 version "2.1.6"
@@ -3336,8 +3360,8 @@ isobject@^2.0.0:
3336 isarray "1.0.0" 3360 isarray "1.0.0"
3337 3361
3338isobject@^3.0.0: 3362isobject@^3.0.0:
3339 version "3.0.0" 3363 version "3.0.1"
3340 resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.0.tgz#39565217f3661789e8a0a0c080d5f7e6bc46e1a0" 3364 resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
3341 3365
3342isstream@~0.1.2: 3366isstream@~0.1.2:
3343 version "0.1.2" 3367 version "0.1.2"
@@ -3348,8 +3372,8 @@ js-base64@^2.1.8, js-base64@^2.1.9:
3348 resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" 3372 resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
3349 3373
3350js-tokens@^3.0.0: 3374js-tokens@^3.0.0:
3351 version "3.0.1" 3375 version "3.0.2"
3352 resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" 3376 resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
3353 3377
3354js-yaml@^3.5.1, js-yaml@^3.7.0: 3378js-yaml@^3.5.1, js-yaml@^3.7.0:
3355 version "3.8.4" 3379 version "3.8.4"
@@ -3898,7 +3922,11 @@ miller-rabin@^4.0.0:
3898 bn.js "^4.0.0" 3922 bn.js "^4.0.0"
3899 brorand "^1.0.1" 3923 brorand "^1.0.1"
3900 3924
3901"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0: 3925"mime-db@>= 1.27.0 < 2":
3926 version "1.28.0"
3927 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.28.0.tgz#fedd349be06d2865b7fc57d837c6de4f17d7ac3c"
3928
3929mime-db@~1.27.0:
3902 version "1.27.0" 3930 version "1.27.0"
3903 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" 3931 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
3904 3932
@@ -4040,8 +4068,8 @@ ng-router-loader@^2.0.0:
4040 recast "^0.11.20" 4068 recast "^0.11.20"
4041 4069
4042ng2-completer@^1.2.2: 4070ng2-completer@^1.2.2:
4043 version "1.2.2" 4071 version "1.5.2"
4044 resolved "https://registry.yarnpkg.com/ng2-completer/-/ng2-completer-1.2.2.tgz#69515e4d65973abce1276aea301cf0f36e5846a4" 4072 resolved "https://registry.yarnpkg.com/ng2-completer/-/ng2-completer-1.5.2.tgz#4f2142b7d9186f64cd8cad79e7da0de9b9e128de"
4045 4073
4046ng2-file-upload@^1.1.4-2: 4074ng2-file-upload@^1.1.4-2:
4047 version "1.2.1" 4075 version "1.2.1"
@@ -4064,9 +4092,9 @@ ng2-tag-input@1.3.3:
4064 dependencies: 4092 dependencies:
4065 ng2-material-dropdown "0.7.7" 4093 ng2-material-dropdown "0.7.7"
4066 4094
4067ngc-webpack@2.0.0: 4095ngc-webpack@3.0.0:
4068 version "2.0.0" 4096 version "3.0.0"
4069 resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-2.0.0.tgz#ebd1f6937b7b81cbcd6d9d1bd1fa9001c6be145f" 4097 resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-3.0.0.tgz#b7caf724e367c22c10f100c5b460f266a0189b63"
4070 dependencies: 4098 dependencies:
4071 minimist "^1.2.0" 4099 minimist "^1.2.0"
4072 reflect-metadata "^0.1.2" 4100 reflect-metadata "^0.1.2"
@@ -4217,8 +4245,8 @@ nopt@^4.0.1:
4217 osenv "^0.1.4" 4245 osenv "^0.1.4"
4218 4246
4219normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: 4247normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
4220 version "2.3.8" 4248 version "2.4.0"
4221 resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb" 4249 resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
4222 dependencies: 4250 dependencies:
4223 hosted-git-info "^2.1.4" 4251 hosted-git-info "^2.1.4"
4224 is-builtin-module "^1.0.0" 4252 is-builtin-module "^1.0.0"
@@ -4249,8 +4277,8 @@ normalize.css@^7.0.0:
4249 resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" 4277 resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"
4250 4278
4251"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2: 4279"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2:
4252 version "4.1.0" 4280 version "4.1.2"
4253 resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5" 4281 resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
4254 dependencies: 4282 dependencies:
4255 are-we-there-yet "~1.1.2" 4283 are-we-there-yet "~1.1.2"
4256 console-control-strings "~1.1.0" 4284 console-control-strings "~1.1.0"
@@ -4840,12 +4868,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
4840 supports-color "^3.2.3" 4868 supports-color "^3.2.3"
4841 4869
4842postcss@^6.0.1: 4870postcss@^6.0.1:
4843 version "6.0.3" 4871 version "6.0.6"
4844 resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b" 4872 resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
4845 dependencies: 4873 dependencies:
4846 chalk "^1.1.3" 4874 chalk "^2.0.1"
4847 source-map "^0.5.6" 4875 source-map "^0.5.6"
4848 supports-color "^4.0.0" 4876 supports-color "^4.1.0"
4849 4877
4850prebuild-install@~2.1.0: 4878prebuild-install@~2.1.0:
4851 version "2.1.2" 4879 version "2.1.2"
@@ -5052,15 +5080,15 @@ readable-stream@1.0:
5052 string_decoder "~0.10.x" 5080 string_decoder "~0.10.x"
5053 5081
5054readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.2: 5082readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.2:
5055 version "2.3.2" 5083 version "2.3.3"
5056 resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d" 5084 resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
5057 dependencies: 5085 dependencies:
5058 core-util-is "~1.0.0" 5086 core-util-is "~1.0.0"
5059 inherits "~2.0.3" 5087 inherits "~2.0.3"
5060 isarray "~1.0.0" 5088 isarray "~1.0.0"
5061 process-nextick-args "~1.0.6" 5089 process-nextick-args "~1.0.6"
5062 safe-buffer "~5.1.0" 5090 safe-buffer "~5.1.1"
5063 string_decoder "~1.0.0" 5091 string_decoder "~1.0.3"
5064 util-deprecate "~1.0.1" 5092 util-deprecate "~1.0.1"
5065 5093
5066readdirp@^2.0.0: 5094readdirp@^2.0.0:
@@ -5364,13 +5392,13 @@ rx-lite@^3.1.2:
5364 version "3.1.2" 5392 version "3.1.2"
5365 resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" 5393 resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
5366 5394
5367rxjs@~5.0.0-rc.5: 5395rxjs@^5.4.2:
5368 version "5.0.3" 5396 version "5.4.2"
5369 resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.3.tgz#fc8bdf464ebf938812748e4196788f392fef9754" 5397 resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7"
5370 dependencies: 5398 dependencies:
5371 symbol-observable "^1.0.1" 5399 symbol-observable "^1.0.1"
5372 5400
5373safe-buffer@^5.0.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0: 5401safe-buffer@^5.0.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
5374 version "5.1.1" 5402 version "5.1.1"
5375 resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" 5403 resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
5376 5404
@@ -5423,10 +5451,10 @@ schema-utils@^0.3.0:
5423 ajv "^5.0.0" 5451 ajv "^5.0.0"
5424 5452
5425script-ext-html-webpack-plugin@^1.3.2: 5453script-ext-html-webpack-plugin@^1.3.2:
5426 version "1.8.1" 5454 version "1.8.3"
5427 resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.1.tgz#36bba726c38bcdebc1e69333e3fd7d718a9b3195" 5455 resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.8.3.tgz#04c77e68eb45eb6358bf36554a1a358ca60ca2ed"
5428 dependencies: 5456 dependencies:
5429 debug "^2.6.3" 5457 debug "^2.6.8"
5430 5458
5431scss-tokenizer@^0.2.3: 5459scss-tokenizer@^0.2.3:
5432 version "0.2.3" 5460 version "0.2.3"
@@ -5819,8 +5847,8 @@ strict-uri-encode@^1.0.0:
5819 resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" 5847 resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
5820 5848
5821string-replace-loader@^1.0.3: 5849string-replace-loader@^1.0.3:
5822 version "1.2.0" 5850 version "1.3.0"
5823 resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-1.2.0.tgz#31752d230584e70037a80fb50ff39c221be326c9" 5851 resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-1.3.0.tgz#1d404a7bf5e2ec21b08ffc76d89445fbe49bc01d"
5824 dependencies: 5852 dependencies:
5825 loader-utils "^1.1.0" 5853 loader-utils "^1.1.0"
5826 lodash "^4" 5854 lodash "^4"
@@ -5834,11 +5862,11 @@ string-width@^1.0.1, string-width@^1.0.2:
5834 strip-ansi "^3.0.0" 5862 strip-ansi "^3.0.0"
5835 5863
5836string-width@^2.0.0: 5864string-width@^2.0.0:
5837 version "2.0.0" 5865 version "2.1.0"
5838 resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e" 5866 resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
5839 dependencies: 5867 dependencies:
5840 is-fullwidth-code-point "^2.0.0" 5868 is-fullwidth-code-point "^2.0.0"
5841 strip-ansi "^3.0.0" 5869 strip-ansi "^4.0.0"
5842 5870
5843string.prototype.codepointat@^0.2.0: 5871string.prototype.codepointat@^0.2.0:
5844 version "0.2.0" 5872 version "0.2.0"
@@ -5855,7 +5883,7 @@ string_decoder@^0.10.25, string_decoder@~0.10.x:
5855 version "0.10.31" 5883 version "0.10.31"
5856 resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" 5884 resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
5857 5885
5858string_decoder@~1.0.0: 5886string_decoder@~1.0.3:
5859 version "1.0.3" 5887 version "1.0.3"
5860 resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" 5888 resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
5861 dependencies: 5889 dependencies:
@@ -5871,6 +5899,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
5871 dependencies: 5899 dependencies:
5872 ansi-regex "^2.0.0" 5900 ansi-regex "^2.0.0"
5873 5901
5902strip-ansi@^4.0.0:
5903 version "4.0.0"
5904 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
5905 dependencies:
5906 ansi-regex "^3.0.0"
5907
5874strip-bom@^2.0.0: 5908strip-bom@^2.0.0:
5875 version "2.0.0" 5909 version "2.0.0"
5876 resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" 5910 resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -5908,9 +5942,9 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
5908 dependencies: 5942 dependencies:
5909 has-flag "^1.0.0" 5943 has-flag "^1.0.0"
5910 5944
5911supports-color@^4.0.0: 5945supports-color@^4.0.0, supports-color@^4.1.0:
5912 version "4.0.0" 5946 version "4.1.0"
5913 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.0.0.tgz#33a7c680aa512c9d03ef929cacbb974d203d2790" 5947 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.1.0.tgz#92cc14bb3dad8928ca5656c33e19a19f20af5c7a"
5914 dependencies: 5948 dependencies:
5915 has-flag "^2.0.0" 5949 has-flag "^2.0.0"
5916 5950
@@ -6120,9 +6154,9 @@ tslint-loader@^3.3.0:
6120 rimraf "^2.4.4" 6154 rimraf "^2.4.4"
6121 semver "^5.3.0" 6155 semver "^5.3.0"
6122 6156
6123tslint@~5.4.3: 6157tslint@^5.4.3:
6124 version "5.4.3" 6158 version "5.5.0"
6125 resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.4.3.tgz#761c8402b80e347b7733a04390a757b253580467" 6159 resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa"
6126 dependencies: 6160 dependencies:
6127 babel-code-frame "^6.22.0" 6161 babel-code-frame "^6.22.0"
6128 colors "^1.1.2" 6162 colors "^1.1.2"
@@ -6133,7 +6167,7 @@ tslint@~5.4.3:
6133 resolve "^1.3.2" 6167 resolve "^1.3.2"
6134 semver "^5.3.0" 6168 semver "^5.3.0"
6135 tslib "^1.7.1" 6169 tslib "^1.7.1"
6136 tsutils "^2.3.0" 6170 tsutils "^2.5.1"
6137 6171
6138tsml@1.0.1: 6172tsml@1.0.1:
6139 version "1.0.1" 6173 version "1.0.1"
@@ -6143,9 +6177,11 @@ tsutils@^1.4.0:
6143 version "1.9.1" 6177 version "1.9.1"
6144 resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0" 6178 resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
6145 6179
6146tsutils@^2.3.0: 6180tsutils@^2.5.1:
6147 version "2.4.0" 6181 version "2.5.1"
6148 resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.4.0.tgz#ad4ce6dba0e5a3edbddf8626b7ca040782189fea" 6182 resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.5.1.tgz#c2001390c79eec1a5ccfa7ac12d599639683e0cf"
6183 dependencies:
6184 tslib "^1.7.1"
6149 6185
6150tty-browserify@0.0.0: 6186tty-browserify@0.0.0:
6151 version "0.0.0" 6187 version "0.0.0"
@@ -6189,12 +6225,12 @@ typedarray@^0.0.6:
6189 resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" 6225 resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
6190 6226
6191typescript@~2.4.0: 6227typescript@~2.4.0:
6192 version "2.4.0" 6228 version "2.4.1"
6193 resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.0.tgz#aef5a8d404beba36ad339abf079ddddfffba86dd" 6229 resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
6194 6230
6195uglify-js@3.0.x: 6231uglify-js@3.0.x:
6196 version "3.0.20" 6232 version "3.0.23"
6197 resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.20.tgz#cb35b2bcfe478051b6f3282be8db4e4add49a1e5" 6233 resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.23.tgz#a58c6b97e6d6763d94dbc265fe8e8c1725e64666"
6198 dependencies: 6234 dependencies:
6199 commander "~2.9.0" 6235 commander "~2.9.0"
6200 source-map "~0.5.1" 6236 source-map "~0.5.1"
@@ -6399,6 +6435,19 @@ video.js@^5.19.2:
6399 videojs-vtt.js "0.12.3" 6435 videojs-vtt.js "0.12.3"
6400 xhr "2.2.2" 6436 xhr "2.2.2"
6401 6437
6438video.js@^6.2.0:
6439 version "6.2.1"
6440 resolved "https://registry.yarnpkg.com/video.js/-/video.js-6.2.1.tgz#a3aa0f965ef4b14a64dd9d561e9cf290c440d943"
6441 dependencies:
6442 babel-runtime "^6.9.2"
6443 global "4.3.2"
6444 safe-json-parse "4.0.0"
6445 tsml "1.0.1"
6446 videojs-font "2.0.0"
6447 videojs-ie8 "1.1.2"
6448 videojs-vtt.js "0.12.4"
6449 xhr "2.4.0"
6450
6402videojs-dock@^2.0.2: 6451videojs-dock@^2.0.2:
6403 version "2.1.2" 6452 version "2.1.2"
6404 resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.1.2.tgz#621c27c6f7dd131c541535300ac545377e515a0e" 6453 resolved "https://registry.yarnpkg.com/videojs-dock/-/videojs-dock-2.1.2.tgz#621c27c6f7dd131c541535300ac545377e515a0e"
@@ -6424,6 +6473,12 @@ videojs-vtt.js@0.12.3:
6424 version "0.12.3" 6473 version "0.12.3"
6425 resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.3.tgz#5ec6606844544790a795e8e396e3f2ab3649a2d6" 6474 resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.3.tgz#5ec6606844544790a795e8e396e3f2ab3649a2d6"
6426 6475
6476videojs-vtt.js@0.12.4:
6477 version "0.12.4"
6478 resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.12.4.tgz#38f2499e31efb3fa93590ddad4cb663275a4b161"
6479 dependencies:
6480 global "^4.3.1"
6481
6427videostream@^2.3.0: 6482videostream@^2.3.0:
6428 version "2.4.2" 6483 version "2.4.2"
6429 resolved "https://registry.yarnpkg.com/videostream/-/videostream-2.4.2.tgz#9560254d00fabdc40955c1a3c282057d8db1d115" 6484 resolved "https://registry.yarnpkg.com/videostream/-/videostream-2.4.2.tgz#9560254d00fabdc40955c1a3c282057d8db1d115"
@@ -6585,8 +6640,8 @@ websocket-extensions@>=0.1.1:
6585 resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7" 6640 resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
6586 6641
6587webtorrent@^0.98.0: 6642webtorrent@^0.98.0:
6588 version "0.98.18" 6643 version "0.98.19"
6589 resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.98.18.tgz#d8e0e04a52af884e9cffa361cbe8c159a4cb6f98" 6644 resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.98.19.tgz#9ce15fe71ea12600aa85ee12a9793eac88087262"
6590 dependencies: 6645 dependencies:
6591 addr-to-ip-port "^1.4.2" 6646 addr-to-ip-port "^1.4.2"
6592 bitfield "^1.1.2" 6647 bitfield "^1.1.2"
@@ -6707,6 +6762,15 @@ xhr@2.2.2:
6707 parse-headers "^2.0.0" 6762 parse-headers "^2.0.0"
6708 xtend "^4.0.0" 6763 xtend "^4.0.0"
6709 6764
6765xhr@2.4.0:
6766 version "2.4.0"
6767 resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
6768 dependencies:
6769 global "~4.3.0"
6770 is-function "^1.0.1"
6771 parse-headers "^2.0.0"
6772 xtend "^4.0.0"
6773
6710xml-char-classes@^1.0.0: 6774xml-char-classes@^1.0.0:
6711 version "1.0.0" 6775 version "1.0.0"
6712 resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" 6776 resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
diff --git a/package.json b/package.json
index b3ea40ad3..b875f5c26 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
20 "build": "SCRIPTY_PARALLEL=true scripty", 20 "build": "SCRIPTY_PARALLEL=true scripty",
21 "build:server": "scripty", 21 "build:server": "scripty",
22 "build:client": "scripty", 22 "build:client": "scripty",
23 "clean": "npm run clean:client",
24 "clean:client": "scripty", 23 "clean:client": "scripty",
24 "clean:server": "scripty",
25 "clean:server:test": "scripty", 25 "clean:server:test": "scripty",
26 "watch:client": "scripty", 26 "watch:client": "scripty",
27 "watch:server": "scripty", 27 "watch:server": "scripty",
diff --git a/scripts/clean/client/dist.sh b/scripts/clean/client/dist.sh
index 2cbbf90dc..ea6f7d644 100755
--- a/scripts/clean/client/dist.sh
+++ b/scripts/clean/client/dist.sh
@@ -1,4 +1,4 @@
1#!/usr/bin/env sh 1#!/usr/bin/env sh
2 2
3cd client || exit -1 3cd client || exit -1
4rm -rf dist/ 4rm -rf compiled/ dist/ dll/
diff --git a/scripts/clean/server/dist.sh b/scripts/clean/server/dist.sh
new file mode 100755
index 000000000..be8135b8f
--- /dev/null
+++ b/scripts/clean/server/dist.sh
@@ -0,0 +1,3 @@
1#!/usr/bin/env sh
2
3rm -rf dist/