diff --git a/.gitignore b/.gitignore index 436a08414e..bbd843c61b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,8 @@ dist/ build/ frappe/docs/current .vscode -node_modules \ No newline at end of file +node_modules + + +# Not Recommended, but will remove once webpack ready +package-lock.json diff --git a/frappe/build.js b/frappe/build.js index 7823923172..6495e2a359 100644 --- a/frappe/build.js +++ b/frappe/build.js @@ -154,11 +154,13 @@ function get_compiled_file(file, output_path, minify, force_compile) { function babelify(content, path, minify) { let presets = ['env']; + var plugins = ['transform-object-rest-spread'] // Minification doesn't work when loading Frappe Desk // Avoid for now, trace the error and come back. try { return babel.transform(content, { presets: presets, + plugins: plugins, comments: false }).code; } catch (e) { diff --git a/package.json b/package.json index 836c0957ef..5f9f50162c 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "babel-core": "^6.26.0", + "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-preset-env": "^1.6.0", "babel-preset-minify": "^0.2.0", "chokidar": "^1.7.0",