From ab32b0fc805b92c5a1d7ac5901cb1a38e94622ca Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 6 Sep 2016 22:40:57 +0200 Subject: Dirty update to Angular RC6 --- client/config/webpack.common.js | 54 +++++++++++++---------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) (limited to 'client/config/webpack.common.js') diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 2ff3a1506..6edc9400c 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -5,7 +5,7 @@ const helpers = require('./helpers') * Webpack Plugins */ -var CopyWebpackPlugin = (CopyWebpackPlugin = require('copy-webpack-plugin'), CopyWebpackPlugin.default || CopyWebpackPlugin) +const CopyWebpackPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin const WebpackNotifierPlugin = require('webpack-notifier') @@ -15,7 +15,8 @@ const WebpackNotifierPlugin = require('webpack-notifier') */ const METADATA = { title: 'PeerTube', - baseUrl: '/' + baseUrl: '/', + isDevServer: helpers.isWebpackDevServer() } /* @@ -69,10 +70,7 @@ module.exports = { root: helpers.root('src'), // remove other default values - modulesDirectories: [ 'node_modules' ], - - packageAlias: 'browser' - + modulesDirectories: [ 'node_modules' ] }, output: { @@ -92,27 +90,15 @@ module.exports = { */ preLoaders: [ - /* - * Tslint loader support for *.ts files - * - * See: https://github.com/wbuchwalter/tslint-loader - */ - // { test: /\.ts$/, loader: 'tslint-loader', exclude: [ helpers.root('node_modules') ] }, - - /* - * Source map loader support for *.js files - * Extracts SourceMaps for source files that as added as sourceMappingURL comment. - * - * See: https://github.com/webpack/source-map-loader - */ { - test: /\.js$/, - loader: 'source-map-loader', - exclude: [ - // these packages have problems with their sourcemaps - helpers.root('node_modules/rxjs'), - helpers.root('node_modules/@angular') - ] + 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)', + flags: 'g' + }, + include: [helpers.root('src')] } ], @@ -134,7 +120,11 @@ module.exports = { */ { test: /\.ts$/, - loader: 'awesome-typescript-loader', + loaders: [ + 'awesome-typescript-loader', + 'angular2-template-loader', + '@angularclass/hmr-loader' + ], exclude: [/\.(spec|e2e)\.ts$/] }, @@ -193,16 +183,6 @@ module.exports = { */ new ForkCheckerPlugin(), - /* - * Plugin: OccurenceOrderPlugin - * Description: Varies the distribution of the ids to get the smallest id length - * for often used ids. - * - * See: https://webpack.github.io/docs/list-of-plugins.html#occurrenceorderplugin - * See: https://github.com/webpack/docs/wiki/optimization#minimize - */ - new webpack.optimize.OccurenceOrderPlugin(true), - /* * Plugin: CommonsChunkPlugin * Description: Shares common code between the pages. -- cgit v1.2.3 From 2e92c10b6cdb32e5170aab0b4c0ff3e4c27e30d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 12 Sep 2016 20:43:44 +0200 Subject: Client: update a webpack configs --- client/config/webpack.common.js | 377 ++++++++++++++++++++-------------------- 1 file changed, 192 insertions(+), 185 deletions(-) (limited to 'client/config/webpack.common.js') diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 6edc9400c..2ce44b6c7 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -8,6 +8,7 @@ const helpers = require('./helpers') 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 WebpackNotifierPlugin = require('webpack-notifier') /* @@ -24,226 +25,232 @@ const METADATA = { * * See: http://webpack.github.io/docs/configuration.html#cli */ -module.exports = { - /* - * Static metadata for index.html - * - * See: (custom attribute) - */ - metadata: METADATA, - - /* - * Cache generated modules and chunks to improve performance for multiple incremental builds. - * This is enabled by default in watch mode. - * You can pass false to disable it. - * - * See: http://webpack.github.io/docs/configuration.html#cache - */ - // cache: false, - - /* - * The entry point for the bundle - * Our Angular.js app - * - * See: http://webpack.github.io/docs/configuration.html#entry - */ - entry: { - 'polyfills': './src/polyfills.ts', - 'vendor': './src/vendor.ts', - 'main': './src/main.ts' - }, - - /* - * Options affecting the resolving of modules. - * - * See: http://webpack.github.io/docs/configuration.html#resolve - */ - resolve: { +module.exports = function (options) { + var isProd = options.env === 'production' + + return { /* - * An array of extensions that should be used to resolve modules. + * Static metadata for index.html * - * See: http://webpack.github.io/docs/configuration.html#resolve-extensions + * See: (custom attribute) */ - extensions: [ '', '.ts', '.js', '.scss' ], - - // Make sure root is src - root: helpers.root('src'), + metadata: METADATA, - // remove other default values - modulesDirectories: [ 'node_modules' ] - }, + /* + * Cache generated modules and chunks to improve performance for multiple incremental builds. + * This is enabled by default in watch mode. + * You can pass false to disable it. + * + * See: http://webpack.github.io/docs/configuration.html#cache + */ + // cache: false, - output: { - publicPath: '/client/' - }, + /* + * The entry point for the bundle + * Our Angular.js app + * + * See: http://webpack.github.io/docs/configuration.html#entry + */ + entry: { + 'polyfills': './src/polyfills.ts', + 'vendor': './src/vendor.ts', + 'main': './src/main.ts' + }, - /* - * Options affecting the normal modules. - * - * See: http://webpack.github.io/docs/configuration.html#module - */ - module: { /* - * An array of applied pre and post loaders. + * Options affecting the resolving of modules. * - * See: http://webpack.github.io/docs/configuration.html#module-preloaders-module-postloaders + * See: http://webpack.github.io/docs/configuration.html#resolve */ - 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)', - flags: 'g' - }, - include: [helpers.root('src')] - } + resolve: { + /* + * An array of extensions that should be used to resolve modules. + * + * 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' ] + }, + + output: { + publicPath: '/client/' + }, /* - * An array of automatically applied loaders. + * Options affecting the normal modules. * - * 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 + * See: http://webpack.github.io/docs/configuration.html#module */ - loaders: [ - + module: { /* - * Typescript loader support for .ts and Angular 2 async routes via .async.ts + * An array of applied pre and post loaders. * - * See: https://github.com/s-panferov/awesome-typescript-loader + * See: http://webpack.github.io/docs/configuration.html#module-preloaders-module-postloaders */ - { - test: /\.ts$/, - loaders: [ - 'awesome-typescript-loader', - 'angular2-template-loader', - '@angularclass/hmr-loader' - ], - exclude: [/\.(spec|e2e)\.ts$/] - }, + 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')] + } + ], /* - * Json loader support for *.json files. + * An array of automatically applied loaders. * - * See: https://github.com/webpack/json-loader - */ - { - test: /\.json$/, - loader: 'json-loader' - }, - - { - test: /\.scss$/, - exclude: /node_modules/, - loaders: [ 'raw-loader', 'sass-loader' ] - }, - - { - test: /\.(woff2?|ttf|eot|svg)$/, - loader: 'url?limit=10000&name=assets/fonts/[hash].[ext]' - }, - - /* Raw loader support for *.html - * Returns file content as string + * 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: https://github.com/webpack/raw-loader + * See: http://webpack.github.io/docs/configuration.html#module-loaders */ - { - test: /\.html$/, - loader: 'raw-loader', - exclude: [ helpers.root('src/index.html') ] - } + loaders: [ - ] + /* + * Typescript loader support for .ts and Angular 2 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' + ], + exclude: [/\.(spec|e2e)\.ts$/] + }, - }, + /* + * Json loader support for *.json files. + * + * See: https://github.com/webpack/json-loader + */ + { + test: /\.json$/, + loader: 'json-loader' + }, - sassLoader: { - precision: 10 - }, + { + test: /\.scss$/, + exclude: /node_modules/, + loaders: [ 'raw-loader', 'sass-loader' ] + }, - /* - * Add additional plugins to the compiler. - * - * See: http://webpack.github.io/docs/configuration.html#plugins - */ - plugins: [ + { + test: /\.(woff2?|ttf|eot|svg)$/, + loader: 'url?limit=10000&name=assets/fonts/[hash].[ext]' + }, - /* - * Plugin: ForkCheckerPlugin - * Description: Do type checking in a separate process, so webpack don't need to wait. - * - * See: https://github.com/s-panferov/awesome-typescript-loader#forkchecker-boolean-defaultfalse - */ - new ForkCheckerPlugin(), + /* Raw loader support for *.html + * Returns file content as string + * + * See: https://github.com/webpack/raw-loader + */ + { + test: /\.html$/, + loader: 'raw-loader', + exclude: [ helpers.root('src/index.html') ] + } - /* - * Plugin: CommonsChunkPlugin - * Description: Shares common code between the pages. - * It identifies common modules and put them into a commons chunk. - * - * 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() - }), + ] + + }, + + sassLoader: { + precision: 10 + }, /* - * Plugin: CopyWebpackPlugin - * Description: Copy files and directories in webpack. + * Add additional plugins to the compiler. * - * Copies project static assets. - * - * See: https://www.npmjs.com/package/copy-webpack-plugin + * See: http://webpack.github.io/docs/configuration.html#plugins */ - new CopyWebpackPlugin([ - { - from: 'src/assets', - to: 'assets' - }, - { - from: 'node_modules/webtorrent/webtorrent.min.js', - to: 'assets/webtorrent' - } - ]), + plugins: [ + new AssetsPlugin({ + path: helpers.root('dist'), + filename: 'webpack-assets.json', + prettyPrint: true + }), + + /* + * Plugin: ForkCheckerPlugin + * Description: Do type checking in a separate process, so webpack don't need to wait. + * + * See: https://github.com/s-panferov/awesome-typescript-loader#forkchecker-boolean-defaultfalse + */ + new ForkCheckerPlugin(), + + /* + * Plugin: CommonsChunkPlugin + * Description: Shares common code between the pages. + * It identifies common modules and put them into a commons chunk. + * + * 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() + }), + + /* + * Plugin: CopyWebpackPlugin + * Description: Copy files and directories in webpack. + * + * Copies project static assets. + * + * See: https://www.npmjs.com/package/copy-webpack-plugin + */ + new CopyWebpackPlugin([ + { + from: 'src/assets', + to: 'assets' + }, + { + from: 'node_modules/webtorrent/webtorrent.min.js', + to: 'assets/webtorrent' + } + ]), + + /* + * 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://github.com/ampedandwired/html-webpack-plugin + */ + new HtmlWebpackPlugin({ + template: 'src/index.html', + chunksSortMode: 'dependency' + }), + + new WebpackNotifierPlugin({ alwaysNotify: true }) + ], /* - * 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. + * Include polyfills or mocks for various node stuff + * Description: Node configuration * - * See: https://github.com/ampedandwired/html-webpack-plugin + * See: https://webpack.github.io/docs/configuration.html#node */ - new HtmlWebpackPlugin({ - template: 'src/index.html', - chunksSortMode: 'dependency' - }), - - new WebpackNotifierPlugin({ alwaysNotify: true }) - ], - - /* - * Include polyfills or mocks for various node stuff - * Description: Node configuration - * - * See: https://webpack.github.io/docs/configuration.html#node - */ - node: { - global: 'window', - crypto: 'empty', - fs: 'empty', - events: true, - module: false, - clearImmediate: false, - setImmediate: false + node: { + global: 'window', + crypto: 'empty', + fs: 'empty', + events: true, + module: false, + clearImmediate: false, + setImmediate: false + } } - } -- cgit v1.2.3 From d268c551cc0cbe2f83f8cc9533ce5f636eda860a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 19 Sep 2016 22:09:12 +0200 Subject: Client: update to angular 2.0 --- client/config/webpack.common.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'client/config/webpack.common.js') diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 2ce44b6c7..88a3639d2 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -9,6 +9,7 @@ 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 WebpackNotifierPlugin = require('webpack-notifier') /* @@ -202,6 +203,19 @@ module.exports = function (options) { name: [ 'polyfills', 'vendor' ].reverse() }), + /** + * Plugin: ContextReplacementPlugin + * Description: Provides context to Angular's use of System.import + * + * 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 + ), + /* * Plugin: CopyWebpackPlugin * Description: Copy files and directories in webpack. -- cgit v1.2.3 From ad22074a780b4bdbe3cd9e903b3fa5ef83eaef14 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 19 Sep 2016 22:27:17 +0200 Subject: Client: fix prod build process --- client/config/webpack.common.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'client/config/webpack.common.js') diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 88a3639d2..882013a9e 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -142,15 +142,11 @@ module.exports = function (options) { }, { - test: /\.scss$/, - exclude: /node_modules/, - loaders: [ 'raw-loader', 'sass-loader' ] - }, - - { - test: /\.(woff2?|ttf|eot|svg)$/, - loader: 'url?limit=10000&name=assets/fonts/[hash].[ext]' + test: /\.(sass|scss)$/, + loaders: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url', 'sass-loader?sourceMap'] }, + { 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' }, /* Raw loader support for *.html * Returns file content as string -- cgit v1.2.3