X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fconfig%2Fwebpack.common.js;h=583f4ba07a428187753cbcf2948691f219e878dc;hb=b33f657c304b77938c1f68164d8e754787f5aae5;hp=08b8a4b09cedf69aa44a3804ba5f984b1e4400c3;hpb=b99290b1d5d736083513fb8f66e91f61bfe07e0b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 08b8a4b09..583f4ba07 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -5,26 +5,25 @@ const helpers = require('./helpers') */ const AssetsPlugin = require('assets-webpack-plugin') -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin -const NormalModuleReplacementPlugin = require('webpack/lib/NormalModuleReplacementPlugin') 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 InlineManifestWebpackPlugin = require('inline-manifest-webpack-plugin') const ngcWebpack = require('ngc-webpack') const WebpackNotifierPlugin = require('webpack-notifier') -/* - * Webpack Constants - */ +const HMR = helpers.hasProcessFlag('hot') +const AOT = process.env.BUILD_AOT || helpers.hasNpmFlag('aot') const METADATA = { title: 'PeerTube', baseUrl: '/', - isDevServer: helpers.isWebpackDevServer() + isDevServer: helpers.isWebpackDevServer(), + HMR: HMR, + AOT: AOT } /* @@ -73,11 +72,7 @@ module.exports = function (options) { */ extensions: [ '.ts', '.js', '.json', '.scss' ], - modules: [ helpers.root('src'), helpers.root('node_modules') ], - - alias: { - 'video.js': 'video.js/dist/alt/video.novtt' - } + modules: [ helpers.root('src'), helpers.root('node_modules') ] }, /* @@ -90,23 +85,30 @@ 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$/, use: [ - '@angularclass/hmr-loader?pretty=' + !isProd + '&prod=' + isProd, - 'awesome-typescript-loader?{configFileName: "tsconfig.webpack.json"}', - 'angular2-template-loader', { loader: 'ng-router-loader', options: { - loader: 'async-system', + 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$/] @@ -119,16 +121,39 @@ module.exports = function (options) { */ { test: /\.json$/, - loader: 'json-loader' + use: 'json-loader' }, { test: /\.(sass|scss)$/, - use: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url-loader', 'sass-loader?sourceMap'], - exclude: [ helpers.root('src', 'styles') ] + use: [ + 'css-to-string-loader', + { + loader: 'css-loader', + options: { + sourceMap: true, + importLoaders: 1 + } + }, + '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])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' }, - { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' }, + { test: /\.(otf|ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000' }, /* Raw loader support for *.html * Returns file content as string @@ -137,8 +162,18 @@ 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') + ] + }, + + /* File loader for supporting images, for example, in CSS files. + */ + { + test: /\.(jpg|png|gif)$/, + use: 'url-loader' } ] @@ -182,7 +217,9 @@ module.exports = function (options) { new CommonsChunkPlugin({ name: 'vendor', chunks: ['main'], - minChunks: module => /node_modules\//.test(module.resource) + minChunks: module => { + return /node_modules\//.test(module.resource) + } }), // Specify the correct order the scripts will be injected in @@ -198,54 +235,18 @@ 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(\\|\/)src(\\|\/)linker/, + /** + * The (\\|\/) piece accounts for path separators in *nix and Windows + */ + /(.+)?angular(\\|\/)core(.+)?/, helpers.root('src'), // location of your src { - // your Angular Async Route paths relative to this root directory + /** + * Your Angular Async Route paths relative to this root directory + */ } ), - /* - * Plugin: CopyWebpackPlugin - * Description: Copy files and directories in webpack. - * - * Copies project static assets. - * - * See: https://www.npmjs.com/package/copy-webpack-plugin - */ - // Used by embed.html - new CopyWebpackPlugin([ - { - from: 'src/assets', - to: 'assets' - }, - { - 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: HtmlWebpackPlugin * Description: Simplifies creation of HTML files to serve your webpack bundles. @@ -257,20 +258,26 @@ module.exports = function (options) { new HtmlWebpackPlugin({ template: 'src/index.html', title: METADATA.title, - chunksSortMode: 'dependency', - metadata: METADATA + chunksSortMode: function (a, b) { + const entryPoints = [ 'inline', 'polyfills', 'sw-register', 'styles', 'vendor', 'main' ] + return entryPoints.indexOf(a.names[0]) - entryPoints.indexOf(b.names[0]) + }, + metadata: METADATA, + inject: 'body' }), /* - * 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 - */ + * 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' + sync: [ /polyfill|vendor/ ], + defaultAttribute: 'async', + preload: [/polyfill|vendor|main/], + prefetch: [/chunk/] }), new WebpackNotifierPlugin({ alwaysNotify: true }), @@ -283,62 +290,18 @@ module.exports = function (options) { new LoaderOptionsPlugin({ options: { sassLoader: { - precision: 10 + precision: 10, + includePaths: [ helpers.root('src/sass') ] } } }), - // Fix Angular 2 - new NormalModuleReplacementPlugin( - /facade(\\|\/)async/, - helpers.root('node_modules/@angular/core/src/facade/async.js') - ), - new NormalModuleReplacementPlugin( - /facade(\\|\/)collection/, - helpers.root('node_modules/@angular/core/src/facade/collection.js') - ), - new NormalModuleReplacementPlugin( - /facade(\\|\/)errors/, - helpers.root('node_modules/@angular/core/src/facade/errors.js') - ), - new NormalModuleReplacementPlugin( - /facade(\\|\/)lang/, - helpers.root('node_modules/@angular/core/src/facade/lang.js') - ), - new NormalModuleReplacementPlugin( - /facade(\\|\/)math/, - helpers.root('node_modules/@angular/core/src/facade/math.js') - ), - new ngcWebpack.NgcWebpackPlugin({ disabled: !AOT, - tsConfig: helpers.root('tsconfig.webpack.json'), - resourceOverride: helpers.root('config/resource-override.js') + tsConfig: helpers.root('tsconfig.webpack.json') }), - 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' - }) + new InlineManifestWebpackPlugin() ], /*