Skip to content

Commit

Permalink
Fix mozilla#812: Pin Babili dependencies to known-good versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Kelly committed Jun 14, 2017
1 parent 8cda4c9 commit 2b71d61
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion recipe-server/package.json
Expand Up @@ -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",
Expand Down
8 changes: 7 additions & 1 deletion recipe-server/webpack.config.js
Expand Up @@ -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';
Expand Down Expand Up @@ -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([
Expand Down

0 comments on commit 2b71d61

Please sign in to comment.