diff --git a/recipe-server/package.json b/recipe-server/package.json index 4da508c10..b818deb38 100644 --- a/recipe-server/package.json +++ b/recipe-server/package.json @@ -57,8 +57,9 @@ "babel-plugin-transform-function-bind": "6.22.0", "babel-plugin-transform-object-rest-spread": "6.23.0", "babel-plugin-transform-runtime": "6.15.0", + "babel-preset-babili": "0.0.12", "babel-preset-react": "6.11.1", - "babili-webpack-plugin": "^0.1.1", + "babili-webpack-plugin": "0.1.1", "css-loader": "0.24.0", "enzyme": "2.4.1", "eslint": "3.19.0", diff --git a/recipe-server/webpack.config.js b/recipe-server/webpack.config.js index 93b682ecb..f4ea657e5 100644 --- a/recipe-server/webpack.config.js +++ b/recipe-server/webpack.config.js @@ -8,6 +8,8 @@ var AsyncAwaitPlugin = require('webpack-async-await'); var BabiliPlugin = require('babili-webpack-plugin'); var argv = require('yargs').argv; var childProcess = require('child_process'); +var babiliPreset = require('babel-preset-babili'); +var babelCore = require('babel-core'); const BOLD = '\u001b[1m'; const END_BOLD = '\u001b[39m\u001b[22m'; @@ -38,7 +40,11 @@ var plugins = [ if (production) { plugins = plugins.concat([ new webpack.optimize.DedupePlugin(), - new BabiliPlugin(), + new BabiliPlugin({}, { + // Use our own pinned versions of babel and babili in case deduplication fails + babel: babelCore, + babili: babiliPreset, + }), ]); } else { plugins = plugins.concat([