Skip to content

Commit a200ba2

Browse files
committed
Fixed babel loader version, update deps
1 parent 2cd577b commit a200ba2

File tree

4 files changed

+6
-4605
lines changed

4 files changed

+6
-4605
lines changed

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
"@rispa/babel": "4.2.x",
1515
"@webpack-blocks/webpack2": "^0.4.0",
1616
"babel-core": "^6.26.0",
17-
"babel-loader": "^7.1.2",
17+
"babel-loader": "7.1.1",
1818
"babel-preset-env": "^1.6.1",
1919
"babel-polyfill": "^6.26.0",
20-
"happypack": "^4.0.0"
20+
"happypack": "^4.0.1",
21+
"webpack": "2.7.0"
2122
},
2223
"scripts": {
2324
"lint": "rispa-eslint .",
2425
"lint:fix": "rispa-eslint . --fix"
2526
}
26-
}
27+
}

src/WebpackJavaScriptPlugin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { PluginInstance } = require('@rispa/core')
22
const HappyPack = require('happypack')
33
const WebpackPluginApi = require('@rispa/webpack')
44
const BabelPluginApi = require('@rispa/babel').default
5-
const babelConfig = require('./configs/babel-options')
5+
const babelConfig = require('./configs/babel.config')
66
const clientWebpackConfig = require('./configs/client.wpc')
77

88
const getJavaScriptLoader = context => ({
@@ -35,7 +35,7 @@ class WebpackJavaScriptPlugin extends PluginInstance {
3535

3636
const config = this.createWebpackConfig()
3737

38-
this.webpack.addClientConfig(config, clientWebpackConfig)
38+
this.webpack.addClientConfig(clientWebpackConfig)
3939
this.webpack.addCommonConfig(config)
4040
}
4141

File renamed without changes.

0 commit comments

Comments
 (0)