Skip to content

Commit ac90631

Browse files
committed
Updated build system
1 parent 6f5047d commit ac90631

File tree

4 files changed

+5512
-9
lines changed

4 files changed

+5512
-9
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"transform-decorators-legacy"
55
],
66
"presets": [
7-
"es2015-webpack",
7+
["es2015", {"modules":false}],
88
"stage-0",
99
"react"
1010
]

.webpackrc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ module.exports = {
3232
loaders: [{
3333
test: /\.jsx?$/,
3434
include: d('src'),
35-
loaders: ['babel'],
35+
loaders: ['babel-loader'],
3636
}, {
3737
test: /\.json$/,
38-
loaders: ['json'],
38+
loaders: ['json-loader'],
3939
}, {
4040
test: /\.(html|css|png|ttf)$/,
4141
include: d('src/renderer'),
4242
loaders: [
43-
'file?context=./src/renderer&name=[name].[ext]?[hash:10]',
43+
'file-loader?context=./src/renderer&name=[name].[ext]?[hash:10]',
4444
],
4545
}, {
4646
test: /\.(html|css|ttf|png)$/,
4747
include: d('src/bundle'),
4848
loaders: [
49-
'file?context=./src/bundle&name=[path][name].[ext]?[hash:10]',
49+
'file-loader?context=./src/bundle&name=[path][name].[ext]?[hash:10]',
5050
],
5151
}, {
5252
test: /\.css$/,
5353
include: d('node_modules/codemirror'),
54-
loaders: ['file?name=[name].[ext]?[hash:10]'],
54+
loaders: ['file-loader?name=[name].[ext]?[hash:10]'],
5555
}]
5656
},
5757

@@ -78,7 +78,7 @@ module.exports = {
7878
},
7979

8080
plugins: [
81-
new webpack.NoErrorsPlugin(),
81+
new webpack.NoEmitOnErrorsPlugin(),
8282
new webpack.EnvironmentPlugin(['NODE_ENV']),
8383
new webpack.LoaderOptionsPlugin({
8484
debug: development,
@@ -90,7 +90,6 @@ module.exports = {
9090
'onBuildStart': "open 'http://localhost:8080'",
9191
}),
9292
] : [
93-
new webpack.optimize.DedupePlugin(),
9493
new webpack.optimize.UglifyJsPlugin({
9594
comments: /\/\/#/, // Keep only source maps
9695
compress: { warnings: false },

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"author": "",
1212
"license": "MIT",
1313
"dependencies": {
14-
"babel-plugin-transform-decorators-legacy": "^1.3.4",
1514
"babel-runtime": "^6.6.1",
1615
"codemirror": "^5.15.2",
1716
"lodash": "^4.12.0",
@@ -29,6 +28,7 @@
2928
"babel-preset-es2015-webpack": "^6.4.1",
3029
"babel-preset-react": "^6.5.0",
3130
"babel-preset-stage-0": "^6.5.0",
31+
"babel-plugin-transform-decorators-legacy": "^1.3.4",
3232
"chai": "^3.5.0",
3333
"coveralls": "^2.11.9",
3434
"css-loader": "^0.23.1",

0 commit comments

Comments
 (0)