Skip to content

Commit 0a3e6ad

Browse files
authored
Update webpack.config.babel.js
1 parent dea3069 commit 0a3e6ad

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

webpack.config.babel.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const path = require('path');
2-
const DefinePlugin = require('webpack').DefinePlugin;
1+
import path from 'path'
2+
import {DefinePlugin} from 'webpack'
33

44
const CONTEXT = path.resolve(__dirname),
55
{NODE_ENV} = process.env,
@@ -26,18 +26,21 @@ var config = {
2626
],
2727

2828
module: {
29-
// preLoaders: [{
30-
// test: /\.js/,
31-
// loader: 'eslint',
32-
// include: [SRC_PATH],
33-
// exclude: [NODE_MODULES]
34-
// }],
35-
loaders: [{
36-
test: /\.js/,
37-
loader: 'babel',
38-
include: [SRC_PATH, createPath('test')],
39-
exclude: [NODE_MODULES]
40-
}]
29+
rules: [
30+
{
31+
enforce: 'pre',
32+
test: /\.js/,
33+
loader: 'eslint-loader',
34+
include: [SRC_PATH],
35+
exclude: [NODE_MODULES]
36+
},
37+
{
38+
test: /\.js/,
39+
loader: 'babel-loader',
40+
include: [SRC_PATH, createPath('test')],
41+
exclude: [NODE_MODULES]
42+
}
43+
]
4144
},
4245

4346
externals: NODE_ENV === 'test' ? [] : [
@@ -47,11 +50,7 @@ var config = {
4750
's3',
4851
'recursive-readdir',
4952
'progress'
50-
],
51-
52-
resolve: {
53-
extensions: ['.js', '']
54-
}
53+
]
5554
}
5655

5756
module.exports = config

0 commit comments

Comments
 (0)