diff --git a/package-lock.json b/package-lock.json index c5b197144de7fea10c20cf24af7e48b1e39d638c..a015966e8a486ac19c8570b3a77afda01897f1c3 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index c21c51ee5a8fe19d32318feee9d372cec8407ca6..0fd8a47039e85f4f1a6dbb30bfd1c03d4bfb0239 100644 --- a/package.json +++ b/package.json @@ -94,38 +94,38 @@ "@graphql-codegen/add": "^3.1.1", "@graphql-codegen/cli": "^2.6.2", "@graphql-codegen/time": "^3.1.1", - "@graphql-codegen/typescript": "^2.4.5", + "@graphql-codegen/typescript": "^2.4.7", "@graphql-codegen/typescript-graphql-files-modules": "^2.1.1", - "@graphql-codegen/typescript-graphql-request": "^4.3.7", - "@graphql-codegen/typescript-operations": "^2.3.2", + "@graphql-codegen/typescript-graphql-request": "^4.4.2", + "@graphql-codegen/typescript-operations": "^2.3.4", "@types/cors": "^2.8.12", "@types/gl": "^4.1.0", "@types/jest": "^27.4.1", - "@typescript-eslint/eslint-plugin": "^5.12.1", - "@typescript-eslint/parser": "^5.12.1", + "@typescript-eslint/eslint-plugin": "^5.14.0", + "@typescript-eslint/parser": "^5.14.0", "benchmark": "^2.1.4", "concurrently": "^7.0.0", "cpx2": "^4.2.0", "crypto-browserify": "^3.12.0", - "css-loader": "^6.6.0", - "eslint": "^8.10.0", + "css-loader": "^6.7.1", + "eslint": "^8.11.0", "extra-watch-webpack-plugin": "^1.0.3", "file-loader": "^6.2.0", "fs-extra": "^10.0.1", "graphql": "^16.3.0", "http-server": "^14.1.0", "jest": "^27.5.1", - "mini-css-extract-plugin": "^2.5.3", + "mini-css-extract-plugin": "^2.6.0", "path-browserify": "^1.0.1", "raw-loader": "^4.0.2", "sass": "^1.49.9", "sass-loader": "^12.6.0", - "simple-git": "^3.2.6", + "simple-git": "^3.3.0", "stream-browserify": "^3.0.0", "style-loader": "^3.3.1", "ts-jest": "^27.1.3", - "typescript": "^4.5.5", - "webpack": "^5.69.1", + "typescript": "^4.6.2", + "webpack": "^5.70.0", "webpack-cli": "^4.9.2" }, "dependencies": { @@ -135,8 +135,8 @@ "@types/express": "^4.17.13", "@types/node": "^16.11.26", "@types/node-fetch": "^2.6.1", - "@types/react": "^17.0.39", - "@types/react-dom": "^17.0.11", + "@types/react": "^17.0.40", + "@types/react-dom": "^17.0.13", "@types/swagger-ui-dist": "3.30.1", "argparse": "^2.0.1", "body-parser": "^1.19.2", @@ -147,8 +147,8 @@ "immer": "^9.0.12", "immutable": "^4.0.0", "node-fetch": "^2.6.7", - "rxjs": "^7.5.4", - "swagger-ui-dist": "^4.5.2", + "rxjs": "^7.5.5", + "swagger-ui-dist": "^4.6.2", "tslib": "^2.3.1", "util.promisify": "^1.1.1", "xhr2": "^0.2.1" diff --git a/src/mol-task/util/scheduler.ts b/src/mol-task/util/scheduler.ts index 346d15f8701a9ff1a8ab55de7b4545a6df82846c..16150b48057a7fdc7cca7d9d71feceae4a3b295d 100644 --- a/src/mol-task/util/scheduler.ts +++ b/src/mol-task/util/scheduler.ts @@ -12,7 +12,7 @@ declare const WorkerGlobalScope: any; function createImmediateActions() { - const global: any = (function () { + const thisGlobal: any = (function () { const _window = typeof window !== 'undefined' && window; const _self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope && self; const _global = typeof global !== 'undefined' && global; @@ -79,14 +79,14 @@ function createImmediateActions() { } function canUsePostMessage() { - if (global && global.postMessage && !global.importScripts) { + if (thisGlobal && thisGlobal.postMessage && !thisGlobal.importScripts) { let postMessageIsAsynchronous = true; - const oldOnMessage = global.onmessage; - global.onmessage = function () { + const oldOnMessage = thisGlobal.onmessage; + thisGlobal.onmessage = function () { postMessageIsAsynchronous = false; }; - global.postMessage('', '*'); - global.onmessage = oldOnMessage; + thisGlobal.postMessage('', '*'); + thisGlobal.onmessage = oldOnMessage; return postMessageIsAsynchronous; } } @@ -98,7 +98,7 @@ function createImmediateActions() { const messagePrefix = 'setImmediate$' + Math.random() + '$'; const onGlobalMessage = function (event: any) { - if (event.source === global && + if (event.source === thisGlobal && typeof event.data === 'string' && event.data.indexOf(messagePrefix) === 0) { runIfPresent(+event.data.slice(messagePrefix.length));