X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fconfig%2Fwebpack.common.js;h=f387b44f9727f2d489d75f18ac135915c6c0cc5f;hb=d235f6b0d1054a2a3451dacade927caefce8f30c;hp=882013a9e1b6f7c481e2d35d23ab3529fd23e89e;hpb=a6375e69668ea42e19531c6bc68dcd37f3f7cbd7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 882013a9e..f387b44f9 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -1,24 +1,30 @@ -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 ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') +const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') +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 CopyWebpackPlugin = require('copy-webpack-plugin') + 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 } /* @@ -27,15 +33,10 @@ 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 { - /* - * Static metadata for index.html - * - * See: (custom attribute) - */ - metadata: METADATA, /* * Cache generated modules and chunks to improve performance for multiple incremental builds. @@ -53,9 +54,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' }, /* @@ -69,17 +71,9 @@ module.exports = function (options) { * * See: http://webpack.github.io/docs/configuration.html#resolve-extensions */ - extensions: [ '', '.ts', '.js', '.scss' ], - - // Make sure root is src - root: helpers.root('src'), - - // remove other default values - modulesDirectories: [ 'node_modules' ] - }, + extensions: [ '.ts', '.js', '.json', '.scss' ], - output: { - publicPath: '/client/' + modules: [ helpers.root('src'), helpers.root('node_modules') ] }, /* @@ -88,45 +82,35 @@ module.exports = function (options) { * See: http://webpack.github.io/docs/configuration.html#module */ module: { - /* - * An array of applied pre and post loaders. - * - * See: http://webpack.github.io/docs/configuration.html#module-preloaders-module-postloaders - */ - preLoaders: [ - { - test: /\.ts$/, - loader: 'string-replace-loader', - query: { - search: '(System|SystemJS)(.*[\\n\\r]\\s*\\.|\\.)import\\((.+)\\)', - replace: '$1.import($3).then(mod => (mod.__esModule && mod.default) ? mod.default : mod)', - flags: 'g' - }, - include: [helpers.root('src')] - } - ], - /* - * An array of automatically applied loaders. - * - * IMPORTANT: The loaders here are resolved relative to the resource which they are applied to. - * This means they are not resolved relative to the configuration file. - * - * See: http://webpack.github.io/docs/configuration.html#module-loaders - */ - loaders: [ + 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: '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$/] }, @@ -138,15 +122,40 @@ 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', + { + 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'), + helpers.root('src/sass/_mixins.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: /\.(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 @@ -155,18 +164,24 @@ module.exports = function (options) { */ { test: /\.html$/, - loader: 'raw-loader', - exclude: [ helpers.root('src/index.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' } ] }, - sassLoader: { - precision: 10 - }, - /* * Add additional plugins to the compiler. * @@ -185,7 +200,7 @@ module.exports = function (options) { * * See: https://github.com/s-panferov/awesome-typescript-loader#forkchecker-boolean-defaultfalse */ - new ForkCheckerPlugin(), + new CheckerPlugin(), /* * Plugin: CommonsChunkPlugin @@ -195,8 +210,23 @@ 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 => { + return /node_modules\//.test(module.resource) + } + }), + + // Specify the correct order the scripts will be injected in + new CommonsChunkPlugin({ + name: ['polyfills', 'vendor'].reverse() }), /** @@ -205,46 +235,87 @@ module.exports = function (options) { * * See: https://webpack.github.io/docs/list-of-plugins.html#contextreplacementplugin * 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(.+)?/, + helpers.root('src'), // location of your src + { + /** + * Your Angular Async Route paths relative to this root directory + */ + } ), /* - * Plugin: CopyWebpackPlugin - * Description: Copy files and directories in webpack. - * - * Copies project static assets. + * Plugin: HtmlWebpackPlugin + * Description: Simplifies creation of HTML files to serve your webpack bundles. + * This is especially useful for webpack bundles that include a hash in the filename + * which changes every compilation. * - * See: https://www.npmjs.com/package/copy-webpack-plugin + * See: https://github.com/ampedandwired/html-webpack-plugin */ + new HtmlWebpackPlugin({ + template: 'src/index.html', + title: METADATA.title, + 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' + }), + new CopyWebpackPlugin([ { - from: 'src/assets', - to: 'assets' + from: helpers.root('src/assets/images/favicon.png'), + to: 'assets/images/favicon.png' }, { - from: 'node_modules/webtorrent/webtorrent.min.js', - to: 'assets/webtorrent' + from: helpers.root('src/assets/images/default-avatar.png'), + to: 'assets/images/default-avatar.png' } ]), /* - * Plugin: HtmlWebpackPlugin - * Description: Simplifies creation of HTML files to serve your webpack bundles. - * This is especially useful for webpack bundles that include a hash in the filename - * which changes every compilation. + * Plugin: ScriptExtHtmlWebpackPlugin + * Description: Enhances html-webpack-plugin functionality + * with different deployment options for your scripts including: * - * See: https://github.com/ampedandwired/html-webpack-plugin + * See: https://github.com/numical/script-ext-html-webpack-plugin */ - new HtmlWebpackPlugin({ - template: 'src/index.html', - chunksSortMode: 'dependency' + new ScriptExtHtmlWebpackPlugin({ + sync: [ /polyfill|vendor/ ], + defaultAttribute: 'async', + preload: [/polyfill|vendor|main/], + prefetch: [/chunk/] + }), + + new WebpackNotifierPlugin({ alwaysNotify: true }), + + /** + * Plugin LoaderOptionsPlugin (experimental) + * + * See: https://gist.github.com/sokra/27b24881210b56bbaff7 + */ + new LoaderOptionsPlugin({ + options: { + context: '', + sassLoader: { + precision: 10, + includePaths: [ helpers.root('src/sass') ] + } + } + }), + + new ngcWebpack.NgcWebpackPlugin({ + disabled: !AOT, + tsConfig: helpers.root('tsconfig.webpack.json') }), - new WebpackNotifierPlugin({ alwaysNotify: true }) + new InlineManifestWebpackPlugin() ], /* @@ -254,13 +325,14 @@ module.exports = function (options) { * See: https://webpack.github.io/docs/configuration.html#node */ node: { - global: 'window', + global: true, crypto: 'empty', - fs: 'empty', - events: true, + process: true, module: false, clearImmediate: false, - setImmediate: false + setImmediate: false, + setInterval: false, + setTimeout: false } } }