From 075bb31d5bf10950bd84c554aa35be5d298c4de9 Mon Sep 17 00:00:00 2001 From: Mariusz Marciniak Date: Wed, 13 Oct 2021 15:22:32 +0200 Subject: [PATCH] Fix webpack to allow async promises --- app/ui.js | 2 ++ package-lock.json | 54 +++++++++++++++++++++++++++++------------------ package.json | 19 +++++++---------- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/app/ui.js b/app/ui.js index 092519e8..9cc254ad 100644 --- a/app/ui.js +++ b/app/ui.js @@ -30,6 +30,8 @@ window.updateSetting = (name, value) => { } } +import "core-js/stable"; +import "regenerator-runtime/runtime"; import * as Log from '../core/util/logging.js'; import _, { l10n } from './localization.js'; import { isTouchDevice, isSafari, hasScrollbarGutter, dragThreshold, supportsBinaryClipboard, isFirefox } diff --git a/package-lock.json b/package-lock.json index 3f57a171..bc278c5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "chai": "*", "clean-webpack-plugin": "^3.0.0", "commander": "*", - "core-js": "*", + "core-js": "^3.18.3", "css-loader": "^5.0.1", "css-minimizer-webpack-plugin": "^1.1.5", "es-module-loader": "*", @@ -48,6 +48,7 @@ "po2json": "*", "postcss-loader": "^4.1.0", "preload-webpack-plugin": "^3.0.0-beta.4", + "regenerator-runtime": "^0.13.9", "requirejs": "*", "rollup": "*", "rollup-plugin-node-resolve": "*", @@ -4010,9 +4011,9 @@ } }, "node_modules/core-js": { - "version": "3.16.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz", - "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==", + "version": "3.18.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz", + "integrity": "sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw==", "dev": true, "hasInstallScript": true, "funding": { @@ -18310,7 +18311,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-node": { "version": "1.8.2", @@ -18364,13 +18366,15 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true + "dev": true, + "requires": {} }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "alphanum-sort": { "version": "1.0.2", @@ -18684,7 +18688,8 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz", "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==", - "dev": true + "dev": true, + "requires": {} }, "babylon": { "version": "6.18.0", @@ -19806,9 +19811,9 @@ "dev": true }, "core-js": { - "version": "3.16.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz", - "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==", + "version": "3.18.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz", + "integrity": "sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw==", "dev": true }, "core-js-compat": { @@ -20819,7 +20824,8 @@ "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true + "dev": true, + "requires": {} } } }, @@ -22436,7 +22442,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "ieee754": { "version": "1.2.1", @@ -23347,19 +23354,22 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz", "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=", - "dev": true + "dev": true, + "requires": {} }, "karma-script-launcher": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz", "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=", - "dev": true + "dev": true, + "requires": {} }, "karma-sinon-chai": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/karma-sinon-chai/-/karma-sinon-chai-2.0.2.tgz", "integrity": "sha512-SDgh6V0CUd+7ruL1d3yG6lFzmJNGRNQuEuCYXLaorruNP9nwQfA7hpsp4clx4CbOo5Gsajh3qUOT7CrVStUKMw==", - "dev": true + "dev": true, + "requires": {} }, "kew": { "version": "0.7.0", @@ -25647,7 +25657,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -26312,7 +26323,8 @@ "version": "3.0.0-beta.4", "resolved": "https://registry.npmjs.org/preload-webpack-plugin/-/preload-webpack-plugin-3.0.0-beta.4.tgz", "integrity": "sha512-6hhh0AswCbp/U4EPVN4fbK2wiDkXhmgjjgEYEmXa21UYwjYzCIgh3ZRMXM21ZPLfbQGpdFuSL3zFslU+edjpwg==", - "dev": true + "dev": true, + "requires": {} }, "prelude-ls": { "version": "1.2.1", @@ -27246,7 +27258,8 @@ "version": "2.14.0", "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.14.0.tgz", "integrity": "sha512-9stIF1utB0ywNHNT7RgiXbdmen8QDCRsrTjw+G9TgKt1Yexjiv8TOWZ6WHsTPz57Yky3DIswZvEqX8fpuHNDtQ==", - "dev": true + "dev": true, + "requires": {} }, "slash": { "version": "2.0.0", @@ -29645,7 +29658,8 @@ "version": "8.2.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.0.tgz", "integrity": "sha512-uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g==", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "3.0.0", diff --git a/package.json b/package.json index 06b07997..5cee3929 100644 --- a/package.json +++ b/package.json @@ -30,29 +30,27 @@ "url": "git+https://github.com/kasmtech/noVNC.git" }, "author": "Kasm Technologies (https://www.kasmweb.com)", - "contributors": [ - ], + "contributors": [], "license": "MPL-2.0", "bugs": { "url": "https://github.com/kasmtech/noVNC/issues" }, "homepage": "https://github.com/kasmtech/noVNC", "devDependencies": { - "@babel/core": "^7.12.10", - "@babel/preset-env": "^7.12.11", + "@babel/cli": "*", "@babel/core": "*", - "babel-loader": "^8.2.2", "@babel/plugin-syntax-dynamic-import": "*", "@babel/plugin-transform-modules-commonjs": "*", "@babel/preset-env": "*", - "@babel/cli": "*", + "@chiragrupani/karma-chromium-edge-launcher": "*", + "babel-loader": "^8.2.2", "babel-plugin-import-redirect": "*", - "browserify": "*", "babelify": "*", - "core-js": "*", + "browserify": "*", "chai": "*", "clean-webpack-plugin": "^3.0.0", "commander": "*", + "core-js": "^3.18.3", "css-loader": "^5.0.1", "css-minimizer-webpack-plugin": "^1.1.5", "es-module-loader": "*", @@ -64,11 +62,10 @@ "html-webpack-plugin": "^4.5.0", "jsdom": "*", "karma": "*", - "karma-mocha": "*", "karma-chrome-launcher": "*", - "@chiragrupani/karma-chromium-edge-launcher": "*", "karma-firefox-launcher": "*", "karma-ie-launcher": "*", + "karma-mocha": "*", "karma-mocha-reporter": "*", "karma-safari-launcher": "*", "karma-script-launcher": "*", @@ -79,6 +76,7 @@ "po2json": "*", "postcss-loader": "^4.1.0", "preload-webpack-plugin": "^3.0.0-beta.4", + "regenerator-runtime": "^0.13.9", "requirejs": "*", "rollup": "*", "rollup-plugin-node-resolve": "*", @@ -90,7 +88,6 @@ "webpack": "^4.29.6", "webpack-cli": "^3.2.3" }, - "dependencies": {}, "keywords": [ "vnc", "rfb",