diff --git a/dev/boot.js b/dev/boot.js index 97a82d8f4..df120ab42 100644 --- a/dev/boot.js +++ b/dev/boot.js @@ -2,6 +2,8 @@ import window from 'window'; import elementDatasetPolyfill from 'element-dataset'; +import 'es6-object-assign/auto'; + import {Promise} from 'es6-promise-polyfill/promise.js'; import {progressJs} from '../vendors/Progress.js/src/progress.js'; diff --git a/package.json b/package.json index 13eeeb687..b7481db6f 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "copy-webpack-plugin": "4.5.1", "element-dataset": "2.2.6", "emailjs-addressparser": "2.0.2", + "es6-object-assign": "1.1.0", "es6-promise-polyfill": "1.2.0", "eslint": "4.19.1", "eslint-plugin-compat": "2.2.0", @@ -103,8 +104,8 @@ "json-loader": "0.5.7", "json3": "3.3.2", "knockout": "3.4.2", - "knockout-transformations": "2.1.0", "knockout-sortable": "1.1.0", + "knockout-transformations": "2.1.0", "lozad": "1.4.0", "matchmedia-polyfill": "0.3.0", "moment": "2.22.1", diff --git a/yarn.lock b/yarn.lock index 3578a713e..8856171df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2052,6 +2052,10 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + es6-promise-polyfill@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es6-promise-polyfill/-/es6-promise-polyfill-1.2.0.tgz#f38925f23cb3e3e8ce6cda8ff774fcebbb090cde"