From 6f3c58a5e2d232aeaff24f41a8fac068ac714f98 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 12 Feb 2023 01:53:19 -0500 Subject: [PATCH] Avoids double bundling react/react-dom Updates dependencies --- ThirdPartyNotices.txt | 46 +++++++++------------------------------------- package.json | 4 ++-- webpack.config.js | 2 ++ yarn.lock | 40 ++++++++++++++++++++-------------------- 4 files changed, 33 insertions(+), 59 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index da8d2e5..0ceaabd 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -17,16 +17,15 @@ This project incorporates components from the projects listed below. 12. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite) 13. lit version 2.6.1 (https://github.com/lit/lit) 14. lodash-es version 4.17.21 (https://github.com/lodash/lodash) -15. md5.js version 1.3.5 (https://github.com/crypto-browserify/md5.js) -16. microsoft/vscode (https://github.com/microsoft/vscode) -17. node-fetch version 2.6.9 (https://github.com/bitinn/node-fetch) -18. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) -19. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify) -20. react-dom version 16.8.4 (https://github.com/facebook/react) -21. react version 16.8.4 (https://github.com/facebook/react) -22. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point) -23. sindresorhus/string-width (https://github.com/sindresorhus/string-width) -24. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable) +15. microsoft/vscode (https://github.com/microsoft/vscode) +16. node-fetch version 2.6.9 (https://github.com/bitinn/node-fetch) +17. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify) +18. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify) +19. react-dom version 16.8.4 (https://github.com/facebook/react) +20. react version 16.8.4 (https://github.com/facebook/react) +21. sindresorhus/is-fullwidth-code-point (https://github.com/sindresorhus/is-fullwidth-code-point) +22. sindresorhus/string-width (https://github.com/sindresorhus/string-width) +23. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable) %% @microsoft/fast-element NOTICES AND INFORMATION BEGIN HERE ========================================= @@ -1505,33 +1504,6 @@ terms above. ========================================= END OF lodash-es NOTICES AND INFORMATION -%% md5.js NOTICES AND INFORMATION BEGIN HERE -========================================= -The MIT License (MIT) - -Copyright (c) 2016 Kirill Fomichev - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -========================================= -END OF md5.js NOTICES AND INFORMATION - %% microsoft/vscode NOTICES AND INFORMATION BEGIN HERE ========================================= MIT License diff --git a/package.json b/package.json index d04c7b0..530a5af 100644 --- a/package.json +++ b/package.json @@ -13034,7 +13034,7 @@ "vscode:prepublish": "yarn run bundle" }, "dependencies": { - "@gitkraken/gitkraken-components": "3.1.0", + "@gitkraken/gitkraken-components": "4.0.0", "@microsoft/fast-element": "1.11.0", "@microsoft/fast-react-wrapper": "0.3.16-0", "@octokit/core": "4.2.0", @@ -13080,7 +13080,7 @@ "cssnano-preset-advanced": "5.3.9", "esbuild": "0.17.7", "esbuild-loader": "3.0.0", - "eslint": "8.33.0", + "eslint": "8.34.0", "eslint-cli": "1.1.1", "eslint-config-prettier": "8.6.0", "eslint-import-resolver-typescript": "3.5.3", diff --git a/webpack.config.js b/webpack.config.js index 5c791f6..cb51470 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -478,6 +478,8 @@ function getWebviewsConfig(mode, env) { resolve: { alias: { '@env': path.resolve(__dirname, 'src', 'env', 'browser'), + react: path.resolve(__dirname, 'node_modules', 'react'), + 'react-dom': path.resolve(__dirname, 'node_modules', 'react-dom'), }, extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'], modules: [basePath, 'node_modules'], diff --git a/yarn.lock b/yarn.lock index 8bf8760..c772363 100644 --- a/yarn.lock +++ b/yarn.lock @@ -185,10 +185,10 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@gitkraken/gitkraken-components@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-3.1.0.tgz#5f2e128c7ece9a1d3cfd6717a8113414312381af" - integrity sha512-7oa2nvIL51Vnua8dISQrxN3oja2H2O5OP6qc8N7AwAEEPDhdtjdhHqFXaJnrEyTuKuKA7A11aL8DEX5R7eJ2zQ== +"@gitkraken/gitkraken-components@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@gitkraken/gitkraken-components/-/gitkraken-components-4.0.0.tgz#dbb18b69accc424b3c3703db5d4f327d5d2ba72b" + integrity sha512-lt6Gf9goQaJvIG+Rga/R41OpvYmIA+aoq6aHu184SrJLlpqYbKp/B3u+91CBqghP6DnKbAaDJbTUaBImg2oEHA== dependencies: "@axosoft/react-virtualized" "9.22.3-gitkraken.3" classnames "2.3.2" @@ -1727,9 +1727,9 @@ chrome-trace-event@^1.0.2: integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^3.2.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" - integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== circular-dependency-plugin@5.2.2: version "5.2.2" @@ -2480,9 +2480,9 @@ define-lazy-prop@^2.0.0: integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -2675,9 +2675,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.284: - version "1.4.293" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.293.tgz#eaea755ad37a0f1759874a8597b33be62def2781" - integrity sha512-h7vBlhC83NsgC9UO3LOZx91xgstIrHk5iqMbZgnEArL5rHTM6HfsUZhnwb3oRnNetXM1741kB9SO7x9jLshz5A== + version "1.4.295" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.295.tgz#911d5df67542bf7554336142eb302c5ec90bba66" + integrity sha512-lEO94zqf1bDA3aepxwnWoHUjA8sZ+2owgcSZjYQy0+uOSEclJX0VieZC+r+wLpSxUHRd6gG32znTWmr+5iGzFw== emoji-regex@^8.0.0: version "8.0.0" @@ -3029,10 +3029,10 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@8.33.0: - version "8.33.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7" - integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA== +eslint@8.34.0: + version "8.34.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6" + integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg== dependencies: "@eslint/eslintrc" "^1.4.1" "@humanwhocodes/config-array" "^0.11.8" @@ -4983,9 +4983,9 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^3.3.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.32.0.tgz#a22e038efab01d9a35c6b19808b430616ed80539" - integrity sha512-HkwdiLzE/LeuOMIQq/dJq70oNyRc88+wt5CH/RXYseE00LkA/c4PkS6Ti1vE4OHYUiKjkwuxjWq9pItgrz8UJw== + version "3.33.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.33.0.tgz#8b23a0cec84e1c5f5411836de6a9b84bccf26e7f" + integrity sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog== dependencies: semver "^7.3.5"