diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-05-30 21:58:09 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-05-30 21:58:09 +0000 |
| commit | 5e88463d3089e3b764ae6347b9ce709a01acb8b7 (patch) | |
| tree | 3d2fa54871b659065bd7919ea54936073e6cb9ea /app/assets | |
| parent | 09916aea40a50cfa0bcc4a74ae7367c3bd18cb96 (diff) | |
| parent | 8faf0d9a14d98c98eae740e8adb065f6f880b98d (diff) | |
| download | gitlab-ce-5e88463d3089e3b764ae6347b9ce709a01acb8b7.tar.gz | |
Merge branch 'upgrade-core-js' into 'master'
Upgrade core-js to v3.1.3 and enable URL polyfill
See merge request gitlab-org/gitlab-ce!28909
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/commons/polyfills.js | 33 | ||||
| -rw-r--r-- | app/assets/javascripts/test_utils/index.js | 4 |
2 files changed, 19 insertions, 18 deletions
diff --git a/app/assets/javascripts/commons/polyfills.js b/app/assets/javascripts/commons/polyfills.js index 9216d4ab372..d0cc4897aeb 100644 --- a/app/assets/javascripts/commons/polyfills.js +++ b/app/assets/javascripts/commons/polyfills.js @@ -1,20 +1,21 @@ // ECMAScript polyfills -import 'core-js/fn/array/fill'; -import 'core-js/fn/array/find'; -import 'core-js/fn/array/find-index'; -import 'core-js/fn/array/from'; -import 'core-js/fn/array/includes'; -import 'core-js/fn/object/assign'; -import 'core-js/fn/object/values'; -import 'core-js/fn/object/entries'; -import 'core-js/fn/promise'; -import 'core-js/fn/promise/finally'; -import 'core-js/fn/string/code-point-at'; -import 'core-js/fn/string/from-code-point'; -import 'core-js/fn/string/includes'; -import 'core-js/fn/symbol'; -import 'core-js/es6/map'; -import 'core-js/es6/weak-map'; +import 'core-js/es/array/fill'; +import 'core-js/es/array/find'; +import 'core-js/es/array/find-index'; +import 'core-js/es/array/from'; +import 'core-js/es/array/includes'; +import 'core-js/es/object/assign'; +import 'core-js/es/object/values'; +import 'core-js/es/object/entries'; +import 'core-js/es/promise'; +import 'core-js/es/promise/finally'; +import 'core-js/es/string/code-point-at'; +import 'core-js/es/string/from-code-point'; +import 'core-js/es/string/includes'; +import 'core-js/es/symbol'; +import 'core-js/es/map'; +import 'core-js/es/weak-map'; +import 'core-js/modules/web.url'; // Browser polyfills import 'formdata-polyfill'; diff --git a/app/assets/javascripts/test_utils/index.js b/app/assets/javascripts/test_utils/index.js index a55a338eea8..1e75ee60671 100644 --- a/app/assets/javascripts/test_utils/index.js +++ b/app/assets/javascripts/test_utils/index.js @@ -1,5 +1,5 @@ -import 'core-js/es6/map'; -import 'core-js/es6/set'; +import 'core-js/es/map'; +import 'core-js/es/set'; import simulateDrag from './simulate_drag'; import simulateInput from './simulate_input'; |