From 72337602a73bbadd8d60747765b21b6edfe1b651 Mon Sep 17 00:00:00 2001 From: Charafeddine Cheraa Date: Fri, 20 Aug 2021 09:46:58 +0000 Subject: [PATCH 1/4] preparing for v2.0.0 --- docker/centos7_x64/Dockerfile | 6 +- docker/centos7_x64/build.sh | 16 +- package.json | 32 +- yarn.lock | 894 ++++++++++++++++++++++++++++++++++ 4 files changed, 925 insertions(+), 23 deletions(-) diff --git a/docker/centos7_x64/Dockerfile b/docker/centos7_x64/Dockerfile index 7c76141..56a8eb2 100644 --- a/docker/centos7_x64/Dockerfile +++ b/docker/centos7_x64/Dockerfile @@ -3,9 +3,13 @@ FROM centos:7 LABEL maintainer="Evolved Binary Ltd " RUN yum -y update && \ + yum -y install centos-release-scl && \ + yum-config-manager --enable rhel-server-rhscl-7-rpms && \ + yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ && \ + source scl_source enable devtoolset-8 && \ yum -y install epel-release && \ yum -y install gcc-c++ make python-pip ruby-devel ruby-gems && \ - yum -y install libxkbfile-devel libX11-devel && \ + yum -y install libxkbfile-devel libX11-devel libsecret && \ yum -y install openssl wget && \ yum -y install https://harbottle.gitlab.io/wine32/7/i386/wine32-release.rpm && \ yum -y install wine.i686 && \ diff --git a/docker/centos7_x64/build.sh b/docker/centos7_x64/build.sh index f80dab1..9f438ca 100644 --- a/docker/centos7_x64/build.sh +++ b/docker/centos7_x64/build.sh @@ -1,20 +1,20 @@ # !/bin/sh source /root/.bashrc -yarn config set drivelist_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/drivelist -yarn config set @theia/node-pty_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/node-pty -yarn config set find-git-repositories_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/find-git-repositories -yarn config set native-keymap_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/native-keymap -yarn config set nsfw_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/nsfw -yarn config set oniguruma_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/oniguruma +source scl_source enable devtoolset-8 +yarn config set drivelist_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/drivelist +yarn config set @theia/node-pty_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/node-pty +yarn config set find-git-repositories_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/find-git-repositories +yarn config set native-keymap_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/native-keymap +yarn config set nsfw_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/nsfw +yarn config set oniguruma_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/oniguruma cp /root/force-download.js /project cd /project if [ -d /project/node_modules ]; then mv /project/node_modules /project/node_modules.bak fi -yarn +yarn --ignore-engines node /project/force-download @theia/node-pty nsfw find-git-repositories drivelist native-keymap oniguruma -p /project yarn package:all -c electron-builder.docker.yml -node /project/force-download @theia/node-pty nsfw find-git-repositories drivelist native-keymap oniguruma -r -p /project rm /project/force-download.js rm -rf node_modules if [ -d /project/node_modules.bak ]; then diff --git a/package.json b/package.json index 7df813c..990c16b 100644 --- a/package.json +++ b/package.json @@ -29,21 +29,25 @@ }, "homepage": "https://github.com/evolvedbinary/fusion-studio#readme", "dependencies": { - "@theia/core": "^1.15.0", - "@theia/editor": "^1.15.0", - "@theia/electron": "^1.15.0", - "@theia/file-search": "^1.15.0", - "@theia/filesystem": "^1.15.0", - "@theia/git": "^1.15.0", - "@theia/markers": "^1.15.0", - "@theia/monaco": "^1.15.0", - "@theia/navigator": "^1.15.0", - "@theia/preferences": "^1.15.0", - "@theia/process": "^1.15.0", - "@theia/terminal": "^1.15.0", - "@theia/workspace": "^1.15.0", + "@theia/core": "1.15.0", + "@theia/editor": "1.15.0", + "@theia/electron": "1.15.0", + "@theia/file-search": "1.15.0", + "@theia/filesystem": "1.15.0", + "@theia/git": "1.15.0", + "@theia/markers": "1.15.0", + "@theia/monaco": "1.15.0", + "@theia/navigator": "1.15.0", + "@theia/preferences": "1.15.0", + "@theia/process": "1.15.0", + "@theia/terminal": "1.15.0", + "@theia/workspace": "1.15.0", "fs-extra": "10.0.0", - "fusion-studio-extension": "^1.2.0" + "fusion-studio-extension": "^2.0.0-next", + "xterm": "^4.13.0", + "xterm-addon-fit": "^0.5.0", + "xterm-addon-search": "^0.8.0", + "yargs": "^17.1.1" }, "devDependencies": { "@theia/cli": "^1.15.0", diff --git a/yarn.lock b/yarn.lock index 99f3fa5..19fa1e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,6 +14,7 @@ dependencies: "@babel/highlight" "^7.14.5" +<<<<<<< HEAD "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": version "7.14.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" @@ -33,6 +34,27 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.14.8" "@babel/types" "^7.14.8" +======= +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" + integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== + +"@babel/core@^7.10.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8" + integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-module-transforms" "^7.15.0" + "@babel/helpers" "^7.14.8" + "@babel/parser" "^7.15.0" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -40,12 +62,21 @@ semver "^6.3.0" source-map "^0.5.0" +<<<<<<< HEAD "@babel/generator@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== dependencies: "@babel/types" "^7.14.8" +======= +"@babel/generator@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" + integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== + dependencies: + "@babel/types" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 jsesc "^2.5.1" source-map "^0.5.0" @@ -64,17 +95,27 @@ "@babel/helper-explode-assignable-expression" "^7.14.5" "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== dependencies: "@babel/compat-data" "^7.14.5" +======= +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" + integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== + dependencies: + "@babel/compat-data" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.14.5": +<<<<<<< HEAD version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc" integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ== @@ -84,6 +125,17 @@ "@babel/helper-member-expression-to-functions" "^7.14.7" "@babel/helper-optimise-call-expression" "^7.14.5" "@babel/helper-replace-supers" "^7.14.5" +======= + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" + integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.0" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-split-export-declaration" "^7.14.5" "@babel/helper-create-regexp-features-plugin@^7.14.5": @@ -138,12 +190,21 @@ dependencies: "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7": version "7.14.7" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== dependencies: "@babel/types" "^7.14.5" +======= +"@babel/helper-member-expression-to-functions@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" + integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== + dependencies: + "@babel/types" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": version "7.14.5" @@ -152,6 +213,7 @@ dependencies: "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49" @@ -165,6 +227,21 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.14.8" "@babel/types" "^7.14.8" +======= +"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" + integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" + "@babel/helper-simple-access" "^7.14.8" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-optimise-call-expression@^7.14.5": version "7.14.5" @@ -187,6 +264,7 @@ "@babel/helper-wrap-function" "^7.14.5" "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/helper-replace-supers@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" @@ -198,6 +276,19 @@ "@babel/types" "^7.14.5" "@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8": +======= +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" + integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.15.0" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" + +"@babel/helper-simple-access@^7.14.8": +>>>>>>> bc2d6b8... preparing for v2.0.0 version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== @@ -218,10 +309,17 @@ dependencies: "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +======= +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -239,6 +337,7 @@ "@babel/types" "^7.14.5" "@babel/helpers@^7.14.8": +<<<<<<< HEAD version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77" integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw== @@ -246,6 +345,15 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.14.8" "@babel/types" "^7.14.8" +======= + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" + integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== + dependencies: + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/highlight@^7.14.5": version "7.14.5" @@ -256,10 +364,17 @@ chalk "^2.0.0" js-tokens "^4.0.0" +<<<<<<< HEAD "@babel/parser@^7.14.5", "@babel/parser@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +======= +"@babel/parser@^7.14.5", "@babel/parser@^7.15.0": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" + integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" @@ -270,10 +385,17 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" +<<<<<<< HEAD "@babel/plugin-proposal-async-generator-functions@^7.14.7": version "7.14.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== +======= +"@babel/plugin-proposal-async-generator-functions@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" + integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -520,6 +642,7 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.14.5": +<<<<<<< HEAD version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939" integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw== @@ -530,6 +653,18 @@ version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== +======= + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" + integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-classes@^7.10.0", "@babel/plugin-transform-classes@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" + integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" @@ -614,6 +749,7 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" +<<<<<<< HEAD "@babel/plugin-transform-modules-commonjs@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97" @@ -622,6 +758,16 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-simple-access" "^7.14.5" +======= +"@babel/plugin-transform-modules-commonjs@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" + integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig== + dependencies: + "@babel/helper-module-transforms" "^7.15.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-simple-access" "^7.14.8" +>>>>>>> bc2d6b8... preparing for v2.0.0 babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.14.5": @@ -643,10 +789,17 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" +<<<<<<< HEAD "@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": version "7.14.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== +======= +"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -694,9 +847,15 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.10.0": +<<<<<<< HEAD version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523" integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg== +======= + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3" + integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" @@ -757,6 +916,7 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@^7.10.0": +<<<<<<< HEAD version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== @@ -767,6 +927,18 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" "@babel/plugin-proposal-async-generator-functions" "^7.14.7" +======= + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464" + integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q== + dependencies: + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-async-generator-functions" "^7.14.9" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -799,7 +971,11 @@ "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" "@babel/plugin-transform-block-scoping" "^7.14.5" +<<<<<<< HEAD "@babel/plugin-transform-classes" "^7.14.5" +======= + "@babel/plugin-transform-classes" "^7.14.9" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" @@ -810,10 +986,17 @@ "@babel/plugin-transform-literals" "^7.14.5" "@babel/plugin-transform-member-expression-literals" "^7.14.5" "@babel/plugin-transform-modules-amd" "^7.14.5" +<<<<<<< HEAD "@babel/plugin-transform-modules-commonjs" "^7.14.5" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" +======= + "@babel/plugin-transform-modules-commonjs" "^7.15.0" + "@babel/plugin-transform-modules-systemjs" "^7.14.5" + "@babel/plugin-transform-modules-umd" "^7.14.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -828,11 +1011,19 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" +<<<<<<< HEAD "@babel/types" "^7.14.8" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" core-js-compat "^3.15.0" +======= + "@babel/types" "^7.15.0" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.2" + babel-plugin-polyfill-regenerator "^0.2.2" + core-js-compat "^3.16.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 semver "^6.3.0" "@babel/preset-modules@^0.1.4": @@ -847,9 +1038,15 @@ esutils "^2.0.2" "@babel/runtime@^7.10.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +<<<<<<< HEAD version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== +======= + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" + integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: regenerator-runtime "^0.13.4" @@ -862,6 +1059,7 @@ "@babel/parser" "^7.14.5" "@babel/types" "^7.14.5" +<<<<<<< HEAD "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" @@ -883,6 +1081,29 @@ integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== dependencies: "@babel/helper-validator-identifier" "^7.14.8" +======= +"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" + integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.15.0" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0", "@babel/types@^7.4.4": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" + integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== + dependencies: + "@babel/helper-validator-identifier" "^7.14.9" +>>>>>>> bc2d6b8... preparing for v2.0.0 to-fast-properties "^2.0.0" "@develar/schema-utils@~2.6.5": @@ -899,9 +1120,15 @@ integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== "@electron/get@^1.0.1": +<<<<<<< HEAD version "1.12.4" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== +======= + version "1.13.0" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" + integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -1098,16 +1325,27 @@ dependencies: defer-to-connect "^1.0.1" +<<<<<<< HEAD "@theia/application-manager@1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.16.0.tgz#3125b27c75dc6e6e6222bea7b1f582b21e3c528c" integrity sha512-W3xnV7wlCQf9L/5I6twuX7vE+cuVuy7FShxHjhKYym7Bf2skdvyg/MWtkgctgfkWgtOb7D3/1v0Y/4EShEa9JQ== +======= +"@theia/application-manager@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.15.0.tgz#0f565b75f32b1b82c1e41d97f9740bfe0cbb6419" + integrity sha512-onTLewJM2935YMnopajJBZi8p14aLiS+3ggOcv8cZmTqU/QlYb9OjhjbbN4Aj37mJ+AbLnE0NCGwr8xtEU4P2Q== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/core" "^7.10.0" "@babel/plugin-transform-classes" "^7.10.0" "@babel/plugin-transform-runtime" "^7.10.0" "@babel/preset-env" "^7.10.0" +<<<<<<< HEAD "@theia/application-package" "1.16.0" +======= + "@theia/application-package" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@theia/compression-webpack-plugin" "^3.0.0" "@types/fs-extra" "^4.0.2" babel-loader "^8.2.2" @@ -1125,15 +1363,26 @@ source-map-support "^0.5.19" style-loader "^2.0.0" umd-compat-loader "^2.1.2" +<<<<<<< HEAD webpack "^5.36.2 <5.47.0" +======= + webpack "^5.36.2" +>>>>>>> bc2d6b8... preparing for v2.0.0 webpack-cli "4.7.0" worker-loader "^3.0.8" yargs "^15.3.1" +<<<<<<< HEAD "@theia/application-package@1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.16.0.tgz#758b988aea6b4b7da44082d52f851cbed56ccffa" integrity sha512-gO6tvkag857NKnad71PTOflYWoOUxUpqiYgq5ZO7R1uEaJhDgYKsiFPBfZFUxHjNzYLqbe053QdWgXWIAY9cHQ== +======= +"@theia/application-package@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.15.0.tgz#c35026c65e8ea7a9d56d1c5603c956e4b39a53af" + integrity sha512-7l3xbIZVIQpMGpMTCS0DwlqhIomnL78jiDy5s7LE+P96i7puaZWWe+hmfpGl9pxDdTNAwNHWpPt6pdz01nDrJA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -1147,6 +1396,7 @@ semver "^5.4.1" write-json-file "^2.2.0" +<<<<<<< HEAD "@theia/cli@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.16.0.tgz#34c5740d0e1f866bac40b039ead02cb3f30c501d" @@ -1155,6 +1405,16 @@ "@theia/application-manager" "1.16.0" "@theia/application-package" "1.16.0" "@theia/ovsx-client" "1.16.0" +======= +"@theia/cli@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.15.0.tgz#f3ecab217eab2416f2b1ecd30a0515953937db95" + integrity sha512-MRuPzVuk5+Yo7jBTtL/kyS0eDhT8D357eoWs7eRtB+G+Vfv9LDBgl0ZXi+EoHnzs5mbIW/FRWV8dGMZK88Kacg== + dependencies: + "@theia/application-manager" "1.15.0" + "@theia/application-package" "1.15.0" + "@theia/ovsx-client" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/chai" "^4.2.7" "@types/mkdirp" "^0.5.2" "@types/mocha" "^5.2.7" @@ -1187,10 +1447,17 @@ serialize-javascript "^1.4.0" webpack-sources "^1.0.1" +<<<<<<< HEAD "@theia/core@1.16.0", "@theia/core@^1.11.0", "@theia/core@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.16.0.tgz#dd409788112e80bd39e48fb858e74d811ba56131" integrity sha512-F2vaVwa4dgFjMK01DkfCqBXDW3hYAe00otXuRczsGYxU/aAJ0IKu2P3osHijN5zv+0gJ541neJ4eVzyG/ROpEg== +======= +"@theia/core@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.15.0.tgz#e61c7e86d50ca2a8617a7f97a58f2d52734e374b" + integrity sha512-G7EberWj0rTW33sXXjuWjRmNTDLCX/BOEDrB1o/Dp649OGSzTfl64N7qRHWVN92pZFkOhBoX4Q0lgnlBOu4OyQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -1204,7 +1471,11 @@ "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" "@primer/octicons-react" "^9.0.0" +<<<<<<< HEAD "@theia/application-package" "1.16.0" +======= + "@theia/application-package" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -1233,7 +1504,11 @@ iconv-lite "^0.6.0" inversify "^5.0.1" jschardet "^2.1.1" +<<<<<<< HEAD keytar "7.2.0" +======= + keytar "7.7.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" nsfw "^2.1.2" @@ -1254,6 +1529,7 @@ ws "^7.1.2" yargs "^15.3.1" +<<<<<<< HEAD "@theia/editor@1.16.0", "@theia/editor@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.16.0.tgz#9374f4208fac3a44242fae85533cdf99751c4fa4" @@ -1268,6 +1544,22 @@ version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.16.0.tgz#873e97c38152b04d62ce49b3a86ab937bd6240d3" integrity sha512-m2hy7IciOGCpFvotMPDVtnyMO0dayR1AVcC5W2goJPZbWBfc4yqswwbi7ntb5cd0NqHqY2ugUcATFZkDI2NeCA== +======= +"@theia/editor@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.15.0.tgz#ad50d8188b671c1538cac9607fb3c7635163beae" + integrity sha512-FGtUD3FGqk19+3fXjifnkouXZ0KCbDV2B7/foZppyVr9m/oTcjmvvrZaMF0iPVy2N/Kr/fPyjmi5ewd5pmtmjA== + dependencies: + "@theia/core" "1.15.0" + "@theia/variable-resolver" "1.15.0" + "@types/base64-arraybuffer" "0.1.0" + base64-arraybuffer "^0.1.5" + +"@theia/electron@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.15.0.tgz#8ef6a55346c7d5a3676ac3ef2a1f35877a7a3ae7" + integrity sha512-UDufick0Ttn1LZrrk8LyikkQnfS0rYDwvbUX2VIXwUcyPywEQvxOo/Pze96jA1jGlgl8tPH0gZ33xHflz0CtXQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: electron "^9.0.2" electron-download "^4.1.1" @@ -1278,6 +1570,7 @@ unzipper "^0.9.11" yargs "^15.3.1" +<<<<<<< HEAD "@theia/file-search@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.16.0.tgz#83c8f6b09c37a958dfd2c6e7ca3b992094a85a22" @@ -1297,6 +1590,26 @@ integrity sha512-FHxKS/ZplYfJvbtKOrEMDMfB/5iW06/y3yA1DcwUK4E2d5kxsihooViWwkJb0oorkfAtmbixOPHTeH2vwhtngg== dependencies: "@theia/core" "1.16.0" +======= +"@theia/file-search@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.15.0.tgz#395bf16b2f15162f52f157f080d55134dbde1f76" + integrity sha512-sFDYUP9q2qjyUoYcD3EH3x5Jl/2Ea1RzFQPVfrqIlhyM/5URY5VnHaMSCOKr8zyNbI/2jIo5m8GTdemGGTTj2g== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/process" "1.15.0" + "@theia/workspace" "1.15.0" + vscode-ripgrep "^1.2.4" + +"@theia/filesystem@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.15.0.tgz#1dcf71b1016c4648a92c0c04f9f091210f73a684" + integrity sha512-7woQNiieo703tGzZHdXvEm/T2gX0waDQrI8axzWK2R39olMRgSlGQ7BLjG0+8MuJrAK8+hijtDDMmumJYOY0CA== + dependencies: + "@theia/core" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/body-parser" "^1.17.0" "@types/rimraf" "^2.0.2" "@types/tar-fs" "^1.16.1" @@ -1310,6 +1623,7 @@ uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" +<<<<<<< HEAD "@theia/git@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.16.0.tgz#f01890edcba5270b4a47d79b17a1a777ba85ceae" @@ -1323,6 +1637,21 @@ "@theia/scm" "1.16.0" "@theia/scm-extra" "1.16.0" "@theia/workspace" "1.16.0" +======= +"@theia/git@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.15.0.tgz#b29c92b2fe8c11c7f8d97cab0278dabd10572bb3" + integrity sha512-aQiqhw45JaJ07N4vYo3QorZbdw1PkHtwk+7nyA18PtY0yiJbr9PTf93o+kMoWZl/pCYPfhpjIRnoB3xt9Fdk1w== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/monaco" "1.15.0" + "@theia/navigator" "1.15.0" + "@theia/scm" "1.15.0" + "@theia/scm-extra" "1.15.0" + "@theia/workspace" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/diff" "^3.2.2" "@types/p-queue" "^2.3.1" diff "^3.4.0" @@ -1334,6 +1663,7 @@ p-queue "^2.4.2" ts-md5 "^1.2.2" +<<<<<<< HEAD "@theia/markers@1.16.0", "@theia/markers@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.16.0.tgz#3bd6988377634699f9eae0b2f309b73545f04496" @@ -1361,6 +1691,35 @@ "@theia/monaco-editor-core" "0.23.0" "@theia/outline-view" "1.16.0" "@theia/workspace" "1.16.0" +======= +"@theia/markers@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.15.0.tgz#12d006b8054fe95e6262bc492f9da107761598ed" + integrity sha512-YxiLPnnN/+TSsy/Mp4vyPWpzekFPEIu527THjlAAW4Sd5IS3BXO3OXLYRDdhNk520awlJEWRpTIayBJYqNFXEQ== + dependencies: + "@theia/core" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/navigator" "1.15.0" + "@theia/workspace" "1.15.0" + +"@theia/monaco-editor-core@^0.20.0": + version "0.20.0" + resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz#0f3cdfd6d1278bbcc3df0224471fc967a4d901c5" + integrity sha512-6QDOrZRW3dE0RgyD/hXMlVla49ACNjwIX+u9+i/qY+OqaZ1u/QdgdnHy4QO6g4J0lQCyr7nXgqF1BAc+Xbxx2g== + +"@theia/monaco@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.15.0.tgz#c8b8250203c9ac572c89a0079d931c43df61b468" + integrity sha512-/Thc4mE/jyRRFrABmZuuxpOlE4JHXyYmLLJcqbGHvddhrBdMrpc79JkrynrEqwkctgVrLrOGBlaJknGYsFlDRg== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/markers" "1.15.0" + "@theia/monaco-editor-core" "^0.20.0" + "@theia/outline-view" "1.15.0" + "@theia/workspace" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 deepmerge "2.0.1" fast-plist "^0.1.2" idb "^4.0.5" @@ -1368,6 +1727,7 @@ onigasm "^2.2.0" vscode-textmate "^4.4.0" +<<<<<<< HEAD "@theia/navigator@1.16.0", "@theia/navigator@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.16.0.tgz#7570e4208f84e3266f3af53891ef1fb391838fcc" @@ -1376,6 +1736,16 @@ "@theia/core" "1.16.0" "@theia/filesystem" "1.16.0" "@theia/workspace" "1.16.0" +======= +"@theia/navigator@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.15.0.tgz#cfa75408b52e1878c1a9f2a385b516e789d32c62" + integrity sha512-tCJzJzI5U8PlY4jc0NtCFfn9rk1di9Lncglv6S3VSTgR3XLcjyKrn2eP1pCjlA3xNiF19Gue+u+ey1yIRgakjA== + dependencies: + "@theia/core" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/workspace" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 minimatch "^3.0.4" "@theia/node-pty@0.9.0-theia.6": @@ -1385,6 +1755,7 @@ dependencies: nan "^2.14.0" +<<<<<<< HEAD "@theia/outline-view@1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.16.0.tgz#5371d46fa0f11a063ba905710eb803bc5944eece" @@ -1396,11 +1767,25 @@ version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.16.0.tgz#ac5df18d5fee0e4ce1a3c277ffa6764c8c3ff740" integrity sha512-87HnWR2wTl2iG7NcNiaaNBQXIwba0hsYFOgc/9jQfiFjnEagRUtaiaOPPOnmlDtfdx7fvxIcj1AA0TzJsGNVEg== +======= +"@theia/outline-view@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.15.0.tgz#2006f969e6e81c7403cc3202e3e2bbf2cdd76ecd" + integrity sha512-2OWTAenzMqr9wUQYSWGZO2DRovi1y561xsd7bMztpb2cmX2reI0dvvpVYXYS3WJ1QM8JNaitbqy5ixjYA2VxUQ== + dependencies: + "@theia/core" "1.15.0" + +"@theia/ovsx-client@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.15.0.tgz#42c55a43a577d95afdd9d8cf196a3191f9488b20" + integrity sha512-CtLotO51wuCnleB8IMF9FQxgC9VvD/6nzSNt8KC/B9JTdBMveDifxaBnarmBc+NQiZYgAWrRUnk/bPpxMoRqZg== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/bent" "^7.0.1" bent "^7.1.0" semver "^5.4.1" +<<<<<<< HEAD "@theia/preferences@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.16.0.tgz#e444f07db9a23ded44234068578721866301c8fd" @@ -1443,12 +1828,57 @@ "@theia/editor" "1.16.0" "@theia/filesystem" "1.16.0" "@theia/navigator" "1.16.0" +======= +"@theia/preferences@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.15.0.tgz#69db9224e9d8e23fa011c53da50a0f41265aeed8" + integrity sha512-z+QGaXe33aeyaYqYjWv8f5VQk7pLuu10orECt3IzmilSksu5dIpKYcamfSnjEcOS8jYzzVechwt78PiafIsEOg== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/monaco" "1.15.0" + "@theia/userstorage" "1.15.0" + "@theia/workspace" "1.15.0" + jsonc-parser "^2.2.0" + +"@theia/process@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.15.0.tgz#4e5231711488c6543363291b9d218a14c65d3c17" + integrity sha512-RMro5E8eTEeyJocdl/kbQVO3m4rR33km4wYzt+0jbaAwDPrPn+CPDHpo7lTcl+TcpCSjJDXFmLQFVJ2fFHXrYQ== + dependencies: + "@theia/core" "1.15.0" + "@theia/node-pty" "0.9.0-theia.6" + string-argv "^0.1.1" + +"@theia/scm-extra@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.15.0.tgz#ef9bb66126b8b9c00e4f66b6bc0b1e38d0975c65" + integrity sha512-v9pt//VqepvZf/RIKDHOzOnNpQZMmWQ6R0QHDaIZloQTAYvyDXWzfqPoTog+5qXYcuAkspq/xinNKL8nsrZYDg== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/navigator" "1.15.0" + "@theia/scm" "1.15.0" + +"@theia/scm@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.15.0.tgz#7e5bef75e19eff53cbb5f6d73b92507d6d9cd65e" + integrity sha512-x7basXm4Fy51vdHlYWOavSL/EWDCSLIGq1A9ba912g2Ry3YHMFCtt9G+dI0kuDzyVJTJOe0S4f6Fz+XA7s68qg== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/navigator" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/diff" "^3.2.2" diff "^3.4.0" p-debounce "^2.1.0" react-autosize-textarea "^7.0.0" ts-md5 "^1.2.2" +<<<<<<< HEAD "@theia/terminal@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.16.0.tgz#5f6f3ec919b9a455b9145ac8f6a149718409803a" @@ -1460,10 +1890,23 @@ "@theia/monaco" "1.16.0" "@theia/process" "1.16.0" "@theia/workspace" "1.16.0" +======= +"@theia/terminal@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.15.0.tgz#81fa75ca890d9b185838e4c4aa25cf701d62a33e" + integrity sha512-Op4b4DH9vYIlAAJiNlo9StuctlquLa7la1jgvRJ6lBIkyGtbBt9B/GF9hjJkV7ujFFz8PpJNEaUFVcstzClrJQ== + dependencies: + "@theia/core" "1.15.0" + "@theia/editor" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/process" "1.15.0" + "@theia/workspace" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 xterm "~4.11.0" xterm-addon-fit "~0.5.0" xterm-addon-search "~0.8.0" +<<<<<<< HEAD "@theia/userstorage@1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.16.0.tgz#7f6074ea8db40a06c914bd6abaaa1e1f338241e6" @@ -1487,6 +1930,31 @@ "@theia/core" "1.16.0" "@theia/filesystem" "1.16.0" "@theia/variable-resolver" "1.16.0" +======= +"@theia/userstorage@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.15.0.tgz#ad7270aee93d4d3798ff843942b6b3b64485ef2a" + integrity sha512-T0pXfnRQtOtc2F0JFDY/BMl0C+z3O8hKLtpRSlqU6dPBbdfYYqk0HGgbhRg+mupA9Q/iRfDy48SCPCqD337qtQ== + dependencies: + "@theia/core" "1.15.0" + "@theia/filesystem" "1.15.0" + +"@theia/variable-resolver@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.15.0.tgz#fc1ab9ce40a8f746945f79c24413343c875e8ad5" + integrity sha512-ePpEYlg0HP8yorv/5FZAiR+fRZra2ZEhjhkBPmA0GlNY+bISRgfTb3yGdc5MGDsWk8HWSlIG0mRlGe2Lt3yjBw== + dependencies: + "@theia/core" "1.15.0" + +"@theia/workspace@1.15.0": + version "1.15.0" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.15.0.tgz#466bdb288d880d24238ccc3ab8dfa99e962f0a05" + integrity sha512-jTharMA0U407pTfV2LcMLcURXgK1Rk9oQdhpu8wszSGK7njELbwFaMPnTG0i6KFvzNE/KVwTNWBFwBHqGHgOtQ== + dependencies: + "@theia/core" "1.15.0" + "@theia/filesystem" "1.15.0" + "@theia/variable-resolver" "1.15.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 ajv "^6.5.3" jsonc-parser "^2.2.0" moment "2.24.0" @@ -1621,9 +2089,15 @@ "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +<<<<<<< HEAD version "7.0.8" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== +======= + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/lodash.debounce@4.0.3": version "4.0.3" @@ -1640,6 +2114,7 @@ "@types/lodash" "*" "@types/lodash@*": +<<<<<<< HEAD version "4.14.171" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== @@ -1648,6 +2123,16 @@ version "2.1.0" resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= +======= + version "4.14.172" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" + integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== + +"@types/mime-types@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" + integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/mime@^1": version "1.3.2" @@ -1660,9 +2145,15 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minipass@*": +<<<<<<< HEAD version "2.2.1" resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-2.2.1.tgz#a52138867c493ff14f07616efcbe2af7662b76fb" integrity sha512-0bI74UwEJ+JjGqzkyoiCxLVGK5C3Vy5MYdDB6VCtUAulcrulHvqhIrQP9lh/gvMgaNzvvJljMW97rRHVvbTe8Q== +======= + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-3.1.0.tgz#616dcc2205982d4c720f4c7e9a9fddc497245273" + integrity sha512-b2yPKwCrB8x9SB65kcCistMoe3wrYnxxt5rJSZ1kprw0uOXvhuKi9kTQ746Y+Pbqoh+9C0N4zt0ztmTnG9yg7A== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/node" "*" @@ -1692,9 +2183,15 @@ form-data "^3.0.0" "@types/node@*": +<<<<<<< HEAD version "16.4.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.7.tgz#f7afa78769d4b477f5092d7c3468e2e8653d779c" integrity sha512-aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA== +======= + version "16.6.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50" + integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/node@^10.14.22": version "10.17.60" @@ -1702,9 +2199,15 @@ integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== "@types/node@^12.0.12": +<<<<<<< HEAD version "12.20.17" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.17.tgz#ffd44c2801fc527a6fe6e86bc9b900261df1c87e" integrity sha512-so8EHl4S6MmatPS0f9sE1ND94/ocbcEshW5OpyYthRqeRpiYyW2uXYTo/84kmfdfeNrDycARkvuiXl6nO40NGg== +======= + version "12.20.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.19.tgz#538e61fc220f77ae4a4663c3d8c3cb391365c209" + integrity sha512-niAuZrwrjKck4+XhoCw6AAVQBENHftpXw9F4ryk66fTgYaKQ53R4FI7c9vUGGw5vQis1HKBHDR1gcYI/Bq1xvw== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1754,26 +2257,44 @@ "@types/react" "^16" "@types/react-virtualized@^9.18.3": +<<<<<<< HEAD version "9.21.12" resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.12.tgz#5b76aa20c24b8df6dd210ed42f1e9192e1234f46" integrity sha512-zt6EvLQPhnnSVnMGa5prpV4pROY9euU2k2aoAyuaiDdfSvrfvzxM9MhkpdVYKKfBVUqAlQpMeE/4DPhNGvp7Cg== +======= + version "9.21.13" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.13.tgz#4222173abe7c9ed7504c75886c8367502ac7b9f1" + integrity sha512-tCIQ5wDKj+QJ3sMzjPKSLY0AXsznt+ovAUcq+JCLjPBOcAHbPt4FraGT9HKYEFfmp9E6+ELuN49i5bWtuBmi3w== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/react" "*" "@types/react@*": +<<<<<<< HEAD version "17.0.15" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.15.tgz#c7533dc38025677e312606502df7656a6ea626d0" integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw== +======= + version "17.0.19" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991" + integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/react@^16", "@types/react@^16.8.0": +<<<<<<< HEAD version "16.14.11" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.11.tgz#992a0cd4b66b9f27315042b5d96e976717368f04" integrity sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ== +======= + version "16.14.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.14.tgz#853de95a32a6a0e719192e222eacad024add2b8e" + integrity sha512-uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2049,9 +2570,15 @@ envinfo "^7.7.3" "@webpack-cli/serve@^1.4.0": +<<<<<<< HEAD version "1.5.1" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278" integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw== +======= + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== +>>>>>>> bc2d6b8... preparing for v2.0.0 "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -2081,6 +2608,14 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +<<<<<<< HEAD +======= +acorn-import-assertions@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" + integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + +>>>>>>> bc2d6b8... preparing for v2.0.0 acorn@^8.4.1: version "8.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" @@ -2549,9 +3084,15 @@ body-parser@1.19.0, body-parser@^1.17.2, body-parser@^1.18.3: type-is "~1.6.17" boolean@^3.0.1: +<<<<<<< HEAD version "3.1.2" resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw== +======= + version "3.1.3" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.3.tgz#f6ff158e3491428f293bef2bfacc3152cbbd9a6c" + integrity sha512-zLOKuqi6MHj/MrY+E9JATy2ojKP3WED4W1yHXe8PSw6+6o34YYJXCwBUC/EEilN8Gq6zgveHBKX2zldtBkviGQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 boxen@^5.0.0: version "5.0.1" @@ -2595,6 +3136,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" +<<<<<<< HEAD browserslist@^4.14.5, browserslist@^4.16.6: version "4.16.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" @@ -2605,6 +3147,18 @@ browserslist@^4.14.5, browserslist@^4.16.6: electron-to-chromium "^1.3.723" escalade "^3.1.1" node-releases "^1.1.71" +======= +browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.16.7: + version "4.16.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" + integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== + dependencies: + caniuse-lite "^1.0.30001251" + colorette "^1.3.0" + electron-to-chromium "^1.3.811" + escalade "^3.1.1" + node-releases "^1.1.75" +>>>>>>> bc2d6b8... preparing for v2.0.0 buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -2791,6 +3345,7 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: +<<<<<<< HEAD version "1.0.30001248" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001248.tgz#8b6ff97bfeefe727f2fb1070e67ccd801e375e44" integrity sha512-29JX6IwToCEjwxR7Q8vhcwgbQvSqb/WRJfMMAR6Fyd9DF+Yi5LUMS8VfN86SlDrGaghqEnK/5advE7RRZ6RzqA== @@ -2799,6 +3354,16 @@ caniuse-lite@^1.0.30001219: version "1.0.30001248" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce" integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== +======= + version "1.0.30001251" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001251.tgz#ae1952b08980f916a8fa47a2a5207910c319e44d" + integrity sha512-qZcXjfDu3lwN6LJMpG0qI2Oz0IGpyXh5exkSeWOc3/I7dZBshplxOcRXGtcFIBTr6bCeBxvgQRxwkKTJOr6d1w== + +caniuse-lite@^1.0.30001251: + version "1.0.30001251" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" + integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== +>>>>>>> bc2d6b8... preparing for v2.0.0 caseless@~0.12.0: version "0.12.0" @@ -2845,9 +3410,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.1.0, chalk@^4.1.1: +<<<<<<< HEAD version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +======= + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2889,7 +3460,11 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" +<<<<<<< HEAD chownr@^1.0.1, chownr@^1.1.1: +======= +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3071,10 +3646,17 @@ color@^0.11.0: color-convert "^1.3.0" color-string "^0.3.0" +<<<<<<< HEAD colorette@^1.2.1, colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +======= +colorette@^1.2.1, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== +>>>>>>> bc2d6b8... preparing for v2.0.0 colormin@^1.0.5: version "1.1.2" @@ -3261,6 +3843,7 @@ copy-webpack-plugin@^8.1.1: schema-utils "^3.0.0" serialize-javascript "^5.0.1" +<<<<<<< HEAD core-js-compat@^3.14.0, core-js-compat@^3.15.0: version "3.16.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.0.tgz#fced4a0a534e7e02f7e084bff66c701f8281805f" @@ -3273,6 +3856,20 @@ core-js@^3.6.5: version "3.16.0" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986" integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== +======= +core-js-compat@^3.14.0, core-js-compat@^3.16.0: + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz#442ef1d933ca6fc80859bd5a1db7a3ba716aaf56" + integrity sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ== + dependencies: + browserslist "^4.16.7" + semver "7.0.0" + +core-js@^3.6.5: + version "3.16.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4" + integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -3713,9 +4310,15 @@ dom-helpers@^5.1.3: csstype "^3.0.2" dompurify@^2.2.9: +<<<<<<< HEAD version "2.3.0" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2" integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw== +======= + version "2.3.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" + integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== +>>>>>>> bc2d6b8... preparing for v2.0.0 dot-prop@^5.0.0, dot-prop@^5.2.0: version "5.3.0" @@ -3894,10 +4497,17 @@ electron-store@^5.1.1: conf "^6.2.1" type-fest "^0.7.1" +<<<<<<< HEAD electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.723: version "1.3.791" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.791.tgz#e38f325ff22470bdcff34409d58c0baf9c2e3e93" integrity sha512-Tdx7w1fZpeWOOBluK+kXTAKCXyc79K65RB6Zp0+sPSZZhDjXlrxfGlXrlMGVVQUrKCyEZFQs1UBBLNz5IdbF0g== +======= +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.811: + version "1.3.812" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.812.tgz#4c4fb407e0e1335056097f172e9f2c0a09efe77d" + integrity sha512-7KiUHsKAWtSrjVoTSzxQ0nPLr/a+qoxNZwkwd9LkylTOgOXSVXkQbpIVT0WAUQcI5gXq3SwOTCrK+WfINHOXQg== +>>>>>>> bc2d6b8... preparing for v2.0.0 electron@^9.0.2: version "9.4.4" @@ -3978,9 +4588,15 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.18.0-next.2: +<<<<<<< HEAD version "1.18.4" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.4.tgz#c6b7a1acd6bb1c8b5afeb54a53c46ad02fab346d" integrity sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ== +======= + version "1.18.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" + integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4246,9 +4862,15 @@ fastparse@^1.1.2: integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: +<<<<<<< HEAD version "1.11.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== +======= + version "1.12.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" + integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: reusify "^1.0.4" @@ -4301,10 +4923,17 @@ filename-reserved-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= +<<<<<<< HEAD filesize@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00" integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg== +======= +filesize@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-7.0.0.tgz#9d4b3ce384ec7731a9e68c64ee29fb4934ad657d" + integrity sha512-Wsstw+O1lZ9gVmOI1thyeQvODsaoId2qw14lCqIzUhoHKXX7T2hVpB7BR6SvgodMBgWccrx/y2eyV8L7tDmY6A== +>>>>>>> bc2d6b8... preparing for v2.0.0 fill-range@^7.0.1: version "7.0.1" @@ -4507,7 +5136,11 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" +<<<<<<< HEAD fs-minipass@^1.2.5: +======= +fs-minipass@^1.2.7: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -4556,6 +5189,7 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +<<<<<<< HEAD fusion-studio-extension@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/fusion-studio-extension/-/fusion-studio-extension-1.2.0.tgz#8ef11cc0235388ab5b165b225006c6cc01ac0cb7" @@ -4568,6 +5202,20 @@ fusion-studio-extension@^1.2.0: moment "2.29.1" ripemd160 "2.0.2" typescript "4.1.3" +======= +fusion-studio-extension@^2.0.0-next: + version "2.0.0-next.0" + resolved "https://registry.yarnpkg.com/fusion-studio-extension/-/fusion-studio-extension-2.0.0-next.0.tgz#fec1f17c90394fdf10f3adfd7fc1c2fc3516ffee" + integrity sha512-OwQSXqpVYD0fU8yYVhfJgFiMt+tCmXuST7BOGYfrRAx5Yf3+BLVgoonoRz7Xbn+hcvJs5Wf62A+rSsngSxckhQ== + dependencies: + "@theia/core" "1.15.0" + awesomplete "1.1.5" + filesize "7.0.0" + mimetype "^0.0.8" + moment "2.29.1" + ripemd160 "2.0.2" + typescript "4.3.5" +>>>>>>> bc2d6b8... preparing for v2.0.0 uuid "^8.3.2" fuzzy@^0.1.3: @@ -4777,9 +5425,15 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4: +<<<<<<< HEAD version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +======= + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +>>>>>>> bc2d6b8... preparing for v2.0.0 "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -4836,6 +5490,16 @@ has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +<<<<<<< HEAD +======= +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +>>>>>>> bc2d6b8... preparing for v2.0.0 has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -5118,9 +5782,17 @@ is-arrayish@^0.2.1: integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.1: +<<<<<<< HEAD version "1.0.2" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== +======= + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-binary-path@~2.1.0: version "2.1.0" @@ -5130,11 +5802,20 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: +<<<<<<< HEAD version "1.1.1" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== dependencies: call-bind "^1.0.2" +======= + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-buffer@~2.0.3: version "2.0.5" @@ -5142,9 +5823,15 @@ is-buffer@~2.0.3: integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== is-callable@^1.1.4, is-callable@^1.2.3: +<<<<<<< HEAD version "1.2.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== +======= + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== +>>>>>>> bc2d6b8... preparing for v2.0.0 is-ci@^2.0.0: version "2.0.0" @@ -5161,16 +5848,30 @@ is-ci@^3.0.0: ci-info "^3.1.1" is-core-module@^2.2.0: +<<<<<<< HEAD version "2.5.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== +======= + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: has "^1.0.3" is-date-object@^1.0.1: +<<<<<<< HEAD version "1.0.4" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== +======= + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-electron@^2.1.0: version "2.2.0" @@ -5235,9 +5936,17 @@ is-npm@^5.0.0: integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== is-number-object@^1.0.4: +<<<<<<< HEAD version "1.0.5" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== +======= + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-number@^7.0.0: version "7.0.0" @@ -5267,12 +5976,21 @@ is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.1.3: +<<<<<<< HEAD version "1.1.3" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: call-bind "^1.0.2" has-symbols "^1.0.2" +======= + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-stream@^1.1.0: version "1.1.0" @@ -5285,9 +6003,17 @@ is-stream@^2.0.0: integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.6: +<<<<<<< HEAD version "1.0.6" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== +======= + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 is-svg@^2.0.0: version "2.1.0" @@ -5523,10 +6249,17 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +<<<<<<< HEAD keytar@7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.2.0.tgz#4db2bec4f9700743ffd9eda22eebb658965c8440" integrity sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw== +======= +keytar@7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" + integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: node-addon-api "^3.0.0" prebuild-install "^6.0.0" @@ -5838,16 +6571,20 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" +<<<<<<< HEAD mime-db@1.46.0: version "1.46.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +======= +>>>>>>> bc2d6b8... preparing for v2.0.0 mime-db@1.49.0: version "1.49.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== +<<<<<<< HEAD mime-types@2.1.29: version "2.1.29" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" @@ -5855,6 +6592,8 @@ mime-types@2.1.29: dependencies: mime-db "1.46.0" +======= +>>>>>>> bc2d6b8... preparing for v2.0.0 mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.32" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" @@ -5872,6 +6611,14 @@ mime@^2.0.3, mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== +<<<<<<< HEAD +======= +mimetype@^0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mimetype/-/mimetype-0.0.8.tgz#fb30022794bbf7725cb7b46df820e87dd91fd086" + integrity sha1-+zACJ5S793Jct7Rt+CDofdkf0IY= + +>>>>>>> bc2d6b8... preparing for v2.0.0 mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -5904,7 +6651,11 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1. resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +<<<<<<< HEAD minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +======= +minipass@^2.6.0, minipass@^2.9.0: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -5919,7 +6670,11 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" +<<<<<<< HEAD minizlib@^1.2.1: +======= +minizlib@^1.3.3: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -5955,7 +6710,11 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== +<<<<<<< HEAD mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.1: +======= +mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -6058,9 +6817,15 @@ ms@^2.1.1: integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== nan@^2.14.0: +<<<<<<< HEAD version "2.14.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +======= + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 napi-build-utils@^1.0.1: version "1.0.2" @@ -6073,9 +6838,15 @@ native-keymap@^2.1.2: integrity sha512-rsEf2gbFFNEy3MxxQocCn9XpNyqBa8kMFFrjXFWCp3lWuhk3svHnWYZOj3Or8lNoAIjVxAPLdMClraLXHz6dnw== native-request@^1.0.5: +<<<<<<< HEAD version "1.0.8" resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== +======= + version "1.0.9" + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.9.tgz#2269748379c004415d9721c204d8da3455abc175" + integrity sha512-KTRwqMwWCkoLZfjes3yBhK6XHwZ5Q1jPsdVra9hug8HNRbMsfTJm8a8L6/WOYi1h5eWNwlBaYy8V5SpJwkDgKw== +>>>>>>> bc2d6b8... preparing for v2.0.0 negotiator@0.6.2: version "0.6.2" @@ -6160,10 +6931,17 @@ node-gyp@^7.0.0: tar "^6.0.2" which "^2.0.2" +<<<<<<< HEAD node-releases@^1.1.71: version "1.1.73" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +======= +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== +>>>>>>> bc2d6b8... preparing for v2.0.0 noop-logger@^0.1.1: version "0.1.1" @@ -6665,6 +7443,7 @@ pkg-up@^3.0.1: find-up "^3.0.0" plist@^3.0.1: +<<<<<<< HEAD version "3.0.2" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== @@ -6672,6 +7451,15 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" xmldom "^0.5.0" +======= + version "3.0.3" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.3.tgz#007df34c7be0e2c3dcfcf460d623e6485457857d" + integrity sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA== + dependencies: + base64-js "^1.5.1" + xmlbuilder "^9.0.7" + xmldom "^0.6.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 postcss-calc@^5.2.0: version "5.3.1" @@ -6974,9 +7762,15 @@ prebuild-install@^5.2.4: which-pm-runs "^1.0.0" prebuild-install@^6.0.0: +<<<<<<< HEAD version "6.1.3" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.3.tgz#8ea1f9d7386a0b30f7ef20247e36f8b2b82825a2" integrity sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q== +======= + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -7625,7 +8419,11 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +<<<<<<< HEAD safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +======= +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -7881,9 +8679,15 @@ slice-ansi@^1.0.0: is-fullwidth-code-point "^2.0.0" smart-buffer@^4.0.2: +<<<<<<< HEAD version "4.1.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== +======= + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +>>>>>>> bc2d6b8... preparing for v2.0.0 sort-keys@^1.0.0: version "1.1.2" @@ -7904,7 +8708,11 @@ source-list-map@^0.1.7: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY= +<<<<<<< HEAD source-list-map@^2.0.0, source-list-map@^2.0.1: +======= +source-list-map@^2.0.0: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== @@ -7977,9 +8785,15 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: +<<<<<<< HEAD version "3.0.9" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== +======= + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== +>>>>>>> bc2d6b8... preparing for v2.0.0 speedometer@~0.1.2: version "0.1.4" @@ -8317,6 +9131,7 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^4.0.2, tar@^4.4.12: +<<<<<<< HEAD version "4.4.15" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== @@ -8333,6 +9148,24 @@ tar@^6.0.2: version "6.1.2" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6" integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q== +======= + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== + dependencies: + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" + +tar@^6.0.2: + version "6.1.10" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz#8a320a74475fba54398fa136cd9883aa8ad11175" + integrity sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -8562,10 +9395,17 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +<<<<<<< HEAD typescript@4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== +======= +typescript@4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== +>>>>>>> bc2d6b8... preparing for v2.0.0 umd-compat-loader@^2.1.2: version "2.1.2" @@ -8898,6 +9738,7 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.6.1" +<<<<<<< HEAD webpack-sources@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" @@ -8910,6 +9751,17 @@ webpack-sources@^2.3.1: version "5.46.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.46.0.tgz#105d20d96f79db59b316b0ae54316f0f630314b5" integrity sha512-qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw== +======= +webpack-sources@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" + integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== + +webpack@^5.36.2: + version "5.51.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.51.1.tgz#41bebf38dccab9a89487b16dbe95c22e147aac57" + integrity sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -8917,6 +9769,10 @@ webpack-sources@^2.3.1: "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" acorn "^8.4.1" +<<<<<<< HEAD +======= + acorn-import-assertions "^1.7.6" +>>>>>>> bc2d6b8... preparing for v2.0.0 browserslist "^4.14.5" chrome-trace-event "^1.0.2" enhanced-resolve "^5.8.0" @@ -8933,7 +9789,11 @@ webpack-sources@^2.3.1: tapable "^2.1.1" terser-webpack-plugin "^5.1.3" watchpack "^2.2.0" +<<<<<<< HEAD webpack-sources "^2.3.1" +======= + webpack-sources "^3.2.0" +>>>>>>> bc2d6b8... preparing for v2.0.0 whet.extend@~0.9.9: version "0.9.9" @@ -9115,10 +9975,17 @@ xmlbuilder@^9.0.7: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +<<<<<<< HEAD xmldom@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== +======= +xmldom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" + integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== +>>>>>>> bc2d6b8... preparing for v2.0.0 xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" @@ -9132,16 +9999,32 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" +<<<<<<< HEAD xterm-addon-fit@~0.5.0: +======= +xterm-addon-fit@^0.5.0, xterm-addon-fit@~0.5.0: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "0.5.0" resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== +<<<<<<< HEAD xterm-addon-search@~0.8.0: +======= +xterm-addon-search@^0.8.0, xterm-addon-search@~0.8.0: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "0.8.0" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz#e33eab918df7eac7e7baf95dd2b3d14133754881" integrity sha512-MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA== +<<<<<<< HEAD +======= +xterm@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.13.0.tgz#7998de1e2ad92c4796fe45807be4f31061f3d9d1" + integrity sha512-HVW1gdoLOTnkMaqQCr2r3mQy4fX9iSa5gWxKZ2UTYdLa4iqavv7QxJ8n1Ypse32shPVkhTYPLS6vHEFZp5ghzw== + +>>>>>>> bc2d6b8... preparing for v2.0.0 xterm@~4.11.0: version "4.11.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.11.0.tgz#d7dabc7af5299579e4663fedf2b3a179af9aaff9" @@ -9162,7 +10045,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +<<<<<<< HEAD yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +======= +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: +>>>>>>> bc2d6b8... preparing for v2.0.0 version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -9260,10 +10147,17 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" +<<<<<<< HEAD yargs@^17.0.1: version "17.0.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== +======= +yargs@^17.0.1, yargs@^17.1.1: + version "17.1.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba" + integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== +>>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: cliui "^7.0.2" escalade "^3.1.1" From e6ec141ce07977ad5bb1b2b0c1033caf9adf6a16 Mon Sep 17 00:00:00 2001 From: Charafeddine Cheraa Date: Fri, 20 Aug 2021 09:57:11 +0000 Subject: [PATCH 2/4] changed version to 2.0.0-next --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 990c16b..fca0b7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fusion-studio-electron", - "version": "1.0.3", + "version": "2.0.0-next.0", "description": "Fusion Studio", "main": "src-gen/frontend/electron-main.js", "repository": { From 3fcab2b69d10a10ff66d3c1703cbec23f8a42271 Mon Sep 17 00:00:00 2001 From: Charafeddine Cheraa Date: Fri, 20 Aug 2021 11:58:44 +0000 Subject: [PATCH 3/4] fix: wrong yarn.lock --- yarn.lock | 907 ++---------------------------------------------------- 1 file changed, 21 insertions(+), 886 deletions(-) diff --git a/yarn.lock b/yarn.lock index 19fa1e7..81b3182 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,27 +14,6 @@ dependencies: "@babel/highlight" "^7.14.5" -<<<<<<< HEAD -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== - -"@babel/core@^7.10.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010" - integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.8" - "@babel/helpers" "^7.14.8" - "@babel/parser" "^7.14.8" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" -======= "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" @@ -54,7 +33,6 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.15.0" "@babel/types" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -62,21 +40,12 @@ semver "^6.3.0" source-map "^0.5.0" -<<<<<<< HEAD -"@babel/generator@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== - dependencies: - "@babel/types" "^7.14.8" -======= "@babel/generator@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== dependencies: "@babel/types" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 jsesc "^2.5.1" source-map "^0.5.0" @@ -95,37 +64,17 @@ "@babel/helper-explode-assignable-expression" "^7.14.5" "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" - integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== - dependencies: - "@babel/compat-data" "^7.14.5" -======= "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== dependencies: "@babel/compat-data" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.14.5": -<<<<<<< HEAD - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc" - integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-member-expression-to-functions" "^7.14.7" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" -======= version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== @@ -135,7 +84,6 @@ "@babel/helper-member-expression-to-functions" "^7.15.0" "@babel/helper-optimise-call-expression" "^7.14.5" "@babel/helper-replace-supers" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-split-export-declaration" "^7.14.5" "@babel/helper-create-regexp-features-plugin@^7.14.5": @@ -190,21 +138,12 @@ dependencies: "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" - integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== - dependencies: - "@babel/types" "^7.14.5" -======= "@babel/helper-member-expression-to-functions@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== dependencies: "@babel/types" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": version "7.14.5" @@ -213,21 +152,6 @@ dependencies: "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49" - integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-simple-access" "^7.14.8" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.8" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" -======= "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" @@ -241,7 +165,6 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.15.0" "@babel/types" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-optimise-call-expression@^7.14.5": version "7.14.5" @@ -264,19 +187,6 @@ "@babel/helper-wrap-function" "^7.14.5" "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/helper-replace-supers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" - integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8": -======= "@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" @@ -288,7 +198,6 @@ "@babel/types" "^7.15.0" "@babel/helper-simple-access@^7.14.8": ->>>>>>> bc2d6b8... preparing for v2.0.0 version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== @@ -309,17 +218,10 @@ dependencies: "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== -======= "@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -337,15 +239,6 @@ "@babel/types" "^7.14.5" "@babel/helpers@^7.14.8": -<<<<<<< HEAD - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77" - integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw== - dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" -======= version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== @@ -353,7 +246,6 @@ "@babel/template" "^7.14.5" "@babel/traverse" "^7.15.0" "@babel/types" "^7.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/highlight@^7.14.5": version "7.14.5" @@ -364,17 +256,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -<<<<<<< HEAD -"@babel/parser@^7.14.5", "@babel/parser@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== -======= "@babel/parser@^7.14.5", "@babel/parser@^7.15.0": version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" @@ -385,17 +270,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -<<<<<<< HEAD -"@babel/plugin-proposal-async-generator-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== -======= "@babel/plugin-proposal-async-generator-functions@^7.14.9": version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -642,18 +520,6 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.14.5": -<<<<<<< HEAD - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939" - integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-classes@^7.10.0", "@babel/plugin-transform-classes@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" - integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== -======= version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== @@ -664,7 +530,6 @@ version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" @@ -749,16 +614,6 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -<<<<<<< HEAD -"@babel/plugin-transform-modules-commonjs@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97" - integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A== - dependencies: - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" -======= "@babel/plugin-transform-modules-commonjs@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" @@ -767,7 +622,6 @@ "@babel/helper-module-transforms" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-simple-access" "^7.14.8" ->>>>>>> bc2d6b8... preparing for v2.0.0 babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.14.5": @@ -789,17 +643,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -<<<<<<< HEAD -"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" - integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== -======= "@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -847,15 +694,9 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.10.0": -<<<<<<< HEAD - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523" - integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg== -======= version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3" integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" @@ -916,18 +757,6 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@^7.10.0": -<<<<<<< HEAD - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" - integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== - dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" -======= version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464" integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q== @@ -938,7 +767,6 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" "@babel/plugin-proposal-async-generator-functions" "^7.14.9" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -971,11 +799,7 @@ "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" "@babel/plugin-transform-block-scoping" "^7.14.5" -<<<<<<< HEAD - "@babel/plugin-transform-classes" "^7.14.5" -======= "@babel/plugin-transform-classes" "^7.14.9" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" @@ -986,17 +810,10 @@ "@babel/plugin-transform-literals" "^7.14.5" "@babel/plugin-transform-member-expression-literals" "^7.14.5" "@babel/plugin-transform-modules-amd" "^7.14.5" -<<<<<<< HEAD - "@babel/plugin-transform-modules-commonjs" "^7.14.5" - "@babel/plugin-transform-modules-systemjs" "^7.14.5" - "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" -======= "@babel/plugin-transform-modules-commonjs" "^7.15.0" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -1011,19 +828,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" -<<<<<<< HEAD - "@babel/types" "^7.14.8" - babel-plugin-polyfill-corejs2 "^0.2.2" - babel-plugin-polyfill-corejs3 "^0.2.2" - babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" -======= "@babel/types" "^7.15.0" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" core-js-compat "^3.16.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 semver "^6.3.0" "@babel/preset-modules@^0.1.4": @@ -1038,15 +847,9 @@ esutils "^2.0.2" "@babel/runtime@^7.10.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": -<<<<<<< HEAD - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" - integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== -======= version "7.15.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: regenerator-runtime "^0.13.4" @@ -1059,29 +862,6 @@ "@babel/parser" "^7.14.5" "@babel/types" "^7.14.5" -<<<<<<< HEAD -"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.4.4": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== - dependencies: - "@babel/helper-validator-identifier" "^7.14.8" -======= "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0": version "7.15.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" @@ -1103,7 +883,6 @@ integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== dependencies: "@babel/helper-validator-identifier" "^7.14.9" ->>>>>>> bc2d6b8... preparing for v2.0.0 to-fast-properties "^2.0.0" "@develar/schema-utils@~2.6.5": @@ -1120,15 +899,9 @@ integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== "@electron/get@^1.0.1": -<<<<<<< HEAD - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== -======= version "1.13.0" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -1325,27 +1098,16 @@ dependencies: defer-to-connect "^1.0.1" -<<<<<<< HEAD "@theia/application-manager@1.16.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.16.0.tgz#3125b27c75dc6e6e6222bea7b1f582b21e3c528c" integrity sha512-W3xnV7wlCQf9L/5I6twuX7vE+cuVuy7FShxHjhKYym7Bf2skdvyg/MWtkgctgfkWgtOb7D3/1v0Y/4EShEa9JQ== -======= -"@theia/application-manager@1.15.0": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.15.0.tgz#0f565b75f32b1b82c1e41d97f9740bfe0cbb6419" - integrity sha512-onTLewJM2935YMnopajJBZi8p14aLiS+3ggOcv8cZmTqU/QlYb9OjhjbbN4Aj37mJ+AbLnE0NCGwr8xtEU4P2Q== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/core" "^7.10.0" "@babel/plugin-transform-classes" "^7.10.0" "@babel/plugin-transform-runtime" "^7.10.0" "@babel/preset-env" "^7.10.0" -<<<<<<< HEAD "@theia/application-package" "1.16.0" -======= - "@theia/application-package" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@theia/compression-webpack-plugin" "^3.0.0" "@types/fs-extra" "^4.0.2" babel-loader "^8.2.2" @@ -1363,26 +1125,15 @@ source-map-support "^0.5.19" style-loader "^2.0.0" umd-compat-loader "^2.1.2" -<<<<<<< HEAD webpack "^5.36.2 <5.47.0" -======= - webpack "^5.36.2" ->>>>>>> bc2d6b8... preparing for v2.0.0 webpack-cli "4.7.0" worker-loader "^3.0.8" yargs "^15.3.1" -<<<<<<< HEAD -"@theia/application-package@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.16.0.tgz#758b988aea6b4b7da44082d52f851cbed56ccffa" - integrity sha512-gO6tvkag857NKnad71PTOflYWoOUxUpqiYgq5ZO7R1uEaJhDgYKsiFPBfZFUxHjNzYLqbe053QdWgXWIAY9cHQ== -======= "@theia/application-package@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.15.0.tgz#c35026c65e8ea7a9d56d1c5603c956e4b39a53af" integrity sha512-7l3xbIZVIQpMGpMTCS0DwlqhIomnL78jiDy5s7LE+P96i7puaZWWe+hmfpGl9pxDdTNAwNHWpPt6pdz01nDrJA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -1396,7 +1147,23 @@ semver "^5.4.1" write-json-file "^2.2.0" -<<<<<<< HEAD +"@theia/application-package@1.16.0": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.16.0.tgz#758b988aea6b4b7da44082d52f851cbed56ccffa" + integrity sha512-gO6tvkag857NKnad71PTOflYWoOUxUpqiYgq5ZO7R1uEaJhDgYKsiFPBfZFUxHjNzYLqbe053QdWgXWIAY9cHQ== + dependencies: + "@types/fs-extra" "^4.0.2" + "@types/request" "^2.0.3" + "@types/semver" "^5.4.0" + "@types/write-json-file" "^2.2.1" + changes-stream "^2.2.0" + deepmerge "2.0.1" + fs-extra "^4.0.2" + is-electron "^2.1.0" + request "^2.82.0" + semver "^5.4.1" + write-json-file "^2.2.0" + "@theia/cli@^1.15.0": version "1.16.0" resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.16.0.tgz#34c5740d0e1f866bac40b039ead02cb3f30c501d" @@ -1405,16 +1172,6 @@ "@theia/application-manager" "1.16.0" "@theia/application-package" "1.16.0" "@theia/ovsx-client" "1.16.0" -======= -"@theia/cli@1.15.0": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.15.0.tgz#f3ecab217eab2416f2b1ecd30a0515953937db95" - integrity sha512-MRuPzVuk5+Yo7jBTtL/kyS0eDhT8D357eoWs7eRtB+G+Vfv9LDBgl0ZXi+EoHnzs5mbIW/FRWV8dGMZK88Kacg== - dependencies: - "@theia/application-manager" "1.15.0" - "@theia/application-package" "1.15.0" - "@theia/ovsx-client" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/chai" "^4.2.7" "@types/mkdirp" "^0.5.2" "@types/mocha" "^5.2.7" @@ -1447,17 +1204,10 @@ serialize-javascript "^1.4.0" webpack-sources "^1.0.1" -<<<<<<< HEAD -"@theia/core@1.16.0", "@theia/core@^1.11.0", "@theia/core@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.16.0.tgz#dd409788112e80bd39e48fb858e74d811ba56131" - integrity sha512-F2vaVwa4dgFjMK01DkfCqBXDW3hYAe00otXuRczsGYxU/aAJ0IKu2P3osHijN5zv+0gJ541neJ4eVzyG/ROpEg== -======= "@theia/core@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.15.0.tgz#e61c7e86d50ca2a8617a7f97a58f2d52734e374b" integrity sha512-G7EberWj0rTW33sXXjuWjRmNTDLCX/BOEDrB1o/Dp649OGSzTfl64N7qRHWVN92pZFkOhBoX4Q0lgnlBOu4OyQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -1471,11 +1221,7 @@ "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" "@primer/octicons-react" "^9.0.0" -<<<<<<< HEAD - "@theia/application-package" "1.16.0" -======= "@theia/application-package" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -1504,11 +1250,7 @@ iconv-lite "^0.6.0" inversify "^5.0.1" jschardet "^2.1.1" -<<<<<<< HEAD - keytar "7.2.0" -======= keytar "7.7.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" nsfw "^2.1.2" @@ -1529,22 +1271,6 @@ ws "^7.1.2" yargs "^15.3.1" -<<<<<<< HEAD -"@theia/editor@1.16.0", "@theia/editor@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.16.0.tgz#9374f4208fac3a44242fae85533cdf99751c4fa4" - integrity sha512-n0bW974ovEOALMZ7WbV3jXLktGoqdZJ3/lY3WEL/bahQJel/+p8OQb3Xx7fA7gOPWGXbgcpiZvZg2/w0nOJ7IA== - dependencies: - "@theia/core" "1.16.0" - "@theia/variable-resolver" "1.16.0" - "@types/base64-arraybuffer" "0.1.0" - base64-arraybuffer "^0.1.5" - -"@theia/electron@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.16.0.tgz#873e97c38152b04d62ce49b3a86ab937bd6240d3" - integrity sha512-m2hy7IciOGCpFvotMPDVtnyMO0dayR1AVcC5W2goJPZbWBfc4yqswwbi7ntb5cd0NqHqY2ugUcATFZkDI2NeCA== -======= "@theia/editor@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.15.0.tgz#ad50d8188b671c1538cac9607fb3c7635163beae" @@ -1559,7 +1285,6 @@ version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.15.0.tgz#8ef6a55346c7d5a3676ac3ef2a1f35877a7a3ae7" integrity sha512-UDufick0Ttn1LZrrk8LyikkQnfS0rYDwvbUX2VIXwUcyPywEQvxOo/Pze96jA1jGlgl8tPH0gZ33xHflz0CtXQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: electron "^9.0.2" electron-download "^4.1.1" @@ -1570,27 +1295,6 @@ unzipper "^0.9.11" yargs "^15.3.1" -<<<<<<< HEAD -"@theia/file-search@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.16.0.tgz#83c8f6b09c37a958dfd2c6e7ca3b992094a85a22" - integrity sha512-uIzbRmjYxtIt0ldGiovSFLI6293GmlNJ7IFWG/wX/gmc59CPWVKxx0PhqWwjwXXzFtJZRT41BYKawL0vvvCmKQ== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/monaco" "1.16.0" - "@theia/process" "1.16.0" - "@theia/workspace" "1.16.0" - vscode-ripgrep "^1.2.4" - -"@theia/filesystem@1.16.0", "@theia/filesystem@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.16.0.tgz#467d4dbcd77eec799256cd9e342bb030a88b4c77" - integrity sha512-FHxKS/ZplYfJvbtKOrEMDMfB/5iW06/y3yA1DcwUK4E2d5kxsihooViWwkJb0oorkfAtmbixOPHTeH2vwhtngg== - dependencies: - "@theia/core" "1.16.0" -======= "@theia/file-search@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.15.0.tgz#395bf16b2f15162f52f157f080d55134dbde1f76" @@ -1609,7 +1313,6 @@ integrity sha512-7woQNiieo703tGzZHdXvEm/T2gX0waDQrI8axzWK2R39olMRgSlGQ7BLjG0+8MuJrAK8+hijtDDMmumJYOY0CA== dependencies: "@theia/core" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/body-parser" "^1.17.0" "@types/rimraf" "^2.0.2" "@types/tar-fs" "^1.16.1" @@ -1623,21 +1326,6 @@ uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" -<<<<<<< HEAD -"@theia/git@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.16.0.tgz#f01890edcba5270b4a47d79b17a1a777ba85ceae" - integrity sha512-bI00suJ52+nYlbQZpuONE/S5WpsS2lqHiX5NFtd5GENxdo3/UyWpH9QXjKDPkwfGfhnjYzCS4YI2eHU6TVduUA== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/monaco" "1.16.0" - "@theia/navigator" "1.16.0" - "@theia/scm" "1.16.0" - "@theia/scm-extra" "1.16.0" - "@theia/workspace" "1.16.0" -======= "@theia/git@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.15.0.tgz#b29c92b2fe8c11c7f8d97cab0278dabd10572bb3" @@ -1651,7 +1339,6 @@ "@theia/scm" "1.15.0" "@theia/scm-extra" "1.15.0" "@theia/workspace" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/diff" "^3.2.2" "@types/p-queue" "^2.3.1" diff "^3.4.0" @@ -1663,35 +1350,6 @@ p-queue "^2.4.2" ts-md5 "^1.2.2" -<<<<<<< HEAD -"@theia/markers@1.16.0", "@theia/markers@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.16.0.tgz#3bd6988377634699f9eae0b2f309b73545f04496" - integrity sha512-8NiAuTEVsYdV3srAs3rTFlxYZeUCz9YpydO3DzITuFmiZ7p3+LlFLy/QtAAE+5MaydKWqpxK+PGCzH93pH40Hw== - dependencies: - "@theia/core" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/navigator" "1.16.0" - "@theia/workspace" "1.16.0" - -"@theia/monaco-editor-core@0.23.0": - version "0.23.0" - resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.23.0.tgz#7a1cbb7a857a509ce8e75c9965abea752bd76e80" - integrity sha512-WyrotTd6ZfeXAX4icgFALTzlqE356tAQ5nRuwa2E0Qdp2YIO9GDcw5G2l2NJ8INO2ygujbE5pEdD5kJM5N4TOQ== - -"@theia/monaco@1.16.0", "@theia/monaco@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.16.0.tgz#997410fa1e6c2bfc53e02bad934555d8c1e10982" - integrity sha512-38rCWHjqcjx2XPUwfxyjp/6S+BIAAHmld3EL6onNqQ736Q2NXs74n3CiE5t6Ap2ahk9P7jewwdCl512tAOg24Q== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/markers" "1.16.0" - "@theia/monaco-editor-core" "0.23.0" - "@theia/outline-view" "1.16.0" - "@theia/workspace" "1.16.0" -======= "@theia/markers@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.15.0.tgz#12d006b8054fe95e6262bc492f9da107761598ed" @@ -1719,7 +1377,6 @@ "@theia/monaco-editor-core" "^0.20.0" "@theia/outline-view" "1.15.0" "@theia/workspace" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 deepmerge "2.0.1" fast-plist "^0.1.2" idb "^4.0.5" @@ -1727,16 +1384,6 @@ onigasm "^2.2.0" vscode-textmate "^4.4.0" -<<<<<<< HEAD -"@theia/navigator@1.16.0", "@theia/navigator@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.16.0.tgz#7570e4208f84e3266f3af53891ef1fb391838fcc" - integrity sha512-DZaxfyyb1U51QjBJ5K1Rkg1TVUEG3TNII3NREYNR/3cV5qDtTmbG3Cp6g15bkdFirD6dBhjuuNRLwTc0/uD4wg== - dependencies: - "@theia/core" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/workspace" "1.16.0" -======= "@theia/navigator@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.15.0.tgz#cfa75408b52e1878c1a9f2a385b516e789d32c62" @@ -1745,7 +1392,6 @@ "@theia/core" "1.15.0" "@theia/filesystem" "1.15.0" "@theia/workspace" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 minimatch "^3.0.4" "@theia/node-pty@0.9.0-theia.6": @@ -1755,19 +1401,6 @@ dependencies: nan "^2.14.0" -<<<<<<< HEAD -"@theia/outline-view@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.16.0.tgz#5371d46fa0f11a063ba905710eb803bc5944eece" - integrity sha512-c9j5w/WBe9vps53c1Ep8eH6EKbUYikLJkHlzrc2rPko3nqy9NBYy+/8ozGVHel8LMJQyulaNEUjW71z2In4HSA== - dependencies: - "@theia/core" "1.16.0" - -"@theia/ovsx-client@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.16.0.tgz#ac5df18d5fee0e4ce1a3c277ffa6764c8c3ff740" - integrity sha512-87HnWR2wTl2iG7NcNiaaNBQXIwba0hsYFOgc/9jQfiFjnEagRUtaiaOPPOnmlDtfdx7fvxIcj1AA0TzJsGNVEg== -======= "@theia/outline-view@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.15.0.tgz#2006f969e6e81c7403cc3202e3e2bbf2cdd76ecd" @@ -1775,60 +1408,15 @@ dependencies: "@theia/core" "1.15.0" -"@theia/ovsx-client@1.15.0": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.15.0.tgz#42c55a43a577d95afdd9d8cf196a3191f9488b20" - integrity sha512-CtLotO51wuCnleB8IMF9FQxgC9VvD/6nzSNt8KC/B9JTdBMveDifxaBnarmBc+NQiZYgAWrRUnk/bPpxMoRqZg== ->>>>>>> bc2d6b8... preparing for v2.0.0 +"@theia/ovsx-client@1.16.0": + version "1.16.0" + resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.16.0.tgz#ac5df18d5fee0e4ce1a3c277ffa6764c8c3ff740" + integrity sha512-87HnWR2wTl2iG7NcNiaaNBQXIwba0hsYFOgc/9jQfiFjnEagRUtaiaOPPOnmlDtfdx7fvxIcj1AA0TzJsGNVEg== dependencies: "@types/bent" "^7.0.1" bent "^7.1.0" semver "^5.4.1" -<<<<<<< HEAD -"@theia/preferences@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.16.0.tgz#e444f07db9a23ded44234068578721866301c8fd" - integrity sha512-khoQ9AFrVCl8usPMSdM/jevAKvZxOl3z7J3UTLiS6JJGI/7MvMQlEnYAgJkcB401X1Hm5J3V2CuWJv6RUHhwFw== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/monaco" "1.16.0" - "@theia/userstorage" "1.16.0" - "@theia/workspace" "1.16.0" - jsonc-parser "^2.2.0" - -"@theia/process@1.16.0", "@theia/process@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.16.0.tgz#ecba0bcfdc580f33ac54063355a718fce2ae5706" - integrity sha512-IRkp1KVwkpXl36vVJXNyFT6pcVzrG9HkiSLEtjabT7tK14wEd3tZxZ/NmfYGswCehQQJzAylGF9wcW126OUYxA== - dependencies: - "@theia/core" "1.16.0" - "@theia/node-pty" "0.9.0-theia.6" - string-argv "^0.1.1" - -"@theia/scm-extra@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.16.0.tgz#38aee126683d3cc7fb05320bdd71c619bd085602" - integrity sha512-UU78w3ws4hWkc5jL4XQSsfoo1nGXinG3w0+zi4B7wK2oFhROrnOlqS37Lll5CYlb6NC5yOp+TY4smBKSDwAADg== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/navigator" "1.16.0" - "@theia/scm" "1.16.0" - -"@theia/scm@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.16.0.tgz#63956c960171f1d6881d75ea61726ba601557391" - integrity sha512-Dhn/zI/CRKwXUtRXj0bsw01EvcD3JHS3r1kH6iKESyIY03CwTBm4X4v2qfHN3xKropenZu2mtKvt7OUM2mPCTg== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/navigator" "1.16.0" -======= "@theia/preferences@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.15.0.tgz#69db9224e9d8e23fa011c53da50a0f41265aeed8" @@ -1871,26 +1459,12 @@ "@theia/editor" "1.15.0" "@theia/filesystem" "1.15.0" "@theia/navigator" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/diff" "^3.2.2" diff "^3.4.0" p-debounce "^2.1.0" react-autosize-textarea "^7.0.0" ts-md5 "^1.2.2" -<<<<<<< HEAD -"@theia/terminal@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.16.0.tgz#5f6f3ec919b9a455b9145ac8f6a149718409803a" - integrity sha512-nvMnQnhnq3MdVBnQ6XR5I7ZAfCTNlyd49eZlR9edlbf/lVJM/bp9AWjC/m7hfMTo95V1ybtkkk+IAqhA205IAQ== - dependencies: - "@theia/core" "1.16.0" - "@theia/editor" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/monaco" "1.16.0" - "@theia/process" "1.16.0" - "@theia/workspace" "1.16.0" -======= "@theia/terminal@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.15.0.tgz#81fa75ca890d9b185838e4c4aa25cf701d62a33e" @@ -1901,36 +1475,10 @@ "@theia/filesystem" "1.15.0" "@theia/process" "1.15.0" "@theia/workspace" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 xterm "~4.11.0" xterm-addon-fit "~0.5.0" xterm-addon-search "~0.8.0" -<<<<<<< HEAD -"@theia/userstorage@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.16.0.tgz#7f6074ea8db40a06c914bd6abaaa1e1f338241e6" - integrity sha512-o7RheO5Y/g/P9WNowckDkG97CdFbSM9ml8CwOBpwg+al0PILIStqAHI8AAfofk6xDcIc7y9IyaatEYleqxdTtA== - dependencies: - "@theia/core" "1.16.0" - "@theia/filesystem" "1.16.0" - -"@theia/variable-resolver@1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.16.0.tgz#00393335623dbed16047a289cc0dd4a0fdea4925" - integrity sha512-cWji+upAxnRcTAz0xhF1Ivqk++wVcD36yU1u9HJlPENKR9JTFoiZn2qXINzGp5OFlHNaA0ojMfX2jXwzSsUBrA== - dependencies: - "@theia/core" "1.16.0" - -"@theia/workspace@1.16.0", "@theia/workspace@^1.15.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.16.0.tgz#6975ecd4c70a76a8a692a70bf7e06cdfe79d8360" - integrity sha512-AHZ/N/1vLnOYyWDIsXmSIbsSLiT9Ttul5hT1fsYGzh1euYtYBFpm9r/Tco1YUk9zHc65Gnkv9qWTPhWXQnUqAw== - dependencies: - "@theia/core" "1.16.0" - "@theia/filesystem" "1.16.0" - "@theia/variable-resolver" "1.16.0" -======= "@theia/userstorage@1.15.0": version "1.15.0" resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.15.0.tgz#ad7270aee93d4d3798ff843942b6b3b64485ef2a" @@ -1954,7 +1502,6 @@ "@theia/core" "1.15.0" "@theia/filesystem" "1.15.0" "@theia/variable-resolver" "1.15.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 ajv "^6.5.3" jsonc-parser "^2.2.0" moment "2.24.0" @@ -2089,15 +1636,9 @@ "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": -<<<<<<< HEAD - version "7.0.8" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" - integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== -======= version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/lodash.debounce@4.0.3": version "4.0.3" @@ -2114,16 +1655,6 @@ "@types/lodash" "*" "@types/lodash@*": -<<<<<<< HEAD - version "4.14.171" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" - integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== - -"@types/mime-types@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" - integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= -======= version "4.14.172" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== @@ -2132,7 +1663,6 @@ version "2.1.1" resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/mime@^1": version "1.3.2" @@ -2145,15 +1675,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minipass@*": -<<<<<<< HEAD - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-2.2.1.tgz#a52138867c493ff14f07616efcbe2af7662b76fb" - integrity sha512-0bI74UwEJ+JjGqzkyoiCxLVGK5C3Vy5MYdDB6VCtUAulcrulHvqhIrQP9lh/gvMgaNzvvJljMW97rRHVvbTe8Q== -======= version "3.1.0" resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-3.1.0.tgz#616dcc2205982d4c720f4c7e9a9fddc497245273" integrity sha512-b2yPKwCrB8x9SB65kcCistMoe3wrYnxxt5rJSZ1kprw0uOXvhuKi9kTQ746Y+Pbqoh+9C0N4zt0ztmTnG9yg7A== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/node" "*" @@ -2183,15 +1707,9 @@ form-data "^3.0.0" "@types/node@*": -<<<<<<< HEAD - version "16.4.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.7.tgz#f7afa78769d4b477f5092d7c3468e2e8653d779c" - integrity sha512-aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA== -======= version "16.6.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz#331b7b9f8621c638284787c5559423822fdffc50" integrity sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/node@^10.14.22": version "10.17.60" @@ -2199,15 +1717,9 @@ integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== "@types/node@^12.0.12": -<<<<<<< HEAD - version "12.20.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.17.tgz#ffd44c2801fc527a6fe6e86bc9b900261df1c87e" - integrity sha512-so8EHl4S6MmatPS0f9sE1ND94/ocbcEshW5OpyYthRqeRpiYyW2uXYTo/84kmfdfeNrDycARkvuiXl6nO40NGg== -======= version "12.20.19" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.19.tgz#538e61fc220f77ae4a4663c3d8c3cb391365c209" integrity sha512-niAuZrwrjKck4+XhoCw6AAVQBENHftpXw9F4ryk66fTgYaKQ53R4FI7c9vUGGw5vQis1HKBHDR1gcYI/Bq1xvw== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2257,44 +1769,26 @@ "@types/react" "^16" "@types/react-virtualized@^9.18.3": -<<<<<<< HEAD - version "9.21.12" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.12.tgz#5b76aa20c24b8df6dd210ed42f1e9192e1234f46" - integrity sha512-zt6EvLQPhnnSVnMGa5prpV4pROY9euU2k2aoAyuaiDdfSvrfvzxM9MhkpdVYKKfBVUqAlQpMeE/4DPhNGvp7Cg== -======= version "9.21.13" resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.13.tgz#4222173abe7c9ed7504c75886c8367502ac7b9f1" integrity sha512-tCIQ5wDKj+QJ3sMzjPKSLY0AXsznt+ovAUcq+JCLjPBOcAHbPt4FraGT9HKYEFfmp9E6+ELuN49i5bWtuBmi3w== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/react" "*" "@types/react@*": -<<<<<<< HEAD - version "17.0.15" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.15.tgz#c7533dc38025677e312606502df7656a6ea626d0" - integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw== -======= version "17.0.19" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991" integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/react@^16", "@types/react@^16.8.0": -<<<<<<< HEAD - version "16.14.11" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.11.tgz#992a0cd4b66b9f27315042b5d96e976717368f04" - integrity sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ== -======= version "16.14.14" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.14.tgz#853de95a32a6a0e719192e222eacad024add2b8e" integrity sha512-uwIWDYW8LznHzEMJl7ag9St1RsK0gw/xaFZ5+uI1ZM1HndwUgmPH3/wQkSb87GkOVg7shUxnpNW8DcN0AzvG5Q== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2570,15 +2064,9 @@ envinfo "^7.7.3" "@webpack-cli/serve@^1.4.0": -<<<<<<< HEAD - version "1.5.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278" - integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw== -======= version "1.5.2" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== ->>>>>>> bc2d6b8... preparing for v2.0.0 "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -2608,14 +2096,6 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -<<<<<<< HEAD -======= -acorn-import-assertions@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" - integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== - ->>>>>>> bc2d6b8... preparing for v2.0.0 acorn@^8.4.1: version "8.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" @@ -3084,15 +2564,9 @@ body-parser@1.19.0, body-parser@^1.17.2, body-parser@^1.18.3: type-is "~1.6.17" boolean@^3.0.1: -<<<<<<< HEAD - version "3.1.2" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" - integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw== -======= version "3.1.3" resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.3.tgz#f6ff158e3491428f293bef2bfacc3152cbbd9a6c" integrity sha512-zLOKuqi6MHj/MrY+E9JATy2ojKP3WED4W1yHXe8PSw6+6o34YYJXCwBUC/EEilN8Gq6zgveHBKX2zldtBkviGQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 boxen@^5.0.0: version "5.0.1" @@ -3136,18 +2610,6 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -<<<<<<< HEAD -browserslist@^4.14.5, browserslist@^4.16.6: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== - dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" - escalade "^3.1.1" - node-releases "^1.1.71" -======= browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.16.7: version "4.16.8" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" @@ -3158,7 +2620,6 @@ browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.16.7: electron-to-chromium "^1.3.811" escalade "^3.1.1" node-releases "^1.1.75" ->>>>>>> bc2d6b8... preparing for v2.0.0 buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -3345,16 +2806,6 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: -<<<<<<< HEAD - version "1.0.30001248" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001248.tgz#8b6ff97bfeefe727f2fb1070e67ccd801e375e44" - integrity sha512-29JX6IwToCEjwxR7Q8vhcwgbQvSqb/WRJfMMAR6Fyd9DF+Yi5LUMS8VfN86SlDrGaghqEnK/5advE7RRZ6RzqA== - -caniuse-lite@^1.0.30001219: - version "1.0.30001248" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce" - integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== -======= version "1.0.30001251" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001251.tgz#ae1952b08980f916a8fa47a2a5207910c319e44d" integrity sha512-qZcXjfDu3lwN6LJMpG0qI2Oz0IGpyXh5exkSeWOc3/I7dZBshplxOcRXGtcFIBTr6bCeBxvgQRxwkKTJOr6d1w== @@ -3363,7 +2814,6 @@ caniuse-lite@^1.0.30001251: version "1.0.30001251" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== ->>>>>>> bc2d6b8... preparing for v2.0.0 caseless@~0.12.0: version "0.12.0" @@ -3410,15 +2860,9 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.1.0, chalk@^4.1.1: -<<<<<<< HEAD - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== -======= version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3460,11 +2904,7 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" -<<<<<<< HEAD -chownr@^1.0.1, chownr@^1.1.1: -======= chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3646,17 +3086,10 @@ color@^0.11.0: color-convert "^1.3.0" color-string "^0.3.0" -<<<<<<< HEAD -colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== -======= colorette@^1.2.1, colorette@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== ->>>>>>> bc2d6b8... preparing for v2.0.0 colormin@^1.0.5: version "1.1.2" @@ -3843,20 +3276,6 @@ copy-webpack-plugin@^8.1.1: schema-utils "^3.0.0" serialize-javascript "^5.0.1" -<<<<<<< HEAD -core-js-compat@^3.14.0, core-js-compat@^3.15.0: - version "3.16.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.0.tgz#fced4a0a534e7e02f7e084bff66c701f8281805f" - integrity sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q== - dependencies: - browserslist "^4.16.6" - semver "7.0.0" - -core-js@^3.6.5: - version "3.16.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986" - integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== -======= core-js-compat@^3.14.0, core-js-compat@^3.16.0: version "3.16.2" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz#442ef1d933ca6fc80859bd5a1db7a3ba716aaf56" @@ -3869,7 +3288,6 @@ core-js@^3.6.5: version "3.16.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4" integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4310,15 +3728,9 @@ dom-helpers@^5.1.3: csstype "^3.0.2" dompurify@^2.2.9: -<<<<<<< HEAD - version "2.3.0" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2" - integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw== -======= version "2.3.1" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== ->>>>>>> bc2d6b8... preparing for v2.0.0 dot-prop@^5.0.0, dot-prop@^5.2.0: version "5.3.0" @@ -4497,17 +3909,10 @@ electron-store@^5.1.1: conf "^6.2.1" type-fest "^0.7.1" -<<<<<<< HEAD -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.723: - version "1.3.791" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.791.tgz#e38f325ff22470bdcff34409d58c0baf9c2e3e93" - integrity sha512-Tdx7w1fZpeWOOBluK+kXTAKCXyc79K65RB6Zp0+sPSZZhDjXlrxfGlXrlMGVVQUrKCyEZFQs1UBBLNz5IdbF0g== -======= electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.811: version "1.3.812" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.812.tgz#4c4fb407e0e1335056097f172e9f2c0a09efe77d" integrity sha512-7KiUHsKAWtSrjVoTSzxQ0nPLr/a+qoxNZwkwd9LkylTOgOXSVXkQbpIVT0WAUQcI5gXq3SwOTCrK+WfINHOXQg== ->>>>>>> bc2d6b8... preparing for v2.0.0 electron@^9.0.2: version "9.4.4" @@ -4588,15 +3993,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.18.0-next.2: -<<<<<<< HEAD - version "1.18.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.4.tgz#c6b7a1acd6bb1c8b5afeb54a53c46ad02fab346d" - integrity sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ== -======= version "1.18.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4862,15 +4261,9 @@ fastparse@^1.1.2: integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: -<<<<<<< HEAD - version "1.11.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" - integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== -======= version "1.12.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: reusify "^1.0.4" @@ -4923,17 +4316,10 @@ filename-reserved-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= -<<<<<<< HEAD -filesize@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00" - integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg== -======= filesize@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/filesize/-/filesize-7.0.0.tgz#9d4b3ce384ec7731a9e68c64ee29fb4934ad657d" integrity sha512-Wsstw+O1lZ9gVmOI1thyeQvODsaoId2qw14lCqIzUhoHKXX7T2hVpB7BR6SvgodMBgWccrx/y2eyV8L7tDmY6A== ->>>>>>> bc2d6b8... preparing for v2.0.0 fill-range@^7.0.1: version "7.0.1" @@ -5136,11 +4522,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" -<<<<<<< HEAD -fs-minipass@^1.2.5: -======= fs-minipass@^1.2.7: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -5189,20 +4571,6 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -<<<<<<< HEAD -fusion-studio-extension@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fusion-studio-extension/-/fusion-studio-extension-1.2.0.tgz#8ef11cc0235388ab5b165b225006c6cc01ac0cb7" - integrity sha512-mDoyIMJFkw/MPPX7Ysu9FVSPs0uadXDLV7C+To18ywviBeSDE/oKn/DjPhhe8n63dFaeb/cL80TmjK/tgWPAew== - dependencies: - "@theia/core" "^1.11.0" - awesomplete "1.1.5" - filesize "6.1.0" - mime-types "2.1.29" - moment "2.29.1" - ripemd160 "2.0.2" - typescript "4.1.3" -======= fusion-studio-extension@^2.0.0-next: version "2.0.0-next.0" resolved "https://registry.yarnpkg.com/fusion-studio-extension/-/fusion-studio-extension-2.0.0-next.0.tgz#fec1f17c90394fdf10f3adfd7fc1c2fc3516ffee" @@ -5215,7 +4583,6 @@ fusion-studio-extension@^2.0.0-next: moment "2.29.1" ripemd160 "2.0.2" typescript "4.3.5" ->>>>>>> bc2d6b8... preparing for v2.0.0 uuid "^8.3.2" fuzzy@^0.1.3: @@ -5425,15 +4792,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4: -<<<<<<< HEAD - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== -======= version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== ->>>>>>> bc2d6b8... preparing for v2.0.0 "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -5490,8 +4851,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== -<<<<<<< HEAD -======= has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -5499,7 +4858,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" ->>>>>>> bc2d6b8... preparing for v2.0.0 has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -5782,17 +5140,11 @@ is-arrayish@^0.2.1: integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.1: -<<<<<<< HEAD - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== -======= version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: has-bigints "^1.0.1" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-binary-path@~2.1.0: version "2.1.0" @@ -5802,20 +5154,12 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: -<<<<<<< HEAD - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== - dependencies: - call-bind "^1.0.2" -======= version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" has-tostringtag "^1.0.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-buffer@~2.0.3: version "2.0.5" @@ -5823,15 +5167,9 @@ is-buffer@~2.0.3: integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== is-callable@^1.1.4, is-callable@^1.2.3: -<<<<<<< HEAD - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== -======= version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== ->>>>>>> bc2d6b8... preparing for v2.0.0 is-ci@^2.0.0: version "2.0.0" @@ -5848,30 +5186,18 @@ is-ci@^3.0.0: ci-info "^3.1.1" is-core-module@^2.2.0: -<<<<<<< HEAD - version "2.5.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" - integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== -======= version "2.6.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: has "^1.0.3" is-date-object@^1.0.1: -<<<<<<< HEAD - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" - integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== -======= version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: has-tostringtag "^1.0.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-electron@^2.1.0: version "2.2.0" @@ -5936,17 +5262,11 @@ is-npm@^5.0.0: integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== is-number-object@^1.0.4: -<<<<<<< HEAD - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== -======= version "1.0.6" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== dependencies: has-tostringtag "^1.0.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-number@^7.0.0: version "7.0.0" @@ -5976,21 +5296,12 @@ is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.1.3: -<<<<<<< HEAD - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== - dependencies: - call-bind "^1.0.2" - has-symbols "^1.0.2" -======= version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" has-tostringtag "^1.0.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-stream@^1.1.0: version "1.1.0" @@ -6003,17 +5314,11 @@ is-stream@^2.0.0: integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.6: -<<<<<<< HEAD - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" - integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== -======= version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== dependencies: has-tostringtag "^1.0.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 is-svg@^2.0.0: version "2.1.0" @@ -6249,17 +5554,10 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -<<<<<<< HEAD -keytar@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.2.0.tgz#4db2bec4f9700743ffd9eda22eebb658965c8440" - integrity sha512-ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw== -======= keytar@7.7.0: version "7.7.0" resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: node-addon-api "^3.0.0" prebuild-install "^6.0.0" @@ -6571,29 +5869,11 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -<<<<<<< HEAD -mime-db@1.46.0: - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== - -======= ->>>>>>> bc2d6b8... preparing for v2.0.0 mime-db@1.49.0: version "1.49.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== -<<<<<<< HEAD -mime-types@2.1.29: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== - dependencies: - mime-db "1.46.0" - -======= ->>>>>>> bc2d6b8... preparing for v2.0.0 mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.32" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" @@ -6611,14 +5891,11 @@ mime@^2.0.3, mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== -<<<<<<< HEAD -======= mimetype@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/mimetype/-/mimetype-0.0.8.tgz#fb30022794bbf7725cb7b46df820e87dd91fd086" integrity sha1-+zACJ5S793Jct7Rt+CDofdkf0IY= ->>>>>>> bc2d6b8... preparing for v2.0.0 mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -6651,11 +5928,7 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1. resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -<<<<<<< HEAD -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: -======= minipass@^2.6.0, minipass@^2.9.0: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -6670,11 +5943,7 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -<<<<<<< HEAD -minizlib@^1.2.1: -======= minizlib@^1.3.3: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -6710,11 +5979,7 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -<<<<<<< HEAD -mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.1: -======= mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -6817,15 +6082,9 @@ ms@^2.1.1: integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== nan@^2.14.0: -<<<<<<< HEAD - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== -======= version "2.15.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 napi-build-utils@^1.0.1: version "1.0.2" @@ -6838,15 +6097,9 @@ native-keymap@^2.1.2: integrity sha512-rsEf2gbFFNEy3MxxQocCn9XpNyqBa8kMFFrjXFWCp3lWuhk3svHnWYZOj3Or8lNoAIjVxAPLdMClraLXHz6dnw== native-request@^1.0.5: -<<<<<<< HEAD - version "1.0.8" - resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== -======= version "1.0.9" resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.9.tgz#2269748379c004415d9721c204d8da3455abc175" integrity sha512-KTRwqMwWCkoLZfjes3yBhK6XHwZ5Q1jPsdVra9hug8HNRbMsfTJm8a8L6/WOYi1h5eWNwlBaYy8V5SpJwkDgKw== ->>>>>>> bc2d6b8... preparing for v2.0.0 negotiator@0.6.2: version "0.6.2" @@ -6931,17 +6184,10 @@ node-gyp@^7.0.0: tar "^6.0.2" which "^2.0.2" -<<<<<<< HEAD -node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== -======= node-releases@^1.1.75: version "1.1.75" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== ->>>>>>> bc2d6b8... preparing for v2.0.0 noop-logger@^0.1.1: version "0.1.1" @@ -7443,15 +6689,6 @@ pkg-up@^3.0.1: find-up "^3.0.0" plist@^3.0.1: -<<<<<<< HEAD - version "3.0.2" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" - integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^9.0.7" - xmldom "^0.5.0" -======= version "3.0.3" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.3.tgz#007df34c7be0e2c3dcfcf460d623e6485457857d" integrity sha512-ghdOKN99hh1oEmAlwBmPYo4L+tSQ7O3jRpkhWqOrMz86CWotpVzMevvQ+czo7oPDpOZyA6K06Ci7QVHpoh9gaA== @@ -7459,7 +6696,6 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" xmldom "^0.6.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 postcss-calc@^5.2.0: version "5.3.1" @@ -7762,15 +6998,9 @@ prebuild-install@^5.2.4: which-pm-runs "^1.0.0" prebuild-install@^6.0.0: -<<<<<<< HEAD - version "6.1.3" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.3.tgz#8ea1f9d7386a0b30f7ef20247e36f8b2b82825a2" - integrity sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q== -======= version "6.1.4" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -8419,11 +7649,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -<<<<<<< HEAD -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: -======= safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -8679,15 +7905,9 @@ slice-ansi@^1.0.0: is-fullwidth-code-point "^2.0.0" smart-buffer@^4.0.2: -<<<<<<< HEAD - version "4.1.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" - integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== -======= version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== ->>>>>>> bc2d6b8... preparing for v2.0.0 sort-keys@^1.0.0: version "1.1.2" @@ -8708,11 +7928,7 @@ source-list-map@^0.1.7: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY= -<<<<<<< HEAD source-list-map@^2.0.0, source-list-map@^2.0.1: -======= -source-list-map@^2.0.0: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== @@ -8785,15 +8001,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: -<<<<<<< HEAD - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== -======= version "3.0.10" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== ->>>>>>> bc2d6b8... preparing for v2.0.0 speedometer@~0.1.2: version "0.1.4" @@ -9131,24 +8341,6 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^4.0.2, tar@^4.4.12: -<<<<<<< HEAD - version "4.4.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" - integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - -tar@^6.0.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6" - integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q== -======= version "4.4.19" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== @@ -9165,7 +8357,6 @@ tar@^6.0.2: version "6.1.10" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz#8a320a74475fba54398fa136cd9883aa8ad11175" integrity sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -9395,17 +8586,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -<<<<<<< HEAD -typescript@4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" - integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -======= typescript@4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== ->>>>>>> bc2d6b8... preparing for v2.0.0 umd-compat-loader@^2.1.2: version "2.1.2" @@ -9738,7 +8922,6 @@ webpack-sources@^1.0.1: source-list-map "^2.0.0" source-map "~0.6.1" -<<<<<<< HEAD webpack-sources@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" @@ -9751,17 +8934,6 @@ webpack-sources@^2.3.1: version "5.46.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.46.0.tgz#105d20d96f79db59b316b0ae54316f0f630314b5" integrity sha512-qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw== -======= -webpack-sources@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" - integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== - -webpack@^5.36.2: - version "5.51.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.51.1.tgz#41bebf38dccab9a89487b16dbe95c22e147aac57" - integrity sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -9769,10 +8941,6 @@ webpack@^5.36.2: "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" acorn "^8.4.1" -<<<<<<< HEAD -======= - acorn-import-assertions "^1.7.6" ->>>>>>> bc2d6b8... preparing for v2.0.0 browserslist "^4.14.5" chrome-trace-event "^1.0.2" enhanced-resolve "^5.8.0" @@ -9789,11 +8957,7 @@ webpack@^5.36.2: tapable "^2.1.1" terser-webpack-plugin "^5.1.3" watchpack "^2.2.0" -<<<<<<< HEAD webpack-sources "^2.3.1" -======= - webpack-sources "^3.2.0" ->>>>>>> bc2d6b8... preparing for v2.0.0 whet.extend@~0.9.9: version "0.9.9" @@ -9975,17 +9139,10 @@ xmlbuilder@^9.0.7: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= -<<<<<<< HEAD -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== -======= xmldom@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== ->>>>>>> bc2d6b8... preparing for v2.0.0 xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" @@ -9999,32 +9156,21 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -<<<<<<< HEAD -xterm-addon-fit@~0.5.0: -======= xterm-addon-fit@^0.5.0, xterm-addon-fit@~0.5.0: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "0.5.0" resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -<<<<<<< HEAD -xterm-addon-search@~0.8.0: -======= xterm-addon-search@^0.8.0, xterm-addon-search@~0.8.0: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "0.8.0" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz#e33eab918df7eac7e7baf95dd2b3d14133754881" integrity sha512-MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA== -<<<<<<< HEAD -======= xterm@^4.13.0: version "4.13.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.13.0.tgz#7998de1e2ad92c4796fe45807be4f31061f3d9d1" integrity sha512-HVW1gdoLOTnkMaqQCr2r3mQy4fX9iSa5gWxKZ2UTYdLa4iqavv7QxJ8n1Ypse32shPVkhTYPLS6vHEFZp5ghzw== ->>>>>>> bc2d6b8... preparing for v2.0.0 xterm@~4.11.0: version "4.11.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.11.0.tgz#d7dabc7af5299579e4663fedf2b3a179af9aaff9" @@ -10045,11 +9191,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -<<<<<<< HEAD -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: -======= yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: ->>>>>>> bc2d6b8... preparing for v2.0.0 version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -10147,17 +9289,10 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -<<<<<<< HEAD -yargs@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" - integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== -======= yargs@^17.0.1, yargs@^17.1.1: version "17.1.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba" integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ== ->>>>>>> bc2d6b8... preparing for v2.0.0 dependencies: cliui "^7.0.2" escalade "^3.1.1" From b9caa99461a6358b00a39d93dd457f65d1bee595 Mon Sep 17 00:00:00 2001 From: Charafeddine Cheraa Date: Fri, 20 Aug 2021 21:29:27 +0000 Subject: [PATCH 4/4] fix: wrong name for storing artifacts --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b75bd2d..8016e13 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,20 +62,20 @@ jobs: equal: [<>, *nix] steps: - store_artifacts: - path: dist/fusion-studio-1.0.3.dmg + path: dist/fusion-studio-2.0.0-next.0.dmg destination: macOS - when: condition: equal: [<>, *nix] steps: - store_artifacts: - path: dist/fusion-studio-1.0.3.deb + path: dist/fusion-studio-2.0.0-next.0.deb destination: Linux - store_artifacts: - path: dist/fusion-studio-1.0.3.AppImage + path: dist/fusion-studio-2.0.0-next.0.AppImage destination: Linux - store_artifacts: - path: dist/fusion-studio-1.0.3.rpm + path: dist/fusion-studio-2.0.0-next.0.rpm destination: Linux # (DP) build-win is a workaround for circleci-docs#5611 build-win: @@ -104,7 +104,7 @@ jobs: - run: yarn --version - run: yarn package - store_artifacts: - path: dist/fusion-studio-1.0.3-installer.exe + path: dist/fusion-studio-2.0.0-next.0-installer.exe destination: Windows