webpack@2 #222

Merged
neb-b merged 3 commits from webpack-2 into master 2017-06-12 18:07:13 +02:00
Showing only changes of commit d4afa34d48 - Show all commits

View file

@ -16,8 +16,8 @@ module.exports = {
}, },
devtool: 'source-map', devtool: 'source-map',
resolve: { resolve: {
root: appPath, modules: [appPath, "node_modules"],
extensions: ['', '.js', '.jsx', '.css'], extensions: ['.js', '.jsx', '.css']
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
@ -25,28 +25,29 @@ module.exports = {
}), }),
], ],
module: { module: {
preLoaders: [ rules: [
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
enforce: "pre",
loaders: ['eslint'], loaders: ['eslint'],
// define an include so we check just the files we need // define an include so we check just the files we need
include: PATHS.app include: PATHS.app
} },
], {
loaders: [ test: /\.css$/,
{ test: /\.css$/, loader: "style!css" }, use: ["style-loader", "css-loader"]
},
{ {
test: /\.jsx?$/, test: /\.jsx?$/,
loader: 'babel', exclude: /node_modules/,
query: { use: {
cacheDirectory: true, loader: 'babel-loader',
presets:[ 'es2015', 'react', 'stage-2' ] options: {
cacheDirectory: true,
presets: [ 'es2015', 'react', 'stage-2' ]
}
} }
}, }
{
test: /mime\.json$/,
loader: 'json',
},
] ]
}, },
target: 'electron-main', target: 'electron-main',