Commit e1d1728d authored by Clement Ho's avatar Clement Ho

Merge branch '64403-remove-setimmediate-polyfill' into 'master'

Remove setImmediate polyfill from production assets

See merge request gitlab-org/gitlab-ce!30591
parents 4b6611f3 7f8585c6
...@@ -344,6 +344,8 @@ module.exports = { ...@@ -344,6 +344,8 @@ module.exports = {
devtool: NO_SOURCEMAPS ? false : devtool, devtool: NO_SOURCEMAPS ? false : devtool,
// sqljs requires fs node: {
node: { fs: 'empty' }, fs: 'empty', // sqljs requires fs
setImmediate: false,
},
}; };
...@@ -89,9 +89,7 @@ export default ( ...@@ -89,9 +89,7 @@ export default (
payload, payload,
); );
return new Promise(resolve => { return new Promise(setImmediate)
setImmediate(resolve);
})
.then(() => result) .then(() => result)
.catch(error => { .catch(error => {
validateResults(); validateResults();
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
import $ from 'jquery'; import $ from 'jquery';
import 'core-js/features/set-immediate';
import 'vendor/jasmine-jquery'; import 'vendor/jasmine-jquery';
import '~/commons'; import '~/commons';
import Vue from 'vue'; import Vue from 'vue';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment