X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fconfig%2Fwebpack.common.js;h=266e630f62d55bb92d51195666945e325e4eb5b7;hb=8635a2c70cc24a4c52558162ac058de95750271f;hp=4ab813d637e73823902b9e822ab73392c7ecb86b;hpb=3bb2c7f99dd495adac8e486e98f135c183642381;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 4ab813d63..266e630f6 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -1,17 +1,20 @@ -const webpack = require('webpack') const helpers = require('./helpers') /* * Webpack Plugins */ -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin const AssetsPlugin = require('assets-webpack-plugin') +const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') +const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') +const CopyWebpackPlugin = require('copy-webpack-plugin') +const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin +const HtmlWebpackPlugin = require('html-webpack-plugin') const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin') const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin') +const ngcWebpack = require('ngc-webpack') + const WebpackNotifierPlugin = require('webpack-notifier') /* @@ -29,7 +32,8 @@ const METADATA = { * See: http://webpack.github.io/docs/configuration.html#cli */ module.exports = function (options) { - var isProd = options.env === 'production' + const isProd = options.env === 'production' + const AOT = isProd return { @@ -49,9 +53,10 @@ module.exports = function (options) { * See: http://webpack.github.io/docs/configuration.html#entry */ entry: { - 'polyfills': './src/polyfills.ts', - 'vendor': './src/vendor.ts', - 'main': './src/main.ts' + 'polyfills': './src/polyfills.browser.ts', + 'main': AOT + ? './src/main.browser.aot.ts' + : './src/main.browser.ts' }, /* @@ -67,7 +72,7 @@ module.exports = function (options) { */ extensions: [ '.ts', '.js', '.json', '.scss' ], - modules: [helpers.root('src'), 'node_modules'] + modules: [ helpers.root('src'), helpers.root('node_modules') ] }, /* @@ -80,16 +85,38 @@ module.exports = function (options) { rules: [ /* - * Typescript loader support for .ts and Angular 2 async routes via .async.ts + * Typescript loader support for .ts and Angular async routes via .async.ts * * See: https://github.com/s-panferov/awesome-typescript-loader */ { test: /\.ts$/, - loaders: [ - '@angularclass/hmr-loader?pretty=' + !isProd + '&prod=' + isProd, - 'awesome-typescript-loader', - 'angular2-template-loader' + use: [ + { + loader: '@angularclass/hmr-loader', + options: { + pretty: !isProd, + prod: isProd + } + }, + { + loader: 'ng-router-loader', + options: { + loader: 'async-import', + genDir: 'compiled', + aot: AOT + } + }, + { + loader: 'awesome-typescript-loader', + options: { + configFileName: 'tsconfig.webpack.json', + useCache: !isProd + } + }, + { + loader: 'angular2-template-loader' + } ], exclude: [/\.(spec|e2e)\.ts$/] }, @@ -101,15 +128,33 @@ module.exports = function (options) { */ { test: /\.json$/, - loader: 'json-loader' + use: 'json-loader' }, { test: /\.(sass|scss)$/, - loaders: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url', 'sass-loader?sourceMap'] + use: [ + 'css-to-string-loader', + 'css-loader?sourceMap', + 'resolve-url-loader', + { + loader: 'sass-loader', + options: { + sourceMap: true + } + }, + { + loader: 'sass-resources-loader', + options: { + resources: [ + helpers.root('src/sass/_variables.scss') + ] + } + } + ] }, - { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'url?limit=10000&minetype=application/font-woff' }, - { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'file' }, + { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' }, + { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' }, /* Raw loader support for *.html * Returns file content as string @@ -118,8 +163,11 @@ module.exports = function (options) { */ { test: /\.html$/, - loader: 'raw-loader', - exclude: [ helpers.root('src/index.html'), helpers.root('src/standalone/videos/embed.html') ] + use: 'raw-loader', + exclude: [ + helpers.root('src/index.html'), + helpers.root('src/standalone/videos/embed.html') + ] } ] @@ -144,7 +192,7 @@ module.exports = function (options) { * * See: https://github.com/s-panferov/awesome-typescript-loader#forkchecker-boolean-defaultfalse */ - new ForkCheckerPlugin(), + new CheckerPlugin(), /* * Plugin: CommonsChunkPlugin @@ -154,8 +202,21 @@ module.exports = function (options) { * See: https://webpack.github.io/docs/list-of-plugins.html#commonschunkplugin * See: https://github.com/webpack/docs/wiki/optimization#multi-page-app */ - new webpack.optimize.CommonsChunkPlugin({ - name: [ 'polyfills', 'vendor' ].reverse() + new CommonsChunkPlugin({ + name: 'polyfills', + chunks: ['polyfills'] + }), + + // This enables tree shaking of the vendor modules + new CommonsChunkPlugin({ + name: 'vendor', + chunks: ['main'], + minChunks: module => /node_modules\//.test(module.resource) + }), + + // Specify the correct order the scripts will be injected in + new CommonsChunkPlugin({ + name: ['polyfills', 'vendor'].reverse() }), /** @@ -166,9 +227,16 @@ module.exports = function (options) { * See: https://github.com/angular/angular/issues/11580 */ new ContextReplacementPlugin( - // The (\\|\/) piece accounts for path separators in *nix and Windows - /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, - helpers.root('src') // location of your src + /** + * The (\\|\/) piece accounts for path separators in *nix and Windows + */ + /angular(\\|\/)core(\\|\/)@angular/, + helpers.root('src'), // location of your src + { + /** + * Your Angular Async Route paths relative to this root directory + */ + } ), /* @@ -179,6 +247,7 @@ module.exports = function (options) { * * See: https://www.npmjs.com/package/copy-webpack-plugin */ + // Used by embed.html new CopyWebpackPlugin([ { from: 'src/assets', @@ -188,28 +257,26 @@ module.exports = function (options) { from: 'node_modules/webtorrent/webtorrent.min.js', to: 'assets/webtorrent' }, - { - from: 'node_modules/video.js/dist/video.min.js', - to: 'assets/video-js' - }, - { - from: 'node_modules/video.js/dist/video-js.min.css', - to: 'assets/video-js' - }, - { - from: 'node_modules/videojs-dock/dist/videojs-dock.min.js', - to: 'assets/video-js' - }, - { - from: 'node_modules/videojs-dock/dist/videojs-dock.css', - to: 'assets/video-js' - }, { from: 'src/standalone', to: 'standalone' } ]), + /* + * Plugin: ScriptExtHtmlWebpackPlugin + * Description: Enhances html-webpack-plugin functionality + * with different deployment options for your scripts including: + * + * See: https://github.com/numical/script-ext-html-webpack-plugin + */ + new ScriptExtHtmlWebpackPlugin({ + sync: [ /polyfill|vendor/, 'webtorrent.min.js' ], + defaultAttribute: 'async', + preload: [/polyfill|vendor|main/], + prefetch: [/chunk/] + }), + /* * Plugin: HtmlWebpackPlugin * Description: Simplifies creation of HTML files to serve your webpack bundles. @@ -222,19 +289,8 @@ module.exports = function (options) { template: 'src/index.html', title: METADATA.title, chunksSortMode: 'dependency', - metadata: METADATA - }), - - /* - * Plugin: ScriptExtHtmlWebpackPlugin - * Description: Enhances html-webpack-plugin functionality - * with different deployment options for your scripts including: - * - * See: https://github.com/numical/script-ext-html-webpack-plugin - */ - new ScriptExtHtmlWebpackPlugin({ - sync: [ 'webtorrent.min.js' ], - defaultAttribute: 'defer' + metadata: METADATA, + inject: 'body' }), new WebpackNotifierPlugin({ alwaysNotify: true }), @@ -247,9 +303,40 @@ module.exports = function (options) { new LoaderOptionsPlugin({ options: { sassLoader: { - precision: 10 + precision: 10, + includePaths: [ helpers.root('src/sass') ] } } + }), + + new ngcWebpack.NgcWebpackPlugin({ + disabled: !AOT, + tsConfig: helpers.root('tsconfig.webpack.json'), + resourceOverride: helpers.root('config/resource-override.js') + }), + + new BundleAnalyzerPlugin({ + // Can be `server`, `static` or `disabled`. + // In `server` mode analyzer will start HTTP server to show bundle report. + // In `static` mode single HTML file with bundle report will be generated. + // In `disabled` mode you can use this plugin to just generate Webpack Stats JSON file by setting `generateStatsFile` to `true`. + analyzerMode: 'static', + // Path to bundle report file that will be generated in `static` mode. + // Relative to bundles output directory. + reportFilename: 'report.html', + // Automatically open report in default browser + openAnalyzer: false, + // If `true`, Webpack Stats JSON file will be generated in bundles output directory + generateStatsFile: true, + // Name of Webpack Stats JSON file that will be generated if `generateStatsFile` is `true`. + // Relative to bundles output directory. + statsFilename: 'stats.json', + // Options for `stats.toJson()` method. + // For example you can exclude sources of your modules from stats file with `source: false` option. + // See more options here: https://github.com/webpack/webpack/blob/webpack-1/lib/Stats.js#L21 + statsOptions: null, + // Log level. Can be 'info', 'warn', 'error' or 'silent'. + logLevel: 'info' }) ], @@ -260,12 +347,14 @@ module.exports = function (options) { * See: https://webpack.github.io/docs/configuration.html#node */ node: { - global: 'true', + global: true, crypto: 'empty', process: true, module: false, clearImmediate: false, - setImmediate: false + setImmediate: false, + setInterval: false, + setTimeout: false } } }