From 63baab088d734a982d21a5df538db554091188ad Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Mon, 10 Jul 2017 21:02:18 +0900 Subject: Fix regular expression for RFC 5646 (regression from #3604) (#4133) --- config/webpack/translationRunner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/webpack') diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js index 097099b48..d616c7839 100644 --- a/config/webpack/translationRunner.js +++ b/config/webpack/translationRunner.js @@ -2,7 +2,7 @@ const fs = require('fs'); const path = require('path'); const { default: manageTranslations } = require('react-intl-translations-manager'); -const RFC5646_REGEXP = /^[a-z]{2,3}(?:|[A-Z]+)$/; +const RFC5646_REGEXP = /^[a-z]{2,3}(?:|-[A-Z]+)$/; const rootDirectory = path.resolve(__dirname, '..', '..'); const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales'); -- cgit From a3d93e8bbede04ddbbab10168360a32aedc6bcf7 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 10 Jul 2017 18:46:46 +0200 Subject: Fix #4059 - Remove ModuleConcatenationPlugin (#4139) It increased memory usage of Webpack 1.5x fold with little benefits --- config/webpack/production.js | 1 - 1 file changed, 1 deletion(-) (limited to 'config/webpack') diff --git a/config/webpack/production.js b/config/webpack/production.js index 0d2c9acfb..303fca81b 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -12,7 +12,6 @@ module.exports = merge(sharedConfig, { stats: 'normal', plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), new webpack.optimize.UglifyJsPlugin({ sourceMap: true, mangle: true, -- cgit