diff options
-rw-r--r-- | client/config/webpack.common.js | 42 | ||||
-rw-r--r-- | client/config/webpack.dev.js | 392 | ||||
-rw-r--r-- | client/config/webpack.prod.js | 455 | ||||
-rw-r--r-- | client/config/webpack.video-embed.js | 183 | ||||
-rw-r--r-- | client/package.json | 5 | ||||
-rw-r--r-- | client/src/standalone/videos/embed.html | 135 | ||||
-rw-r--r-- | client/src/standalone/videos/embed.scss | 41 | ||||
-rw-r--r-- | client/src/standalone/videos/embed.ts | 103 | ||||
-rw-r--r-- | client/yarn.lock | 198 |
9 files changed, 942 insertions, 612 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index da900da85..5f6d254cc 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js | |||
@@ -8,7 +8,6 @@ const AssetsPlugin = require('assets-webpack-plugin') | |||
8 | const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin | 8 | const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin |
9 | const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') | 9 | const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') |
10 | const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') | 10 | const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') |
11 | const CopyWebpackPlugin = require('copy-webpack-plugin') | ||
12 | const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin | 11 | const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin |
13 | const HtmlWebpackPlugin = require('html-webpack-plugin') | 12 | const HtmlWebpackPlugin = require('html-webpack-plugin') |
14 | const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin') | 13 | const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin') |
@@ -253,47 +252,6 @@ module.exports = function (options) { | |||
253 | ), | 252 | ), |
254 | 253 | ||
255 | /* | 254 | /* |
256 | * Plugin: CopyWebpackPlugin | ||
257 | * Description: Copy files and directories in webpack. | ||
258 | * | ||
259 | * Copies project static assets. | ||
260 | * | ||
261 | * See: https://www.npmjs.com/package/copy-webpack-plugin | ||
262 | */ | ||
263 | |||
264 | // Used by embed.html | ||
265 | new CopyWebpackPlugin([ | ||
266 | { | ||
267 | from: 'src/assets', | ||
268 | to: 'assets' | ||
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 | }, | ||
290 | { | ||
291 | from: 'src/standalone', | ||
292 | to: 'standalone' | ||
293 | } | ||
294 | ]), | ||
295 | |||
296 | /* | ||
297 | * Plugin: ScriptExtHtmlWebpackPlugin | 255 | * Plugin: ScriptExtHtmlWebpackPlugin |
298 | * Description: Enhances html-webpack-plugin functionality | 256 | * Description: Enhances html-webpack-plugin functionality |
299 | * with different deployment options for your scripts including: | 257 | * with different deployment options for your scripts including: |
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js index c472ac762..9cf09db0f 100644 --- a/client/config/webpack.dev.js +++ b/client/config/webpack.dev.js | |||
@@ -2,6 +2,7 @@ const helpers = require('./helpers') | |||
2 | const webpackMerge = require('webpack-merge') // used to merge webpack configs | 2 | const webpackMerge = require('webpack-merge') // used to merge webpack configs |
3 | const webpackMergeDll = webpackMerge.strategy({plugins: 'replace'}) | 3 | const webpackMergeDll = webpackMerge.strategy({plugins: 'replace'}) |
4 | const commonConfig = require('./webpack.common.js') // the settings that are common to prod and dev | 4 | const commonConfig = require('./webpack.common.js') // the settings that are common to prod and dev |
5 | const videoEmbedConfig = require('./webpack.video-embed.js') | ||
5 | 6 | ||
6 | /** | 7 | /** |
7 | * Webpack Plugins | 8 | * Webpack Plugins |
@@ -34,220 +35,225 @@ const DllBundlesPlugin = require('webpack-dll-bundles-plugin').DllBundlesPlugin | |||
34 | * See: http://webpack.github.io/docs/configuration.html#cli | 35 | * See: http://webpack.github.io/docs/configuration.html#cli |
35 | */ | 36 | */ |
36 | module.exports = function (env) { | 37 | module.exports = function (env) { |
37 | return webpackMerge(commonConfig({ env: ENV }), { | 38 | return [ |
38 | /** | ||
39 | * Developer tool to enhance debugging | ||
40 | * | ||
41 | * See: http://webpack.github.io/docs/configuration.html#devtool | ||
42 | * See: https://github.com/webpack/docs/wiki/build-performance#sourcemaps | ||
43 | */ | ||
44 | devtool: 'cheap-module-source-map', | ||
45 | |||
46 | /** | ||
47 | * Options affecting the output of the compilation. | ||
48 | * | ||
49 | * See: http://webpack.github.io/docs/configuration.html#output | ||
50 | */ | ||
51 | output: { | ||
52 | /** | ||
53 | * The output directory as absolute path (required). | ||
54 | * | ||
55 | * See: http://webpack.github.io/docs/configuration.html#output-path | ||
56 | */ | ||
57 | path: helpers.root('dist'), | ||
58 | 39 | ||
40 | webpackMerge(commonConfig({ env: ENV }), { | ||
59 | /** | 41 | /** |
60 | * Specifies the name of each output file on disk. | 42 | * Developer tool to enhance debugging |
61 | * IMPORTANT: You must not specify an absolute path here! | ||
62 | * | 43 | * |
63 | * See: http://webpack.github.io/docs/configuration.html#output-filename | 44 | * See: http://webpack.github.io/docs/configuration.html#devtool |
45 | * See: https://github.com/webpack/docs/wiki/build-performance#sourcemaps | ||
64 | */ | 46 | */ |
65 | filename: '[name].bundle.js', | 47 | devtool: 'cheap-module-source-map', |
66 | 48 | ||
67 | /** | 49 | /** |
68 | * The filename of the SourceMaps for the JavaScript files. | 50 | * Options affecting the output of the compilation. |
69 | * They are inside the output.path directory. | ||
70 | * | 51 | * |
71 | * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename | 52 | * See: http://webpack.github.io/docs/configuration.html#output |
72 | */ | 53 | */ |
73 | sourceMapFilename: '[name].map', | 54 | output: { |
55 | /** | ||
56 | * The output directory as absolute path (required). | ||
57 | * | ||
58 | * See: http://webpack.github.io/docs/configuration.html#output-path | ||
59 | */ | ||
60 | path: helpers.root('dist'), | ||
74 | 61 | ||
75 | /** The filename of non-entry chunks as relative path | 62 | /** |
76 | * inside the output.path directory. | 63 | * Specifies the name of each output file on disk. |
77 | * | 64 | * IMPORTANT: You must not specify an absolute path here! |
78 | * See: http://webpack.github.io/docs/configuration.html#output-chunkfilename | 65 | * |
79 | */ | 66 | * See: http://webpack.github.io/docs/configuration.html#output-filename |
80 | chunkFilename: '[id].chunk.js', | 67 | */ |
81 | 68 | filename: '[name].bundle.js', | |
82 | library: 'ac_[name]', | ||
83 | libraryTarget: 'var' | ||
84 | }, | ||
85 | |||
86 | module: { | ||
87 | |||
88 | // Too slow, life is short | ||
89 | // rules: [ | ||
90 | // { | ||
91 | // test: /\.ts$/, | ||
92 | // use: [ | ||
93 | // { | ||
94 | // loader: 'tslint-loader', | ||
95 | // options: { | ||
96 | // configFile: 'tslint.json' | ||
97 | // } | ||
98 | // } | ||
99 | // ], | ||
100 | // exclude: [ | ||
101 | // /\.(spec|e2e)\.ts$/, | ||
102 | // /node_modules\// | ||
103 | // ] | ||
104 | // } | ||
105 | // ] | ||
106 | }, | ||
107 | |||
108 | plugins: [ | ||
109 | 69 | ||
110 | /** | 70 | /** |
111 | * Plugin: DefinePlugin | 71 | * The filename of the SourceMaps for the JavaScript files. |
112 | * Description: Define free variables. | 72 | * They are inside the output.path directory. |
113 | * Useful for having development builds with debug logging or adding global constants. | 73 | * |
114 | * | 74 | * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename |
115 | * Environment helpers | 75 | */ |
116 | * | 76 | sourceMapFilename: '[name].map', |
117 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin | 77 | |
118 | */ | 78 | /** The filename of non-entry chunks as relative path |
119 | // NOTE: when adding more properties, make sure you include them in custom-typings.d.ts | 79 | * inside the output.path directory. |
120 | new DefinePlugin({ | 80 | * |
121 | 'ENV': JSON.stringify(METADATA.ENV), | 81 | * See: http://webpack.github.io/docs/configuration.html#output-chunkfilename |
122 | 'HMR': METADATA.HMR, | 82 | */ |
123 | 'API_URL': JSON.stringify(METADATA.API_URL), | 83 | chunkFilename: '[id].chunk.js', |
124 | 'process.version': JSON.stringify(process.version), | 84 | |
125 | 'process.env': { | 85 | library: 'ac_[name]', |
86 | libraryTarget: 'var' | ||
87 | }, | ||
88 | |||
89 | module: { | ||
90 | |||
91 | // Too slow, life is short | ||
92 | // rules: [ | ||
93 | // { | ||
94 | // test: /\.ts$/, | ||
95 | // use: [ | ||
96 | // { | ||
97 | // loader: 'tslint-loader', | ||
98 | // options: { | ||
99 | // configFile: 'tslint.json' | ||
100 | // } | ||
101 | // } | ||
102 | // ], | ||
103 | // exclude: [ | ||
104 | // /\.(spec|e2e)\.ts$/, | ||
105 | // /node_modules\// | ||
106 | // ] | ||
107 | // } | ||
108 | // ] | ||
109 | }, | ||
110 | |||
111 | plugins: [ | ||
112 | |||
113 | /** | ||
114 | * Plugin: DefinePlugin | ||
115 | * Description: Define free variables. | ||
116 | * Useful for having development builds with debug logging or adding global constants. | ||
117 | * | ||
118 | * Environment helpers | ||
119 | * | ||
120 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin | ||
121 | */ | ||
122 | // NOTE: when adding more properties, make sure you include them in custom-typings.d.ts | ||
123 | new DefinePlugin({ | ||
126 | 'ENV': JSON.stringify(METADATA.ENV), | 124 | 'ENV': JSON.stringify(METADATA.ENV), |
127 | 'NODE_ENV': JSON.stringify(METADATA.ENV), | 125 | 'HMR': METADATA.HMR, |
128 | 'HMR': METADATA.HMR | 126 | 'API_URL': JSON.stringify(METADATA.API_URL), |
129 | } | 127 | 'process.version': JSON.stringify(process.version), |
130 | }), | 128 | 'process.env': { |
131 | 129 | 'ENV': JSON.stringify(METADATA.ENV), | |
132 | new DllBundlesPlugin({ | 130 | 'NODE_ENV': JSON.stringify(METADATA.ENV), |
133 | bundles: { | 131 | 'HMR': METADATA.HMR |
134 | polyfills: [ | 132 | } |
135 | 'core-js', | 133 | }), |
136 | { | 134 | |
137 | name: 'zone.js', | 135 | new DllBundlesPlugin({ |
138 | path: 'zone.js/dist/zone.js' | 136 | bundles: { |
137 | polyfills: [ | ||
138 | 'core-js', | ||
139 | { | ||
140 | name: 'zone.js', | ||
141 | path: 'zone.js/dist/zone.js' | ||
142 | }, | ||
143 | { | ||
144 | name: 'zone.js', | ||
145 | path: 'zone.js/dist/long-stack-trace-zone.js' | ||
146 | } | ||
147 | ], | ||
148 | vendor: [ | ||
149 | '@angular/platform-browser', | ||
150 | '@angular/platform-browser-dynamic', | ||
151 | '@angular/core', | ||
152 | '@angular/common', | ||
153 | '@angular/forms', | ||
154 | '@angular/http', | ||
155 | '@angular/router', | ||
156 | '@angularclass/hmr', | ||
157 | 'rxjs' | ||
158 | ] | ||
159 | }, | ||
160 | dllDir: helpers.root('dll'), | ||
161 | webpackConfig: webpackMergeDll(commonConfig({env: ENV}), { | ||
162 | devtool: 'cheap-module-source-map', | ||
163 | plugins: [] | ||
164 | }) | ||
165 | }), | ||
166 | |||
167 | /** | ||
168 | * Plugin: AddAssetHtmlPlugin | ||
169 | * Description: Adds the given JS or CSS file to the files | ||
170 | * Webpack knows about, and put it into the list of assets | ||
171 | * html-webpack-plugin injects into the generated html. | ||
172 | * | ||
173 | * See: https://github.com/SimenB/add-asset-html-webpack-plugin | ||
174 | */ | ||
175 | new AddAssetHtmlPlugin([ | ||
176 | { filepath: helpers.root(`dll/${DllBundlesPlugin.resolveFile('polyfills')}`) }, | ||
177 | { filepath: helpers.root(`dll/${DllBundlesPlugin.resolveFile('vendor')}`) } | ||
178 | ]), | ||
179 | |||
180 | /** | ||
181 | * Plugin: NamedModulesPlugin (experimental) | ||
182 | * Description: Uses file names as module name. | ||
183 | * | ||
184 | * See: https://github.com/webpack/webpack/commit/a04ffb928365b19feb75087c63f13cadfc08e1eb | ||
185 | */ | ||
186 | new NamedModulesPlugin(), | ||
187 | |||
188 | /** | ||
189 | * Plugin LoaderOptionsPlugin (experimental) | ||
190 | * | ||
191 | * See: https://gist.github.com/sokra/27b24881210b56bbaff7 | ||
192 | */ | ||
193 | new LoaderOptionsPlugin({ | ||
194 | debug: true, | ||
195 | options: { | ||
196 | |||
197 | /** | ||
198 | * Static analysis linter for TypeScript advanced options configuration | ||
199 | * Description: An extensible linter for the TypeScript language. | ||
200 | * | ||
201 | * See: https://github.com/wbuchwalter/tslint-loader | ||
202 | */ | ||
203 | tslint: { | ||
204 | emitErrors: false, | ||
205 | failOnHint: false, | ||
206 | typeCheck: true, | ||
207 | resourcePath: 'src' | ||
139 | }, | 208 | }, |
140 | { | 209 | |
141 | name: 'zone.js', | 210 | // FIXME: Remove |
142 | path: 'zone.js/dist/long-stack-trace-zone.js' | 211 | // https://github.com/bholloway/resolve-url-loader/issues/36 |
212 | // https://github.com/jtangelder/sass-loader/issues/289 | ||
213 | context: __dirname, | ||
214 | output: { | ||
215 | path: helpers.root('dist') | ||
143 | } | 216 | } |
144 | ], | 217 | |
145 | vendor: [ | 218 | } |
146 | '@angular/platform-browser', | ||
147 | '@angular/platform-browser-dynamic', | ||
148 | '@angular/core', | ||
149 | '@angular/common', | ||
150 | '@angular/forms', | ||
151 | '@angular/http', | ||
152 | '@angular/router', | ||
153 | '@angularclass/hmr', | ||
154 | 'rxjs' | ||
155 | ] | ||
156 | }, | ||
157 | dllDir: helpers.root('dll'), | ||
158 | webpackConfig: webpackMergeDll(commonConfig({env: ENV}), { | ||
159 | devtool: 'cheap-module-source-map', | ||
160 | plugins: [] | ||
161 | }) | 219 | }) |
162 | }), | ||
163 | 220 | ||
164 | /** | 221 | ], |
165 | * Plugin: AddAssetHtmlPlugin | ||
166 | * Description: Adds the given JS or CSS file to the files | ||
167 | * Webpack knows about, and put it into the list of assets | ||
168 | * html-webpack-plugin injects into the generated html. | ||
169 | * | ||
170 | * See: https://github.com/SimenB/add-asset-html-webpack-plugin | ||
171 | */ | ||
172 | new AddAssetHtmlPlugin([ | ||
173 | { filepath: helpers.root(`dll/${DllBundlesPlugin.resolveFile('polyfills')}`) }, | ||
174 | { filepath: helpers.root(`dll/${DllBundlesPlugin.resolveFile('vendor')}`) } | ||
175 | ]), | ||
176 | 222 | ||
177 | /** | 223 | /** |
178 | * Plugin: NamedModulesPlugin (experimental) | 224 | * Webpack Development Server configuration |
179 | * Description: Uses file names as module name. | 225 | * Description: The webpack-dev-server is a little node.js Express server. |
226 | * The server emits information about the compilation state to the client, | ||
227 | * which reacts to those events. | ||
180 | * | 228 | * |
181 | * See: https://github.com/webpack/webpack/commit/a04ffb928365b19feb75087c63f13cadfc08e1eb | 229 | * See: https://webpack.github.io/docs/webpack-dev-server.html |
182 | */ | 230 | */ |
183 | new NamedModulesPlugin(), | 231 | devServer: { |
232 | port: METADATA.port, | ||
233 | host: METADATA.host, | ||
234 | historyApiFallback: true, | ||
235 | watchOptions: { | ||
236 | ignored: /node_modules/ | ||
237 | } | ||
238 | }, | ||
184 | 239 | ||
185 | /** | 240 | /* |
186 | * Plugin LoaderOptionsPlugin (experimental) | 241 | * Include polyfills or mocks for various node stuff |
242 | * Description: Node configuration | ||
187 | * | 243 | * |
188 | * See: https://gist.github.com/sokra/27b24881210b56bbaff7 | 244 | * See: https://webpack.github.io/docs/configuration.html#node |
189 | */ | 245 | */ |
190 | new LoaderOptionsPlugin({ | 246 | node: { |
191 | debug: true, | 247 | global: true, |
192 | options: { | 248 | crypto: 'empty', |
193 | 249 | fs: 'empty', | |
194 | /** | 250 | process: true, |
195 | * Static analysis linter for TypeScript advanced options configuration | 251 | module: false, |
196 | * Description: An extensible linter for the TypeScript language. | 252 | clearImmediate: false, |
197 | * | 253 | setImmediate: false |
198 | * See: https://github.com/wbuchwalter/tslint-loader | ||
199 | */ | ||
200 | tslint: { | ||
201 | emitErrors: false, | ||
202 | failOnHint: false, | ||
203 | typeCheck: true, | ||
204 | resourcePath: 'src' | ||
205 | }, | ||
206 | |||
207 | // FIXME: Remove | ||
208 | // https://github.com/bholloway/resolve-url-loader/issues/36 | ||
209 | // https://github.com/jtangelder/sass-loader/issues/289 | ||
210 | context: __dirname, | ||
211 | output: { | ||
212 | path: helpers.root('dist') | ||
213 | } | ||
214 | |||
215 | } | ||
216 | }) | ||
217 | |||
218 | ], | ||
219 | |||
220 | /** | ||
221 | * Webpack Development Server configuration | ||
222 | * Description: The webpack-dev-server is a little node.js Express server. | ||
223 | * The server emits information about the compilation state to the client, | ||
224 | * which reacts to those events. | ||
225 | * | ||
226 | * See: https://webpack.github.io/docs/webpack-dev-server.html | ||
227 | */ | ||
228 | devServer: { | ||
229 | port: METADATA.port, | ||
230 | host: METADATA.host, | ||
231 | historyApiFallback: true, | ||
232 | watchOptions: { | ||
233 | ignored: /node_modules/ | ||
234 | } | 254 | } |
235 | }, | 255 | }), |
236 | 256 | ||
237 | /* | 257 | videoEmbedConfig({env: ENV}) |
238 | * Include polyfills or mocks for various node stuff | 258 | ] |
239 | * Description: Node configuration | ||
240 | * | ||
241 | * See: https://webpack.github.io/docs/configuration.html#node | ||
242 | */ | ||
243 | node: { | ||
244 | global: true, | ||
245 | crypto: 'empty', | ||
246 | fs: 'empty', | ||
247 | process: true, | ||
248 | module: false, | ||
249 | clearImmediate: false, | ||
250 | setImmediate: false | ||
251 | } | ||
252 | }) | ||
253 | } | 259 | } |
diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js index 4f33961f5..ddc9343a7 100644 --- a/client/config/webpack.prod.js +++ b/client/config/webpack.prod.js | |||
@@ -5,6 +5,7 @@ | |||
5 | const helpers = require('./helpers') | 5 | const helpers = require('./helpers') |
6 | const webpackMerge = require('webpack-merge') // used to merge webpack configs | 6 | const webpackMerge = require('webpack-merge') // used to merge webpack configs |
7 | const commonConfig = require('./webpack.common.js') // the settings that are common to prod and dev | 7 | const commonConfig = require('./webpack.common.js') // the settings that are common to prod and dev |
8 | const videoEmbedConfig = require('./webpack.video-embed.js') | ||
8 | 9 | ||
9 | /** | 10 | /** |
10 | * Webpack Plugins | 11 | * Webpack Plugins |
@@ -31,266 +32,270 @@ const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, { | |||
31 | }) | 32 | }) |
32 | 33 | ||
33 | module.exports = function (env) { | 34 | module.exports = function (env) { |
34 | return webpackMerge(commonConfig({env: ENV}), { | 35 | return [ |
35 | /** | 36 | videoEmbedConfig({ env: ENV }), |
36 | * Developer tool to enhance debugging | ||
37 | * | ||
38 | * See: http://webpack.github.io/docs/configuration.html#devtool | ||
39 | * See: https://github.com/webpack/docs/wiki/build-performance#sourcemaps | ||
40 | */ | ||
41 | devtool: 'source-map', | ||
42 | |||
43 | /** | ||
44 | * Options affecting the output of the compilation. | ||
45 | * | ||
46 | * See: http://webpack.github.io/docs/configuration.html#output | ||
47 | */ | ||
48 | output: { | ||
49 | 37 | ||
38 | webpackMerge(commonConfig({ env: ENV }), { | ||
50 | /** | 39 | /** |
51 | * The output directory as absolute path (required). | 40 | * Developer tool to enhance debugging |
52 | * | 41 | * |
53 | * See: http://webpack.github.io/docs/configuration.html#output-path | 42 | * See: http://webpack.github.io/docs/configuration.html#devtool |
43 | * See: https://github.com/webpack/docs/wiki/build-performance#sourcemaps | ||
54 | */ | 44 | */ |
55 | path: helpers.root('dist'), | 45 | devtool: 'source-map', |
56 | 46 | ||
57 | /** | 47 | /** |
58 | * Specifies the name of each output file on disk. | 48 | * Options affecting the output of the compilation. |
59 | * IMPORTANT: You must not specify an absolute path here! | ||
60 | * | 49 | * |
61 | * See: http://webpack.github.io/docs/configuration.html#output-filename | 50 | * See: http://webpack.github.io/docs/configuration.html#output |
62 | */ | 51 | */ |
63 | filename: '[name].[chunkhash].bundle.js', | 52 | output: { |
64 | 53 | ||
65 | /** | 54 | /** |
66 | * The filename of the SourceMaps for the JavaScript files. | 55 | * The output directory as absolute path (required). |
67 | * They are inside the output.path directory. | 56 | * |
68 | * | 57 | * See: http://webpack.github.io/docs/configuration.html#output-path |
69 | * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename | 58 | */ |
70 | */ | 59 | path: helpers.root('dist'), |
71 | sourceMapFilename: '[file].map', | ||
72 | 60 | ||
73 | /** | 61 | /** |
74 | * The filename of non-entry chunks as relative path | 62 | * Specifies the name of each output file on disk. |
75 | * inside the output.path directory. | 63 | * IMPORTANT: You must not specify an absolute path here! |
76 | * | 64 | * |
77 | * See: http://webpack.github.io/docs/configuration.html#output-chunkfilename | 65 | * See: http://webpack.github.io/docs/configuration.html#output-filename |
78 | */ | 66 | */ |
79 | chunkFilename: '[name].[chunkhash].chunk.js', | 67 | filename: '[name].[chunkhash].bundle.js', |
68 | |||
69 | /** | ||
70 | * The filename of the SourceMaps for the JavaScript files. | ||
71 | * They are inside the output.path directory. | ||
72 | * | ||
73 | * See: http://webpack.github.io/docs/configuration.html#output-sourcemapfilename | ||
74 | */ | ||
75 | sourceMapFilename: '[file].map', | ||
80 | 76 | ||
81 | publicPath: '/client/' | 77 | /** |
82 | }, | 78 | * The filename of non-entry chunks as relative path |
79 | * inside the output.path directory. | ||
80 | * | ||
81 | * See: http://webpack.github.io/docs/configuration.html#output-chunkfilename | ||
82 | */ | ||
83 | chunkFilename: '[name].[chunkhash].chunk.js', | ||
83 | 84 | ||
84 | module: { | 85 | publicPath: '/client/' |
85 | rules: [ | 86 | }, |
86 | { | 87 | |
87 | test: /junk\/index\.js$/, | 88 | module: { |
88 | // exclude: /(node_modules|bower_components)/, | 89 | rules: [ |
89 | use: { | 90 | { |
90 | loader: 'babel-loader', | 91 | test: /junk\/index\.js$/, |
91 | options: { | 92 | // exclude: /(node_modules|bower_components)/, |
92 | presets: [ 'env' ] | 93 | use: { |
94 | loader: 'babel-loader', | ||
95 | options: { | ||
96 | presets: [ 'env' ] | ||
97 | } | ||
93 | } | 98 | } |
94 | } | 99 | } |
95 | } | 100 | ] |
96 | ] | 101 | }, |
97 | }, | ||
98 | |||
99 | /** | ||
100 | * Add additional plugins to the compiler. | ||
101 | * | ||
102 | * See: http://webpack.github.io/docs/configuration.html#plugins | ||
103 | */ | ||
104 | plugins: [ | ||
105 | 102 | ||
106 | /** | 103 | /** |
107 | * Webpack plugin to optimize a JavaScript file for faster initial load | 104 | * Add additional plugins to the compiler. |
108 | * by wrapping eagerly-invoked functions. | ||
109 | * | 105 | * |
110 | * See: https://github.com/vigneshshanmugam/optimize-js-plugin | 106 | * See: http://webpack.github.io/docs/configuration.html#plugins |
111 | */ | 107 | */ |
108 | plugins: [ | ||
112 | 109 | ||
113 | new OptimizeJsPlugin({ | 110 | /** |
114 | sourceMap: false | 111 | * Webpack plugin to optimize a JavaScript file for faster initial load |
115 | }), | 112 | * by wrapping eagerly-invoked functions. |
113 | * | ||
114 | * See: https://github.com/vigneshshanmugam/optimize-js-plugin | ||
115 | */ | ||
116 | 116 | ||
117 | /** | 117 | new OptimizeJsPlugin({ |
118 | * Plugin: DedupePlugin | 118 | sourceMap: false |
119 | * Description: Prevents the inclusion of duplicate code into your bundle | 119 | }), |
120 | * and instead applies a copy of the function at runtime. | ||
121 | * | ||
122 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin | ||
123 | * See: https://github.com/webpack/docs/wiki/optimization#deduplication | ||
124 | */ | ||
125 | // new DedupePlugin(), | ||
126 | 120 | ||
127 | /** | 121 | /** |
128 | * Plugin: DefinePlugin | 122 | * Plugin: DedupePlugin |
129 | * Description: Define free variables. | 123 | * Description: Prevents the inclusion of duplicate code into your bundle |
130 | * Useful for having development builds with debug logging or adding global constants. | 124 | * and instead applies a copy of the function at runtime. |
131 | * | 125 | * |
132 | * Environment helpers | 126 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin |
133 | * | 127 | * See: https://github.com/webpack/docs/wiki/optimization#deduplication |
134 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin | 128 | */ |
135 | */ | 129 | // new DedupePlugin(), |
136 | // NOTE: when adding more properties make sure you include them in custom-typings.d.ts | 130 | |
137 | new DefinePlugin({ | 131 | /** |
138 | 'ENV': JSON.stringify(METADATA.ENV), | 132 | * Plugin: DefinePlugin |
139 | 'HMR': METADATA.HMR, | 133 | * Description: Define free variables. |
140 | 'API_URL': JSON.stringify(METADATA.API_URL), | 134 | * Useful for having development builds with debug logging or adding global constants. |
141 | 'process.version': JSON.stringify(process.version), | 135 | * |
142 | 'process.env': { | 136 | * Environment helpers |
137 | * | ||
138 | * See: https://webpack.github.io/docs/list-of-plugins.html#defineplugin | ||
139 | */ | ||
140 | // NOTE: when adding more properties make sure you include them in custom-typings.d.ts | ||
141 | new DefinePlugin({ | ||
143 | 'ENV': JSON.stringify(METADATA.ENV), | 142 | 'ENV': JSON.stringify(METADATA.ENV), |
144 | 'NODE_ENV': JSON.stringify(METADATA.ENV), | 143 | 'HMR': METADATA.HMR, |
145 | 'HMR': METADATA.HMR | 144 | 'API_URL': JSON.stringify(METADATA.API_URL), |
146 | } | 145 | 'process.version': JSON.stringify(process.version), |
147 | }), | 146 | 'process.env': { |
147 | 'ENV': JSON.stringify(METADATA.ENV), | ||
148 | 'NODE_ENV': JSON.stringify(METADATA.ENV), | ||
149 | 'HMR': METADATA.HMR | ||
150 | } | ||
151 | }), | ||
148 | 152 | ||
149 | /** | 153 | /** |
150 | * Plugin: UglifyJsPlugin | 154 | * Plugin: UglifyJsPlugin |
151 | * Description: Minimize all JavaScript output of chunks. | 155 | * Description: Minimize all JavaScript output of chunks. |
152 | * Loaders are switched into minimizing mode. | 156 | * Loaders are switched into minimizing mode. |
153 | * | 157 | * |
154 | * See: https://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin | 158 | * See: https://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin |
155 | */ | 159 | */ |
156 | // NOTE: To debug prod builds uncomment //debug lines and comment //prod lines | 160 | // NOTE: To debug prod builds uncomment //debug lines and comment //prod lines |
157 | new UglifyJsPlugin({ | 161 | new UglifyJsPlugin({ |
158 | // beautify: true, //debug | 162 | // beautify: true, //debug |
159 | // mangle: false, //debug | 163 | // mangle: false, //debug |
160 | // dead_code: false, //debug | 164 | // dead_code: false, //debug |
161 | // unused: false, //debug | 165 | // unused: false, //debug |
162 | // deadCode: false, //debug | 166 | // deadCode: false, //debug |
163 | // compress: { | 167 | // compress: { |
164 | // screw_ie8: true, | 168 | // screw_ie8: true, |
165 | // keep_fnames: true, | 169 | // keep_fnames: true, |
166 | // drop_debugger: false, | 170 | // drop_debugger: false, |
167 | // dead_code: false, | 171 | // dead_code: false, |
168 | // unused: false | 172 | // unused: false |
169 | // }, // debug | 173 | // }, // debug |
170 | // comments: true, //debug | 174 | // comments: true, //debug |
171 | 175 | ||
172 | beautify: false, // prod | 176 | beautify: false, // prod |
173 | output: { | 177 | output: { |
174 | comments: false | 178 | comments: false |
175 | }, // prod | 179 | }, // prod |
176 | mangle: { | 180 | mangle: { |
177 | screw_ie8: true | 181 | screw_ie8: true |
178 | }, // prod | 182 | }, // prod |
179 | compress: { | 183 | compress: { |
180 | screw_ie8: true, | 184 | screw_ie8: true, |
181 | warnings: false, | 185 | warnings: false, |
182 | conditionals: true, | 186 | conditionals: true, |
183 | unused: true, | 187 | unused: true, |
184 | comparisons: true, | 188 | comparisons: true, |
185 | sequences: true, | 189 | sequences: true, |
186 | dead_code: true, | 190 | dead_code: true, |
187 | evaluate: true, | 191 | evaluate: true, |
188 | if_return: true, | 192 | if_return: true, |
189 | join_vars: true, | 193 | join_vars: true, |
190 | negate_iife: false // we need this for lazy v8 | 194 | negate_iife: false // we need this for lazy v8 |
191 | } | 195 | } |
192 | }), | 196 | }), |
193 | 197 | ||
194 | new NormalModuleReplacementPlugin( | 198 | new NormalModuleReplacementPlugin( |
195 | /angular2-hmr/, | 199 | /angular2-hmr/, |
196 | helpers.root('config/empty.js') | 200 | helpers.root('config/empty.js') |
197 | ), | 201 | ), |
198 | 202 | ||
199 | new NormalModuleReplacementPlugin( | 203 | new NormalModuleReplacementPlugin( |
200 | /zone\.js(\\|\/)dist(\\|\/)long-stack-trace-zone/, | 204 | /zone\.js(\\|\/)dist(\\|\/)long-stack-trace-zone/, |
201 | helpers.root('config/empty.js') | 205 | helpers.root('config/empty.js') |
202 | ), | 206 | ), |
203 | 207 | ||
204 | new HashedModuleIdsPlugin(), | 208 | new HashedModuleIdsPlugin(), |
205 | 209 | ||
206 | /** | 210 | /** |
207 | * Plugin: IgnorePlugin | 211 | * Plugin: IgnorePlugin |
208 | * Description: Don’t generate modules for requests matching the provided RegExp. | 212 | * Description: Don’t generate modules for requests matching the provided RegExp. |
209 | * | 213 | * |
210 | * See: http://webpack.github.io/docs/list-of-plugins.html#ignoreplugin | 214 | * See: http://webpack.github.io/docs/list-of-plugins.html#ignoreplugin |
211 | */ | 215 | */ |
212 | 216 | ||
213 | // new IgnorePlugin(/angular2-hmr/), | 217 | // new IgnorePlugin(/angular2-hmr/), |
214 | 218 | ||
215 | /** | 219 | /** |
216 | * Plugin: CompressionPlugin | 220 | * Plugin: CompressionPlugin |
217 | * Description: Prepares compressed versions of assets to serve | 221 | * Description: Prepares compressed versions of assets to serve |
218 | * them with Content-Encoding | 222 | * them with Content-Encoding |
219 | * | 223 | * |
220 | * See: https://github.com/webpack/compression-webpack-plugin | 224 | * See: https://github.com/webpack/compression-webpack-plugin |
221 | */ | 225 | */ |
222 | // install compression-webpack-plugin | 226 | // install compression-webpack-plugin |
223 | // new CompressionPlugin({ | 227 | // new CompressionPlugin({ |
224 | // regExp: /\.css$|\.html$|\.js$|\.map$/, | 228 | // regExp: /\.css$|\.html$|\.js$|\.map$/, |
225 | // threshold: 2 * 1024 | 229 | // threshold: 2 * 1024 |
226 | // }) | 230 | // }) |
227 | 231 | ||
228 | /** | 232 | /** |
229 | * Plugin LoaderOptionsPlugin (experimental) | 233 | * Plugin LoaderOptionsPlugin (experimental) |
230 | * | 234 | * |
231 | * See: https://gist.github.com/sokra/27b24881210b56bbaff7 | 235 | * See: https://gist.github.com/sokra/27b24881210b56bbaff7 |
232 | */ | 236 | */ |
233 | new LoaderOptionsPlugin({ | 237 | new LoaderOptionsPlugin({ |
234 | minimize: true, | 238 | minimize: true, |
235 | debug: false, | 239 | debug: false, |
236 | options: { | 240 | options: { |
237 | 241 | ||
238 | /** | 242 | /** |
239 | * Static analysis linter for TypeScript advanced options configuration | 243 | * Static analysis linter for TypeScript advanced options configuration |
240 | * Description: An extensible linter for the TypeScript language. | 244 | * Description: An extensible linter for the TypeScript language. |
241 | * | 245 | * |
242 | * See: https://github.com/wbuchwalter/tslint-loader | 246 | * See: https://github.com/wbuchwalter/tslint-loader |
243 | */ | 247 | */ |
244 | tslint: { | 248 | tslint: { |
245 | emitErrors: true, | 249 | emitErrors: true, |
246 | failOnHint: true, | 250 | failOnHint: true, |
247 | resourcePath: 'src' | 251 | resourcePath: 'src' |
248 | }, | 252 | }, |
249 | 253 | ||
250 | /** | 254 | /** |
251 | * Html loader advanced options | 255 | * Html loader advanced options |
252 | * | 256 | * |
253 | * See: https://github.com/webpack/html-loader#advanced-options | 257 | * See: https://github.com/webpack/html-loader#advanced-options |
254 | */ | 258 | */ |
255 | // TODO: Need to workaround Angular 2's html syntax => #id [bind] (event) *ngFor | 259 | // TODO: Need to workaround Angular 2's html syntax => #id [bind] (event) *ngFor |
256 | htmlLoader: { | 260 | htmlLoader: { |
257 | minimize: true, | 261 | minimize: true, |
258 | removeAttributeQuotes: false, | 262 | removeAttributeQuotes: false, |
259 | caseSensitive: true, | 263 | caseSensitive: true, |
260 | customAttrSurround: [ | 264 | customAttrSurround: [ |
261 | [/#/, /(?:)/], | 265 | [/#/, /(?:)/], |
262 | [/\*/, /(?:)/], | 266 | [/\*/, /(?:)/], |
263 | [/\[?\(?/, /(?:)/] | 267 | [/\[?\(?/, /(?:)/] |
264 | ], | 268 | ], |
265 | customAttrAssign: [/\)?]?=/] | 269 | customAttrAssign: [/\)?]?=/] |
266 | }, | 270 | }, |
267 | 271 | ||
268 | // FIXME: Remove | 272 | // FIXME: Remove |
269 | // https://github.com/bholloway/resolve-url-loader/issues/36 | 273 | // https://github.com/bholloway/resolve-url-loader/issues/36 |
270 | // https://github.com/jtangelder/sass-loader/issues/289 | 274 | // https://github.com/jtangelder/sass-loader/issues/289 |
271 | context: __dirname, | 275 | context: __dirname, |
272 | output: { | 276 | output: { |
273 | path: helpers.root('dist') | 277 | path: helpers.root('dist') |
278 | } | ||
274 | } | 279 | } |
275 | } | 280 | }) |
276 | }) | 281 | ], |
277 | ], | ||
278 | 282 | ||
279 | /* | 283 | /* |
280 | * Include polyfills or mocks for various node stuff | 284 | * Include polyfills or mocks for various node stuff |
281 | * Description: Node configuration | 285 | * Description: Node configuration |
282 | * | 286 | * |
283 | * See: https://webpack.github.io/docs/configuration.html#node | 287 | * See: https://webpack.github.io/docs/configuration.html#node |
284 | */ | 288 | */ |
285 | node: { | 289 | node: { |
286 | global: true, | 290 | global: true, |
287 | crypto: 'empty', | 291 | crypto: 'empty', |
288 | fs: 'empty', | 292 | fs: 'empty', |
289 | process: true, | 293 | process: true, |
290 | module: false, | 294 | module: false, |
291 | clearImmediate: false, | 295 | clearImmediate: false, |
292 | setImmediate: false | 296 | setImmediate: false |
293 | } | 297 | } |
294 | 298 | ||
295 | }) | 299 | }) |
300 | ] | ||
296 | } | 301 | } |
diff --git a/client/config/webpack.video-embed.js b/client/config/webpack.video-embed.js new file mode 100644 index 000000000..a04d5be8b --- /dev/null +++ b/client/config/webpack.video-embed.js | |||
@@ -0,0 +1,183 @@ | |||
1 | const helpers = require('./helpers') | ||
2 | |||
3 | const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin | ||
4 | const HtmlWebpackPlugin = require('html-webpack-plugin') | ||
5 | const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin') | ||
6 | const HashedModuleIdsPlugin = require('webpack/lib/HashedModuleIdsPlugin') | ||
7 | const ExtractTextPlugin = require('extract-text-webpack-plugin') | ||
8 | const PurifyCSSPlugin = require('purifycss-webpack') | ||
9 | |||
10 | module.exports = function (options) { | ||
11 | const isProd = options.env === 'production' | ||
12 | |||
13 | const configuration = { | ||
14 | entry: { | ||
15 | 'video-embed': './src/standalone/videos/embed.ts' | ||
16 | }, | ||
17 | |||
18 | resolve: { | ||
19 | /* | ||
20 | * An array of extensions that should be used to resolve modules. | ||
21 | * | ||
22 | * See: http://webpack.github.io/docs/configuration.html#resolve-extensions | ||
23 | */ | ||
24 | extensions: [ '.ts', '.js', '.json', '.scss' ], | ||
25 | |||
26 | modules: [ helpers.root('src'), helpers.root('node_modules') ] | ||
27 | }, | ||
28 | |||
29 | output: { | ||
30 | path: helpers.root('dist/standalone/videos'), | ||
31 | filename: '[name].[hash].bundle.js', | ||
32 | sourceMapFilename: '[file].map', | ||
33 | chunkFilename: '[id].chunk.js', | ||
34 | publicPath: '/client/standalone/videos/' | ||
35 | }, | ||
36 | |||
37 | module: { | ||
38 | |||
39 | rules: [ | ||
40 | { | ||
41 | test: /\.ts$/, | ||
42 | use: [ | ||
43 | { | ||
44 | loader: 'awesome-typescript-loader', | ||
45 | options: { | ||
46 | configFileName: 'tsconfig.webpack.json', | ||
47 | useCache: !isProd | ||
48 | } | ||
49 | } | ||
50 | ], | ||
51 | exclude: [/\.(spec|e2e)\.ts$/] | ||
52 | }, | ||
53 | |||
54 | { | ||
55 | test: /\.(sass|scss)$/, | ||
56 | use: ExtractTextPlugin.extract({ | ||
57 | fallback: 'style-loader', | ||
58 | use: [ | ||
59 | { | ||
60 | loader: 'css-loader', | ||
61 | options: { | ||
62 | sourceMap: true, | ||
63 | importLoaders: 1 | ||
64 | } | ||
65 | }, | ||
66 | 'resolve-url-loader', | ||
67 | { | ||
68 | loader: 'sass-loader', | ||
69 | options: { | ||
70 | sourceMap: true | ||
71 | } | ||
72 | }, | ||
73 | { | ||
74 | loader: 'sass-resources-loader', | ||
75 | options: { | ||
76 | resources: [ | ||
77 | helpers.root('src/sass/_variables.scss') | ||
78 | ] | ||
79 | } | ||
80 | } | ||
81 | ] | ||
82 | }) | ||
83 | }, | ||
84 | |||
85 | { | ||
86 | test: /\.html$/, | ||
87 | use: 'raw-loader', | ||
88 | exclude: [ | ||
89 | helpers.root('src/index.html'), | ||
90 | helpers.root('src/standalone/videos/embed.html') | ||
91 | ] | ||
92 | }, | ||
93 | |||
94 | { | ||
95 | test: /\.(jpg|png|gif)$/, | ||
96 | use: 'url-loader' | ||
97 | }, | ||
98 | |||
99 | { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' }, | ||
100 | { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' } | ||
101 | ] | ||
102 | |||
103 | }, | ||
104 | |||
105 | plugins: [ | ||
106 | new ExtractTextPlugin({ | ||
107 | filename: '[name].[contenthash].css' | ||
108 | }), | ||
109 | |||
110 | new PurifyCSSPlugin({ | ||
111 | paths: [ helpers.root('src/standalone/videos/embed.ts') ], | ||
112 | purifyOptions: { | ||
113 | minify: true, | ||
114 | whitelist: [ '*vjs*', '*video-js*' ] | ||
115 | } | ||
116 | }), | ||
117 | |||
118 | new CheckerPlugin(), | ||
119 | |||
120 | new HtmlWebpackPlugin({ | ||
121 | template: 'src/standalone/videos/embed.html', | ||
122 | filename: 'embed.html', | ||
123 | title: 'PeerTube', | ||
124 | chunksSortMode: 'dependency', | ||
125 | inject: 'body' | ||
126 | }) | ||
127 | ], | ||
128 | |||
129 | node: { | ||
130 | global: true, | ||
131 | crypto: 'empty', | ||
132 | fs: 'empty', | ||
133 | process: true, | ||
134 | module: false, | ||
135 | clearImmediate: false, | ||
136 | setImmediate: false | ||
137 | } | ||
138 | } | ||
139 | |||
140 | if (isProd) { | ||
141 | configuration.module.rules.push( | ||
142 | { | ||
143 | test: /junk\/index\.js$/, | ||
144 | // exclude: /(node_modules|bower_components)/, | ||
145 | use: { | ||
146 | loader: 'babel-loader', | ||
147 | options: { | ||
148 | presets: [ 'env' ] | ||
149 | } | ||
150 | } | ||
151 | } | ||
152 | ) | ||
153 | |||
154 | configuration.plugins.push( | ||
155 | new UglifyJsPlugin({ | ||
156 | beautify: false, | ||
157 | output: { | ||
158 | comments: false | ||
159 | }, // prod | ||
160 | mangle: { | ||
161 | screw_ie8: true | ||
162 | }, // prod | ||
163 | compress: { | ||
164 | screw_ie8: true, | ||
165 | warnings: false, | ||
166 | conditionals: true, | ||
167 | unused: true, | ||
168 | comparisons: true, | ||
169 | sequences: true, | ||
170 | dead_code: true, | ||
171 | evaluate: true, | ||
172 | if_return: true, | ||
173 | join_vars: true, | ||
174 | negate_iife: false // we need this for lazy v8 | ||
175 | } | ||
176 | }), | ||
177 | |||
178 | new HashedModuleIdsPlugin() | ||
179 | ) | ||
180 | } | ||
181 | |||
182 | return configuration | ||
183 | } | ||
diff --git a/client/package.json b/client/package.json index b19a3e57d..f66c6e2c2 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -86,7 +86,7 @@ | |||
86 | "url-loader": "^0.5.7", | 86 | "url-loader": "^0.5.7", |
87 | "video.js": "^6.2.0", | 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.3.0", |
90 | "webpack-merge": "~4.1.0", | 90 | "webpack-merge": "~4.1.0", |
91 | "webpack-notifier": "^1.3.0", | 91 | "webpack-notifier": "^1.3.0", |
92 | "webtorrent": "^0.98.0", | 92 | "webtorrent": "^0.98.0", |
@@ -96,6 +96,9 @@ | |||
96 | "@types/webtorrent": "^0.98.4", | 96 | "@types/webtorrent": "^0.98.4", |
97 | "add-asset-html-webpack-plugin": "^2.0.1", | 97 | "add-asset-html-webpack-plugin": "^2.0.1", |
98 | "codelyzer": "^3.0.0-beta.4", | 98 | "codelyzer": "^3.0.0-beta.4", |
99 | "extract-text-webpack-plugin": "^3.0.0", | ||
100 | "purify-css": "^1.2.5", | ||
101 | "purifycss-webpack": "^0.7.0", | ||
99 | "standard": "^10.0.0", | 102 | "standard": "^10.0.0", |
100 | "tslint-config-standard": "^6.0.1", | 103 | "tslint-config-standard": "^6.0.1", |
101 | "webpack-bundle-analyzer": "^2.8.2", | 104 | "webpack-bundle-analyzer": "^2.8.2", |
diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html index f72080937..627acb5af 100644 --- a/client/src/standalone/videos/embed.html +++ b/client/src/standalone/videos/embed.html | |||
@@ -7,143 +7,12 @@ | |||
7 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 7 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
8 | 8 | ||
9 | <link rel="icon" type="image/png" href="/client/assets/favicon.png" /> | 9 | <link rel="icon" type="image/png" href="/client/assets/favicon.png" /> |
10 | |||
11 | <link rel="stylesheet" href="/client/assets/video-js/video-js.min.css"> | ||
12 | <link rel="stylesheet" href="/client/assets/video-js/videojs-dock.css"> | ||
13 | |||
14 | <script src="/client/assets/webtorrent/webtorrent.min.js"></script> | ||
15 | <script src="/client/assets/video-js/video.min.js"></script> | ||
16 | <script src="/client/assets/video-js/videojs-dock.min.js"></script> | ||
17 | |||
18 | <style> | ||
19 | video { | ||
20 | width: 99%; | ||
21 | } | ||
22 | |||
23 | /* fill the entire space */ | ||
24 | html, body { | ||
25 | height: 100%; | ||
26 | margin: 0; | ||
27 | } | ||
28 | |||
29 | .video-js { | ||
30 | width: 100%; | ||
31 | height: 100%; | ||
32 | } | ||
33 | |||
34 | .vjs-poster { | ||
35 | background-size: 100% auto; | ||
36 | } | ||
37 | |||
38 | .vjs-peertube-link { | ||
39 | color: white; | ||
40 | text-decoration: none; | ||
41 | font-size: 1.3em; | ||
42 | line-height: 2.20; | ||
43 | transition: all .4s; | ||
44 | } | ||
45 | |||
46 | .vjs-peertube-link:hover { | ||
47 | text-shadow: 0 0 1em #fff; | ||
48 | } | ||
49 | |||
50 | </style> | ||
51 | </head> | 10 | </head> |
52 | 11 | ||
53 | <body> | 12 | <body> |
54 | 13 | ||
55 | <video id="video-container" class="video-js vjs-default-skin vjs-big-play-centered"> | 14 | <video id="video-container" class="video-js vjs-sublime-skin vjs-big-play-centered"> |
56 | </video> | 15 | </video> |
57 | |||
58 | |||
59 | <script> | ||
60 | function loadVideoInfos (videoId, callback) { | ||
61 | var xhttp = new XMLHttpRequest() | ||
62 | xhttp.onreadystatechange = function () { | ||
63 | if (this.readyState === 4 && this.status === 200) { | ||
64 | var json = JSON.parse(this.responseText) | ||
65 | return callback(json) | ||
66 | } | ||
67 | } | ||
68 | |||
69 | var url = window.location.origin + '/api/v1/videos/' + videoId | ||
70 | xhttp.open('GET', url, true) | ||
71 | xhttp.send() | ||
72 | } | ||
73 | |||
74 | function loadVideoTorrent (magnetUri, player) { | ||
75 | console.log('Loading video ' + videoId) | ||
76 | var client = new window.WebTorrent() | ||
77 | |||
78 | console.log('Adding magnet ' + magnetUri) | ||
79 | client.add(magnetUri, function (torrent) { | ||
80 | var file = torrent.files[0] | ||
81 | |||
82 | file.renderTo('video', function (err) { | ||
83 | if (err) { | ||
84 | console.error(err) | ||
85 | return | ||
86 | } | ||
87 | |||
88 | // Hack to "simulate" src link in video.js >= 6 | ||
89 | // If no, we can't play the video after pausing it | ||
90 | // https://github.com/videojs/video.js/blob/master/src/js/player.js#L1633 | ||
91 | player.src = function () { return true } | ||
92 | |||
93 | player.play() | ||
94 | }) | ||
95 | }) | ||
96 | } | ||
97 | |||
98 | var urlParts = window.location.href.split('/') | ||
99 | var videoId = urlParts[urlParts.length - 1] | ||
100 | |||
101 | loadVideoInfos(videoId, function (videoInfos) { | ||
102 | var magnetUri = videoInfos.magnetUri | ||
103 | var videoContainer = document.getElementById('video-container') | ||
104 | var previewUrl = window.location.origin + videoInfos.previewPath | ||
105 | videoContainer.poster = previewUrl | ||
106 | |||
107 | videojs('video-container', { controls: true, autoplay: false }, function () { | ||
108 | var player = this | ||
109 | |||
110 | var Button = videojs.getComponent('Button') | ||
111 | var peertubeLinkButton = videojs.extend(Button, { | ||
112 | constructor: function () { | ||
113 | Button.apply(this, arguments) | ||
114 | }, | ||
115 | |||
116 | createEl: function () { | ||
117 | var link = document.createElement('a') | ||
118 | link.href = window.location.href.replace('embed', 'watch') | ||
119 | link.innerHTML = 'PeerTube' | ||
120 | link.title = 'Go to the video page' | ||
121 | link.className = 'vjs-peertube-link' | ||
122 | link.target = '_blank' | ||
123 | |||
124 | return link | ||
125 | }, | ||
126 | |||
127 | handleClick: function () { | ||
128 | player.pause() | ||
129 | } | ||
130 | }) | ||
131 | videojs.registerComponent('PeerTubeLinkButton', peertubeLinkButton) | ||
132 | |||
133 | var controlBar = player.getChild('controlBar') | ||
134 | var addedLink = controlBar.addChild('PeerTubeLinkButton', {}) | ||
135 | controlBar.el().insertBefore(addedLink.el(), controlBar.fullscreenToggle.el()) | ||
136 | |||
137 | player.dock({ | ||
138 | title: videoInfos.name | ||
139 | }) | ||
140 | |||
141 | document.querySelector('.vjs-big-play-button').addEventListener('click', function () { | ||
142 | loadVideoTorrent(magnetUri, player) | ||
143 | }, false) | ||
144 | }) | ||
145 | }) | ||
146 | 16 | ||
147 | </script> | ||
148 | </body> | 17 | </body> |
149 | </html | 18 | </html |
diff --git a/client/src/standalone/videos/embed.scss b/client/src/standalone/videos/embed.scss new file mode 100644 index 000000000..a4c44a59b --- /dev/null +++ b/client/src/standalone/videos/embed.scss | |||
@@ -0,0 +1,41 @@ | |||
1 | @import '~video.js/dist/video-js.css'; | ||
2 | @import '~videojs-dock/dist/videojs-dock.css'; | ||
3 | @import '../../sass/video-js-custom.scss'; | ||
4 | |||
5 | video { | ||
6 | width: 99%; | ||
7 | } | ||
8 | |||
9 | /* fill the entire space */ | ||
10 | html, body { | ||
11 | height: 100%; | ||
12 | margin: 0; | ||
13 | } | ||
14 | |||
15 | .video-js { | ||
16 | width: 100%; | ||
17 | height: 100%; | ||
18 | } | ||
19 | |||
20 | .vjs-poster { | ||
21 | background-size: 100% auto; | ||
22 | } | ||
23 | |||
24 | .vjs-peertube-link { | ||
25 | color: white; | ||
26 | text-decoration: none; | ||
27 | font-size: 1.3em; | ||
28 | line-height: 2.20; | ||
29 | transition: all .4s; | ||
30 | position: relative; | ||
31 | right: 6px; | ||
32 | } | ||
33 | |||
34 | .vjs-peertube-link:hover { | ||
35 | text-shadow: 0 0 1em #fff; | ||
36 | } | ||
37 | |||
38 | // Fix volume panel because we added a new component (PeerTube link) | ||
39 | .vjs-volume-panel { | ||
40 | margin-right: 90px !important; | ||
41 | } | ||
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts new file mode 100644 index 000000000..64a0f0798 --- /dev/null +++ b/client/src/standalone/videos/embed.ts | |||
@@ -0,0 +1,103 @@ | |||
1 | import './embed.scss' | ||
2 | |||
3 | import videojs from 'video.js' | ||
4 | import 'videojs-dock/dist/videojs-dock.es.js' | ||
5 | import * as WebTorrent from 'webtorrent' | ||
6 | import { Video } from '../../../../shared' | ||
7 | |||
8 | // videojs typings don't have some method we need | ||
9 | const videojsUntyped = videojs as any | ||
10 | |||
11 | function loadVideoInfos (videoId: string, callback: (err: Error, res?: Video) => void) { | ||
12 | const xhttp = new XMLHttpRequest() | ||
13 | xhttp.onreadystatechange = function () { | ||
14 | if (this.readyState === 4 && this.status === 200) { | ||
15 | const json = JSON.parse(this.responseText) | ||
16 | return callback(null, json) | ||
17 | } | ||
18 | } | ||
19 | |||
20 | xhttp.onerror = err => callback(err.error) | ||
21 | |||
22 | const url = window.location.origin + '/api/v1/videos/' + videoId | ||
23 | xhttp.open('GET', url, true) | ||
24 | xhttp.send() | ||
25 | } | ||
26 | |||
27 | function loadVideoTorrent (magnetUri: string, player: videojs.Player) { | ||
28 | console.log('Loading video ' + videoId) | ||
29 | const client = new WebTorrent() | ||
30 | |||
31 | console.log('Adding magnet ' + magnetUri) | ||
32 | client.add(magnetUri, torrent => { | ||
33 | const file = torrent.files[0] | ||
34 | |||
35 | file.renderTo('video', err => { | ||
36 | if (err) { | ||
37 | console.error(err) | ||
38 | return | ||
39 | } | ||
40 | |||
41 | // Hack to "simulate" src link in video.js >= 6 | ||
42 | // If no, we can't play the video after pausing it | ||
43 | // https://github.com/videojs/video.js/blob/master/src/js/player.js#L1633 | ||
44 | (player as any).src = () => true | ||
45 | |||
46 | player.play() | ||
47 | }) | ||
48 | }) | ||
49 | } | ||
50 | |||
51 | const urlParts = window.location.href.split('/') | ||
52 | const videoId = urlParts[urlParts.length - 1] | ||
53 | |||
54 | loadVideoInfos(videoId, (err, videoInfos) => { | ||
55 | if (err) { | ||
56 | console.error(err) | ||
57 | return | ||
58 | } | ||
59 | |||
60 | const magnetUri = videoInfos.magnetUri | ||
61 | const videoContainer = document.getElementById('video-container') as HTMLVideoElement | ||
62 | const previewUrl = window.location.origin + videoInfos.previewPath | ||
63 | videoContainer.poster = previewUrl | ||
64 | |||
65 | videojs('video-container', { controls: true, autoplay: false }, function () { | ||
66 | const player = this | ||
67 | |||
68 | const Button = videojsUntyped.getComponent('Button') | ||
69 | const peertubeLinkButton = videojsUntyped.extend(Button, { | ||
70 | constructor: function () { | ||
71 | Button.apply(this, arguments) | ||
72 | }, | ||
73 | |||
74 | createEl: function () { | ||
75 | const link = document.createElement('a') | ||
76 | link.href = window.location.href.replace('embed', 'watch') | ||
77 | link.innerHTML = 'PeerTube' | ||
78 | link.title = 'Go to the video page' | ||
79 | link.className = 'vjs-peertube-link' | ||
80 | link.target = '_blank' | ||
81 | |||
82 | return link | ||
83 | }, | ||
84 | |||
85 | handleClick: function () { | ||
86 | player.pause() | ||
87 | } | ||
88 | }) | ||
89 | videojsUntyped.registerComponent('PeerTubeLinkButton', peertubeLinkButton) | ||
90 | |||
91 | const controlBar = player.getChild('controlBar') | ||
92 | const addedLink = controlBar.addChild('PeerTubeLinkButton', {}) | ||
93 | controlBar.el().insertBefore(addedLink.el(), controlBar.fullscreenToggle.el()) | ||
94 | |||
95 | player.dock({ | ||
96 | title: videoInfos.name | ||
97 | }) | ||
98 | |||
99 | document.querySelector('.vjs-big-play-button').addEventListener('click', () => { | ||
100 | loadVideoTorrent(magnetUri, player) | ||
101 | }, false) | ||
102 | }) | ||
103 | }) | ||
diff --git a/client/yarn.lock b/client/yarn.lock index 9a6aff1b2..a8bd103dc 100644 --- a/client/yarn.lock +++ b/client/yarn.lock | |||
@@ -235,7 +235,7 @@ ajv-keywords@^2.0.0: | |||
235 | version "2.1.0" | 235 | version "2.1.0" |
236 | resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0" | 236 | resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0" |
237 | 237 | ||
238 | ajv@^4.7.0, ajv@^4.9.1: | 238 | ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1: |
239 | version "4.11.8" | 239 | version "4.11.8" |
240 | resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" | 240 | resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" |
241 | dependencies: | 241 | dependencies: |
@@ -442,7 +442,7 @@ async@^1.5.2: | |||
442 | version "1.5.2" | 442 | version "1.5.2" |
443 | resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" | 443 | resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" |
444 | 444 | ||
445 | async@^2.1.2, async@^2.1.4, async@^2.1.5: | 445 | async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1: |
446 | version "2.5.0" | 446 | version "2.5.0" |
447 | resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" | 447 | resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" |
448 | dependencies: | 448 | dependencies: |
@@ -1309,7 +1309,7 @@ camelcase@^3.0.0: | |||
1309 | version "3.0.0" | 1309 | version "3.0.0" |
1310 | resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" | 1310 | resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" |
1311 | 1311 | ||
1312 | camelcase@^4.0.0: | 1312 | camelcase@^4.0.0, camelcase@^4.1.0: |
1313 | version "4.1.0" | 1313 | version "4.1.0" |
1314 | resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" | 1314 | resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" |
1315 | 1315 | ||
@@ -1366,7 +1366,7 @@ chalk@^2.0.1: | |||
1366 | escape-string-regexp "^1.0.5" | 1366 | escape-string-regexp "^1.0.5" |
1367 | supports-color "^4.0.0" | 1367 | supports-color "^4.0.0" |
1368 | 1368 | ||
1369 | chokidar@^1.4.3, chokidar@^1.6.0: | 1369 | chokidar@^1.6.0, chokidar@^1.7.0: |
1370 | version "1.7.0" | 1370 | version "1.7.0" |
1371 | resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" | 1371 | resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" |
1372 | dependencies: | 1372 | dependencies: |
@@ -1415,6 +1415,12 @@ clean-css@4.1.x: | |||
1415 | dependencies: | 1415 | dependencies: |
1416 | source-map "0.5.x" | 1416 | source-map "0.5.x" |
1417 | 1417 | ||
1418 | clean-css@^4.0.12: | ||
1419 | version "4.1.7" | ||
1420 | resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.7.tgz#b9aea4f85679889cf3eae8b40349ec4ebdfdd032" | ||
1421 | dependencies: | ||
1422 | source-map "0.5.x" | ||
1423 | |||
1418 | cli-cursor@^1.0.1: | 1424 | cli-cursor@^1.0.1: |
1419 | version "1.0.2" | 1425 | version "1.0.2" |
1420 | resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" | 1426 | resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" |
@@ -1548,7 +1554,7 @@ commander@2.9.x, commander@~2.9.0: | |||
1548 | dependencies: | 1554 | dependencies: |
1549 | graceful-readlink ">= 1.0.0" | 1555 | graceful-readlink ">= 1.0.0" |
1550 | 1556 | ||
1551 | commander@^2.9.0: | 1557 | commander@^2.9.0, commander@~2.11.0: |
1552 | version "2.11.0" | 1558 | version "2.11.0" |
1553 | resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" | 1559 | resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" |
1554 | 1560 | ||
@@ -1711,6 +1717,14 @@ cross-spawn@^3.0.0: | |||
1711 | lru-cache "^4.0.1" | 1717 | lru-cache "^4.0.1" |
1712 | which "^1.2.9" | 1718 | which "^1.2.9" |
1713 | 1719 | ||
1720 | cross-spawn@^5.0.1: | ||
1721 | version "5.1.0" | ||
1722 | resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" | ||
1723 | dependencies: | ||
1724 | lru-cache "^4.0.1" | ||
1725 | shebang-command "^1.2.0" | ||
1726 | which "^1.2.9" | ||
1727 | |||
1714 | cryptiles@2.x.x: | 1728 | cryptiles@2.x.x: |
1715 | version "2.0.5" | 1729 | version "2.0.5" |
1716 | resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" | 1730 | resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" |
@@ -2129,7 +2143,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: | |||
2129 | dependencies: | 2143 | dependencies: |
2130 | once "^1.4.0" | 2144 | once "^1.4.0" |
2131 | 2145 | ||
2132 | enhanced-resolve@^3.0.0, enhanced-resolve@^3.1.0: | 2146 | enhanced-resolve@^3.1.0, enhanced-resolve@^3.3.0: |
2133 | version "3.3.0" | 2147 | version "3.3.0" |
2134 | resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3" | 2148 | resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3" |
2135 | dependencies: | 2149 | dependencies: |
@@ -2437,6 +2451,18 @@ evp_bytestokey@^1.0.0: | |||
2437 | dependencies: | 2451 | dependencies: |
2438 | create-hash "^1.1.1" | 2452 | create-hash "^1.1.1" |
2439 | 2453 | ||
2454 | execa@^0.7.0: | ||
2455 | version "0.7.0" | ||
2456 | resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" | ||
2457 | dependencies: | ||
2458 | cross-spawn "^5.0.1" | ||
2459 | get-stream "^3.0.0" | ||
2460 | is-stream "^1.1.0" | ||
2461 | npm-run-path "^2.0.0" | ||
2462 | p-finally "^1.0.0" | ||
2463 | signal-exit "^3.0.0" | ||
2464 | strip-eof "^1.0.0" | ||
2465 | |||
2440 | exit-hook@^1.0.0: | 2466 | exit-hook@^1.0.0: |
2441 | version "1.1.1" | 2467 | version "1.1.1" |
2442 | resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" | 2468 | resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" |
@@ -2507,6 +2533,15 @@ extglob@^0.3.1: | |||
2507 | dependencies: | 2533 | dependencies: |
2508 | is-extglob "^1.0.0" | 2534 | is-extglob "^1.0.0" |
2509 | 2535 | ||
2536 | extract-text-webpack-plugin@^3.0.0: | ||
2537 | version "3.0.0" | ||
2538 | resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612" | ||
2539 | dependencies: | ||
2540 | async "^2.4.1" | ||
2541 | loader-utils "^1.1.0" | ||
2542 | schema-utils "^0.3.0" | ||
2543 | webpack-sources "^1.0.1" | ||
2544 | |||
2510 | extsprintf@1.0.2: | 2545 | extsprintf@1.0.2: |
2511 | version "1.0.2" | 2546 | version "1.0.2" |
2512 | resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" | 2547 | resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" |
@@ -2780,6 +2815,10 @@ get-stdin@^5.0.1: | |||
2780 | version "5.0.1" | 2815 | version "5.0.1" |
2781 | resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" | 2816 | resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" |
2782 | 2817 | ||
2818 | get-stream@^3.0.0: | ||
2819 | version "3.0.0" | ||
2820 | resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" | ||
2821 | |||
2783 | getpass@^0.1.1: | 2822 | getpass@^0.1.1: |
2784 | version "0.1.7" | 2823 | version "0.1.7" |
2785 | resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" | 2824 | resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" |
@@ -3364,6 +3403,10 @@ is-resolvable@^1.0.0: | |||
3364 | dependencies: | 3403 | dependencies: |
3365 | tryit "^1.0.1" | 3404 | tryit "^1.0.1" |
3366 | 3405 | ||
3406 | is-stream@^1.1.0: | ||
3407 | version "1.1.0" | ||
3408 | resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" | ||
3409 | |||
3367 | is-svg@^2.0.0: | 3410 | is-svg@^2.0.0: |
3368 | version "2.1.0" | 3411 | version "2.1.0" |
3369 | resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" | 3412 | resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" |
@@ -3904,6 +3947,12 @@ mediasource@^2.0.0, mediasource@^2.1.0: | |||
3904 | readable-stream "^2.0.5" | 3947 | readable-stream "^2.0.5" |
3905 | to-arraybuffer "^1.0.1" | 3948 | to-arraybuffer "^1.0.1" |
3906 | 3949 | ||
3950 | mem@^1.1.0: | ||
3951 | version "1.1.0" | ||
3952 | resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" | ||
3953 | dependencies: | ||
3954 | mimic-fn "^1.0.0" | ||
3955 | |||
3907 | memory-chunk-store@^1.2.0: | 3956 | memory-chunk-store@^1.2.0: |
3908 | version "1.2.0" | 3957 | version "1.2.0" |
3909 | resolved "https://registry.yarnpkg.com/memory-chunk-store/-/memory-chunk-store-1.2.0.tgz#c8fb00528242eb3c44afd74b33e6b40c37b6eca0" | 3958 | resolved "https://registry.yarnpkg.com/memory-chunk-store/-/memory-chunk-store-1.2.0.tgz#c8fb00528242eb3c44afd74b33e6b40c37b6eca0" |
@@ -3985,6 +4034,10 @@ mime@1.3.x, mime@^1.3.4: | |||
3985 | version "1.3.6" | 4034 | version "1.3.6" |
3986 | resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" | 4035 | resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" |
3987 | 4036 | ||
4037 | mimic-fn@^1.0.0: | ||
4038 | version "1.1.0" | ||
4039 | resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" | ||
4040 | |||
3988 | min-document@^2.19.0, min-document@^2.6.1: | 4041 | min-document@^2.19.0, min-document@^2.6.1: |
3989 | version "2.19.0" | 4042 | version "2.19.0" |
3990 | resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" | 4043 | resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" |
@@ -4317,6 +4370,12 @@ normalize.css@^7.0.0: | |||
4317 | version "7.0.0" | 4370 | version "7.0.0" |
4318 | resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" | 4371 | resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" |
4319 | 4372 | ||
4373 | npm-run-path@^2.0.0: | ||
4374 | version "2.0.2" | ||
4375 | resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" | ||
4376 | dependencies: | ||
4377 | path-key "^2.0.0" | ||
4378 | |||
4320 | "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2: | 4379 | "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2: |
4321 | version "4.1.2" | 4380 | version "4.1.2" |
4322 | resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" | 4381 | resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" |
@@ -4454,6 +4513,14 @@ os-locale@^1.4.0: | |||
4454 | dependencies: | 4513 | dependencies: |
4455 | lcid "^1.0.0" | 4514 | lcid "^1.0.0" |
4456 | 4515 | ||
4516 | os-locale@^2.0.0: | ||
4517 | version "2.1.0" | ||
4518 | resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" | ||
4519 | dependencies: | ||
4520 | execa "^0.7.0" | ||
4521 | lcid "^1.0.0" | ||
4522 | mem "^1.1.0" | ||
4523 | |||
4457 | os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: | 4524 | os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: |
4458 | version "1.0.2" | 4525 | version "1.0.2" |
4459 | resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" | 4526 | resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" |
@@ -4465,6 +4532,10 @@ osenv@0, osenv@^0.1.4: | |||
4465 | os-homedir "^1.0.0" | 4532 | os-homedir "^1.0.0" |
4466 | os-tmpdir "^1.0.0" | 4533 | os-tmpdir "^1.0.0" |
4467 | 4534 | ||
4535 | p-finally@^1.0.0: | ||
4536 | version "1.0.0" | ||
4537 | resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" | ||
4538 | |||
4468 | p-limit@^1.1.0: | 4539 | p-limit@^1.1.0: |
4469 | version "1.1.0" | 4540 | version "1.1.0" |
4470 | resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" | 4541 | resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" |
@@ -4571,6 +4642,10 @@ path-is-inside@^1.0.1: | |||
4571 | version "1.0.2" | 4642 | version "1.0.2" |
4572 | resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" | 4643 | resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" |
4573 | 4644 | ||
4645 | path-key@^2.0.0: | ||
4646 | version "2.0.1" | ||
4647 | resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" | ||
4648 | |||
4574 | path-parse@^1.0.5: | 4649 | path-parse@^1.0.5: |
4575 | version "1.0.5" | 4650 | version "1.0.5" |
4576 | resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" | 4651 | resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" |
@@ -4587,6 +4662,12 @@ path-type@^1.0.0: | |||
4587 | pify "^2.0.0" | 4662 | pify "^2.0.0" |
4588 | pinkie-promise "^2.0.0" | 4663 | pinkie-promise "^2.0.0" |
4589 | 4664 | ||
4665 | path-type@^2.0.0: | ||
4666 | version "2.0.0" | ||
4667 | resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" | ||
4668 | dependencies: | ||
4669 | pify "^2.0.0" | ||
4670 | |||
4590 | pbkdf2@^3.0.3: | 4671 | pbkdf2@^3.0.3: |
4591 | version "3.0.12" | 4672 | version "3.0.12" |
4592 | resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2" | 4673 | resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2" |
@@ -5014,6 +5095,23 @@ punycode@^1.2.4, punycode@^1.4.1: | |||
5014 | version "1.4.1" | 5095 | version "1.4.1" |
5015 | resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" | 5096 | resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" |
5016 | 5097 | ||
5098 | purify-css@^1.2.5: | ||
5099 | version "1.2.5" | ||
5100 | resolved "https://registry.yarnpkg.com/purify-css/-/purify-css-1.2.5.tgz#c4b9ec90735765f3e247ba6a3b49f132f3482500" | ||
5101 | dependencies: | ||
5102 | clean-css "^4.0.12" | ||
5103 | glob "^7.1.1" | ||
5104 | rework "^1.0.1" | ||
5105 | uglify-js "^3.0.6" | ||
5106 | yargs "^8.0.1" | ||
5107 | |||
5108 | purifycss-webpack@^0.7.0: | ||
5109 | version "0.7.0" | ||
5110 | resolved "https://registry.yarnpkg.com/purifycss-webpack/-/purifycss-webpack-0.7.0.tgz#07c9ce7988f608f1928102ed3ff19178ce38f0e0" | ||
5111 | dependencies: | ||
5112 | ajv "^4.11.2" | ||
5113 | webpack-sources "^0.1.4" | ||
5114 | |||
5017 | q@^1.1.2: | 5115 | q@^1.1.2: |
5018 | version "1.5.0" | 5116 | version "1.5.0" |
5019 | resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" | 5117 | resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" |
@@ -5103,6 +5201,13 @@ read-pkg-up@^1.0.1: | |||
5103 | find-up "^1.0.0" | 5201 | find-up "^1.0.0" |
5104 | read-pkg "^1.0.0" | 5202 | read-pkg "^1.0.0" |
5105 | 5203 | ||
5204 | read-pkg-up@^2.0.0: | ||
5205 | version "2.0.0" | ||
5206 | resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" | ||
5207 | dependencies: | ||
5208 | find-up "^2.0.0" | ||
5209 | read-pkg "^2.0.0" | ||
5210 | |||
5106 | read-pkg@^1.0.0: | 5211 | read-pkg@^1.0.0: |
5107 | version "1.1.0" | 5212 | version "1.1.0" |
5108 | resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" | 5213 | resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" |
@@ -5111,6 +5216,14 @@ read-pkg@^1.0.0: | |||
5111 | normalize-package-data "^2.3.2" | 5216 | normalize-package-data "^2.3.2" |
5112 | path-type "^1.0.0" | 5217 | path-type "^1.0.0" |
5113 | 5218 | ||
5219 | read-pkg@^2.0.0: | ||
5220 | version "2.0.0" | ||
5221 | resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" | ||
5222 | dependencies: | ||
5223 | load-json-file "^2.0.0" | ||
5224 | normalize-package-data "^2.3.2" | ||
5225 | path-type "^2.0.0" | ||
5226 | |||
5114 | readable-stream@1.0: | 5227 | readable-stream@1.0: |
5115 | version "1.0.34" | 5228 | version "1.0.34" |
5116 | resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" | 5229 | resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" |
@@ -5594,6 +5707,16 @@ shallow-clone@^0.1.2: | |||
5594 | lazy-cache "^0.2.3" | 5707 | lazy-cache "^0.2.3" |
5595 | mixin-object "^2.0.1" | 5708 | mixin-object "^2.0.1" |
5596 | 5709 | ||
5710 | shebang-command@^1.2.0: | ||
5711 | version "1.2.0" | ||
5712 | resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" | ||
5713 | dependencies: | ||
5714 | shebang-regex "^1.0.0" | ||
5715 | |||
5716 | shebang-regex@^1.0.0: | ||
5717 | version "1.0.0" | ||
5718 | resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" | ||
5719 | |||
5597 | shelljs@^0.7.5: | 5720 | shelljs@^0.7.5: |
5598 | version "0.7.8" | 5721 | version "0.7.8" |
5599 | resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" | 5722 | resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" |
@@ -5956,6 +6079,10 @@ strip-bom@^3.0.0: | |||
5956 | version "3.0.0" | 6079 | version "3.0.0" |
5957 | resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" | 6080 | resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" |
5958 | 6081 | ||
6082 | strip-eof@^1.0.0: | ||
6083 | version "1.0.0" | ||
6084 | resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" | ||
6085 | |||
5959 | strip-indent@^1.0.1: | 6086 | strip-indent@^1.0.1: |
5960 | version "1.0.1" | 6087 | version "1.0.1" |
5961 | resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" | 6088 | resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" |
@@ -6285,11 +6412,18 @@ uglify-js@^2.8.29: | |||
6285 | optionalDependencies: | 6412 | optionalDependencies: |
6286 | uglify-to-browserify "~1.0.0" | 6413 | uglify-to-browserify "~1.0.0" |
6287 | 6414 | ||
6415 | uglify-js@^3.0.6: | ||
6416 | version "3.0.26" | ||
6417 | resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.26.tgz#ba279ca597b13fe6c62c2d87dd5188e57a7a3233" | ||
6418 | dependencies: | ||
6419 | commander "~2.11.0" | ||
6420 | source-map "~0.5.1" | ||
6421 | |||
6288 | uglify-to-browserify@~1.0.0: | 6422 | uglify-to-browserify@~1.0.0: |
6289 | version "1.0.2" | 6423 | version "1.0.2" |
6290 | resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" | 6424 | resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" |
6291 | 6425 | ||
6292 | uglifyjs-webpack-plugin@^0.4.4: | 6426 | uglifyjs-webpack-plugin@^0.4.6: |
6293 | version "0.4.6" | 6427 | version "0.4.6" |
6294 | resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" | 6428 | resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" |
6295 | dependencies: | 6429 | dependencies: |
@@ -6543,12 +6677,12 @@ vm-browserify@0.0.4: | |||
6543 | dependencies: | 6677 | dependencies: |
6544 | indexof "0.0.1" | 6678 | indexof "0.0.1" |
6545 | 6679 | ||
6546 | watchpack@^1.3.1: | 6680 | watchpack@^1.4.0: |
6547 | version "1.3.1" | 6681 | version "1.4.0" |
6548 | resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" | 6682 | resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" |
6549 | dependencies: | 6683 | dependencies: |
6550 | async "^2.1.2" | 6684 | async "^2.1.2" |
6551 | chokidar "^1.4.3" | 6685 | chokidar "^1.7.0" |
6552 | graceful-fs "^4.1.2" | 6686 | graceful-fs "^4.1.2" |
6553 | 6687 | ||
6554 | wbuf@^1.1.0, wbuf@^1.7.2: | 6688 | wbuf@^1.1.0, wbuf@^1.7.2: |
@@ -6629,7 +6763,7 @@ webpack-notifier@^1.3.0: | |||
6629 | object-assign "^4.1.0" | 6763 | object-assign "^4.1.0" |
6630 | strip-ansi "^3.0.1" | 6764 | strip-ansi "^3.0.1" |
6631 | 6765 | ||
6632 | webpack-sources@^0.1.2: | 6766 | webpack-sources@^0.1.2, webpack-sources@^0.1.4: |
6633 | version "0.1.5" | 6767 | version "0.1.5" |
6634 | resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" | 6768 | resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" |
6635 | dependencies: | 6769 | dependencies: |
@@ -6643,16 +6777,16 @@ webpack-sources@^1.0.1: | |||
6643 | source-list-map "^2.0.0" | 6777 | source-list-map "^2.0.0" |
6644 | source-map "~0.5.3" | 6778 | source-map "~0.5.3" |
6645 | 6779 | ||
6646 | webpack@^3.0.0: | 6780 | webpack@^3.3.0: |
6647 | version "3.0.0" | 6781 | version "3.3.0" |
6648 | resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7" | 6782 | resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc" |
6649 | dependencies: | 6783 | dependencies: |
6650 | acorn "^5.0.0" | 6784 | acorn "^5.0.0" |
6651 | acorn-dynamic-import "^2.0.0" | 6785 | acorn-dynamic-import "^2.0.0" |
6652 | ajv "^5.1.5" | 6786 | ajv "^5.1.5" |
6653 | ajv-keywords "^2.0.0" | 6787 | ajv-keywords "^2.0.0" |
6654 | async "^2.1.2" | 6788 | async "^2.1.2" |
6655 | enhanced-resolve "^3.0.0" | 6789 | enhanced-resolve "^3.3.0" |
6656 | escope "^3.6.0" | 6790 | escope "^3.6.0" |
6657 | interpret "^1.0.0" | 6791 | interpret "^1.0.0" |
6658 | json-loader "^0.5.4" | 6792 | json-loader "^0.5.4" |
@@ -6665,8 +6799,8 @@ webpack@^3.0.0: | |||
6665 | source-map "^0.5.3" | 6799 | source-map "^0.5.3" |
6666 | supports-color "^3.1.0" | 6800 | supports-color "^3.1.0" |
6667 | tapable "~0.2.5" | 6801 | tapable "~0.2.5" |
6668 | uglifyjs-webpack-plugin "^0.4.4" | 6802 | uglifyjs-webpack-plugin "^0.4.6" |
6669 | watchpack "^1.3.1" | 6803 | watchpack "^1.4.0" |
6670 | webpack-sources "^1.0.1" | 6804 | webpack-sources "^1.0.1" |
6671 | yargs "^6.0.0" | 6805 | yargs "^6.0.0" |
6672 | 6806 | ||
@@ -6735,6 +6869,10 @@ which-module@^1.0.0: | |||
6735 | version "1.0.0" | 6869 | version "1.0.0" |
6736 | resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" | 6870 | resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" |
6737 | 6871 | ||
6872 | which-module@^2.0.0: | ||
6873 | version "2.0.0" | ||
6874 | resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" | ||
6875 | |||
6738 | which@1, which@^1.0.5, which@^1.2.9: | 6876 | which@1, which@^1.0.5, which@^1.2.9: |
6739 | version "1.2.14" | 6877 | version "1.2.14" |
6740 | resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" | 6878 | resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" |
@@ -6847,6 +6985,12 @@ yargs-parser@^5.0.0: | |||
6847 | dependencies: | 6985 | dependencies: |
6848 | camelcase "^3.0.0" | 6986 | camelcase "^3.0.0" |
6849 | 6987 | ||
6988 | yargs-parser@^7.0.0: | ||
6989 | version "7.0.0" | ||
6990 | resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" | ||
6991 | dependencies: | ||
6992 | camelcase "^4.1.0" | ||
6993 | |||
6850 | yargs@^4.8.1: | 6994 | yargs@^4.8.1: |
6851 | version "4.8.1" | 6995 | version "4.8.1" |
6852 | resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" | 6996 | resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" |
@@ -6902,6 +7046,24 @@ yargs@^7.0.0: | |||
6902 | y18n "^3.2.1" | 7046 | y18n "^3.2.1" |
6903 | yargs-parser "^5.0.0" | 7047 | yargs-parser "^5.0.0" |
6904 | 7048 | ||
7049 | yargs@^8.0.1: | ||
7050 | version "8.0.2" | ||
7051 | resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" | ||
7052 | dependencies: | ||
7053 | camelcase "^4.1.0" | ||
7054 | cliui "^3.2.0" | ||
7055 | decamelize "^1.1.1" | ||
7056 | get-caller-file "^1.0.1" | ||
7057 | os-locale "^2.0.0" | ||
7058 | read-pkg-up "^2.0.0" | ||
7059 | require-directory "^2.1.1" | ||
7060 | require-main-filename "^1.0.1" | ||
7061 | set-blocking "^2.0.0" | ||
7062 | string-width "^2.0.0" | ||
7063 | which-module "^2.0.0" | ||
7064 | y18n "^3.2.1" | ||
7065 | yargs-parser "^7.0.0" | ||
7066 | |||
6905 | yargs@~3.10.0: | 7067 | yargs@~3.10.0: |
6906 | version "3.10.0" | 7068 | version "3.10.0" |
6907 | resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" | 7069 | resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" |