grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-add happypack for babel builds

Browse Source
This commit is contained in:
Jaco Greeff 2017-08-01 18:11:35 +02:00
parent 34a8daa629
commit aa95c09a88
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/webpack/app.js
View File

@ -66,7 +66,7 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
exclude: /(node_modules)/, exclude: /(node_modules)/,
use: [ 'babel-loader' ] use: [ 'happypack/loader?id=babel' ]
}, },
{ {
test: /\.json$/, test: /\.json$/,
@ -121,7 +121,8 @@ module.exports = {
{ {
loader: 'postcss-loader', loader: 'postcss-loader',
options: { options: {
plugins: (loader) => [ sourceMap: true,
plugins: [
require('postcss-import'), require('postcss-import'),
require('postcss-nested'), require('postcss-nested'),
require('postcss-simple-vars') require('postcss-simple-vars')

2
js/webpack/libraries.js
View File

@ -55,7 +55,7 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
exclude: /node_modules/, exclude: /node_modules/,
use: [ 'babel-loader' ] use: [ 'happypack/loader?id=babel' ]
}, },
{ {
test: /\.json$/, test: /\.json$/,

2
js/webpack/rules/es6.js
View File

@ -17,5 +17,5 @@
module.exports = { module.exports = {
test: /\.js$/, test: /\.js$/,
include: /node_modules\/(get-own-enumerable-property-symbols|ethereumjs-tx|stringify-object)/, include: /node_modules\/(get-own-enumerable-property-symbols|ethereumjs-tx|stringify-object)/,
use: [ 'babel-loader' ] use: [ 'happypack/loader?id=babel' ]
}; };

2
js/webpack/rules/parity.js
View File

@ -17,5 +17,5 @@
module.exports = { module.exports = {
test: /\.js$/, test: /\.js$/,
include: /node_modules\/@parity\//, include: /node_modules\/@parity\//,
use: [ 'babel-loader' ] use: [ 'happypack/loader?id=babel' ]
}; };

12
js/webpack/shared.js
View File

@ -18,7 +18,7 @@ const webpack = require('webpack');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
// const HappyPack = require('happypack'); const HappyPack = require('happypack');
const CircularDependencyPlugin = require('circular-dependency-plugin'); const CircularDependencyPlugin = require('circular-dependency-plugin');
const PackageJson = require('../package.json'); const PackageJson = require('../package.json');
@ -83,12 +83,12 @@ function getPlugins (_isProd = isProd) {
LOGGING: JSON.stringify(!isProd), LOGGING: JSON.stringify(!isProd),
UI_VERSION: JSON.stringify(UI_VERSION) UI_VERSION: JSON.stringify(UI_VERSION)
} }
}),
new HappyPack({
id: 'babel',
threads: 4,
loaders: ['babel-loader']
}) })
// new HappyPack({
// id: 'babel',
// threads: 4,
// loaders: [ 'babel-loader' ]
// })
]; ];
if (_isProd) { if (_isProd) {