aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-06-11 15:19:43 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-06-11 15:19:43 +0200
commit1840c2f7c91f5f89602a3683d85b0a9df1454855 (patch)
tree7efc223222e2d318abfaef0839a79e23be727cea
parent8635a2c70cc24a4c52558162ac058de95750271f (diff)
downloadPeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.gz
PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.tar.zst
PeerTube-1840c2f7c91f5f89602a3683d85b0a9df1454855.zip
Update webpack stack
-rw-r--r--client/config/webpack.common.js9
-rw-r--r--client/config/webpack.dev.js11
-rw-r--r--client/config/webpack.prod.js4
-rw-r--r--client/package.json9
-rw-r--r--client/src/app/+admin/friends/shared/friend.service.ts2
-rw-r--r--client/src/app/+admin/requests/shared/request.service.ts2
-rw-r--r--client/src/app/+admin/users/shared/user.service.ts2
-rw-r--r--client/src/app/app.component.scss2
-rw-r--r--client/src/app/core/auth/auth.service.ts6
-rw-r--r--client/src/app/core/config/config.service.ts2
-rw-r--r--client/src/app/shared/users/user.service.ts2
-rw-r--r--client/src/app/shared/video-abuse/video-abuse.service.ts2
-rw-r--r--client/src/app/videos/shared/video.model.ts2
-rw-r--r--client/src/app/videos/shared/video.service.ts2
-rw-r--r--client/src/app/videos/video-edit/video-add.component.ts2
-rw-r--r--client/src/app/videos/video-list/video-miniature.component.html2
-rw-r--r--client/src/custom-typings.d.ts2
-rw-r--r--client/src/index.html2
-rw-r--r--client/yarn.lock309
-rw-r--r--package.json4
-rw-r--r--scripts/danger/clean/cleaner.ts (renamed from scripts/danger/clean/cleaner.js)12
-rwxr-xr-xscripts/danger/clean/dev.sh2
-rwxr-xr-xscripts/watch/client.sh2
-rw-r--r--server.ts13
-rw-r--r--server/controllers/api/videos/index.ts1
-rw-r--r--server/helpers/core-utils.ts22
-rw-r--r--server/helpers/custom-validators/videos.ts1
-rw-r--r--server/helpers/index.ts1
-rw-r--r--server/helpers/utils.ts13
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/initializers/database.ts8
-rw-r--r--yarn.lock46
32 files changed, 424 insertions, 77 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 266e630f6..459985880 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -168,6 +168,13 @@ module.exports = function (options) {
168 helpers.root('src/index.html'), 168 helpers.root('src/index.html'),
169 helpers.root('src/standalone/videos/embed.html') 169 helpers.root('src/standalone/videos/embed.html')
170 ] 170 ]
171 },
172
173 /* File loader for supporting images, for example, in CSS files.
174 */
175 {
176 test: /\.(jpg|png|gif)$/,
177 use: 'file-loader'
171 } 178 }
172 179
173 ] 180 ]
@@ -271,7 +278,7 @@ module.exports = function (options) {
271 * See: https://github.com/numical/script-ext-html-webpack-plugin 278 * See: https://github.com/numical/script-ext-html-webpack-plugin
272 */ 279 */
273 new ScriptExtHtmlWebpackPlugin({ 280 new ScriptExtHtmlWebpackPlugin({
274 sync: [ /polyfill|vendor/, 'webtorrent.min.js' ], 281 sync: [ /polyfill|vendor/ ],
275 defaultAttribute: 'async', 282 defaultAttribute: 'async',
276 preload: [/polyfill|vendor|main/], 283 preload: [/polyfill|vendor|main/],
277 prefetch: [/chunk/] 284 prefetch: [/chunk/]
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js
index 03d6d2fba..d6ebed730 100644
--- a/client/config/webpack.dev.js
+++ b/client/config/webpack.dev.js
@@ -22,7 +22,8 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, {
22 host: HOST, 22 host: HOST,
23 port: PORT, 23 port: PORT,
24 ENV: ENV, 24 ENV: ENV,
25 HMR: HMR 25 HMR: HMR,
26 API_URL: 'http://localhost:9000'
26}) 27})
27 28
28const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin 29const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin
@@ -79,9 +80,7 @@ module.exports = function (env) {
79 chunkFilename: '[id].chunk.js', 80 chunkFilename: '[id].chunk.js',
80 81
81 library: 'ac_[name]', 82 library: 'ac_[name]',
82 libraryTarget: 'var', 83 libraryTarget: 'var'
83
84 publicPath: '/client/'
85 }, 84 },
86 85
87 externals: { 86 externals: {
@@ -125,6 +124,7 @@ module.exports = function (env) {
125 new DefinePlugin({ 124 new DefinePlugin({
126 'ENV': JSON.stringify(METADATA.ENV), 125 'ENV': JSON.stringify(METADATA.ENV),
127 'HMR': METADATA.HMR, 126 'HMR': METADATA.HMR,
127 'API_URL': JSON.stringify(METADATA.API_URL),
128 'process.env': { 128 'process.env': {
129 'ENV': JSON.stringify(METADATA.ENV), 129 'ENV': JSON.stringify(METADATA.ENV),
130 'NODE_ENV': JSON.stringify(METADATA.ENV), 130 'NODE_ENV': JSON.stringify(METADATA.ENV),
@@ -234,8 +234,7 @@ module.exports = function (env) {
234 historyApiFallback: true, 234 historyApiFallback: true,
235 watchOptions: { 235 watchOptions: {
236 ignored: /node_modules/ 236 ignored: /node_modules/
237 }, 237 }
238 outputPath: helpers.root('dist')
239 }, 238 },
240 239
241 /* 240 /*
diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js
index 9bb7306af..3f063c7c6 100644
--- a/client/config/webpack.prod.js
+++ b/client/config/webpack.prod.js
@@ -26,7 +26,8 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, {
26 host: HOST, 26 host: HOST,
27 port: PORT, 27 port: PORT,
28 ENV: ENV, 28 ENV: ENV,
29 HMR: false 29 HMR: false,
30 API_URL: ''
30}) 31})
31 32
32module.exports = function (env) { 33module.exports = function (env) {
@@ -125,6 +126,7 @@ module.exports = function (env) {
125 new DefinePlugin({ 126 new DefinePlugin({
126 'ENV': JSON.stringify(METADATA.ENV), 127 'ENV': JSON.stringify(METADATA.ENV),
127 'HMR': METADATA.HMR, 128 'HMR': METADATA.HMR,
129 'API_URL': JSON.stringify(METADATA.API_URL),
128 'process.env': { 130 'process.env': {
129 'ENV': JSON.stringify(METADATA.ENV), 131 'ENV': JSON.stringify(METADATA.ENV),
130 'NODE_ENV': JSON.stringify(METADATA.ENV), 132 'NODE_ENV': JSON.stringify(METADATA.ENV),
diff --git a/client/package.json b/client/package.json
index dbf9ef06d..aee548c3f 100644
--- a/client/package.json
+++ b/client/package.json
@@ -14,7 +14,8 @@
14 }, 14 },
15 "scripts": { 15 "scripts": {
16 "test": "standard && tslint -c ./tslint.json src/**/*.ts", 16 "test": "standard && tslint -c ./tslint.json src/**/*.ts",
17 "webpack": "webpack" 17 "webpack": "webpack",
18 "webpack-dev-server": "webpack-dev-server"
18 }, 19 },
19 "license": "GPLv3", 20 "license": "GPLv3",
20 "dependencies": { 21 "dependencies": {
@@ -57,8 +58,8 @@
57 "json-loader": "^0.5.4", 58 "json-loader": "^0.5.4",
58 "ng-router-loader": "^2.0.0", 59 "ng-router-loader": "^2.0.0",
59 "ng2-file-upload": "^1.1.4-2", 60 "ng2-file-upload": "^1.1.4-2",
60 "ng2-smart-table": "1.0.3", 61 "ng2-smart-table": "1.2.1",
61 "ng2-tag-input": "1.0.5", 62 "ng2-tag-input": "1.3.3",
62 "ngc-webpack": "2.0.0", 63 "ngc-webpack": "2.0.0",
63 "ngx-bootstrap": "1.6.6", 64 "ngx-bootstrap": "1.6.6",
64 "node-sass": "^4.1.1", 65 "node-sass": "^4.1.1",
@@ -90,8 +91,10 @@
90 "devDependencies": { 91 "devDependencies": {
91 "add-asset-html-webpack-plugin": "^2.0.1", 92 "add-asset-html-webpack-plugin": "^2.0.1",
92 "codelyzer": "^3.0.0-beta.4", 93 "codelyzer": "^3.0.0-beta.4",
94 "ng2-completer": "1.2.2",
93 "standard": "^10.0.0", 95 "standard": "^10.0.0",
94 "webpack-bundle-analyzer": "^2.8.2", 96 "webpack-bundle-analyzer": "^2.8.2",
97 "webpack-dev-server": "^2.4.5",
95 "webpack-dll-bundles-plugin": "^1.0.0-beta.5" 98 "webpack-dll-bundles-plugin": "^1.0.0-beta.5"
96 } 99 }
97} 100}
diff --git a/client/src/app/+admin/friends/shared/friend.service.ts b/client/src/app/+admin/friends/shared/friend.service.ts
index 6cb84f5cd..6e51c954f 100644
--- a/client/src/app/+admin/friends/shared/friend.service.ts
+++ b/client/src/app/+admin/friends/shared/friend.service.ts
@@ -10,7 +10,7 @@ import { AuthHttp, RestExtractor, RestDataSource, ResultList } from '../../../sh
10 10
11@Injectable() 11@Injectable()
12export class FriendService { 12export class FriendService {
13 private static BASE_FRIEND_URL: string = '/api/v1/pods/'; 13 private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/';
14 14
15 constructor ( 15 constructor (
16 private authHttp: AuthHttp, 16 private authHttp: AuthHttp,
diff --git a/client/src/app/+admin/requests/shared/request.service.ts b/client/src/app/+admin/requests/shared/request.service.ts
index 915d192a6..0872ba0b8 100644
--- a/client/src/app/+admin/requests/shared/request.service.ts
+++ b/client/src/app/+admin/requests/shared/request.service.ts
@@ -8,7 +8,7 @@ import { AuthHttp, RestExtractor } from '../../../shared';
8 8
9@Injectable() 9@Injectable()
10export class RequestService { 10export class RequestService {
11 private static BASE_REQUEST_URL: string = '/api/v1/requests/'; 11 private static BASE_REQUEST_URL = API_URL + '/api/v1/requests/';
12 12
13 constructor ( 13 constructor (
14 private authHttp: AuthHttp, 14 private authHttp: AuthHttp,
diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index da540bf9f..9c7176d39 100644
--- a/client/src/app/+admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
@@ -6,7 +6,7 @@ import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared';
6 6
7@Injectable() 7@Injectable()
8export class UserService { 8export class UserService {
9 private static BASE_USERS_URL = '/api/v1/users/'; 9 private static BASE_USERS_URL = API_URL + '/api/v1/users/';
10 10
11 constructor( 11 constructor(
12 private authHttp: AuthHttp, 12 private authHttp: AuthHttp,
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 68fadbe7c..a98e57cc3 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -51,7 +51,7 @@
51 a { 51 a {
52 color: inherit !important; 52 color: inherit !important;
53 display: block; 53 display: block;
54 background: url(/client/assets/logo.png) no-repeat; 54 background: url(/assets/logo.png) no-repeat;
55 background-size: contain; 55 background-size: contain;
56 background-position: center; 56 background-position: center;
57 height: 100%; 57 height: 100%;
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index caf765b42..4c75df1ca 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -16,9 +16,9 @@ import { RestExtractor } from '../../shared/rest';
16 16
17@Injectable() 17@Injectable()
18export class AuthService { 18export class AuthService {
19 private static BASE_CLIENT_URL = '/api/v1/clients/local'; 19 private static BASE_CLIENT_URL = API_URL + '/api/v1/clients/local';
20 private static BASE_TOKEN_URL = '/api/v1/users/token'; 20 private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token';
21 private static BASE_USER_INFORMATIONS_URL = '/api/v1/users/me'; 21 private static BASE_USER_INFORMATIONS_URL = API_URL + '/api/v1/users/me';
22 22
23 loginChangedSource: Observable<AuthStatus>; 23 loginChangedSource: Observable<AuthStatus>;
24 24
diff --git a/client/src/app/core/config/config.service.ts b/client/src/app/core/config/config.service.ts
index 295e68c36..407dca083 100644
--- a/client/src/app/core/config/config.service.ts
+++ b/client/src/app/core/config/config.service.ts
@@ -5,7 +5,7 @@ import { RestExtractor } from '../../shared/rest';
5 5
6@Injectable() 6@Injectable()
7export class ConfigService { 7export class ConfigService {
8 private static BASE_CONFIG_URL = '/api/v1/config/'; 8 private static BASE_CONFIG_URL = API_URL + '/api/v1/config/';
9 9
10 private config: { 10 private config: {
11 signup: { 11 signup: {
diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts
index 0727b76fd..f1265be0a 100644
--- a/client/src/app/shared/users/user.service.ts
+++ b/client/src/app/shared/users/user.service.ts
@@ -9,7 +9,7 @@ import { RestExtractor } from '../rest';
9 9
10@Injectable() 10@Injectable()
11export class UserService { 11export class UserService {
12 static BASE_USERS_URL = '/api/v1/users/'; 12 static BASE_USERS_URL = API_URL + '/api/v1/users/';
13 13
14 constructor( 14 constructor(
15 private http: Http, 15 private http: Http,
diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts
index f23c36f05..da7b2ef8a 100644
--- a/client/src/app/shared/video-abuse/video-abuse.service.ts
+++ b/client/src/app/shared/video-abuse/video-abuse.service.ts
@@ -11,7 +11,7 @@ import { VideoAbuse } from './video-abuse.model';
11 11
12@Injectable() 12@Injectable()
13export class VideoAbuseService { 13export class VideoAbuseService {
14 private static BASE_VIDEO_ABUSE_URL = '/api/v1/videos/'; 14 private static BASE_VIDEO_ABUSE_URL = API_URL + '/api/v1/videos/';
15 15
16 constructor( 16 constructor(
17 private authHttp: AuthHttp, 17 private authHttp: AuthHttp,
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts
index 0cf4039df..e897eb175 100644
--- a/client/src/app/videos/shared/video.model.ts
+++ b/client/src/app/videos/shared/video.model.ts
@@ -21,6 +21,7 @@ export class Video implements VideoServerModel {
21 podHost: string; 21 podHost: string;
22 tags: string[]; 22 tags: string[];
23 thumbnailPath: string; 23 thumbnailPath: string;
24 thumbnailUrl: string;
24 views: number; 25 views: number;
25 likes: number; 26 likes: number;
26 dislikes: number; 27 dislikes: number;
@@ -80,6 +81,7 @@ export class Video implements VideoServerModel {
80 this.podHost = hash.podHost; 81 this.podHost = hash.podHost;
81 this.tags = hash.tags; 82 this.tags = hash.tags;
82 this.thumbnailPath = hash.thumbnailPath; 83 this.thumbnailPath = hash.thumbnailPath;
84 this.thumbnailUrl = API_URL + hash.thumbnailPath;
83 this.views = hash.views; 85 this.views = hash.views;
84 this.likes = hash.likes; 86 this.likes = hash.likes;
85 this.dislikes = hash.dislikes; 87 this.dislikes = hash.dislikes;
diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts
index ef683dea6..a53ea1064 100644
--- a/client/src/app/videos/shared/video.service.ts
+++ b/client/src/app/videos/shared/video.service.ts
@@ -20,7 +20,7 @@ import { Video } from './video.model';
20 20
21@Injectable() 21@Injectable()
22export class VideoService { 22export class VideoService {
23 private static BASE_VIDEO_URL = '/api/v1/videos/'; 23 private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/';
24 24
25 videoCategories: Array<{ id: number, label: string }> = []; 25 videoCategories: Array<{ id: number, label: string }> = [];
26 videoLicences: Array<{ id: number, label: string }> = []; 26 videoLicences: Array<{ id: number, label: string }> = [];
diff --git a/client/src/app/videos/video-edit/video-add.component.ts b/client/src/app/videos/video-edit/video-add.component.ts
index 21343880d..e5eb9a9f4 100644
--- a/client/src/app/videos/video-edit/video-add.component.ts
+++ b/client/src/app/videos/video-edit/video-add.component.ts
@@ -94,7 +94,7 @@ export class VideoAddComponent extends FormReactive implements OnInit {
94 this.uploader = new FileUploader({ 94 this.uploader = new FileUploader({
95 authToken: this.authService.getRequestHeaderValue(), 95 authToken: this.authService.getRequestHeaderValue(),
96 queueLimit: 1, 96 queueLimit: 1,
97 url: '/api/v1/videos', 97 url: API_URL + '/api/v1/videos',
98 removeAfterUpload: true 98 removeAfterUpload: true
99 }); 99 });
100 100
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html
index b1b881fea..db6c4d6fb 100644
--- a/client/src/app/videos/video-list/video-miniature.component.html
+++ b/client/src/app/videos/video-list/video-miniature.component.html
@@ -3,7 +3,7 @@
3 [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description" 3 [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description"
4 class="video-miniature-thumbnail" 4 class="video-miniature-thumbnail"
5 > 5 >
6 <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailPath" alt="video thumbnail" /> 6 <img *ngIf="isVideoNSFWForThisUser() === false" [attr.src]="video.thumbnailUrl" alt="video thumbnail" />
7 <div *ngIf="isVideoNSFWForThisUser()" class="thumbnail-nsfw"> 7 <div *ngIf="isVideoNSFWForThisUser()" class="thumbnail-nsfw">
8 NSFW 8 NSFW
9 </div> 9 </div>
diff --git a/client/src/custom-typings.d.ts b/client/src/custom-typings.d.ts
index 621a416b4..67e069cc6 100644
--- a/client/src/custom-typings.d.ts
+++ b/client/src/custom-typings.d.ts
@@ -58,6 +58,7 @@ declare module 'modern-lru' {
58 58
59// Extra variables that live on Global that will be replaced by webpack DefinePlugin 59// Extra variables that live on Global that will be replaced by webpack DefinePlugin
60declare var ENV: string; 60declare var ENV: string;
61declare var API_URL: string;
61declare var HMR: boolean; 62declare var HMR: boolean;
62declare var System: SystemJS; 63declare var System: SystemJS;
63 64
@@ -67,6 +68,7 @@ interface SystemJS {
67 68
68interface GlobalEnvironment { 69interface GlobalEnvironment {
69 ENV: string; 70 ENV: string;
71 API_URL: string;
70 HMR: boolean; 72 HMR: boolean;
71 SystemJS: SystemJS; 73 SystemJS: SystemJS;
72 System: SystemJS; 74 System: SystemJS;
diff --git a/client/src/index.html b/client/src/index.html
index e18b83dc8..ea88bb15b 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -12,7 +12,7 @@
12 <!-- Do not remove it! --> 12 <!-- Do not remove it! -->
13 13
14 <!-- TODO: bundle it with webpack when https://github.com/webpack/webpack/pull/1931 will be merged --> 14 <!-- TODO: bundle it with webpack when https://github.com/webpack/webpack/pull/1931 will be merged -->
15 <script src="/client/assets/webtorrent/webtorrent.min.js"></script> 15 <!-- <script src="/client/assets/webtorrent/webtorrent.min.js"></script> -->
16 16
17 <link rel="icon" type="image/png" href="/client/assets/favicon.png" /> 17 <link rel="icon" type="image/png" href="/client/assets/favicon.png" />
18 18
diff --git a/client/yarn.lock b/client/yarn.lock
index 383f4541f..68e4116ac 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -212,6 +212,10 @@ ansi-escapes@^1.1.0:
212 version "1.4.0" 212 version "1.4.0"
213 resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" 213 resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
214 214
215ansi-html@0.0.7:
216 version "0.0.7"
217 resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
218
215ansi-regex@^2.0.0: 219ansi-regex@^2.0.0:
216 version "2.1.1" 220 version "2.1.1"
217 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" 221 resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -347,6 +351,10 @@ async@^0.9.0:
347 version "0.9.2" 351 version "0.9.2"
348 resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" 352 resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
349 353
354async@^1.5.2:
355 version "1.5.2"
356 resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
357
350async@^2.1.2, async@^2.1.4, async@^2.1.5: 358async@^2.1.2, async@^2.1.4, async@^2.1.5:
351 version "2.4.1" 359 version "2.4.1"
352 resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7" 360 resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
@@ -415,6 +423,10 @@ base64-js@^1.0.2:
415 version "1.2.0" 423 version "1.2.0"
416 resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" 424 resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
417 425
426batch@0.6.1:
427 version "0.6.1"
428 resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
429
418bcrypt-pbkdf@^1.0.0: 430bcrypt-pbkdf@^1.0.0:
419 version "1.0.1" 431 version "1.0.1"
420 resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" 432 resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -695,6 +707,10 @@ builtin-status-codes@^3.0.0:
695 version "3.0.0" 707 version "3.0.0"
696 resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" 708 resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
697 709
710bytes@2.3.0:
711 version "2.3.0"
712 resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
713
698caller-path@^0.1.0: 714caller-path@^0.1.0:
699 version "0.1.0" 715 version "0.1.0"
700 resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" 716 resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -776,7 +792,7 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
776 strip-ansi "^3.0.0" 792 strip-ansi "^3.0.0"
777 supports-color "^2.0.0" 793 supports-color "^2.0.0"
778 794
779chokidar@^1.4.3: 795chokidar@^1.4.3, chokidar@^1.6.0:
780 version "1.7.0" 796 version "1.7.0"
781 resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" 797 resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
782 dependencies: 798 dependencies:
@@ -965,6 +981,23 @@ compact2string@^1.2.0:
965 dependencies: 981 dependencies:
966 ipaddr.js ">= 0.1.5" 982 ipaddr.js ">= 0.1.5"
967 983
984compressible@~2.0.8:
985 version "2.0.10"
986 resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
987 dependencies:
988 mime-db ">= 1.27.0 < 2"
989
990compression@^1.5.2:
991 version "1.6.2"
992 resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
993 dependencies:
994 accepts "~1.3.3"
995 bytes "2.3.0"
996 compressible "~2.0.8"
997 debug "~2.2.0"
998 on-headers "~1.0.1"
999 vary "~1.1.0"
1000
968concat-map@0.0.1: 1001concat-map@0.0.1:
969 version "0.0.1" 1002 version "0.0.1"
970 resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" 1003 resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -977,6 +1010,10 @@ concat-stream@^1.5.1, concat-stream@^1.5.2:
977 readable-stream "^2.2.2" 1010 readable-stream "^2.2.2"
978 typedarray "^0.0.6" 1011 typedarray "^0.0.6"
979 1012
1013connect-history-api-fallback@^1.3.0:
1014 version "1.3.0"
1015 resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
1016
980console-browserify@^1.1.0: 1017console-browserify@^1.1.0:
981 version "1.1.0" 1018 version "1.1.0"
982 resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" 1019 resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -1253,7 +1290,7 @@ debug-log@^1.0.0:
1253 version "1.0.1" 1290 version "1.0.1"
1254 resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" 1291 resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
1255 1292
1256debug@2.2.0: 1293debug@2.2.0, debug@~2.2.0:
1257 version "2.2.0" 1294 version "2.2.0"
1258 resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" 1295 resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
1259 dependencies: 1296 dependencies:
@@ -1265,7 +1302,7 @@ debug@2.6.7:
1265 dependencies: 1302 dependencies:
1266 ms "2.0.0" 1303 ms "2.0.0"
1267 1304
1268debug@^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: 1305debug@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:
1269 version "2.6.8" 1306 version "2.6.8"
1270 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" 1307 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
1271 dependencies: 1308 dependencies:
@@ -1340,6 +1377,10 @@ destroy@~1.0.4:
1340 version "1.0.4" 1377 version "1.0.4"
1341 resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" 1378 resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
1342 1379
1380detect-node@^2.0.3:
1381 version "2.0.3"
1382 resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
1383
1343diff@^3.1.0, diff@^3.2.0: 1384diff@^3.1.0, diff@^3.2.0:
1344 version "3.2.0" 1385 version "3.2.0"
1345 resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" 1386 resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
@@ -1750,10 +1791,20 @@ event-emitter@~0.3.5:
1750 d "1" 1791 d "1"
1751 es5-ext "~0.10.14" 1792 es5-ext "~0.10.14"
1752 1793
1794eventemitter3@1.x.x:
1795 version "1.2.0"
1796 resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
1797
1753events@^1.0.0: 1798events@^1.0.0:
1754 version "1.1.1" 1799 version "1.1.1"
1755 resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" 1800 resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
1756 1801
1802eventsource@0.1.6:
1803 version "0.1.6"
1804 resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
1805 dependencies:
1806 original ">=0.0.5"
1807
1757evp_bytestokey@^1.0.0: 1808evp_bytestokey@^1.0.0:
1758 version "1.0.0" 1809 version "1.0.0"
1759 resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53" 1810 resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
@@ -1787,7 +1838,7 @@ exports-loader@^0.6.3:
1787 loader-utils "^1.0.2" 1838 loader-utils "^1.0.2"
1788 source-map "0.5.x" 1839 source-map "0.5.x"
1789 1840
1790express@^4.15.2: 1841express@^4.13.3, express@^4.15.2:
1791 version "4.15.3" 1842 version "4.15.3"
1792 resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662" 1843 resolved "https://registry.yarnpkg.com/express/-/express-4.15.3.tgz#bab65d0f03aa80c358408972fc700f916944b662"
1793 dependencies: 1844 dependencies:
@@ -1842,6 +1893,18 @@ fastparse@^1.1.1:
1842 version "1.1.1" 1893 version "1.1.1"
1843 resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" 1894 resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
1844 1895
1896faye-websocket@^0.10.0:
1897 version "0.10.0"
1898 resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
1899 dependencies:
1900 websocket-driver ">=0.5.1"
1901
1902faye-websocket@~0.11.0:
1903 version "0.11.1"
1904 resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
1905 dependencies:
1906 websocket-driver ">=0.5.1"
1907
1845figures@^1.3.5: 1908figures@^1.3.5:
1846 version "1.7.0" 1909 version "1.7.0"
1847 resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" 1910 resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -2172,6 +2235,10 @@ gzip-size@^3.0.0:
2172 dependencies: 2235 dependencies:
2173 duplexer "^0.1.1" 2236 duplexer "^0.1.1"
2174 2237
2238handle-thing@^1.2.5:
2239 version "1.2.5"
2240 resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
2241
2175har-schema@^1.0.5: 2242har-schema@^1.0.5:
2176 version "1.0.5" 2243 version "1.0.5"
2177 resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" 2244 resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -2244,10 +2311,23 @@ hosted-git-info@^2.1.4:
2244 version "2.4.2" 2311 version "2.4.2"
2245 resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67" 2312 resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
2246 2313
2314hpack.js@^2.1.6:
2315 version "2.1.6"
2316 resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
2317 dependencies:
2318 inherits "^2.0.1"
2319 obuf "^1.0.0"
2320 readable-stream "^2.0.1"
2321 wbuf "^1.1.0"
2322
2247html-comment-regex@^1.1.0: 2323html-comment-regex@^1.1.0:
2248 version "1.1.1" 2324 version "1.1.1"
2249 resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" 2325 resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
2250 2326
2327html-entities@^1.2.0:
2328 version "1.2.1"
2329 resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
2330
2251html-minifier@^3.2.3: 2331html-minifier@^3.2.3:
2252 version "3.5.2" 2332 version "3.5.2"
2253 resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7" 2333 resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.2.tgz#d73bc3ff448942408818ce609bf3fb0ea7ef4eb7"
@@ -2281,6 +2361,10 @@ htmlparser2@~3.3.0:
2281 domutils "1.1" 2361 domutils "1.1"
2282 readable-stream "1.0" 2362 readable-stream "1.0"
2283 2363
2364http-deceiver@^1.2.7:
2365 version "1.2.7"
2366 resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
2367
2284http-errors@~1.6.1: 2368http-errors@~1.6.1:
2285 version "1.6.1" 2369 version "1.6.1"
2286 resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" 2370 resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
@@ -2290,6 +2374,22 @@ http-errors@~1.6.1:
2290 setprototypeof "1.0.3" 2374 setprototypeof "1.0.3"
2291 statuses ">= 1.3.1 < 2" 2375 statuses ">= 1.3.1 < 2"
2292 2376
2377http-proxy-middleware@~0.17.4:
2378 version "0.17.4"
2379 resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
2380 dependencies:
2381 http-proxy "^1.16.2"
2382 is-glob "^3.1.0"
2383 lodash "^4.17.2"
2384 micromatch "^2.3.11"
2385
2386http-proxy@^1.16.2:
2387 version "1.16.2"
2388 resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
2389 dependencies:
2390 eventemitter3 "1.x.x"
2391 requires-port "1.x.x"
2392
2293http-signature@~1.1.0: 2393http-signature@~1.1.0:
2294 version "1.1.1" 2394 version "1.1.1"
2295 resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" 2395 resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -2674,6 +2774,10 @@ json-stringify-safe@~5.0.1:
2674 version "5.0.1" 2774 version "5.0.1"
2675 resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" 2775 resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
2676 2776
2777json3@^3.3.2:
2778 version "3.3.2"
2779 resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
2780
2677json5@^0.5.0, json5@^0.5.1: 2781json5@^0.5.0, json5@^0.5.1:
2678 version "0.5.1" 2782 version "0.5.1"
2679 resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" 2783 resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -3007,7 +3111,7 @@ lodash.uniq@^4.5.0:
3007 version "4.5.0" 3111 version "4.5.0"
3008 resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" 3112 resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
3009 3113
3010lodash@^4, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@~4.17.4: 3114lodash@^4, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@~4.17.4:
3011 version "4.17.4" 3115 version "4.17.4"
3012 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" 3116 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
3013 3117
@@ -3130,7 +3234,7 @@ methods@~1.1.2:
3130 version "1.1.2" 3234 version "1.1.2"
3131 resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" 3235 resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
3132 3236
3133micromatch@^2.1.5: 3237micromatch@^2.1.5, micromatch@^2.3.11:
3134 version "2.3.11" 3238 version "2.3.11"
3135 resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" 3239 resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
3136 dependencies: 3240 dependencies:
@@ -3155,7 +3259,7 @@ miller-rabin@^4.0.0:
3155 bn.js "^4.0.0" 3259 bn.js "^4.0.0"
3156 brorand "^1.0.1" 3260 brorand "^1.0.1"
3157 3261
3158mime-db@~1.27.0: 3262"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0:
3159 version "1.27.0" 3263 version "1.27.0"
3160 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" 3264 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
3161 3265
@@ -3208,7 +3312,7 @@ mixin-object@^2.0.1:
3208 for-in "^0.1.3" 3312 for-in "^0.1.3"
3209 is-extendable "^0.1.1" 3313 is-extendable "^0.1.1"
3210 3314
3211"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: 3315mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
3212 version "0.5.1" 3316 version "0.5.1"
3213 resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" 3317 resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
3214 dependencies: 3318 dependencies:
@@ -3285,9 +3389,9 @@ ng-router-loader@^2.0.0:
3285 loader-utils "^0.2.16" 3389 loader-utils "^0.2.16"
3286 recast "^0.11.20" 3390 recast "^0.11.20"
3287 3391
3288ng2-completer@^1.2.2: 3392ng2-completer@1.2.2, ng2-completer@^1.2.2:
3289 version "1.5.0" 3393 version "1.2.2"
3290 resolved "https://registry.yarnpkg.com/ng2-completer/-/ng2-completer-1.5.0.tgz#335d29bcfa433981d948e55a041ac912f10f47ec" 3394 resolved "https://registry.yarnpkg.com/ng2-completer/-/ng2-completer-1.2.2.tgz#69515e4d65973abce1276aea301cf0f36e5846a4"
3291 3395
3292ng2-file-upload@^1.1.4-2: 3396ng2-file-upload@^1.1.4-2:
3293 version "1.2.1" 3397 version "1.2.1"
@@ -3297,16 +3401,16 @@ ng2-material-dropdown@0.7.7:
3297 version "0.7.7" 3401 version "0.7.7"
3298 resolved "https://registry.yarnpkg.com/ng2-material-dropdown/-/ng2-material-dropdown-0.7.7.tgz#5f107cbd99c8c6362d869e0ac99e85b8c59aceab" 3402 resolved "https://registry.yarnpkg.com/ng2-material-dropdown/-/ng2-material-dropdown-0.7.7.tgz#5f107cbd99c8c6362d869e0ac99e85b8c59aceab"
3299 3403
3300ng2-smart-table@1.0.3: 3404ng2-smart-table@1.2.1:
3301 version "1.0.3" 3405 version "1.2.1"
3302 resolved "https://registry.yarnpkg.com/ng2-smart-table/-/ng2-smart-table-1.0.3.tgz#259f12564044aa87f6a86885fa16fbe6be8c2439" 3406 resolved "https://registry.yarnpkg.com/ng2-smart-table/-/ng2-smart-table-1.2.1.tgz#b25102c1a8b0588c508cf913c539ddf0f0b3341d"
3303 dependencies: 3407 dependencies:
3304 lodash "^4.17.4" 3408 lodash "^4.17.4"
3305 ng2-completer "^1.2.2" 3409 ng2-completer "^1.2.2"
3306 3410
3307ng2-tag-input@1.0.5: 3411ng2-tag-input@1.3.3:
3308 version "1.0.5" 3412 version "1.3.3"
3309 resolved "https://registry.yarnpkg.com/ng2-tag-input/-/ng2-tag-input-1.0.5.tgz#cb1391a6ae8ca6c53f0143c04513d1e16bd6b476" 3413 resolved "https://registry.yarnpkg.com/ng2-tag-input/-/ng2-tag-input-1.3.3.tgz#612b12b244dfd1efdb9659fd99caafa16762ff56"
3310 dependencies: 3414 dependencies:
3311 ng2-material-dropdown "0.7.7" 3415 ng2-material-dropdown "0.7.7"
3312 3416
@@ -3544,12 +3648,20 @@ object.omit@^2.0.0:
3544 for-own "^0.1.4" 3648 for-own "^0.1.4"
3545 is-extendable "^0.1.1" 3649 is-extendable "^0.1.1"
3546 3650
3651obuf@^1.0.0, obuf@^1.1.1:
3652 version "1.1.1"
3653 resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
3654
3547on-finished@~2.3.0: 3655on-finished@~2.3.0:
3548 version "2.3.0" 3656 version "2.3.0"
3549 resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" 3657 resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
3550 dependencies: 3658 dependencies:
3551 ee-first "1.1.1" 3659 ee-first "1.1.1"
3552 3660
3661on-headers@~1.0.1:
3662 version "1.0.1"
3663 resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
3664
3553once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: 3665once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
3554 version "1.4.0" 3666 version "1.4.0"
3555 resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" 3667 resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -3564,6 +3676,13 @@ opener@^1.4.3:
3564 version "1.4.3" 3676 version "1.4.3"
3565 resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" 3677 resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
3566 3678
3679opn@4.0.2:
3680 version "4.0.2"
3681 resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
3682 dependencies:
3683 object-assign "^4.0.1"
3684 pinkie-promise "^2.0.0"
3685
3567optimize-js-plugin@0.0.4: 3686optimize-js-plugin@0.0.4:
3568 version "0.0.4" 3687 version "0.0.4"
3569 resolved "https://registry.yarnpkg.com/optimize-js-plugin/-/optimize-js-plugin-0.0.4.tgz#69e7a67e0f66c69f7fc0c7b25c5d33b2db6c2817" 3688 resolved "https://registry.yarnpkg.com/optimize-js-plugin/-/optimize-js-plugin-0.0.4.tgz#69e7a67e0f66c69f7fc0c7b25c5d33b2db6c2817"
@@ -3592,6 +3711,12 @@ optionator@^0.8.2:
3592 type-check "~0.3.2" 3711 type-check "~0.3.2"
3593 wordwrap "~1.0.0" 3712 wordwrap "~1.0.0"
3594 3713
3714original@>=0.0.5:
3715 version "1.0.0"
3716 resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
3717 dependencies:
3718 url-parse "1.0.x"
3719
3595os-browserify@^0.2.0: 3720os-browserify@^0.2.0:
3596 version "0.2.1" 3721 version "0.2.1"
3597 resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" 3722 resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
@@ -3800,6 +3925,14 @@ pluralize@^1.2.1:
3800 version "1.2.1" 3925 version "1.2.1"
3801 resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" 3926 resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
3802 3927
3928portfinder@^1.0.9:
3929 version "1.0.13"
3930 resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
3931 dependencies:
3932 async "^1.5.2"
3933 debug "^2.2.0"
3934 mkdirp "0.5.x"
3935
3803postcss-calc@^5.2.0: 3936postcss-calc@^5.2.0:
3804 version "5.3.1" 3937 version "5.3.1"
3805 resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" 3938 resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -4167,6 +4300,14 @@ querystring@0.2.0:
4167 version "0.2.0" 4300 version "0.2.0"
4168 resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" 4301 resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
4169 4302
4303querystringify@0.0.x:
4304 version "0.0.4"
4305 resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
4306
4307querystringify@~1.0.0:
4308 version "1.0.0"
4309 resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
4310
4170random-access-file@^1.0.1: 4311random-access-file@^1.0.1:
4171 version "1.8.1" 4312 version "1.8.1"
4172 resolved "https://registry.yarnpkg.com/random-access-file/-/random-access-file-1.8.1.tgz#b1a54a0f924fbd4d45731a5771aea36be2166532" 4313 resolved "https://registry.yarnpkg.com/random-access-file/-/random-access-file-1.8.1.tgz#b1a54a0f924fbd4d45731a5771aea36be2166532"
@@ -4194,7 +4335,7 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.3:
4194 dependencies: 4335 dependencies:
4195 safe-buffer "^5.1.0" 4336 safe-buffer "^5.1.0"
4196 4337
4197range-parser@^1.2.0, range-parser@~1.2.0: 4338range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
4198 version "1.2.0" 4339 version "1.2.0"
4199 resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" 4340 resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
4200 4341
@@ -4242,7 +4383,7 @@ readable-stream@1.0:
4242 isarray "0.0.1" 4383 isarray "0.0.1"
4243 string_decoder "~0.10.x" 4384 string_decoder "~0.10.x"
4244 4385
4245readable-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: 4386readable-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:
4246 version "2.2.11" 4387 version "2.2.11"
4247 resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72" 4388 resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
4248 dependencies: 4389 dependencies:
@@ -4438,6 +4579,10 @@ require-uncached@^1.0.2:
4438 caller-path "^0.1.0" 4579 caller-path "^0.1.0"
4439 resolve-from "^1.0.0" 4580 resolve-from "^1.0.0"
4440 4581
4582requires-port@1.0.x, requires-port@1.x.x:
4583 version "1.0.0"
4584 resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
4585
4441resolve-from@^1.0.0: 4586resolve-from@^1.0.0:
4442 version "1.0.1" 4587 version "1.0.1"
4443 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" 4588 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -4606,6 +4751,10 @@ scss-tokenizer@^0.2.3:
4606 js-base64 "^2.1.8" 4751 js-base64 "^2.1.8"
4607 source-map "^0.4.2" 4752 source-map "^0.4.2"
4608 4753
4754select-hose@^2.0.0:
4755 version "2.0.0"
4756 resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
4757
4609semver-dsl@^1.0.1: 4758semver-dsl@^1.0.1:
4610 version "1.0.1" 4759 version "1.0.1"
4611 resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0" 4760 resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
@@ -4634,6 +4783,18 @@ send@0.15.3:
4634 range-parser "~1.2.0" 4783 range-parser "~1.2.0"
4635 statuses "~1.3.1" 4784 statuses "~1.3.1"
4636 4785
4786serve-index@^1.7.2:
4787 version "1.9.0"
4788 resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.0.tgz#d2b280fc560d616ee81b48bf0fa82abed2485ce7"
4789 dependencies:
4790 accepts "~1.3.3"
4791 batch "0.6.1"
4792 debug "2.6.8"
4793 escape-html "~1.0.3"
4794 http-errors "~1.6.1"
4795 mime-types "~2.1.15"
4796 parseurl "~1.3.1"
4797
4637serve-static@1.12.3: 4798serve-static@1.12.3:
4638 version "1.12.3" 4799 version "1.12.3"
4639 resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2" 4800 resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"
@@ -4747,6 +4908,24 @@ sntp@1.x.x:
4747 dependencies: 4908 dependencies:
4748 hoek "2.x.x" 4909 hoek "2.x.x"
4749 4910
4911sockjs-client@1.1.2:
4912 version "1.1.2"
4913 resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5"
4914 dependencies:
4915 debug "^2.2.0"
4916 eventsource "0.1.6"
4917 faye-websocket "~0.11.0"
4918 inherits "^2.0.1"
4919 json3 "^3.3.2"
4920 url-parse "^1.1.1"
4921
4922sockjs@0.3.18:
4923 version "0.3.18"
4924 resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
4925 dependencies:
4926 faye-websocket "^0.10.0"
4927 uuid "^2.0.2"
4928
4750sort-keys@^1.0.0: 4929sort-keys@^1.0.0:
4751 version "1.1.2" 4930 version "1.1.2"
4752 resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" 4931 resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -4818,6 +4997,29 @@ spdx-license-ids@^1.0.2:
4818 version "1.2.2" 4997 version "1.2.2"
4819 resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" 4998 resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
4820 4999
5000spdy-transport@^2.0.18:
5001 version "2.0.20"
5002 resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
5003 dependencies:
5004 debug "^2.6.8"
5005 detect-node "^2.0.3"
5006 hpack.js "^2.1.6"
5007 obuf "^1.1.1"
5008 readable-stream "^2.2.9"
5009 safe-buffer "^5.0.1"
5010 wbuf "^1.7.2"
5011
5012spdy@^3.4.1:
5013 version "3.4.7"
5014 resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
5015 dependencies:
5016 debug "^2.6.8"
5017 handle-thing "^1.2.5"
5018 http-deceiver "^1.2.7"
5019 safe-buffer "^5.0.1"
5020 select-hose "^2.0.0"
5021 spdy-transport "^2.0.18"
5022
4821speedometer@^1.0.0: 5023speedometer@^1.0.0:
4822 version "1.0.0" 5024 version "1.0.0"
4823 resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-1.0.0.tgz#cd671cb06752c22bca3370e2f334440be4fc62e2" 5025 resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-1.0.0.tgz#cd671cb06752c22bca3370e2f334440be4fc62e2"
@@ -5006,7 +5208,7 @@ supports-color@^2.0.0:
5006 version "2.0.0" 5208 version "2.0.0"
5007 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" 5209 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
5008 5210
5009supports-color@^3.1.0, supports-color@^3.2.3: 5211supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
5010 version "3.2.3" 5212 version "3.2.3"
5011 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" 5213 resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
5012 dependencies: 5214 dependencies:
@@ -5337,6 +5539,20 @@ url-loader@^0.5.7:
5337 loader-utils "^1.0.2" 5539 loader-utils "^1.0.2"
5338 mime "1.3.x" 5540 mime "1.3.x"
5339 5541
5542url-parse@1.0.x:
5543 version "1.0.5"
5544 resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
5545 dependencies:
5546 querystringify "0.0.x"
5547 requires-port "1.0.x"
5548
5549url-parse@^1.1.1:
5550 version "1.1.9"
5551 resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.9.tgz#c67f1d775d51f0a18911dd7b3ffad27bb9e5bd19"
5552 dependencies:
5553 querystringify "~1.0.0"
5554 requires-port "1.0.x"
5555
5340url@^0.11.0: 5556url@^0.11.0:
5341 version "0.11.0" 5557 version "0.11.0"
5342 resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" 5558 resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -5396,6 +5612,10 @@ utils-merge@1.0.0:
5396 version "1.0.0" 5612 version "1.0.0"
5397 resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" 5613 resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
5398 5614
5615uuid@^2.0.2:
5616 version "2.0.3"
5617 resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
5618
5399uuid@^3.0.0: 5619uuid@^3.0.0:
5400 version "3.0.1" 5620 version "3.0.1"
5401 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" 5621 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
@@ -5413,7 +5633,7 @@ validate-npm-package-license@^3.0.1:
5413 spdx-correct "~1.0.0" 5633 spdx-correct "~1.0.0"
5414 spdx-expression-parse "~1.0.0" 5634 spdx-expression-parse "~1.0.0"
5415 5635
5416vary@~1.1.1: 5636vary@~1.1.0, vary@~1.1.1:
5417 version "1.1.1" 5637 version "1.1.1"
5418 resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" 5638 resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
5419 5639
@@ -5497,6 +5717,12 @@ watchpack@^1.3.1:
5497 chokidar "^1.4.3" 5717 chokidar "^1.4.3"
5498 graceful-fs "^4.1.2" 5718 graceful-fs "^4.1.2"
5499 5719
5720wbuf@^1.1.0, wbuf@^1.7.2:
5721 version "1.7.2"
5722 resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
5723 dependencies:
5724 minimalistic-assert "^1.0.0"
5725
5500webpack-bundle-analyzer@^2.8.2: 5726webpack-bundle-analyzer@^2.8.2:
5501 version "2.8.2" 5727 version "2.8.2"
5502 resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8" 5728 resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.8.2.tgz#8b6240c29a9d63bc72f09d920fb050adbcce9fe8"
@@ -5513,6 +5739,37 @@ webpack-bundle-analyzer@^2.8.2:
5513 opener "^1.4.3" 5739 opener "^1.4.3"
5514 ws "^2.3.1" 5740 ws "^2.3.1"
5515 5741
5742webpack-dev-middleware@^1.10.2:
5743 version "1.10.2"
5744 resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
5745 dependencies:
5746 memory-fs "~0.4.1"
5747 mime "^1.3.4"
5748 path-is-absolute "^1.0.0"
5749 range-parser "^1.0.3"
5750
5751webpack-dev-server@^2.4.5:
5752 version "2.4.5"
5753 resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
5754 dependencies:
5755 ansi-html "0.0.7"
5756 chokidar "^1.6.0"
5757 compression "^1.5.2"
5758 connect-history-api-fallback "^1.3.0"
5759 express "^4.13.3"
5760 html-entities "^1.2.0"
5761 http-proxy-middleware "~0.17.4"
5762 opn "4.0.2"
5763 portfinder "^1.0.9"
5764 serve-index "^1.7.2"
5765 sockjs "0.3.18"
5766 sockjs-client "1.1.2"
5767 spdy "^3.4.1"
5768 strip-ansi "^3.0.0"
5769 supports-color "^3.1.1"
5770 webpack-dev-middleware "^1.10.2"
5771 yargs "^6.0.0"
5772
5516webpack-dll-bundles-plugin@^1.0.0-beta.5: 5773webpack-dll-bundles-plugin@^1.0.0-beta.5:
5517 version "1.0.0-beta.5" 5774 version "1.0.0-beta.5"
5518 resolved "https://registry.yarnpkg.com/webpack-dll-bundles-plugin/-/webpack-dll-bundles-plugin-1.0.0-beta.5.tgz#cfb109710a88c3eeb557fcc38be0c5015a54196d" 5775 resolved "https://registry.yarnpkg.com/webpack-dll-bundles-plugin/-/webpack-dll-bundles-plugin-1.0.0-beta.5.tgz#cfb109710a88c3eeb557fcc38be0c5015a54196d"
@@ -5574,6 +5831,16 @@ webpack@^2.6.0:
5574 webpack-sources "^0.2.3" 5831 webpack-sources "^0.2.3"
5575 yargs "^6.0.0" 5832 yargs "^6.0.0"
5576 5833
5834websocket-driver@>=0.5.1:
5835 version "0.6.5"
5836 resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
5837 dependencies:
5838 websocket-extensions ">=0.1.1"
5839
5840websocket-extensions@>=0.1.1:
5841 version "0.1.1"
5842 resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
5843
5577webtorrent@^0.98.0: 5844webtorrent@^0.98.0:
5578 version "0.98.18" 5845 version "0.98.18"
5579 resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.98.18.tgz#d8e0e04a52af884e9cffa361cbe8c159a4cb6f98" 5846 resolved "https://registry.yarnpkg.com/webtorrent/-/webtorrent-0.98.18.tgz#d8e0e04a52af884e9cffa361cbe8c159a4cb6f98"
diff --git a/package.json b/package.json
index 2dd6e7666..83ea17638 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,8 @@
40 "help": "scripty", 40 "help": "scripty",
41 "postinstall": "cd client && yarn install", 41 "postinstall": "cd client && yarn install",
42 "tsc": "tsc", 42 "tsc": "tsc",
43 "nodemon": "nodemon" 43 "nodemon": "nodemon",
44 "ts-node": "ts-node"
44 }, 45 },
45 "dependencies": { 46 "dependencies": {
46 "async": "^2.0.0", 47 "async": "^2.0.0",
@@ -74,6 +75,7 @@
74 "safe-buffer": "^5.0.1", 75 "safe-buffer": "^5.0.1",
75 "scripty": "^1.5.0", 76 "scripty": "^1.5.0",
76 "sequelize": "4.0.0-2", 77 "sequelize": "4.0.0-2",
78 "ts-node": "^3.0.6",
77 "typescript": "~2.2.0", 79 "typescript": "~2.2.0",
78 "validator": "^7.0.0", 80 "validator": "^7.0.0",
79 "winston": "^2.1.1", 81 "winston": "^2.1.1",
diff --git a/scripts/danger/clean/cleaner.js b/scripts/danger/clean/cleaner.ts
index 1a1e3dee7..d1dba4650 100644
--- a/scripts/danger/clean/cleaner.js
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,16 +1,16 @@
1const eachSeries = require('async/eachSeries') 1import * as eachSeries from 'async/eachSeries'
2const rimraf = require('rimraf') 2import * as rimraf from 'rimraf'
3 3
4const constants = require('../../../server/initializers/constants') 4import { CONFIG } from '../../../server/initializers/constants'
5const db = require('../../../server/initializers/database') 5import { database as db } from '../../../server/initializers/database'
6 6
7db.init(true, function () { 7db.init(true, function () {
8 db.sequelize.drop().asCallback(function (err) { 8 db.sequelize.drop().asCallback(function (err) {
9 if (err) throw err 9 if (err) throw err
10 10
11 console.info('Tables of %s deleted.', db.sequelize.config.database) 11 console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
12 12
13 const STORAGE = constants.CONFIG.STORAGE 13 const STORAGE = CONFIG.STORAGE
14 eachSeries(Object.keys(STORAGE), function (storage, callbackEach) { 14 eachSeries(Object.keys(STORAGE), function (storage, callbackEach) {
15 const storageDir = STORAGE[storage] 15 const storageDir = STORAGE[storage]
16 16
diff --git a/scripts/danger/clean/dev.sh b/scripts/danger/clean/dev.sh
index f4a5d1e8a..270ca0a2e 100755
--- a/scripts/danger/clean/dev.sh
+++ b/scripts/danger/clean/dev.sh
@@ -4,5 +4,5 @@ read -p "This will remove all directories and SQL tables. Are you sure? (y/*) "
4echo 4echo
5 5
6if [[ "$REPLY" =~ ^[Yy]$ ]]; then 6if [[ "$REPLY" =~ ^[Yy]$ ]]; then
7 NODE_ENV=test node "./scripts/danger/clean/cleaner" 7 NODE_ENV=test npm run ts-node "./scripts/danger/clean/cleaner"
8fi 8fi
diff --git a/scripts/watch/client.sh b/scripts/watch/client.sh
index 3e4522547..c99ed14e6 100755
--- a/scripts/watch/client.sh
+++ b/scripts/watch/client.sh
@@ -2,4 +2,4 @@
2 2
3cd client || exit -1 3cd client || exit -1
4 4
5npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch 5npm run webpack-dev-server -- --config config/webpack.dev.js --progress --profile --colors --watch --content-base src/ --inline --hot
diff --git a/server.ts b/server.ts
index b27a83860..60045865d 100644
--- a/server.ts
+++ b/server.ts
@@ -1,4 +1,6 @@
1if ([ 'dev', 'test'].indexOf(process.env.NODE_ENV) !== -1) { 1import { isTestInstance } from './server/helpers/core-utils'
2
3if (isTestInstance()) {
2 require('source-map-support').install() 4 require('source-map-support').install()
3} 5}
4 6
@@ -11,6 +13,7 @@ import * as http from 'http'
11import * as morgan from 'morgan' 13import * as morgan from 'morgan'
12import * as path from 'path' 14import * as path from 'path'
13import * as bittorrentTracker from 'bittorrent-tracker' 15import * as bittorrentTracker from 'bittorrent-tracker'
16import * as cors from 'cors'
14import { Server as WebSocketServer } from 'ws' 17import { Server as WebSocketServer } from 'ws'
15 18
16const TrackerServer = bittorrentTracker.Server 19const TrackerServer = bittorrentTracker.Server
@@ -56,6 +59,14 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers'
56 59
57// ----------- App ----------- 60// ----------- App -----------
58 61
62// Enable cors for develop
63if (isTestInstance()) {
64 app.use(cors({
65 origin: 'http://localhost:3000',
66 credentials: true
67 }))
68}
69
59// For the logger 70// For the logger
60app.use(morgan('combined', { 71app.use(morgan('combined', {
61 stream: { write: logger.info } 72 stream: { write: logger.info }
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index bfa018031..3b2ac4a6c 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -86,7 +86,6 @@ videosRouter.get('/',
86) 86)
87videosRouter.put('/:id', 87videosRouter.put('/:id',
88 authenticate, 88 authenticate,
89 reqFiles,
90 videosUpdateValidator, 89 videosUpdateValidator,
91 updateVideoRetryWrapper 90 updateVideoRetryWrapper
92) 91)
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
new file mode 100644
index 000000000..32b89b6dd
--- /dev/null
+++ b/server/helpers/core-utils.ts
@@ -0,0 +1,22 @@
1/*
2 Different from 'utils' because we don't not import other PeerTube modules.
3 Useful to avoid circular dependencies.
4*/
5
6import { join } from 'path'
7
8function isTestInstance () {
9 return process.env.NODE_ENV === 'test'
10}
11
12function root () {
13 // We are in /dist/helpers/utils.js
14 return join(__dirname, '..', '..', '..')
15}
16
17// ---------------------------------------------------------------------------
18
19export {
20 isTestInstance,
21 root
22}
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index c5ef4cb5f..8904975c0 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,5 +1,6 @@
1import { values } from 'lodash' 1import { values } from 'lodash'
2import * as validator from 'validator' 2import * as validator from 'validator'
3import 'multer'
3 4
4import { 5import {
5 CONSTRAINTS_FIELDS, 6 CONSTRAINTS_FIELDS,
diff --git a/server/helpers/index.ts b/server/helpers/index.ts
index e56bd21ad..78215fe10 100644
--- a/server/helpers/index.ts
+++ b/server/helpers/index.ts
@@ -1,3 +1,4 @@
1export * from './core-utils'
1export * from './logger' 2export * from './logger'
2export * from './custom-validators' 3export * from './custom-validators'
3export * from './database-utils' 4export * from './database-utils'
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 1dcbd31c4..8e489de96 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -23,10 +23,6 @@ function createEmptyCallback () {
23 } 23 }
24} 24}
25 25
26function isTestInstance () {
27 return process.env.NODE_ENV === 'test'
28}
29
30function getFormatedObjects (objects: any[], objectsTotal: number) { 26function getFormatedObjects (objects: any[], objectsTotal: number) {
31 const formatedObjects = [] 27 const formatedObjects = []
32 28
@@ -40,18 +36,11 @@ function getFormatedObjects (objects: any[], objectsTotal: number) {
40 } 36 }
41} 37}
42 38
43function root () {
44 // We are in /dist/helpers/utils.js
45 return join(__dirname, '..', '..', '..')
46}
47
48// --------------------------------------------------------------------------- 39// ---------------------------------------------------------------------------
49 40
50export { 41export {
51 badRequest, 42 badRequest,
52 createEmptyCallback, 43 createEmptyCallback,
53 generateRandomString, 44 generateRandomString,
54 isTestInstance, 45 getFormatedObjects
55 getFormatedObjects,
56 root
57} 46}
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 6dcb4bb91..b476ef928 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -2,7 +2,7 @@ import * as config from 'config'
2import { join } from 'path' 2import { join } from 'path'
3 3
4// Do not use barrels, remain constants as independent as possible 4// Do not use barrels, remain constants as independent as possible
5import { root, isTestInstance } from '../helpers/utils' 5import { root, isTestInstance } from '../helpers/core-utils'
6 6
7// --------------------------------------------------------------------------- 7// ---------------------------------------------------------------------------
8 8
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 78ca5ab84..0ab9e98db 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -5,7 +5,7 @@ import * as Sequelize from 'sequelize'
5import { CONFIG } from './constants' 5import { CONFIG } from './constants'
6// Do not use barrel, we need to load database first 6// Do not use barrel, we need to load database first
7import { logger } from '../helpers/logger' 7import { logger } from '../helpers/logger'
8import { isTestInstance } from '../helpers/utils' 8import { isTestInstance } from '../helpers/core-utils'
9import { 9import {
10 ApplicationModel, 10 ApplicationModel,
11 AuthorModel, 11 AuthorModel,
@@ -80,9 +80,9 @@ database.init = function (silent: boolean, callback: (err: Error) => void) {
80 files.filter(function (file) { 80 files.filter(function (file) {
81 // For all models but not utils.js 81 // For all models but not utils.js
82 if ( 82 if (
83 file === 'index.js' || 83 file === 'index.js' || file === 'index.ts' ||
84 file === 'utils.js' || 84 file === 'utils.js' || file === 'utils.ts' ||
85 file.endsWith('-interface.js') || 85 file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
86 file.endsWith('.js.map') 86 file.endsWith('.js.map')
87 ) return false 87 ) return false
88 88
diff --git a/yarn.lock b/yarn.lock
index 5b2fe58e9..a4f880cc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -944,7 +944,7 @@ dicer@0.2.5:
944 readable-stream "1.1.x" 944 readable-stream "1.1.x"
945 streamsearch "0.1.2" 945 streamsearch "0.1.2"
946 946
947diff@3.2.0, diff@^3.2.0: 947diff@3.2.0, diff@^3.1.0, diff@^3.2.0:
948 version "3.2.0" 948 version "3.2.0"
949 resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" 949 resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
950 950
@@ -2258,6 +2258,10 @@ magnet-uri@^5.1.3, magnet-uri@^5.1.4:
2258 uniq "^1.0.1" 2258 uniq "^1.0.1"
2259 xtend "^4.0.0" 2259 xtend "^4.0.0"
2260 2260
2261make-error@^1.1.1:
2262 version "1.3.0"
2263 resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
2264
2261map-stream@~0.1.0: 2265map-stream@~0.1.0:
2262 version "0.1.0" 2266 version "0.1.0"
2263 resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" 2267 resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -3395,7 +3399,7 @@ sntp@1.x.x:
3395 dependencies: 3399 dependencies:
3396 hoek "2.x.x" 3400 hoek "2.x.x"
3397 3401
3398source-map-support@^0.4.15: 3402source-map-support@^0.4.0, source-map-support@^0.4.15:
3399 version "0.4.15" 3403 version "0.4.15"
3400 resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1" 3404 resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
3401 dependencies: 3405 dependencies:
@@ -3574,7 +3578,7 @@ strip-bom@^3.0.0:
3574 version "3.0.0" 3578 version "3.0.0"
3575 resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" 3579 resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
3576 3580
3577strip-json-comments@~2.0.1: 3581strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
3578 version "2.0.1" 3582 version "2.0.1"
3579 resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" 3583 resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
3580 3584
@@ -3751,6 +3755,28 @@ tryit@^1.0.1:
3751 version "1.0.3" 3755 version "1.0.3"
3752 resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" 3756 resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
3753 3757
3758ts-node@^3.0.6:
3759 version "3.0.6"
3760 resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.0.6.tgz#55127ff790c7eebf6ba68c1e6dde94b09aaa21e0"
3761 dependencies:
3762 arrify "^1.0.0"
3763 chalk "^1.1.1"
3764 diff "^3.1.0"
3765 make-error "^1.1.1"
3766 minimist "^1.2.0"
3767 mkdirp "^0.5.1"
3768 source-map-support "^0.4.0"
3769 tsconfig "^6.0.0"
3770 v8flags "^2.0.11"
3771 yn "^2.0.0"
3772
3773tsconfig@^6.0.0:
3774 version "6.0.0"
3775 resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032"
3776 dependencies:
3777 strip-bom "^3.0.0"
3778 strip-json-comments "^2.0.0"
3779
3754tslib@^1.0.0, tslib@^1.7.1: 3780tslib@^1.0.0, tslib@^1.7.1:
3755 version "1.7.1" 3781 version "1.7.1"
3756 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" 3782 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
@@ -3897,6 +3923,10 @@ upper-case@^1.1.1:
3897 version "1.1.3" 3923 version "1.1.3"
3898 resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" 3924 resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
3899 3925
3926user-home@^1.1.1:
3927 version "1.1.1"
3928 resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
3929
3900user-home@^2.0.0: 3930user-home@^2.0.0:
3901 version "2.0.0" 3931 version "2.0.0"
3902 resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" 3932 resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
@@ -3939,6 +3969,12 @@ uuid@^3.0.0:
3939 version "3.0.1" 3969 version "3.0.1"
3940 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" 3970 resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
3941 3971
3972v8flags@^2.0.11:
3973 version "2.1.1"
3974 resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
3975 dependencies:
3976 user-home "^1.1.1"
3977
3942validator.js@^1.1.1: 3978validator.js@^1.1.1:
3943 version "1.2.3" 3979 version "1.2.3"
3944 resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1" 3980 resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1"
@@ -4099,6 +4135,10 @@ yallist@^2.1.2:
4099 version "2.1.2" 4135 version "2.1.2"
4100 resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" 4136 resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
4101 4137
4138yn@^2.0.0:
4139 version "2.0.0"
4140 resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
4141
4102zero-fill@^2.2.3: 4142zero-fill@^2.2.3:
4103 version "2.2.3" 4143 version "2.2.3"
4104 resolved "https://registry.yarnpkg.com/zero-fill/-/zero-fill-2.2.3.tgz#a3def06ba5e39ae644850bb4ca2ad4112b4855e9" 4144 resolved "https://registry.yarnpkg.com/zero-fill/-/zero-fill-2.2.3.tgz#a3def06ba5e39ae644850bb4ca2ad4112b4855e9"