From 5ac4d7661a9e8faefacfb260c8fb2d3a79d3e6d0 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 27 Apr 2021 13:54:06 +0200 Subject: [PATCH 0001/1843] added publisher_id field to user - it can be retrieved with getUserInfos - it can be changed with updateUserInfos --- docu/login_server.api.md | 7 +++-- login_server/skeema/gradido_login/users.sql | 1 + .../cpp/JSONInterface/JsonGetUserInfos.cpp | 3 ++ .../cpp/JSONInterface/JsonUpdateUserInfos.cpp | 11 +++++++ login_server/src/cpp/model/table/User.cpp | 29 ++++++++++--------- login_server/src/cpp/model/table/User.h | 5 +++- 6 files changed, 39 insertions(+), 17 deletions(-) diff --git a/docu/login_server.api.md b/docu/login_server.api.md index 27d83c06a..8b8c7e484 100644 --- a/docu/login_server.api.md +++ b/docu/login_server.api.md @@ -167,7 +167,8 @@ with: "User.last_name" : "Musterman", "User.disabled": 0, "User.language": "de", - "User.password": "1234" + "User.password": "1234", + "User.publisher_id": "1" } } ``` @@ -237,7 +238,8 @@ with: "user.last_name", "user.disabled", "user.email_checked", - "user.language" + "user.language", + "user.publisher_id" ] } ``` @@ -273,6 +275,7 @@ Return only the fields which are defined in request is in db only saved in state_users so if we delete this entry, validating all transactions is no longer possible. Disabled User cannot login and cannot receive transactions. - `email_checked`: If user has clicked on link in verification email (register), can only transfer gradidos if email_checked is 1 - `language`: Language Key for User, currently 'de' or 'en' +- `publisher_id`: elopage publisher ip - `errors`: array of strings if error occure ## Login by Email Verification Code diff --git a/login_server/skeema/gradido_login/users.sql b/login_server/skeema/gradido_login/users.sql index 9de1bad49..033ef3563 100644 --- a/login_server/skeema/gradido_login/users.sql +++ b/login_server/skeema/gradido_login/users.sql @@ -14,6 +14,7 @@ CREATE TABLE `users` ( `language` varchar(4) NOT NULL DEFAULT 'de', `disabled` tinyint DEFAULT '0', `group_id` int unsigned DEFAULT 0, + `publisher_id` int DEFAULT 0, PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp index 2b1f229de..74bd7625a 100644 --- a/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp +++ b/login_server/src/cpp/JSONInterface/JsonGetUserInfos.cpp @@ -134,6 +134,9 @@ Poco::JSON::Object* JsonGetUserInfos::handle(Poco::Dynamic::Var params) else if (parameterString == "user.language") { jsonUser.set("language", user_model->getLanguageKey()); } + else if (parameterString == "user.publisher_id") { + jsonUser.set("publisher_id", user_model->getPublisherId()); + } } catch (Poco::Exception& ex) { jsonErrorsArray.add("ask parameter invalid"); diff --git a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp index 4b55694af..b682d3603 100644 --- a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp @@ -118,6 +118,17 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params) } } } + else if ("User.publisher_id" == name) { + if (value.isInteger()) { + int publisher_id = 0; + value.convert(publisher_id); + user_model->setPublisherId(publisher_id); + extractet_values++; + } + else { + jsonErrorsArray.add("User.publisher_id isn't a valid integer"); + } + } else if ("User.password" == name && value.size() > 0 && (ServerConfig::g_AllowUnsecureFlags & ServerConfig::UNSECURE_PASSWORD_REQUESTS) == ServerConfig::UNSECURE_PASSWORD_REQUESTS) { if (!value.isString()) { jsonErrorsArray.add("User.password isn't string"); diff --git a/login_server/src/cpp/model/table/User.cpp b/login_server/src/cpp/model/table/User.cpp index 91cfbf7f1..de309b0a8 100644 --- a/login_server/src/cpp/model/table/User.cpp +++ b/login_server/src/cpp/model/table/User.cpp @@ -15,12 +15,12 @@ namespace model { namespace table { User::User() - : mPasswordHashed(0), mEmailChecked(false), mLanguageKey("de"), mDisabled(false), mRole(ROLE_NOT_LOADED) + : mPasswordHashed(0), mEmailChecked(false), mLanguageKey("de"), mDisabled(false), mPublisherId(0), mRole(ROLE_NOT_LOADED) { } User::User(const std::string& email, const std::string& first_name, const std::string& last_name, int group_id, Poco::UInt64 passwordHashed/* = 0*/, std::string languageKey/* = "de"*/) - : mFirstName(first_name), mLastName(last_name), mPasswordHashed(passwordHashed), mEmailChecked(false), mLanguageKey(languageKey), mDisabled(false), mGroupId(group_id), mRole(ROLE_NOT_LOADED) + : mFirstName(first_name), mLastName(last_name), mPasswordHashed(passwordHashed), mEmailChecked(false), mLanguageKey(languageKey), mDisabled(false), mGroupId(group_id), mPublisherId(0), mRole(ROLE_NOT_LOADED) { setEmail(email); @@ -29,8 +29,9 @@ namespace model { User::User(UserTuple tuple) : ModelBase(tuple.get<0>()), mFirstName(tuple.get<1>()), mLastName(tuple.get<2>()), mEmail(tuple.get<3>()), mUsername(tuple.get<4>()), - mPublicKey(tuple.get<5>()), mCreated(tuple.get<6>()), mEmailChecked(tuple.get<7>()), mDisabled(tuple.get<8>()), mGroupId(tuple.get<9>()), - mPasswordHashed(0), mLanguageKey("de"), mRole(ROLE_NOT_LOADED) + mPublicKey(tuple.get<5>()), mCreated(tuple.get<6>()), mEmailChecked(tuple.get<7>()), mDisabled(tuple.get<8>()), + mGroupId(tuple.get<9>()), mPublisherId(tuple.get<10>()), + mPasswordHashed(0), mLanguageKey("de"), mRole(ROLE_NOT_LOADED) { } @@ -82,12 +83,12 @@ namespace model { if (mPasswordHashed) { - insert << "INSERT INTO users (email, first_name, last_name, username, password, email_hash, language, group_id) VALUES(?,?,?,?,?,?,?,?);", - use(mEmail), use(mFirstName), use(mLastName), use(mUsername), bind(mPasswordHashed), use(mEmailHash), use(mLanguageKey), use(mGroupId); + insert << "INSERT INTO users (email, first_name, last_name, username, password, email_hash, language, group_id, publisher_id) VALUES(?,?,?,?,?,?,?,?,?);", + use(mEmail), use(mFirstName), use(mLastName), use(mUsername), bind(mPasswordHashed), use(mEmailHash), use(mLanguageKey), use(mGroupId), use(mPublisherId); } else { - insert << "INSERT INTO users (email, first_name, last_name, username, email_hash, language, group_id) VALUES(?,?,?,?,?,?,?);", - use(mEmail), use(mFirstName), use(mLastName), use(mUsername), use(mEmailHash), use(mLanguageKey), use(mGroupId); + insert << "INSERT INTO users (email, first_name, last_name, username, email_hash, language, group_id, publisher_id) VALUES(?,?,?,?,?,?,?,?);", + use(mEmail), use(mFirstName), use(mLastName), use(mUsername), use(mEmailHash), use(mLanguageKey), use(mGroupId), use(mPublisherId); } return insert; @@ -100,13 +101,13 @@ namespace model { _fieldName = getTableName() + std::string(".id"); } Poco::Data::Statement select(session); - select << "SELECT " << getTableName() << ".id, email, first_name, last_name, username, password, pubkey, privkey, email_hash, created, email_checked, language, disabled, group_id, user_roles.role_id " + select << "SELECT " << getTableName() << ".id, email, first_name, last_name, username, password, pubkey, privkey, email_hash, created, email_checked, language, disabled, group_id, publisher_id, user_roles.role_id " << " FROM " << getTableName() << " LEFT JOIN user_roles ON " << getTableName() << ".id = user_roles.user_id " << " WHERE " << _fieldName << " = ?" , into(mID), into(mEmail), into(mFirstName), into(mLastName), into(mUsername), into(mPasswordHashed), into(mPublicKey), into(mPrivateKey), into(mEmailHash), into(mCreated), into(mEmailChecked), - into(mLanguageKey), into(mDisabled), into(mGroupId), into(mRole); + into(mLanguageKey), into(mDisabled), into(mGroupId), into(mPublisherId), into(mRole); return select; @@ -116,7 +117,7 @@ namespace model { { Poco::Data::Statement select(session); // typedef Poco::Tuple, int> UserTuple; - select << "SELECT id, first_name, last_name, email, username, pubkey, created, email_checked, disabled, group_id FROM " << getTableName() + select << "SELECT id, first_name, last_name, email, username, pubkey, created, email_checked, disabled, group_id, publisher_id FROM " << getTableName() << " where " << fieldName << " LIKE ?"; @@ -132,7 +133,7 @@ namespace model { } // typedef Poco::Tuple, int> UserTuple; - select << "SELECT id, first_name, last_name, email, username, pubkey, created, email_checked, disabled, group_id FROM " << getTableName() + select << "SELECT id, first_name, last_name, email, username, pubkey, created, email_checked, disabled, group_id, publisher_id FROM " << getTableName() << " where " << fieldNames[0] << " LIKE ?"; if (conditionType == MYSQL_CONDITION_AND) { for (int i = 1; i < fieldNames.size(); i++) { @@ -244,8 +245,8 @@ namespace model { auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER); Poco::Data::Statement update(session); - update << "UPDATE users SET first_name = ?, last_name = ?, username = ?, disabled = ?, language = ? where id = ?;", - use(mFirstName), use(mLastName), use(mUsername), use(mDisabled), use(mLanguageKey), use(mID); + update << "UPDATE users SET first_name = ?, last_name = ?, username = ?, disabled = ?, language = ?, publisher_id = ? where id = ?;", + use(mFirstName), use(mLastName), use(mUsername), use(mDisabled), use(mLanguageKey), use(mPublisherId), use(mID); try { diff --git a/login_server/src/cpp/model/table/User.h b/login_server/src/cpp/model/table/User.h index 876803cf8..3947e3c22 100644 --- a/login_server/src/cpp/model/table/User.h +++ b/login_server/src/cpp/model/table/User.h @@ -28,7 +28,7 @@ namespace model { USER_FIELDS_LANGUAGE }; - typedef Poco::Tuple, Poco::DateTime, int, int, int> UserTuple; + typedef Poco::Tuple, Poco::DateTime, int, int, int, int> UserTuple; class User : public ModelBase { @@ -60,6 +60,7 @@ namespace model { inline std::string getNameWithEmailHtml() const { SHARED_LOCK; return mFirstName + " " + mLastName + " <" + mEmail + ">"; } inline const Poco::UInt64 getPasswordHashed() const { SHARED_LOCK; return mPasswordHashed; } inline int getGroupId() const { SHARED_LOCK; return mGroupId; } + inline int getPublisherId() const { SHARED_LOCK; return mPublisherId; } inline RoleType getRole() const { SHARED_LOCK; if (mRole.isNull()) return ROLE_NONE; return static_cast(mRole.value()); } inline const unsigned char* getPublicKey() const { SHARED_LOCK; if (mPublicKey.isNull()) return nullptr; return mPublicKey.value().content().data(); } MemoryBin* getPublicKeyCopy() const; @@ -89,6 +90,7 @@ namespace model { inline void setLanguageKey(const std::string& languageKey) { UNIQUE_LOCK; mLanguageKey = languageKey; } inline void setDisabled(bool disabled) { UNIQUE_LOCK; mDisabled = disabled; } inline void setGroupId(int groupId) { UNIQUE_LOCK; mGroupId = groupId; } + inline void setPublisherId(int publisherId) { UNIQUE_LOCK; mPublisherId = publisherId; } Poco::JSON::Object getJson(); @@ -121,6 +123,7 @@ namespace model { bool mDisabled; int mGroupId; + int mPublisherId; // from neighbor tables Poco::Nullable mRole; From fdf0979830fece04208a6b3bb06bb5323a3c149b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Jun 2021 15:40:45 +0200 Subject: [PATCH 0002/1843] initial commit, base packages --- backend/.gitignore | 1 + backend/package.json | 17 + backend/yarn.lock | 957 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 975 insertions(+) create mode 100644 backend/.gitignore create mode 100644 backend/package.json create mode 100644 backend/yarn.lock diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 000000000..2ccbe4656 --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1 @@ +/node_modules/ diff --git a/backend/package.json b/backend/package.json new file mode 100644 index 000000000..fc4f73533 --- /dev/null +++ b/backend/package.json @@ -0,0 +1,17 @@ +{ + "name": "gradido-backend", + "version": "0.0.1", + "description": "Gradido unified backend providing an API-Service for Gradido Transactions", + "main": "index.js", + "repository": "https://github.com/gradido/gradido/backend", + "author": "Ulf Gebhardt", + "license": "MIT", + "private": false, + "dependencies": { + "express": "^4.17.1", + "express-graphql": "^0.12.0", + "reflect-metadata": "^0.1.13", + "type-graphql": "^1.1.1", + "typeorm": "^0.2.34" + } +} diff --git a/backend/yarn.lock b/backend/yarn.lock new file mode 100644 index 000000000..d7fc8be9f --- /dev/null +++ b/backend/yarn.lock @@ -0,0 +1,957 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@sqltools/formatter@^1.2.2": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.3.tgz#1185726610acc37317ddab11c3c7f9066966bd20" + integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg== + +"@types/glob@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/minimatch@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + +"@types/node@*": + version "15.12.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" + integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== + +"@types/node@^14.11.2": + version "14.17.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" + integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== + +"@types/semver@^7.3.3": + version "7.3.6" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.6.tgz#e9831776f4512a7ba6da53e71c26e5fb67882d63" + integrity sha512-0caWDWmpCp0uifxFh+FaqK3CuZ2SkRR/ZRxAV5+zNdC3QVUi6wyOJnefhPvtNt8NQWXB5OA93BUvZsXpWat2Xw== + +"@types/zen-observable@^0.8.2": + version "0.8.2" + resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" + integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== + +accepts@^1.3.7, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + +app-root-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" + integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +chalk@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +cli-highlight@^2.1.10: + version "2.1.11" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" + integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== + dependencies: + chalk "^4.0.0" + highlight.js "^10.7.1" + mz "^2.4.0" + parse5 "^5.1.1" + parse5-htmlparser2-tree-adapter "^6.0.0" + yargs "^16.0.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@^1.0.4, content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +dotenv@^8.2.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +express-graphql@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/express-graphql/-/express-graphql-0.12.0.tgz#58deabc309909ca2c9fe2f83f5fbe94429aa23df" + integrity sha512-DwYaJQy0amdy3pgNtiTDuGGM2BLdj+YO2SgbKoLliCfuHv3VVTt7vNG/ZqK2hRYjtYHE2t2KB705EU94mE64zg== + dependencies: + accepts "^1.3.7" + content-type "^1.0.4" + http-errors "1.8.0" + raw-body "^2.4.1" + +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +figlet@^1.1.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.0.tgz#2db4d00a584e5155a96080632db919213c3e003c" + integrity sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww== + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +glob@^7.1.6: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +graphql-query-complexity@^0.7.0: + version "0.7.2" + resolved "https://registry.yarnpkg.com/graphql-query-complexity/-/graphql-query-complexity-0.7.2.tgz#7fc6bb20930ab1b666ecf3bbfb24b65b6f08ecc4" + integrity sha512-+VgmrfxGEjHI3zuojWOR8bsz7Ycz/BZjNjxnlUieTz5DsB92WoIrYCSZdWG7UWZ3rfcA1Gb2Nf+wB80GsaZWuQ== + dependencies: + lodash.get "^4.4.2" + +graphql-subscriptions@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d" + integrity sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g== + dependencies: + iterall "^1.3.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +highlight.js@^10.7.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@1.7.3, http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" + integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +iterall@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" + integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== + +js-yaml@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +mime-db@1.48.0: + version "1.48.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== + +mime-types@~2.1.24: + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" + integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== + dependencies: + mime-db "1.48.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +mz@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +object-assign@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +parent-require@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977" + integrity sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc= + +parse5-htmlparser2-tree-adapter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + +parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +raw-body@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" + integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== + dependencies: + bytes "3.1.0" + http-errors "1.7.3" + iconv-lite "0.4.24" + unpipe "1.0.0" + +reflect-metadata@^0.1.13: + version "0.1.13" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" + integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +safe-buffer@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.0.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver@^7.3.2: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sha.js@^2.4.11: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +tslib@^2.0.1, tslib@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + +type-graphql@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/type-graphql/-/type-graphql-1.1.1.tgz#dc0710d961713b92d3fee927981fa43bf71667a4" + integrity sha512-iOOWVn0ehCYMukmnXStbkRwFE9dcjt7/oDcBS1JyQZo9CbhlIll4lHHps54HMEk4A4c8bUPd+DjK8w1/ZrxB4A== + dependencies: + "@types/glob" "^7.1.3" + "@types/node" "^14.11.2" + "@types/semver" "^7.3.3" + glob "^7.1.6" + graphql-query-complexity "^0.7.0" + graphql-subscriptions "^1.1.0" + semver "^7.3.2" + tslib "^2.0.1" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typeorm@^0.2.34: + version "0.2.34" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.34.tgz#637b3cec2de54ee7f423012b813a2022c0aacc8b" + integrity sha512-FZAeEGGdSGq7uTH3FWRQq67JjKu0mgANsSZ04j3kvDYNgy9KwBl/6RFgMVgiSgjf7Rqd7NrhC2KxVT7I80qf7w== + dependencies: + "@sqltools/formatter" "^1.2.2" + app-root-path "^3.0.0" + buffer "^6.0.3" + chalk "^4.1.0" + cli-highlight "^2.1.10" + debug "^4.3.1" + dotenv "^8.2.0" + glob "^7.1.6" + js-yaml "^4.0.0" + mkdirp "^1.0.4" + reflect-metadata "^0.1.13" + sha.js "^2.4.11" + tslib "^2.1.0" + xml2js "^0.4.23" + yargonaut "^1.1.4" + yargs "^16.2.0" + zen-observable-ts "^1.0.0" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +xml2js@^0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" + integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + +xmlbuilder@~11.0.0: + version "11.0.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" + integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargonaut@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/yargonaut/-/yargonaut-1.1.4.tgz#c64f56432c7465271221f53f5cc517890c3d6e0c" + integrity sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA== + dependencies: + chalk "^1.1.1" + figlet "^1.1.1" + parent-require "^1.0.0" + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.0.0, yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +zen-observable-ts@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.0.0.tgz#30d1202b81d8ba4c489e3781e8ca09abf0075e70" + integrity sha512-KmWcbz+9kKUeAQ8btY8m1SsEFgBcp7h/Uf3V5quhan7ZWdjGsf0JcGLULQiwOZibbFWnHkYq8Nn2AZbJabovQg== + dependencies: + "@types/zen-observable" "^0.8.2" + zen-observable "^0.8.15" + +zen-observable@^0.8.15: + version "0.8.15" + resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" + integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== From 43f7cf87679713d436a64d569d6af1594a12ee33 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Jun 2021 17:38:00 +0200 Subject: [PATCH 0003/1843] server stack seems to work. Graphql does not load properly yet --- backend/package.json | 10 + backend/src/graphql/resolvers.ts | 1 + backend/src/index.ts | 65 +++ backend/tsconfig.json | 73 +++ backend/yarn.lock | 829 ++++++++++++++++++++++++++++++- 5 files changed, 975 insertions(+), 3 deletions(-) create mode 100644 backend/src/graphql/resolvers.ts create mode 100644 backend/src/index.ts create mode 100644 backend/tsconfig.json diff --git a/backend/package.json b/backend/package.json index fc4f73533..cf285b70f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,11 +7,21 @@ "author": "Ulf Gebhardt", "license": "MIT", "private": false, + "scripts": { + "start": "nodemon -w src --ext ts --exec ts-node src/index.ts" + }, "dependencies": { "express": "^4.17.1", "express-graphql": "^0.12.0", + "graphql": "^15.5.1", "reflect-metadata": "^0.1.13", "type-graphql": "^1.1.1", "typeorm": "^0.2.34" + }, + "devDependencies": { + "@types/express": "^4.17.12", + "nodemon": "^2.0.7", + "ts-node": "^10.0.0", + "typescript": "^4.3.4" } } diff --git a/backend/src/graphql/resolvers.ts b/backend/src/graphql/resolvers.ts new file mode 100644 index 000000000..4ad71d6e3 --- /dev/null +++ b/backend/src/graphql/resolvers.ts @@ -0,0 +1 @@ +export default [] \ No newline at end of file diff --git a/backend/src/index.ts b/backend/src/index.ts new file mode 100644 index 000000000..5c02aeb14 --- /dev/null +++ b/backend/src/index.ts @@ -0,0 +1,65 @@ +import 'reflect-metadata' +import express from 'express' +import { graphqlHTTP } from 'express-graphql' +import { createConnection } from 'typeorm' +import { buildSchema } from 'type-graphql' +// import resolvers from './graphql/resolvers' +const resolvers: [string] = [''] +// import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; + +async function main() { + //const connection = await createConnection() + const schema = await buildSchema({ + resolvers + }) + const server = express(); + + server.use('/api', + graphqlHTTP({ + schema, + graphiql: true, + validationRules: [ + /** + * This provides GraphQL query analysis to reject complex queries to your GraphQL server. + * This can be used to protect your GraphQL servers + * against resource exhaustion and DoS attacks. + * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] + */ + /*queryComplexity({ + // The maximum allowed query complexity, queries above this threshold will be rejected + maximumComplexity: 20, + // The query variables. This is needed because the variables are not available + // in the visitor of the graphql-js library + variables: params!.variables!, + // Optional callback function to retrieve the determined query complexity + // Will be invoked weather the query is rejected or not + // This can be used for logging or to implement rate limiting + onComplete: (complexity: number) => { + console.log("Query Complexity:", complexity); + }, + // Add any number of estimators. The estimators are invoked in order, the first + // numeric value that is being returned by an estimator is used as the field complexity. + // If no estimator returns a value, an exception is raised. + estimators: [ + fieldConfigEstimator(), + // Add more estimators here... + // This will assign each field a complexity of 1 if no other estimator + // returned a value. + simpleEstimator({ + defaultComplexity: 1, + }), + ], + }),*/ + ], + }) + ) + + // app.get("/playground", expressPlayground({ endpoint: "/graphql" })); + server.listen(4000, () => { + console.log( + `Server is running, GraphQL Playground available at http://localhost:4000/playground`, + ); + }); +} + +main() \ No newline at end of file diff --git a/backend/tsconfig.json b/backend/tsconfig.json new file mode 100644 index 000000000..64ec9cb7e --- /dev/null +++ b/backend/tsconfig.json @@ -0,0 +1,73 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // TODO: "strictPropertyInitialization": false + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} diff --git a/backend/yarn.lock b/backend/yarn.lock index d7fc8be9f..94320161b 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2,11 +2,77 @@ # yarn lockfile v1 +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + "@sqltools/formatter@^1.2.2": version "1.2.3" resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.3.tgz#1185726610acc37317ddab11c3c7f9066966bd20" integrity sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg== +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@tsconfig/node10@^1.0.7": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" + integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + +"@tsconfig/node12@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" + integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + +"@tsconfig/node14@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" + integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + +"@tsconfig/node16@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.1.tgz#a6ca6a9a0ff366af433f42f5f0e124794ff6b8f1" + integrity sha512-FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA== + +"@types/body-parser@*": + version "1.19.0" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" + integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.34" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" + integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== + dependencies: + "@types/node" "*" + +"@types/express-serve-static-core@^4.17.18": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz#a427278e106bca77b83ad85221eae709a3414d42" + integrity sha512-gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@^4.17.12": + version "4.17.12" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350" + integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/glob@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" @@ -15,6 +81,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + "@types/minimatch@*": version "3.0.4" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" @@ -30,16 +101,39 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== +"@types/qs@*": + version "6.9.6" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" + integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== + +"@types/range-parser@*": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" + integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== + "@types/semver@^7.3.3": version "7.3.6" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.6.tgz#e9831776f4512a7ba6da53e71c26e5fb67882d63" integrity sha512-0caWDWmpCp0uifxFh+FaqK3CuZ2SkRR/ZRxAV5+zNdC3QVUi6wyOJnefhPvtNt8NQWXB5OA93BUvZsXpWat2Xw== +"@types/serve-static@*": + version "1.13.9" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" + integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + "@types/zen-observable@^0.8.2": version "0.8.2" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@^1.3.7, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -48,11 +142,23 @@ accepts@^1.3.7, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + dependencies: + string-width "^3.0.0" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -75,11 +181,24 @@ any-promise@^1.0.0: resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + app-root-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -100,6 +219,11 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -116,6 +240,20 @@ body-parser@1.19.0: raw-body "2.4.0" type-is "~1.6.17" +boxen@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" + integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^5.3.1" + chalk "^3.0.0" + cli-boxes "^2.2.0" + string-width "^4.1.0" + term-size "^2.1.0" + type-fest "^0.8.1" + widest-line "^3.1.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -124,6 +262,18 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" @@ -137,6 +287,24 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -148,6 +316,14 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^4.0.0, chalk@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" @@ -156,6 +332,31 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chokidar@^3.2.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +cli-boxes@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + cli-highlight@^2.1.10: version "2.1.11" resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" @@ -177,6 +378,13 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -194,6 +402,18 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -216,13 +436,30 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -debug@2.6.9: +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" +debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" @@ -230,6 +467,23 @@ debug@^4.3.1: dependencies: ms "2.1.2" +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -240,16 +494,38 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -260,11 +536,23 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -331,6 +619,13 @@ figlet@^1.1.1: resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.0.tgz#2db4d00a584e5155a96080632db919213c3e003c" integrity sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww== +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -359,11 +654,37 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + glob@^7.1.6: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" @@ -376,6 +697,35 @@ glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +global-dirs@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== + dependencies: + ini "1.3.7" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + graphql-query-complexity@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/graphql-query-complexity/-/graphql-query-complexity-0.7.2.tgz#7fc6bb20930ab1b666ecf3bbfb24b65b6f08ecc4" @@ -390,6 +740,11 @@ graphql-subscriptions@^1.1.0: dependencies: iterall "^1.3.0" +graphql@^15.5.1: + version "15.5.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad" + integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw== + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -397,16 +752,31 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + highlight.js@^10.7.1: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -452,6 +822,21 @@ ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== +ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -470,16 +855,95 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" + integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== + dependencies: + global-dirs "^2.0.1" + is-path-inside "^3.0.1" + +is-npm@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" + integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + iterall@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" @@ -492,11 +956,40 @@ js-yaml@^4.0.0: dependencies: argparse "^2.0.1" +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +latest-version@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -504,6 +997,18 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -536,6 +1041,11 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -543,6 +1053,11 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimist@^1.2.0: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -563,6 +1078,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mz@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -577,6 +1097,39 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +nodemon@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32" + integrity sha512-XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA== + dependencies: + chokidar "^3.2.2" + debug "^3.2.6" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.7" + semver "^5.7.1" + supports-color "^5.5.0" + touch "^3.1.0" + undefsafe "^2.0.3" + update-notifier "^4.1.0" + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + dependencies: + abbrev "1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -589,13 +1142,28 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + parent-require@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977" @@ -633,6 +1201,16 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +picomatch@^2.0.4, picomatch@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -641,6 +1219,26 @@ proxy-addr@~2.0.5: forwarded "0.2.0" ipaddr.js "1.9.1" +pstree.remy@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" + integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pupa@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -671,16 +1269,54 @@ raw-body@^2.4.1: iconv-lite "0.4.24" unpipe "1.0.0" +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + reflect-metadata@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + safe-buffer@5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -701,6 +1337,23 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + semver@^7.3.2: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" @@ -755,12 +1408,39 @@ sha.js@^2.4.11: inherits "^2.0.1" safe-buffer "^5.0.1" +signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +source-map-support@^0.5.17: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -string-width@^4.1.0, string-width@^4.2.0: +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: version "4.2.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== @@ -776,6 +1456,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -783,11 +1470,23 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= +supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -795,6 +1494,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +term-size@^2.1.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" + integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -809,16 +1513,56 @@ thenify-all@^1.0.0: dependencies: any-promise "^1.0.0" +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== + dependencies: + nopt "~1.0.10" + +ts-node@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" + integrity sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg== + dependencies: + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + tslib@^2.0.1, tslib@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-graphql@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/type-graphql/-/type-graphql-1.1.1.tgz#dc0710d961713b92d3fee927981fa43bf71667a4" @@ -841,6 +1585,13 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typeorm@^0.2.34: version "0.2.34" resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.34.tgz#637b3cec2de54ee7f423012b813a2022c0aacc8b" @@ -864,11 +1615,56 @@ typeorm@^0.2.34: yargs "^16.2.0" zen-observable-ts "^1.0.0" +typescript@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" + integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== + +undefsafe@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae" + integrity sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A== + dependencies: + debug "^2.2.0" + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +update-notifier@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" + integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== + dependencies: + boxen "^4.2.0" + chalk "^3.0.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.3.1" + is-npm "^4.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.0.0" + pupa "^2.0.1" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -879,6 +1675,13 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -893,6 +1696,21 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + xml2js@^0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" @@ -943,6 +1761,11 @@ yargs@^16.0.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + zen-observable-ts@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.0.0.tgz#30d1202b81d8ba4c489e3781e8ca09abf0075e70" From 4c0667d8701b2b60c5852c7cd5f44db70da4029e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Jun 2021 17:56:49 +0200 Subject: [PATCH 0004/1843] book resolvers, working server, example orm config --- backend/ormconfig.json | 6 +++ backend/src/graphql/inputs/CreateBookInput.ts | 10 +++++ backend/src/graphql/inputs/UpdateBookInput.ts | 13 ++++++ backend/src/graphql/models/Book.ts | 22 ++++++++++ backend/src/graphql/resolvers.ts | 1 - backend/src/graphql/resolvers/BookResolver.ts | 41 +++++++++++++++++++ backend/src/index.ts | 11 ++--- backend/tsconfig.json | 3 +- 8 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 backend/ormconfig.json create mode 100644 backend/src/graphql/inputs/CreateBookInput.ts create mode 100644 backend/src/graphql/inputs/UpdateBookInput.ts create mode 100644 backend/src/graphql/models/Book.ts delete mode 100644 backend/src/graphql/resolvers.ts create mode 100644 backend/src/graphql/resolvers/BookResolver.ts diff --git a/backend/ormconfig.json b/backend/ormconfig.json new file mode 100644 index 000000000..36c565344 --- /dev/null +++ b/backend/ormconfig.json @@ -0,0 +1,6 @@ +{ + "type": "sqlite", + "database": "./db.sqlite3", + "entities": ["./src/graphql/models/*.ts"], + "synchronize": true +} \ No newline at end of file diff --git a/backend/src/graphql/inputs/CreateBookInput.ts b/backend/src/graphql/inputs/CreateBookInput.ts new file mode 100644 index 000000000..8b3129a4a --- /dev/null +++ b/backend/src/graphql/inputs/CreateBookInput.ts @@ -0,0 +1,10 @@ +import { InputType, Field } from 'type-graphql' + +@InputType() +export class CreateBookInput { + @Field() + title: string; + + @Field() + author: string; +} diff --git a/backend/src/graphql/inputs/UpdateBookInput.ts b/backend/src/graphql/inputs/UpdateBookInput.ts new file mode 100644 index 000000000..12e11a39e --- /dev/null +++ b/backend/src/graphql/inputs/UpdateBookInput.ts @@ -0,0 +1,13 @@ +import { InputType, Field } from 'type-graphql' + +@InputType() +export class UpdateBookInput { + @Field({ nullable: true }) + title?: string; + + @Field({ nullable: true }) + author?: string; + + @Field({ nullable: true }) + isPublished?: boolean; +} \ No newline at end of file diff --git a/backend/src/graphql/models/Book.ts b/backend/src/graphql/models/Book.ts new file mode 100644 index 000000000..9fb15b001 --- /dev/null +++ b/backend/src/graphql/models/Book.ts @@ -0,0 +1,22 @@ +import { Entity, BaseEntity, PrimaryGeneratedColumn, Column } from 'typeorm' +import { ObjectType, Field, ID } from 'type-graphql' + +@Entity() +@ObjectType() +export class Book extends BaseEntity { + @Field(() => ID) + @PrimaryGeneratedColumn() + id: string; + + @Field(() => String) + @Column() + title: string; + + @Field(() => String) + @Column() + author: string; + + @Field(() => Boolean) + @Column({ default: false }) + isPublished: boolean; +} \ No newline at end of file diff --git a/backend/src/graphql/resolvers.ts b/backend/src/graphql/resolvers.ts deleted file mode 100644 index 4ad71d6e3..000000000 --- a/backend/src/graphql/resolvers.ts +++ /dev/null @@ -1 +0,0 @@ -export default [] \ No newline at end of file diff --git a/backend/src/graphql/resolvers/BookResolver.ts b/backend/src/graphql/resolvers/BookResolver.ts new file mode 100644 index 000000000..e301a69a7 --- /dev/null +++ b/backend/src/graphql/resolvers/BookResolver.ts @@ -0,0 +1,41 @@ +import { Resolver, Query, Mutation, Arg } from 'type-graphql' +import { Book } from '../models/Book' +import { CreateBookInput } from '../inputs/CreateBookInput' +import { UpdateBookInput } from '../inputs/UpdateBookInput' + +@Resolver() +export class BookResolver { + @Query(() => [Book]) + books() { + return Book.find(); + } + + @Query(() => Book) + book(@Arg("id") id: string) { + return Book.findOne({ where: { id } }); + } + + @Mutation(() => Book) + async createBook(@Arg("data") data: CreateBookInput) { + const book = Book.create(data); + await book.save(); + return book; + } + + @Mutation(() => Book) + async updateBook(@Arg("id") id: string, @Arg("data") data: UpdateBookInput) { + const book = await Book.findOne({ where: { id } }); + if (!book) throw new Error("Book not found!"); + Object.assign(book, data); + await book.save(); + return book; + } + + @Mutation(() => Boolean) + async deleteBook(@Arg("id") id: string) { + const book = await Book.findOne({ where: { id } }); + if (!book) throw new Error("Book not found!"); + await book.remove(); + return true; + } +} \ No newline at end of file diff --git a/backend/src/index.ts b/backend/src/index.ts index 5c02aeb14..7c265643b 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -3,15 +3,12 @@ import express from 'express' import { graphqlHTTP } from 'express-graphql' import { createConnection } from 'typeorm' import { buildSchema } from 'type-graphql' -// import resolvers from './graphql/resolvers' -const resolvers: [string] = [''] +import { BookResolver } from "./graphql/resolvers/BookResolver" // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { - //const connection = await createConnection() - const schema = await buildSchema({ - resolvers - }) + const connection = await createConnection() + const schema = await buildSchema({ resolvers: [BookResolver]}) const server = express(); server.use('/api', @@ -57,7 +54,7 @@ async function main() { // app.get("/playground", expressPlayground({ endpoint: "/graphql" })); server.listen(4000, () => { console.log( - `Server is running, GraphQL Playground available at http://localhost:4000/playground`, + `Server is running, GraphIQL available at http://localhost:4000/api`, ); }); } diff --git a/backend/tsconfig.json b/backend/tsconfig.json index 64ec9cb7e..422ff8e0a 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -30,8 +30,7 @@ // "strictNullChecks": true, /* Enable strict null checks. */ // "strictFunctionTypes": true, /* Enable strict checking of function types. */ // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // TODO: "strictPropertyInitialization": false - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + "strictPropertyInitialization": false, /* Enable strict checking of property initialization in classes. */ // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ From 34b30b216b6fafcb5b686d4b023b05f2e9766bdf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 Jun 2021 23:06:53 +0200 Subject: [PATCH 0005/1843] linting, server is working --- backend/.eslintignore | 3 + backend/.eslintrc.js | 26 + backend/.prettierrc.js | 8 + backend/package.json | 13 +- backend/src/graphql/inputs/CreateBookInput.ts | 4 +- backend/src/graphql/inputs/UpdateBookInput.ts | 8 +- backend/src/graphql/models/Book.ts | 10 +- backend/src/graphql/resolvers/BookResolver.ts | 38 +- backend/src/index.ts | 43 +- backend/yarn.lock | 1287 ++++++++++++++++- 10 files changed, 1374 insertions(+), 66 deletions(-) create mode 100644 backend/.eslintignore create mode 100644 backend/.eslintrc.js create mode 100644 backend/.prettierrc.js diff --git a/backend/.eslintignore b/backend/.eslintignore new file mode 100644 index 000000000..e973d3709 --- /dev/null +++ b/backend/.eslintignore @@ -0,0 +1,3 @@ +node_modules +**/*.min.js +dist \ No newline at end of file diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js new file mode 100644 index 000000000..8fbf554ce --- /dev/null +++ b/backend/.eslintrc.js @@ -0,0 +1,26 @@ +module.exports = { + root: true, + env: { + node: true, + // jest: true, + }, + parser: '@typescript-eslint/parser', + plugins: ['prettier', '@typescript-eslint' /*, 'jest' */], + extends: [ + 'standard', + 'eslint:recommended', + 'plugin:prettier/recommended', + 'plugin:@typescript-eslint/recommended', + ], + // add your custom rules here + rules: { + 'no-console': ['error'], + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'prettier/prettier': [ + 'error', + { + htmlWhitespaceSensitivity: 'ignore', + }, + ], + }, +} diff --git a/backend/.prettierrc.js b/backend/.prettierrc.js new file mode 100644 index 000000000..e88113754 --- /dev/null +++ b/backend/.prettierrc.js @@ -0,0 +1,8 @@ +module.exports = { + semi: false, + printWidth: 100, + singleQuote: true, + trailingComma: "all", + tabWidth: 2, + bracketSpacing: true +}; diff --git a/backend/package.json b/backend/package.json index cf285b70f..c1bc5ad89 100644 --- a/backend/package.json +++ b/backend/package.json @@ -8,7 +8,8 @@ "license": "MIT", "private": false, "scripts": { - "start": "nodemon -w src --ext ts --exec ts-node src/index.ts" + "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", + "lint": "eslint . --ext .js,.ts" }, "dependencies": { "express": "^4.17.1", @@ -20,7 +21,17 @@ }, "devDependencies": { "@types/express": "^4.17.12", + "@typescript-eslint/eslint-plugin": "^4.28.0", + "@typescript-eslint/parser": "^4.28.0", + "eslint": "^7.29.0", + "eslint-config-prettier": "^8.3.0", + "eslint-config-standard": "^16.0.3", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-promise": "^5.1.0", "nodemon": "^2.0.7", + "prettier": "^2.3.1", "ts-node": "^10.0.0", "typescript": "^4.3.4" } diff --git a/backend/src/graphql/inputs/CreateBookInput.ts b/backend/src/graphql/inputs/CreateBookInput.ts index 8b3129a4a..ac4108afd 100644 --- a/backend/src/graphql/inputs/CreateBookInput.ts +++ b/backend/src/graphql/inputs/CreateBookInput.ts @@ -3,8 +3,8 @@ import { InputType, Field } from 'type-graphql' @InputType() export class CreateBookInput { @Field() - title: string; + title: string @Field() - author: string; + author: string } diff --git a/backend/src/graphql/inputs/UpdateBookInput.ts b/backend/src/graphql/inputs/UpdateBookInput.ts index 12e11a39e..3f5042ecf 100644 --- a/backend/src/graphql/inputs/UpdateBookInput.ts +++ b/backend/src/graphql/inputs/UpdateBookInput.ts @@ -3,11 +3,11 @@ import { InputType, Field } from 'type-graphql' @InputType() export class UpdateBookInput { @Field({ nullable: true }) - title?: string; + title?: string @Field({ nullable: true }) - author?: string; + author?: string @Field({ nullable: true }) - isPublished?: boolean; -} \ No newline at end of file + isPublished?: boolean +} diff --git a/backend/src/graphql/models/Book.ts b/backend/src/graphql/models/Book.ts index 9fb15b001..fb95979dd 100644 --- a/backend/src/graphql/models/Book.ts +++ b/backend/src/graphql/models/Book.ts @@ -6,17 +6,17 @@ import { ObjectType, Field, ID } from 'type-graphql' export class Book extends BaseEntity { @Field(() => ID) @PrimaryGeneratedColumn() - id: string; + id: string @Field(() => String) @Column() - title: string; + title: string @Field(() => String) @Column() - author: string; + author: string @Field(() => Boolean) @Column({ default: false }) - isPublished: boolean; -} \ No newline at end of file + isPublished: boolean +} diff --git a/backend/src/graphql/resolvers/BookResolver.ts b/backend/src/graphql/resolvers/BookResolver.ts index e301a69a7..9e5b6d1b3 100644 --- a/backend/src/graphql/resolvers/BookResolver.ts +++ b/backend/src/graphql/resolvers/BookResolver.ts @@ -7,35 +7,35 @@ import { UpdateBookInput } from '../inputs/UpdateBookInput' export class BookResolver { @Query(() => [Book]) books() { - return Book.find(); + return Book.find() } @Query(() => Book) - book(@Arg("id") id: string) { - return Book.findOne({ where: { id } }); + book(@Arg('id') id: string) { + return Book.findOne({ where: { id } }) } @Mutation(() => Book) - async createBook(@Arg("data") data: CreateBookInput) { - const book = Book.create(data); - await book.save(); - return book; + async createBook(@Arg('data') data: CreateBookInput) { + const book = Book.create(data) + await book.save() + return book } @Mutation(() => Book) - async updateBook(@Arg("id") id: string, @Arg("data") data: UpdateBookInput) { - const book = await Book.findOne({ where: { id } }); - if (!book) throw new Error("Book not found!"); - Object.assign(book, data); - await book.save(); - return book; + async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { + const book = await Book.findOne({ where: { id } }) + if (!book) throw new Error('Book not found!') + Object.assign(book, data) + await book.save() + return book } @Mutation(() => Boolean) - async deleteBook(@Arg("id") id: string) { - const book = await Book.findOne({ where: { id } }); - if (!book) throw new Error("Book not found!"); - await book.remove(); - return true; + async deleteBook(@Arg('id') id: string) { + const book = await Book.findOne({ where: { id } }) + if (!book) throw new Error('Book not found!') + await book.remove() + return true } -} \ No newline at end of file +} diff --git a/backend/src/index.ts b/backend/src/index.ts index 7c265643b..453a5fdbc 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,28 +1,29 @@ import 'reflect-metadata' import express from 'express' import { graphqlHTTP } from 'express-graphql' -import { createConnection } from 'typeorm' +// import { createConnection } from 'typeorm' import { buildSchema } from 'type-graphql' -import { BookResolver } from "./graphql/resolvers/BookResolver" +import { BookResolver } from './graphql/resolvers/BookResolver' // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { - const connection = await createConnection() - const schema = await buildSchema({ resolvers: [BookResolver]}) - const server = express(); + // const connection = await createConnection() + const schema = await buildSchema({ resolvers: [BookResolver] }) + const server = express() - server.use('/api', + server.use( + '/api', graphqlHTTP({ schema, graphiql: true, validationRules: [ - /** - * This provides GraphQL query analysis to reject complex queries to your GraphQL server. - * This can be used to protect your GraphQL servers - * against resource exhaustion and DoS attacks. - * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] - */ - /*queryComplexity({ + /** + * This provides GraphQL query analysis to reject complex queries to your GraphQL server. + * This can be used to protect your GraphQL servers + * against resource exhaustion and DoS attacks. + * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] + */ + /* queryComplexity({ // The maximum allowed query complexity, queries above this threshold will be rejected maximumComplexity: 20, // The query variables. This is needed because the variables are not available @@ -46,17 +47,15 @@ async function main() { defaultComplexity: 1, }), ], - }),*/ - ], - }) + }), */ + ], + }), ) - // app.get("/playground", expressPlayground({ endpoint: "/graphql" })); server.listen(4000, () => { - console.log( - `Server is running, GraphIQL available at http://localhost:4000/api`, - ); - }); + // eslint-disable-next-line no-console + console.log(`Server is running, GraphIQL available at http://localhost:4000/api`) + }) } -main() \ No newline at end of file +main() diff --git a/backend/yarn.lock b/backend/yarn.lock index 94320161b..b4433044e 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2,6 +2,63 @@ # yarn lockfile v1 +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" + integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== + +"@babel/highlight@^7.10.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2" + integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -81,6 +138,16 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/json-schema@^7.0.7": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== + +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -129,6 +196,75 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== +"@typescript-eslint/eslint-plugin@^4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz#1a66f03b264844387beb7dc85e1f1d403bd1803f" + integrity sha512-KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ== + dependencies: + "@typescript-eslint/experimental-utils" "4.28.0" + "@typescript-eslint/scope-manager" "4.28.0" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz#13167ed991320684bdc23588135ae62115b30ee0" + integrity sha512-9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.28.0" + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/typescript-estree" "4.28.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/parser@^4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz#2404c16751a28616ef3abab77c8e51d680a12caa" + integrity sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A== + dependencies: + "@typescript-eslint/scope-manager" "4.28.0" + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/typescript-estree" "4.28.0" + debug "^4.3.1" + +"@typescript-eslint/scope-manager@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz#6a3009d2ab64a30fc8a1e257a1a320067f36a0ce" + integrity sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg== + dependencies: + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/visitor-keys" "4.28.0" + +"@typescript-eslint/types@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0" + integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA== + +"@typescript-eslint/typescript-estree@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf" + integrity sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ== + dependencies: + "@typescript-eslint/types" "4.28.0" + "@typescript-eslint/visitor-keys" "4.28.0" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/visitor-keys@4.28.0": + version "4.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434" + integrity sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw== + dependencies: + "@typescript-eslint/types" "4.28.0" + eslint-visitor-keys "^2.0.0" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -142,6 +278,36 @@ accepts@^1.3.7, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-align@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" @@ -149,6 +315,11 @@ ansi-align@^3.0.0: dependencies: string-width "^3.0.0" +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -169,6 +340,13 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -199,6 +377,13 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -209,6 +394,36 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" + is-string "^1.0.5" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.flat@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -262,7 +477,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@~3.0.2: +braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -300,6 +515,19 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -316,6 +544,15 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" @@ -385,6 +622,13 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -392,6 +636,11 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -441,26 +690,35 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-random-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@2.6.9, debug@^2.2.0: +debug@2.6.9, debug@^2.2.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^3.2.6: +debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.3.1: +debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -479,11 +737,23 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +deep-is@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -499,6 +769,27 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -543,6 +834,51 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: + version "1.18.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" + integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.2" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.10.3" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -558,11 +894,215 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-config-standard@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== + +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + dependencies: + debug "^2.6.9" + resolve "^1.13.1" + +eslint-module-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" + integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== + dependencies: + debug "^3.2.7" + pkg-dir "^2.0.0" + +eslint-plugin-es@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" + integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ== + dependencies: + eslint-utils "^2.0.0" + regexpp "^3.0.0" + +eslint-plugin-import@^2.23.4: + version "2.23.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" + integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== + dependencies: + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" + debug "^2.6.9" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.1" + find-up "^2.0.0" + has "^1.0.3" + is-core-module "^2.4.0" + minimatch "^3.0.4" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.9.0" + +eslint-plugin-node@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" + integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== + dependencies: + eslint-plugin-es "^3.0.0" + eslint-utils "^2.0.0" + ignore "^5.1.1" + minimatch "^3.0.4" + resolve "^1.10.1" + semver "^6.1.0" + +eslint-plugin-prettier@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7" + integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-promise@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" + integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.0.0, eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint@^7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" @@ -614,11 +1154,57 @@ express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.1.1: + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fastq@^1.6.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + dependencies: + reusify "^1.0.4" + figlet@^1.1.1: version "1.5.0" resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.0.tgz#2db4d00a584e5155a96080632db919213c3e003c" integrity sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -639,6 +1225,26 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +find-up@^2.0.0, find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -659,11 +1265,30 @@ fsevents@~2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -678,14 +1303,14 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -glob-parent@~5.1.2: +glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@^7.1.6: +glob@^7.1.3, glob@^7.1.6: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -704,6 +1329,25 @@ global-dirs@^2.0.1: dependencies: ini "1.3.7" +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -752,6 +1396,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -762,16 +1411,33 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + highlight.js@^10.7.1: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" @@ -827,6 +1493,24 @@ ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +ignore@^5.1.1, ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" @@ -870,6 +1554,16 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-bigint@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -877,6 +1571,18 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-boolean-object@^1.1.0: + 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" + +is-callable@^1.1.4, is-callable@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -884,6 +1590,18 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-core-module@^2.2.0, is-core-module@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== + dependencies: + has "^1.0.3" + +is-date-object@^1.0.1: + 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== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -899,7 +1617,7 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -914,11 +1632,21 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== +is-number-object@^1.0.4: + 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== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -934,6 +1662,26 @@ is-path-inside@^3.0.1: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-regex@^1.1.3: + 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" + +is-string@^1.0.5, is-string@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -944,11 +1692,29 @@ is-yarn-global@^0.3.0: resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + iterall@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -961,6 +1727,33 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -975,11 +1768,52 @@ latest-version@^5.0.0: dependencies: package-json "^6.3.0" +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -1019,11 +1853,24 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +micromatch@^4.0.2: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + mime-db@1.48.0: version "1.48.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" @@ -1092,6 +1939,11 @@ mz@^2.4.0: object-assign "^4.0.1" thenify-all "^1.0.0" +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -1120,6 +1972,16 @@ nopt@~1.0.10: dependencies: abbrev "1" +normalize-package-data@^2.3.2: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -1135,6 +1997,35 @@ object-assign@^4.0.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-inspect@^1.10.3: + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.values@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -1149,11 +2040,42 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -1164,11 +2086,26 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + parent-require@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977" integrity sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc= +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + parse5-htmlparser2-tree-adapter@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" @@ -1191,26 +2128,94 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -picomatch@^2.0.4, picomatch@^2.2.1: +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" + integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== + +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -1232,6 +2237,11 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + pupa@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" @@ -1244,6 +2254,11 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -1279,6 +2294,23 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + dependencies: + find-up "^2.0.0" + read-pkg "^3.0.0" + +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -1291,6 +2323,11 @@ reflect-metadata@^0.1.13: resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== +regexpp@^3.0.0, regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + registry-auth-token@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" @@ -1310,6 +2347,24 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -1317,6 +2372,25 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + safe-buffer@5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -1344,17 +2418,17 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -1408,11 +2482,37 @@ sha.js@^2.4.11: inherits "^2.0.1" safe-buffer "^5.0.1" +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + source-map-support@^0.5.17: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -1426,6 +2526,37 @@ source-map@^0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + 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== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -1449,6 +2580,22 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -1470,6 +2617,16 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -1480,7 +2637,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.5.0: +supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -1494,11 +2651,28 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + term-size@^2.1.0: version "2.2.1" resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -1553,11 +2727,45 @@ ts-node@^10.0.0: source-map-support "^0.5.17" yn "3.1.1" +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + +tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + tslib@^2.0.1, tslib@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -1620,6 +2828,16 @@ typescript@^4.3.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + undefsafe@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae" @@ -1658,6 +2876,13 @@ update-notifier@^4.1.0: semver-diff "^3.1.1" xdg-basedir "^4.0.0" +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" @@ -1670,11 +2895,42 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -1682,6 +2938,11 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" From 9cd14d13040d47c18fec985f4e449b8c5da156b5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 10:17:09 +0200 Subject: [PATCH 0006/1843] add User Model and Resolver --- backend/.env.dist | 2 + backend/package.json | 1 + backend/src/config/index.ts | 24 +++++++ .../src/graphql/datasources/login_server.ts | 8 +++ backend/src/graphql/models/User.ts | 62 +++++++++++++++++++ backend/src/graphql/resolvers/UserResolver.ts | 42 +++++++++++++ 6 files changed, 139 insertions(+) create mode 100644 backend/.env.dist create mode 100644 backend/src/config/index.ts create mode 100644 backend/src/graphql/datasources/login_server.ts create mode 100644 backend/src/graphql/models/User.ts create mode 100644 backend/src/graphql/resolvers/UserResolver.ts diff --git a/backend/.env.dist b/backend/.env.dist new file mode 100644 index 000000000..7815be556 --- /dev/null +++ b/backend/.env.dist @@ -0,0 +1,2 @@ +LOGIN_API_URL=http://localhost/login_api/ +COMMUNITY_API_URL=http://localhost/api/ \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index c1bc5ad89..02328230f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -12,6 +12,7 @@ "lint": "eslint . --ext .js,.ts" }, "dependencies": { + "apollo-datasource-rest": "^0.14.0", "express": "^4.17.1", "express-graphql": "^0.12.0", "graphql": "^15.5.1", diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts new file mode 100644 index 000000000..db60d2b84 --- /dev/null +++ b/backend/src/config/index.ts @@ -0,0 +1,24 @@ +// ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env) + +// Load Package Details for some default values +const pkg = require('../../package') + +const environment = { + NODE_ENV: process.env.NODE_ENV, + DEBUG: process.env.NODE_ENV !== 'production' || false, + PRODUCTION: process.env.NODE_ENV === 'production' || false, + ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false', +} + +const server = { + LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', + COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', +} + +const CONFIG = { + ...environment, + ...server, + APP_VERSION: pkg.version, +} + +export default CONFIG diff --git a/backend/src/graphql/datasources/login_server.ts b/backend/src/graphql/datasources/login_server.ts new file mode 100644 index 000000000..870c90382 --- /dev/null +++ b/backend/src/graphql/datasources/login_server.ts @@ -0,0 +1,8 @@ +import { RESTDataSource } from 'apollo-datasource-rest' + +export class LoginServerAPI extends RESTDataSource { + constructor() { + super() + this.baseURL = 'https://api.spacexdata.com/v2/' + } +} diff --git a/backend/src/graphql/models/User.ts b/backend/src/graphql/models/User.ts new file mode 100644 index 000000000..8f3ababf7 --- /dev/null +++ b/backend/src/graphql/models/User.ts @@ -0,0 +1,62 @@ +import { Entity, BaseEntity, PrimaryGeneratedColumn, Column } from 'typeorm' +import { ObjectType, Field, ID, GraphQLISODateTime } from 'type-graphql' + +@Entity() +@ObjectType() +export class User extends BaseEntity { + @Field(() => ID) + @PrimaryGeneratedColumn() + id: number + + @Field(() => String) + @Column({ length: 191 }) + email: string + + @Field(() => String) + @Column({ length: 150 }) + firstName: string + + @Field(() => String) + @Column() + lastName: string + + @Field(() => String) + @Column() + username: string + + @Field(() => String) + @Column('text') + description: string + + @Field(() => String) + @Column({ length: 64 }) + pubkey: string + + @Field(() => GraphQLISODateTime) + @Column({ type: 'datetime' }) + created: Date + + @Field(() => Boolean) + @Column({ default: false }) + emailChecked: boolean + + @Field(() => Boolean) + @Column({ default: false }) + passphraseShown: boolean + + @Field(() => String) + @Column({ default: 'de' }) + language: string + + @Field(() => Boolean) + @Column({ default: false }) + disabled: boolean + + @Field(() => ID) + @Column() + groupId: number + + @Field(() => ID) + @Column({ default: 0 }) + publisherId: number +} diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts new file mode 100644 index 000000000..8e0fae982 --- /dev/null +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -0,0 +1,42 @@ +import { Resolver, Query, Mutation, Arg } from 'type-graphql' +import { User } from '../models/User' +// import { CreateBookInput } from '../inputs/CreateBookInput' +// import { UpdateBookInput } from '../inputs/UpdateBookInput' + +@Resolver() +export class UserResolver { + @Query(() => [User]) + users(): Promise { + return User.find() + } + + @Query(() => User) + user(@Arg('id') id: string): Promise { + return User.findOne({ where: { id } }) + } + + /* + @Mutation(() => User) + async createBook(@Arg('data') data: CreateBookInput) { + const book = User.create(data) + await book.save() + return book + } + + @Mutation(() => Book) + async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { + const book = await Book.findOne({ where: { id } }) + if (!book) throw new Error('Book not found!') + Object.assign(book, data) + await book.save() + return book + } +*/ + @Mutation(() => Boolean) + async deleteUser(@Arg('id') id: string): Promise { + const user = await User.findOne({ where: { id } }) + if (!user) throw new Error('User not found!') + await user.remove() + return true + } +} From 2ccdf6431283878dab1d0d2ac277b1553435f632 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 11:15:03 +0200 Subject: [PATCH 0007/1843] try to get group list from login-server --- backend/src/config/index.ts | 16 +----------- .../src/graphql/datasources/loginServer.ts | 23 ++++++++++++++++ .../src/graphql/datasources/login_server.ts | 8 ------ backend/src/graphql/models/Group.ts | 26 +++++++++++++++++++ .../src/graphql/resolvers/GroupResolver.ts | 17 ++++++++++++ backend/src/index.ts | 2 ++ 6 files changed, 69 insertions(+), 23 deletions(-) create mode 100644 backend/src/graphql/datasources/loginServer.ts delete mode 100644 backend/src/graphql/datasources/login_server.ts create mode 100644 backend/src/graphql/models/Group.ts create mode 100644 backend/src/graphql/resolvers/GroupResolver.ts diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index db60d2b84..edf409104 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -1,24 +1,10 @@ // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env) -// Load Package Details for some default values -const pkg = require('../../package') - -const environment = { - NODE_ENV: process.env.NODE_ENV, - DEBUG: process.env.NODE_ENV !== 'production' || false, - PRODUCTION: process.env.NODE_ENV === 'production' || false, - ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false', -} - const server = { LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', } -const CONFIG = { - ...environment, - ...server, - APP_VERSION: pkg.version, -} +const CONFIG = { ...server } export default CONFIG diff --git a/backend/src/graphql/datasources/loginServer.ts b/backend/src/graphql/datasources/loginServer.ts new file mode 100644 index 000000000..ff802bce8 --- /dev/null +++ b/backend/src/graphql/datasources/loginServer.ts @@ -0,0 +1,23 @@ +import { RESTDataSource } from 'apollo-datasource-rest' +import CONFIG from '../../config' +import { Group } from '../models/Group' + +export class LoginServerAPI extends RESTDataSource { + constructor() { + super() + this.baseURL = CONFIG.LOGIN_API_URL + } + + async getAllGroupAliases(): Promise { + return new Promise(() => { + const response = await this.post('networkInfos', { ask: ['groups'] }) + const groups: Group[] = [] + response.data.forEach((element: string) => { + const group = new Group() + group.alias = element + groups.push(group) + })(groups) + return groups + }) + } +} diff --git a/backend/src/graphql/datasources/login_server.ts b/backend/src/graphql/datasources/login_server.ts deleted file mode 100644 index 870c90382..000000000 --- a/backend/src/graphql/datasources/login_server.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { RESTDataSource } from 'apollo-datasource-rest' - -export class LoginServerAPI extends RESTDataSource { - constructor() { - super() - this.baseURL = 'https://api.spacexdata.com/v2/' - } -} diff --git a/backend/src/graphql/models/Group.ts b/backend/src/graphql/models/Group.ts new file mode 100644 index 000000000..45582225e --- /dev/null +++ b/backend/src/graphql/models/Group.ts @@ -0,0 +1,26 @@ +import { Entity, BaseEntity, PrimaryGeneratedColumn, Column } from 'typeorm' +import { ObjectType, Field, ID } from 'type-graphql' + +@Entity() +@ObjectType() +export class Group extends BaseEntity { + @Field(() => ID) + @PrimaryGeneratedColumn() + id: number + + @Field(() => String) + @Column({ length: 190 }) + alias: string + + @Field(() => String) + @Column() + name: string + + @Field(() => String) + @Column('text') + description: string + + @Field(() => String) + @Column() + url: string +} diff --git a/backend/src/graphql/resolvers/GroupResolver.ts b/backend/src/graphql/resolvers/GroupResolver.ts new file mode 100644 index 000000000..b66908470 --- /dev/null +++ b/backend/src/graphql/resolvers/GroupResolver.ts @@ -0,0 +1,17 @@ +import { Resolver, Query, Mutation, Arg } from 'type-graphql' +import { Group } from '../models/Group' +import { LoginServerAPI } from '../datasources/loginServer' +@Resolver() +export class UserResolver { + @Query(() => [Group]) + groups(): Group[] { + const loginServer = new LoginServerAPI() + return loginServer.getAllGroupAliases() + } + + @Query(() => Group) + group(@Arg('id') id: string): Promise { + return Group.findOne({ where: { id } }) + } + +} diff --git a/backend/src/index.ts b/backend/src/index.ts index 453a5fdbc..fdc768410 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -4,6 +4,8 @@ import { graphqlHTTP } from 'express-graphql' // import { createConnection } from 'typeorm' import { buildSchema } from 'type-graphql' import { BookResolver } from './graphql/resolvers/BookResolver' +import { UserResolver } from './graphql/resolvers/UserResolver' +import LoginServerAPI = require('./graphql/datasources/loginServer') // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { From 0224cac092a950af46a79f20b668f96d48d84097 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 16:12:39 +0200 Subject: [PATCH 0008/1843] typescript login server api from frontend --- backend/package.json | 2 +- backend/src/apis/loginAPI.ts | 163 ++++++++++++++++++ .../src/graphql/datasources/loginServer.ts | 23 --- 3 files changed, 164 insertions(+), 24 deletions(-) create mode 100644 backend/src/apis/loginAPI.ts delete mode 100644 backend/src/graphql/datasources/loginServer.ts diff --git a/backend/package.json b/backend/package.json index 02328230f..16b0cdf22 100644 --- a/backend/package.json +++ b/backend/package.json @@ -12,7 +12,7 @@ "lint": "eslint . --ext .js,.ts" }, "dependencies": { - "apollo-datasource-rest": "^0.14.0", + "axios": "^0.21.1", "express": "^4.17.1", "express-graphql": "^0.12.0", "graphql": "^15.5.1", diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts new file mode 100644 index 000000000..7370ee50c --- /dev/null +++ b/backend/src/apis/loginAPI.ts @@ -0,0 +1,163 @@ +import axios from 'axios' +import CONFIG from '../config' +// eslint-disable-next-line no-unused-vars +import regeneratorRuntime from 'regenerator-runtime' + +// control email-text sended with email verification code +const EMAIL_TYPE = { + DEFAULT: 2, // if user has registered directly + ADMIN: 5, // if user was registered by an admin +} + +const apiGet = async (url: string) => { + try { + const result = await axios.get(url) + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (!['success', 'warning'].includes(result.data.state)) { + throw new Error(result.data.msg) + } + return { success: true, result } + } catch (error) { + return { success: false, result: error } + } +} + +const apiPost = async (url: string, payload: string) => { + try { + const result = await axios.post(url, payload) + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (result.data.state === 'warning') { + return { success: true, result: result.error } + } + if (result.data.state !== 'success') { + throw new Error(result.data.msg) + } + return { success: true, result } + } catch (error) { + return { success: false, result: error } + } +} + +const loginAPI = { + login: async (email: string, password: string): Promise => { + const payload: any = { + email, + password, + } + return apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', payload) + }, + logout: async (sessionId: number): Promise => { + const payload: any = { session_id: sessionId } + return apiPost(CONFIG.LOGIN_API_URL + 'logout', payload) + }, + create: async ( + email: string, + firstName: string, + lastName: string, + password: string, + ): Promise => { + const payload: any = { + email, + first_name: firstName, + last_name: lastName, + password, + emailType: EMAIL_TYPE.DEFAULT, + login_after_register: true, + } + return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload) + }, + sendEmail: async ( + email: string, + email_text = 7, + email_verification_code_type = 'resetPassword', + ): Promise => { + const payload: any = { + email, + email_text, + email_verification_code_type, + } + return apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', payload) + }, + loginViaEmailVerificationCode: async (optin: number): Promise => { + return apiGet( + CONFIG.LOGIN_API_URL + 'loginViaEmailVerificationCode?emailVerificationCode=' + optin, + ) + }, + getUserInfos: async (sessionId: number, email: string): Promise => { + const payload: any = { + session_id: sessionId, + email: email, + ask: ['user.first_name', 'user.last_name'], + } + return apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', payload) + }, + updateUserInfos: async (sessionId: number, email: string, data: any): Promise => { + const payload: any = { + session_id: sessionId, + email, + update: { + 'User.first_name': data.firstName, + 'User.last_name': data.lastName, + 'User.description': data.description, + }, + } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + }, + changePassword: async (sessionId: number, email: string, password: string): Promise => { + const payload: any = { + session_id: sessionId, + email, + password, + } + return apiPost(CONFIG.LOGIN_API_URL + 'resetPassword', payload) + }, + changePasswordProfile: async ( + sessionId: number, + email: string, + password: string, + passwordNew: string, + ): Promise => { + const payload: any = { + session_id: sessionId, + email, + update: { + 'User.password_old': password, + 'User.password': passwordNew, + }, + } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + }, + changeUsernameProfile: async ( + sessionId: number, + email: string, + username: string, + ): Promise => { + const payload: any = { + session_id: sessionId, + email, + update: { + 'User.username': username, + }, + } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + }, + updateLanguage: async (sessionId: number, email: string, language: string): Promise => { + const payload: any = { + session_id: sessionId, + email, + update: { + 'User.language': language, + }, + } + return apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) + }, + checkUsername: async (username: string, groupId = 1): Promise => { + return apiGet(CONFIG.LOGIN_API_URL + `checkUsername?username=${username}&group_id=${groupId}`) + }, +} + +export default loginAPI diff --git a/backend/src/graphql/datasources/loginServer.ts b/backend/src/graphql/datasources/loginServer.ts deleted file mode 100644 index ff802bce8..000000000 --- a/backend/src/graphql/datasources/loginServer.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { RESTDataSource } from 'apollo-datasource-rest' -import CONFIG from '../../config' -import { Group } from '../models/Group' - -export class LoginServerAPI extends RESTDataSource { - constructor() { - super() - this.baseURL = CONFIG.LOGIN_API_URL - } - - async getAllGroupAliases(): Promise { - return new Promise(() => { - const response = await this.post('networkInfos', { ask: ['groups'] }) - const groups: Group[] = [] - response.data.forEach((element: string) => { - const group = new Group() - group.alias = element - groups.push(group) - })(groups) - return groups - }) - } -} From 00639965122b2a0d35ed4fa6b4ad2c6c953325f0 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 17:32:54 +0200 Subject: [PATCH 0009/1843] get groups from login server, first running api call to login server --- backend/src/apis/loginAPI.ts | 20 ++++++++++++++---- backend/src/config/index.ts | 3 +++ .../src/graphql/resolvers/GroupResolver.ts | 21 +++++++++++++------ backend/src/index.ts | 4 ++-- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts index 7370ee50c..eef6ea2d7 100644 --- a/backend/src/apis/loginAPI.ts +++ b/backend/src/apis/loginAPI.ts @@ -1,7 +1,7 @@ import axios from 'axios' import CONFIG from '../config' // eslint-disable-next-line no-unused-vars -import regeneratorRuntime from 'regenerator-runtime' +// import regeneratorRuntime from 'regenerator-runtime' // control email-text sended with email verification code const EMAIL_TYPE = { @@ -24,14 +24,14 @@ const apiGet = async (url: string) => { } } -const apiPost = async (url: string, payload: string) => { +const apiPost = async (url: string, payload: any): Promise => { try { const result = await axios.post(url, payload) if (result.status !== 200) { throw new Error('HTTP Status Error ' + result.status) } if (result.data.state === 'warning') { - return { success: true, result: result.error } + return { success: true, result: result.data.errors } } if (result.data.state !== 'success') { throw new Error(result.data.msg) @@ -42,6 +42,15 @@ const apiPost = async (url: string, payload: string) => { } } +interface NetworkInfosResult { + state: string + msg?: string + errors: string[] + data: { + groups?: string[] + } +} + const loginAPI = { login: async (email: string, password: string): Promise => { const payload: any = { @@ -158,6 +167,9 @@ const loginAPI = { checkUsername: async (username: string, groupId = 1): Promise => { return apiGet(CONFIG.LOGIN_API_URL + `checkUsername?username=${username}&group_id=${groupId}`) }, + getNetworkInfos: async (ask: string[]): Promise => { + return (await apiPost(CONFIG.LOGIN_API_URL + `networkInfos`, { ask: ask })).result.data + }, } -export default loginAPI +export { loginAPI, NetworkInfosResult } diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index edf409104..1c922f7f1 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -1,5 +1,8 @@ // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env) +import dotenv from 'dotenv' +dotenv.config() + const server = { LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', diff --git a/backend/src/graphql/resolvers/GroupResolver.ts b/backend/src/graphql/resolvers/GroupResolver.ts index b66908470..4a4f997f3 100644 --- a/backend/src/graphql/resolvers/GroupResolver.ts +++ b/backend/src/graphql/resolvers/GroupResolver.ts @@ -1,17 +1,26 @@ import { Resolver, Query, Mutation, Arg } from 'type-graphql' import { Group } from '../models/Group' -import { LoginServerAPI } from '../datasources/loginServer' +import { loginAPI, NetworkInfosResult } from '../../apis/loginAPI' @Resolver() -export class UserResolver { +export class GroupResolver { @Query(() => [Group]) - groups(): Group[] { - const loginServer = new LoginServerAPI() - return loginServer.getAllGroupAliases() + async groups(): Promise { + // eslint-disable-next-line no-console + console.log('group resolver') + const result: NetworkInfosResult = await loginAPI.getNetworkInfos(['groups']) + const groups: Group[] = [] + + result.data.groups?.forEach((alias: string) => { + console.log("alias: ", alias) + const group = new Group() + group.alias = alias + groups.push(group) + }) + return groups } @Query(() => Group) group(@Arg('id') id: string): Promise { return Group.findOne({ where: { id } }) } - } diff --git a/backend/src/index.ts b/backend/src/index.ts index fdc768410..0cdadf53a 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -5,12 +5,12 @@ import { graphqlHTTP } from 'express-graphql' import { buildSchema } from 'type-graphql' import { BookResolver } from './graphql/resolvers/BookResolver' import { UserResolver } from './graphql/resolvers/UserResolver' -import LoginServerAPI = require('./graphql/datasources/loginServer') +import { GroupResolver } from './graphql/resolvers/GroupResolver' // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { // const connection = await createConnection() - const schema = await buildSchema({ resolvers: [BookResolver] }) + const schema = await buildSchema({ resolvers: [BookResolver, GroupResolver] }) const server = express() server.use( From c2ecd0d64175b04e5a2757b3071f957774d909e6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 17:34:37 +0200 Subject: [PATCH 0010/1843] remove debug logging --- backend/src/graphql/resolvers/GroupResolver.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/graphql/resolvers/GroupResolver.ts b/backend/src/graphql/resolvers/GroupResolver.ts index 4a4f997f3..8294c09ab 100644 --- a/backend/src/graphql/resolvers/GroupResolver.ts +++ b/backend/src/graphql/resolvers/GroupResolver.ts @@ -5,13 +5,10 @@ import { loginAPI, NetworkInfosResult } from '../../apis/loginAPI' export class GroupResolver { @Query(() => [Group]) async groups(): Promise { - // eslint-disable-next-line no-console - console.log('group resolver') const result: NetworkInfosResult = await loginAPI.getNetworkInfos(['groups']) const groups: Group[] = [] result.data.groups?.forEach((alias: string) => { - console.log("alias: ", alias) const group = new Group() group.alias = alias groups.push(group) From 8e96aa02dfeca8a42a35fa80c154ac2026a1407c Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 18:29:30 +0200 Subject: [PATCH 0011/1843] try to login user --- backend/package.json | 2 ++ backend/src/apis/loginAPI.ts | 23 +++++++++++++------ backend/src/graphql/resolvers/UserResolver.ts | 9 ++++++++ backend/src/index.ts | 2 +- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/backend/package.json b/backend/package.json index 16b0cdf22..4ab300e13 100644 --- a/backend/package.json +++ b/backend/package.json @@ -16,12 +16,14 @@ "express": "^4.17.1", "express-graphql": "^0.12.0", "graphql": "^15.5.1", + "jsonwebtoken": "^8.5.1", "reflect-metadata": "^0.1.13", "type-graphql": "^1.1.1", "typeorm": "^0.2.34" }, "devDependencies": { "@types/express": "^4.17.12", + "@types/jsonwebtoken": "^8.5.2", "@typescript-eslint/eslint-plugin": "^4.28.0", "@typescript-eslint/parser": "^4.28.0", "eslint": "^7.29.0", diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts index eef6ea2d7..8e4b5e040 100644 --- a/backend/src/apis/loginAPI.ts +++ b/backend/src/apis/loginAPI.ts @@ -1,5 +1,8 @@ import axios from 'axios' +import { graphql } from 'graphql' import CONFIG from '../config' +import { User } from '../graphql/models/User' +import { LoginUserInput } from '../graphql/inputs/LoginUserInput' // eslint-disable-next-line no-unused-vars // import regeneratorRuntime from 'regenerator-runtime' @@ -51,13 +54,19 @@ interface NetworkInfosResult { } } +interface LoginResult { + state: string + msg?: string + details?: number + info?: string + user?: User + // eslint-disable-next-line camelcase + session_id?: number +} + const loginAPI = { - login: async (email: string, password: string): Promise => { - const payload: any = { - email, - password, - } - return apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', payload) + login: async (login: LoginUserInput): Promise => { + return (await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', login)).result.data }, logout: async (sessionId: number): Promise => { const payload: any = { session_id: sessionId } @@ -172,4 +181,4 @@ const loginAPI = { }, } -export { loginAPI, NetworkInfosResult } +export { loginAPI, NetworkInfosResult, LoginResult } diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 8e0fae982..cfdea954e 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -1,5 +1,8 @@ import { Resolver, Query, Mutation, Arg } from 'type-graphql' import { User } from '../models/User' +import jwt from 'jsonwebtoken' +import { LoginUserInput } from '../inputs/LoginUserInput' +import { loginAPI, LoginResult } from '../../apis/loginAPI' // import { CreateBookInput } from '../inputs/CreateBookInput' // import { UpdateBookInput } from '../inputs/UpdateBookInput' @@ -15,6 +18,12 @@ export class UserResolver { return User.findOne({ where: { id } }) } + @Mutation(() => User) + async login(@Arg('data') data: LoginUserInput): Promise { + const loginResult: LoginResult = await loginAPI.login(data) + return loginResult.user ? loginResult.user : new User() + } + /* @Mutation(() => User) async createBook(@Arg('data') data: CreateBookInput) { diff --git a/backend/src/index.ts b/backend/src/index.ts index 0cdadf53a..7b7f64c75 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -10,7 +10,7 @@ import { GroupResolver } from './graphql/resolvers/GroupResolver' async function main() { // const connection = await createConnection() - const schema = await buildSchema({ resolvers: [BookResolver, GroupResolver] }) + const schema = await buildSchema({ resolvers: [BookResolver, GroupResolver, UserResolver] }) const server = express() server.use( From 0c029dc76863e8f32c1712b5e287e021023b90cf Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 24 Jun 2021 20:41:24 +0200 Subject: [PATCH 0012/1843] missing file --- backend/src/graphql/inputs/LoginUserInput.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 backend/src/graphql/inputs/LoginUserInput.ts diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts new file mode 100644 index 000000000..ee6fb1814 --- /dev/null +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -0,0 +1,16 @@ +import { InputType, Field } from 'type-graphql' + +@InputType() +export class LoginUserInput { + @Field({ nullable: true }) + username?: string + + @Field({ nullable: true }) + email?: string + + @Field({ nullable: true }) + pubkey?: string + + @Field() + password: string +} From 05be9a79d5054e2dea1ff3ca2a60db0d0be5604a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 21:32:32 +0200 Subject: [PATCH 0013/1843] implement config options for graphiql & port separate graphiql from graphql interface disabled api calls for user & group - we are not yet that far ignore .env, adjust .env.dist accordingly --- backend/.env.dist | 6 +- backend/.gitignore | 1 + .../src/apis/{loginAPI.ts => loginAPI.ts.old} | 0 backend/src/config/index.ts | 6 +- ...oginUserInput.ts => LoginUserInput.ts.old} | 0 .../graphql/models/{Group.ts => Group.ts.old} | 0 .../graphql/models/{User.ts => User.ts.old} | 0 ...{GroupResolver.ts => GroupResolver.ts.old} | 0 .../{UserResolver.ts => UserResolver.ts.old} | 0 backend/src/index.ts | 98 ++++++++++------- backend/yarn.lock | 101 +++++++++++++++++- 11 files changed, 167 insertions(+), 45 deletions(-) rename backend/src/apis/{loginAPI.ts => loginAPI.ts.old} (100%) rename backend/src/graphql/inputs/{LoginUserInput.ts => LoginUserInput.ts.old} (100%) rename backend/src/graphql/models/{Group.ts => Group.ts.old} (100%) rename backend/src/graphql/models/{User.ts => User.ts.old} (100%) rename backend/src/graphql/resolvers/{GroupResolver.ts => GroupResolver.ts.old} (100%) rename backend/src/graphql/resolvers/{UserResolver.ts => UserResolver.ts.old} (100%) diff --git a/backend/.env.dist b/backend/.env.dist index 7815be556..21127b9ed 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,2 +1,4 @@ -LOGIN_API_URL=http://localhost/login_api/ -COMMUNITY_API_URL=http://localhost/api/ \ No newline at end of file +PORT=4000 +GRAPHIQL=false +// LOGIN_API_URL=http://localhost/login_api/ +// COMMUNITY_API_URL=http://localhost/api/ \ No newline at end of file diff --git a/backend/.gitignore b/backend/.gitignore index 2ccbe4656..66ee735e1 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1 +1,2 @@ /node_modules/ +/.env diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts.old similarity index 100% rename from backend/src/apis/loginAPI.ts rename to backend/src/apis/loginAPI.ts.old diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 1c922f7f1..341c08f4f 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -4,8 +4,10 @@ import dotenv from 'dotenv' dotenv.config() const server = { - LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', - COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', + PORT: process.env.PORT || 4000, + GRAPHIQL: process.env.GRAPHIQL === 'true' || false, + // LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', + // COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', } const CONFIG = { ...server } diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts.old similarity index 100% rename from backend/src/graphql/inputs/LoginUserInput.ts rename to backend/src/graphql/inputs/LoginUserInput.ts.old diff --git a/backend/src/graphql/models/Group.ts b/backend/src/graphql/models/Group.ts.old similarity index 100% rename from backend/src/graphql/models/Group.ts rename to backend/src/graphql/models/Group.ts.old diff --git a/backend/src/graphql/models/User.ts b/backend/src/graphql/models/User.ts.old similarity index 100% rename from backend/src/graphql/models/User.ts rename to backend/src/graphql/models/User.ts.old diff --git a/backend/src/graphql/resolvers/GroupResolver.ts b/backend/src/graphql/resolvers/GroupResolver.ts.old similarity index 100% rename from backend/src/graphql/resolvers/GroupResolver.ts rename to backend/src/graphql/resolvers/GroupResolver.ts.old diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts.old similarity index 100% rename from backend/src/graphql/resolvers/UserResolver.ts rename to backend/src/graphql/resolvers/UserResolver.ts.old diff --git a/backend/src/index.ts b/backend/src/index.ts index 7b7f64c75..6dca948a4 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,62 +1,80 @@ import 'reflect-metadata' import express from 'express' import { graphqlHTTP } from 'express-graphql' -// import { createConnection } from 'typeorm' import { buildSchema } from 'type-graphql' +// import { createConnection } from 'typeorm' +import CONFIG from './config' + +// TODO move to extern import { BookResolver } from './graphql/resolvers/BookResolver' -import { UserResolver } from './graphql/resolvers/UserResolver' -import { GroupResolver } from './graphql/resolvers/GroupResolver' +// import { UserResolver } from './graphql/resolvers/UserResolver' +// import { GroupResolver } from './graphql/resolvers/GroupResolver' +// TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { // const connection = await createConnection() - const schema = await buildSchema({ resolvers: [BookResolver, GroupResolver, UserResolver] }) + const schema = await buildSchema({ resolvers: [BookResolver /*, GroupResolver, UserResolver */] }) const server = express() + const validationRules: [] = [ + /** + * This provides GraphQL query analysis to reject complex queries to your GraphQL server. + * This can be used to protect your GraphQL servers + * against resource exhaustion and DoS attacks. + * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] + */ + /* queryComplexity({ + // The maximum allowed query complexity, queries above this threshold will be rejected + maximumComplexity: 20, + // The query variables. This is needed because the variables are not available + // in the visitor of the graphql-js library + variables: params!.variables!, + // Optional callback function to retrieve the determined query complexity + // Will be invoked weather the query is rejected or not + // This can be used for logging or to implement rate limiting + onComplete: (complexity: number) => { + console.log("Query Complexity:", complexity); + }, + // Add any number of estimators. The estimators are invoked in order, the first + // numeric value that is being returned by an estimator is used as the field complexity. + // If no estimator returns a value, an exception is raised. + estimators: [ + fieldConfigEstimator(), + // Add more estimators here... + // This will assign each field a complexity of 1 if no other estimator + // returned a value. + simpleEstimator({ + defaultComplexity: 1, + }), + ], + }), */ + ] + // TODO Versioning? server.use( '/api', graphqlHTTP({ schema, - graphiql: true, - validationRules: [ - /** - * This provides GraphQL query analysis to reject complex queries to your GraphQL server. - * This can be used to protect your GraphQL servers - * against resource exhaustion and DoS attacks. - * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] - */ - /* queryComplexity({ - // The maximum allowed query complexity, queries above this threshold will be rejected - maximumComplexity: 20, - // The query variables. This is needed because the variables are not available - // in the visitor of the graphql-js library - variables: params!.variables!, - // Optional callback function to retrieve the determined query complexity - // Will be invoked weather the query is rejected or not - // This can be used for logging or to implement rate limiting - onComplete: (complexity: number) => { - console.log("Query Complexity:", complexity); - }, - // Add any number of estimators. The estimators are invoked in order, the first - // numeric value that is being returned by an estimator is used as the field complexity. - // If no estimator returns a value, an exception is raised. - estimators: [ - fieldConfigEstimator(), - // Add more estimators here... - // This will assign each field a complexity of 1 if no other estimator - // returned a value. - simpleEstimator({ - defaultComplexity: 1, - }), - ], - }), */ - ], + graphiql: false, + validationRules, }), ) - server.listen(4000, () => { + // Graphiql interface + if (CONFIG.GRAPHIQL) { + server.use( + '/graphiql', + graphqlHTTP({ + schema, + graphiql: true, + validationRules, + }), + ) + } + + server.listen(CONFIG.PORT, () => { // eslint-disable-next-line no-console - console.log(`Server is running, GraphIQL available at http://localhost:4000/api`) + console.log(`Server is running, GraphIQL available at http://localhost:${CONFIG.PORT}/graphiql`) }) } diff --git a/backend/yarn.lock b/backend/yarn.lock index b4433044e..f5ec125e6 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -148,6 +148,13 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/jsonwebtoken@^8.5.2": + version "8.5.2" + resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.2.tgz#eb71c717b3b8681bb85fbd2950c9c4c5d4506748" + integrity sha512-X8BOCkp+WJVNYCYIBugREtVZa4Y09Or9HDx6xqRZem5F8jJV8FuJgNessXyMuv9+U8pjnvdezASwU28uw+1scw== + dependencies: + "@types/node" "*" + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -424,6 +431,13 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -484,6 +498,11 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -807,6 +826,13 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= +ecdsa-sig-formatter@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf" + integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ== + dependencies: + safe-buffer "^5.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1245,6 +1271,11 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== +follow-redirects@^1.10.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -1754,6 +1785,39 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +jsonwebtoken@^8.5.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d" + integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w== + dependencies: + jws "^3.2.2" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + semver "^5.6.0" + +jwa@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" + integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA== + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.11" + safe-buffer "^5.0.1" + +jws@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" + integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== + dependencies: + jwa "^1.4.1" + safe-buffer "^5.0.1" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -1804,11 +1868,46 @@ lodash.get@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.includes@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" + integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8= + +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + +lodash.isinteger@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" + integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M= + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= + lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -2418,7 +2517,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.7.1: +"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== From e510dee7a8acc21e6140e33efc48649b976884fe Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 21:35:34 +0200 Subject: [PATCH 0014/1843] removed development environment linting exception --- backend/.eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index 8fbf554ce..f213be8c6 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -15,7 +15,7 @@ module.exports = { // add your custom rules here rules: { 'no-console': ['error'], - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': 'error', 'prettier/prettier': [ 'error', { From fbf5e783d3531de5038333f6232896904e979529 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 21:53:15 +0200 Subject: [PATCH 0015/1843] build & start commands dockerfile --- backend/.gitignore | 1 + backend/Dockerfile | 95 +++++++++++++++++++++++++++++++++++++++++++ backend/package.json | 3 ++ backend/tsconfig.json | 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 backend/Dockerfile diff --git a/backend/.gitignore b/backend/.gitignore index 66ee735e1..8a3d521fc 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,2 +1,3 @@ /node_modules/ /.env +/build/ diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 000000000..fc853eb63 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,95 @@ +################################################################################## +# BASE ########################################################################### +################################################################################## +FROM node:12.19.0-alpine3.10 as base + +# ENVs (available in production aswell, can be overwritten by commandline or env file) +## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame +ENV DOCKER_WORKDIR="/app" +## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0 +ENV BUILD_DATE="1970-01-01T00:00:00.00Z" +## We cannot do $(npm run version).${BUILD_NUMBER} here so we default to 0.0.0.0 +ENV BUILD_VERSION="0.0.0.0" +## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000 +ENV BUILD_COMMIT="0000000" +## SET NODE_ENV +ENV NODE_ENV="production" +## App relevant Envs +ENV PORT="4000" + +# Labels +LABEL org.label-schema.build-date="${BUILD_DATE}" +LABEL org.label-schema.name="gradido:backend" +LABEL org.label-schema.description="Gradido GraphQL Backend" +LABEL org.label-schema.usage="https://github.com/gradido/gradido/blob/master/README.md" +LABEL org.label-schema.url="https://gradido.net" +LABEL org.label-schema.vcs-url="https://github.com/gradido/gradido/tree/master/backend" +LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}" +LABEL org.label-schema.vendor="Gradido Community" +LABEL org.label-schema.version="${BUILD_VERSION}" +LABEL org.label-schema.schema-version="1.0" +LABEL maintainer="support@gradido.net" + +# Install Additional Software +## install: git +#RUN apk --no-cache add git + +# Settings +## Expose Container Port +EXPOSE ${PORT} + +## Workdir +RUN mkdir -p ${DOCKER_WORKDIR} +WORKDIR ${DOCKER_WORKDIR} + +################################################################################## +# DEVELOPMENT (Connected to the local environment, to reload on demand) ########## +################################################################################## +FROM base as development + +# We don't need to copy or build anything since we gonna bind to the +# local filesystem which will need a rebuild anyway + +# Run command +# (for development we need to execute npm install since the +# node_modules are on another volume and need updating) +CMD /bin/sh -c "yarn install && yarn run dev" + +################################################################################## +# BUILD (Does contain all files and is therefore bloated) ######################## +################################################################################## +FROM base as build + +# Copy everything +COPY . . +# npm install +RUN yarn install --production=false --frozen-lockfile --non-interactive +# npm build +RUN yarn run build + +################################################################################## +# TEST ########################################################################### +################################################################################## +FROM build as test + +# Run command +CMD /bin/sh -c "yarn run dev" + +################################################################################## +# PRODUCTION (Does contain only "binary"- and static-files to reduce image size) # +################################################################################## +FROM base as production + +# Copy "binary"-files from build image +COPY --from=build ${DOCKER_WORKDIR}/build ./build +# We also copy the node_modules express and serve-static for the run script +# COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules +# Copy static files +# COPY --from=build ${DOCKER_WORKDIR}/public ./public +# Copy package.json for script definitions (lock file should not be needed) +COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json +# Copy run scripts run/ +# COPY --from=build ${DOCKER_WORKDIR}/run ./run + +# Run command +CMD /bin/sh -c "yarn run start" \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index 4ab300e13..2ffef3b58 100644 --- a/backend/package.json +++ b/backend/package.json @@ -8,6 +8,9 @@ "license": "MIT", "private": false, "scripts": { + "build": "tsc --build", + "clean": "tsc --build --clean", + "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts" }, diff --git a/backend/tsconfig.json b/backend/tsconfig.json index 422ff8e0a..d48524ba5 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ + "outDir": "./build", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ From ae3c27ea9e97b0bdffeddf686bd0ee4670374eaa Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 21:54:06 +0200 Subject: [PATCH 0016/1843] emcas backup ignore file pattern --- backend/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/.gitignore b/backend/.gitignore index 8a3d521fc..d2d2310f8 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,3 +1,6 @@ /node_modules/ /.env /build/ + +# emacs +*~ \ No newline at end of file From 1c21dc17453e08c410996db564491947c7a205fb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 21:56:03 +0200 Subject: [PATCH 0017/1843] missing trailing comma --- backend/.prettierrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.prettierrc.js b/backend/.prettierrc.js index e88113754..8495e3f20 100644 --- a/backend/.prettierrc.js +++ b/backend/.prettierrc.js @@ -4,5 +4,5 @@ module.exports = { singleQuote: true, trailingComma: "all", tabWidth: 2, - bracketSpacing: true + bracketSpacing: true, }; From 2c5d780db4d651df679d485c1dbbee8662b5b8fa Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 22:23:15 +0200 Subject: [PATCH 0018/1843] docker-compose github workflows publish & lint --- .github/workflows/publish.yml | 52 +++++++++++++++++++++++++++++++-- .github/workflows/test.yml | 55 +++++++++++++++++++++++++++++++++++ docker-compose.override.yml | 21 ++++++++++++- docker-compose.yml | 26 ++++++++++++++++- 4 files changed, 149 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 66bc2bbf8..8161fb3b4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: jobs: ############################################################################## - # JOB: DOCKER BUILD COMMUNITY NEO4J ########################################## + # JOB: DOCKER BUILD PRODUCTION FRONTEND ###################################### ############################################################################## build_production_frontend: name: Docker Build Production - Frontend @@ -43,6 +43,43 @@ jobs: name: docker-frontend-production path: /tmp/frontend.tar + ############################################################################## + # JOB: DOCKER BUILD PRODUCTION BACKEND ####################################### + ############################################################################## + build_production_backend: + name: Docker Build Production - Backend + runs-on: ubuntu-latest + #needs: [nothing] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # SET ENVS ############################################################### + ########################################################################## + - name: ENV - VERSION + run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV + - name: ENV - BUILD_DATE + run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV + - name: ENV - BUILD_VERSION + run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV + - name: ENV - BUILD_COMMIT + run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV + ########################################################################## + # BACKEND ################################################################ + ########################################################################## + - name: Backend | Build `production` image + run: | + docker build --target production -t "gradido/backend:latest" -t "gradido/backend:production" -t "gradido/backend:${VERSION}" -t "gradido/backend:${BUILD_VERSION}" backend/ + docker save "gradido/backend" > /tmp/backend.tar + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: docker-backend-production + path: /tmp/backend.tar + ############################################################################## # JOB: DOCKER BUILD PRODUCTION LOGIN SERVER ################################## ############################################################################## @@ -199,7 +236,7 @@ jobs: upload_to_dockerhub: name: Upload to Dockerhub runs-on: ubuntu-latest - needs: [build_production_frontend, build_production_login_server, build_production_community_server, build_production_mariadb, build_production_nginx] + needs: [build_production_frontend, build_production_backend, build_production_login_server, build_production_community_server, build_production_mariadb, build_production_nginx] env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -212,13 +249,20 @@ jobs: ########################################################################## # DOWNLOAD DOCKER IMAGES ################################################# ########################################################################## - - name: Download Docker Image (Neo4J) + - name: Download Docker Image (Frontend) uses: actions/download-artifact@v2 with: name: docker-frontend-production path: /tmp - name: Load Docker Image run: docker load < /tmp/frontend.tar + - name: Download Docker Image (Backend) + uses: actions/download-artifact@v2 + with: + name: docker-backend-production + path: /tmp + - name: Load Docker Image + run: docker load < /tmp/backend.tar - name: Download Docker Image (Login Server) uses: actions/download-artifact@v2 with: @@ -254,6 +298,8 @@ jobs: run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin - name: Push frontend run: docker push --all-tags gradido/frontend + - name: Push backend + run: docker push --all-tags gradido/backend - name: Push login_server run: docker push --all-tags gradido/login_server - name: Push community_server diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 002118f5b..8f7c2db05 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,32 @@ jobs: name: docker-frontend-test path: /tmp/frontend.tar + ############################################################################## + # JOB: DOCKER BUILD TEST BACKEND ############################################# + ############################################################################## + build_test_backend: + name: Docker Build Test - Backend + runs-on: ubuntu-latest + #needs: [nothing] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # FRONTEND ############################################################### + ########################################################################## + - name: Backend | Build `test` image + run: | + docker build --target test -t "gradido/backend:test" backend/ + docker save "gradido/backend:test" > /tmp/backend.tar + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: docker-backend-test + path: /tmp/backend.tar + ############################################################################## # JOB: DOCKER BUILD TEST LOGIN SERVER ######################################## ############################################################################## @@ -159,6 +185,35 @@ jobs: - name: frontend | Lint run: docker run --rm gradido/frontend:test yarn run lint + ############################################################################## + # JOB: LINT BACKEND ######################################################### + ############################################################################## + lint_backend: + name: Lint - Backend + runs-on: ubuntu-latest + needs: [build_test_backend] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # DOWNLOAD DOCKER IMAGE ################################################## + ########################################################################## + - name: Download Docker Image (Backend) + uses: actions/download-artifact@v2 + with: + name: docker-backend-test + path: /tmp + - name: Load Docker Image + run: docker load < /tmp/backend.tar + ########################################################################## + # LINT FRONTEND ########################################################### + ########################################################################## + - name: backend | Lint + run: docker run --rm gradido/backend:test yarn run lint + ############################################################################## # JOB: UNIT TEST FRONTEND ################################################### ############################################################################## diff --git a/docker-compose.override.yml b/docker-compose.override.yml index cbb041457..092cd9db1 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -21,6 +21,24 @@ services: # bind the local folder to the docker to allow live reload - ./frontend:/app + ######################################################## + # BACKEND ############################################## + ######################################################## + backend: + image: gradido/backend:development + build: + target: development + networks: + - external-net + environment: + - NODE_ENV="development" + volumes: + # This makes sure the docker container has its own node modules. + # Therefore it is possible to have a different node version on the host machine + - backend_node_modules:/app/node_modules + # bind the local folder to the docker to allow live reload + - ./backend:/app + ######################################################### ## LOGIN SERVER ######################################### ######################################################### @@ -99,4 +117,5 @@ services: volumes: frontend_node_modules: - login_build_ubuntu_3.1: + backend_node_modules: + login_build_ubuntu_3.1: \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 35e015f4e..7528527e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,31 @@ services: ports: - 3306:3306 volumes: - - db_vol:/var/lib/mysql + - db_vol:/var/lib/mysql + + ######################################################## + # BACKEND ############################################## + ######################################################## + backend: + image: gradido/backend:latest + build: + context: ./backend + target: production + networks: + - internal-net + ports: + - 4000:4000 + environment: + # Envs used in Dockerfile + # - DOCKER_WORKDIR="/app" + # - PORT=4000 + - BUILD_DATE + - BUILD_VERSION + - BUILD_COMMIT + - NODE_ENV="production" + # Application only envs + #env_file: + # - ./frontend/.env ######################################################### ## LOGIN SERVER ######################################### From 50a762073a00d08b51d652bd761d559607c576e9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 24 Jun 2021 22:27:36 +0200 Subject: [PATCH 0019/1843] corrected .eslintignore --- backend/.eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.eslintignore b/backend/.eslintignore index e973d3709..f6b255e92 100644 --- a/backend/.eslintignore +++ b/backend/.eslintignore @@ -1,3 +1,3 @@ node_modules **/*.min.js -dist \ No newline at end of file +build \ No newline at end of file From fd54febd24a5bf26a8f9c510148f532d028554e4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 29 Jun 2021 12:24:45 +0200 Subject: [PATCH 0020/1843] started login functionality & graphql schema --- backend/src/config/index.ts | 4 +- backend/src/graphql/resolvers/UserResolver.ts | 84 +++++++++++++++++++ .../src/graphql/resolvers/UserResolver.ts.old | 51 ----------- backend/src/index.ts | 8 +- 4 files changed, 92 insertions(+), 55 deletions(-) create mode 100644 backend/src/graphql/resolvers/UserResolver.ts delete mode 100644 backend/src/graphql/resolvers/UserResolver.ts.old diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 341c08f4f..e9c06d6a6 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -5,8 +5,10 @@ dotenv.config() const server = { PORT: process.env.PORT || 4000, + JWT_SECRET: process.env.JWT_SECRET || 'secret123', + JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '10m', GRAPHIQL: process.env.GRAPHIQL === 'true' || false, - // LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', + LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', // COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', } diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts new file mode 100644 index 000000000..fbabff7fd --- /dev/null +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -0,0 +1,84 @@ +import jwt from 'jsonwebtoken' +import axios from 'axios' +import { Resolver, Query, /* Mutation, */ Arg } from 'type-graphql' +import CONFIG from '../../config' +// import { User } from '../models/User' +// import { LoginUserInput } from '../inputs/LoginUserInput' +// import { loginAPI, LoginResult } from '../../apis/loginAPI' +// import { CreateBookInput } from '../inputs/CreateBookInput' +// import { UpdateBookInput } from '../inputs/UpdateBookInput' + +const apiPost = async (url: string, payload: any): Promise => { + try { + const result = await axios.post(url, payload) + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (result.data.state === 'warning') { + return { success: true, result: result.data.errors } + } + if (result.data.state !== 'success') { + throw new Error(result.data.msg) + } + return { success: true, result } + } catch (error) { + return { success: false, result: error } + } +} + +@Resolver() +export class UserResolver { + /* @Query(() => [User]) + users(): Promise { + return User.find() + } */ + + /* @Query(() => User) + user(@Arg('id') id: string): Promise { + return User.findOne({ where: { id } }) + } */ + + @Query(() => String) + async login(@Arg('email') email: string, @Arg('password') password: string): Promise { + email = email.trim().toLowerCase() + + const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) + + console.log(result) + // if there is no user, throw an authentication error + if (!result.success) { + throw new Error(result.result) + } + + // create and return the json web token + return jwt.sign({ result }, CONFIG.JWT_SECRET, { expiresIn: CONFIG.JWT_EXPIRES_IN }) + // return (await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', login)).result.data + // const loginResult: LoginResult = await loginAPI.login(data) + // return loginResult.user ? loginResult.user : new User() + } + + /* + @Mutation(() => User) + async createBook(@Arg('data') data: CreateBookInput) { + const book = User.create(data) + await book.save() + return book + } + + @Mutation(() => Book) + async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { + const book = await Book.findOne({ where: { id } }) + if (!book) throw new Error('Book not found!') + Object.assign(book, data) + await book.save() + return book + } +*/ + /* @Mutation(() => Boolean) + async deleteUser(@Arg('id') id: string): Promise { + const user = await User.findOne({ where: { id } }) + if (!user) throw new Error('User not found!') + await user.remove() + return true + } */ +} diff --git a/backend/src/graphql/resolvers/UserResolver.ts.old b/backend/src/graphql/resolvers/UserResolver.ts.old deleted file mode 100644 index cfdea954e..000000000 --- a/backend/src/graphql/resolvers/UserResolver.ts.old +++ /dev/null @@ -1,51 +0,0 @@ -import { Resolver, Query, Mutation, Arg } from 'type-graphql' -import { User } from '../models/User' -import jwt from 'jsonwebtoken' -import { LoginUserInput } from '../inputs/LoginUserInput' -import { loginAPI, LoginResult } from '../../apis/loginAPI' -// import { CreateBookInput } from '../inputs/CreateBookInput' -// import { UpdateBookInput } from '../inputs/UpdateBookInput' - -@Resolver() -export class UserResolver { - @Query(() => [User]) - users(): Promise { - return User.find() - } - - @Query(() => User) - user(@Arg('id') id: string): Promise { - return User.findOne({ where: { id } }) - } - - @Mutation(() => User) - async login(@Arg('data') data: LoginUserInput): Promise { - const loginResult: LoginResult = await loginAPI.login(data) - return loginResult.user ? loginResult.user : new User() - } - - /* - @Mutation(() => User) - async createBook(@Arg('data') data: CreateBookInput) { - const book = User.create(data) - await book.save() - return book - } - - @Mutation(() => Book) - async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { - const book = await Book.findOne({ where: { id } }) - if (!book) throw new Error('Book not found!') - Object.assign(book, data) - await book.save() - return book - } -*/ - @Mutation(() => Boolean) - async deleteUser(@Arg('id') id: string): Promise { - const user = await User.findOne({ where: { id } }) - if (!user) throw new Error('User not found!') - await user.remove() - return true - } -} diff --git a/backend/src/index.ts b/backend/src/index.ts index 6dca948a4..ca161ebf8 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -6,15 +6,17 @@ import { buildSchema } from 'type-graphql' import CONFIG from './config' // TODO move to extern -import { BookResolver } from './graphql/resolvers/BookResolver' -// import { UserResolver } from './graphql/resolvers/UserResolver' +// import { BookResolver } from './graphql/resolvers/BookResolver' +import { UserResolver } from './graphql/resolvers/UserResolver' // import { GroupResolver } from './graphql/resolvers/GroupResolver' // TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; async function main() { // const connection = await createConnection() - const schema = await buildSchema({ resolvers: [BookResolver /*, GroupResolver, UserResolver */] }) + const schema = await buildSchema({ + resolvers: [/* BookResolver , GroupResolver, */ UserResolver], + }) const server = express() const validationRules: [] = [ /** From 81afd9d78ff1e01b7c66ad313460f3f0cf9dd726 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 29 Jun 2021 13:07:04 +0200 Subject: [PATCH 0021/1843] jwt thoughts and fixes --- backend/src/graphql/resolvers/UserResolver.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index fbabff7fd..e5a7725e4 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -51,7 +51,12 @@ export class UserResolver { } // create and return the json web token - return jwt.sign({ result }, CONFIG.JWT_SECRET, { expiresIn: CONFIG.JWT_EXPIRES_IN }) + // The expire doesn't help us here. The client needs to track when the token expires on its own, + // since every action prolongs the time the session is valid. + return jwt.sign( + { result, role: 'todo' }, + CONFIG.JWT_SECRET /* , { expiresIn: CONFIG.JWT_EXPIRES_IN } */, + ) // return (await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', login)).result.data // const loginResult: LoginResult = await loginAPI.login(data) // return loginResult.user ? loginResult.user : new User() From e1596ad78b7d2587253fda4c1a44636958903c40 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 2 Jul 2021 10:49:08 +0200 Subject: [PATCH 0022/1843] switched to apollo --- backend/package.json | 2 +- backend/src/config/index.ts | 3 + backend/src/graphql/resolvers/UserResolver.ts | 2 +- backend/src/index.ts | 70 +- backend/yarn.lock | 632 ++++++++++++++++-- 5 files changed, 608 insertions(+), 101 deletions(-) diff --git a/backend/package.json b/backend/package.json index 2ffef3b58..822a2e019 100644 --- a/backend/package.json +++ b/backend/package.json @@ -15,9 +15,9 @@ "lint": "eslint . --ext .js,.ts" }, "dependencies": { + "apollo-server-express": "^2.25.2", "axios": "^0.21.1", "express": "^4.17.1", - "express-graphql": "^0.12.0", "graphql": "^15.5.1", "jsonwebtoken": "^8.5.1", "reflect-metadata": "^0.1.13", diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index e9c06d6a6..14e824d19 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -12,6 +12,9 @@ const server = { // COMMUNITY_API_URL: process.env.COMMUNITY_API_URL || 'http://localhost/api/', } +// This is needed by graphql-directive-auth +process.env.APP_SECRET = server.JWT_SECRET + const CONFIG = { ...server } export default CONFIG diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index e5a7725e4..be03354ca 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -11,6 +11,7 @@ import CONFIG from '../../config' const apiPost = async (url: string, payload: any): Promise => { try { const result = await axios.post(url, payload) + console.log(result) if (result.status !== 200) { throw new Error('HTTP Status Error ' + result.status) } @@ -44,7 +45,6 @@ export class UserResolver { const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) - console.log(result) // if there is no user, throw an authentication error if (!result.success) { throw new Error(result.result) diff --git a/backend/src/index.ts b/backend/src/index.ts index ca161ebf8..0d4bfd3db 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' import express from 'express' -import { graphqlHTTP } from 'express-graphql' import { buildSchema } from 'type-graphql' +import { ApolloServer } from 'apollo-server-express' // import { createConnection } from 'typeorm' import CONFIG from './config' @@ -17,66 +17,28 @@ async function main() { const schema = await buildSchema({ resolvers: [/* BookResolver , GroupResolver, */ UserResolver], }) - const server = express() - const validationRules: [] = [ - /** - * This provides GraphQL query analysis to reject complex queries to your GraphQL server. - * This can be used to protect your GraphQL servers - * against resource exhaustion and DoS attacks. - * More documentation can be found (here)[https://github.com/ivome/graphql-query-complexity] - */ - /* queryComplexity({ - // The maximum allowed query complexity, queries above this threshold will be rejected - maximumComplexity: 20, - // The query variables. This is needed because the variables are not available - // in the visitor of the graphql-js library - variables: params!.variables!, - // Optional callback function to retrieve the determined query complexity - // Will be invoked weather the query is rejected or not - // This can be used for logging or to implement rate limiting - onComplete: (complexity: number) => { - console.log("Query Complexity:", complexity); - }, - // Add any number of estimators. The estimators are invoked in order, the first - // numeric value that is being returned by an estimator is used as the field complexity. - // If no estimator returns a value, an exception is raised. - estimators: [ - fieldConfigEstimator(), - // Add more estimators here... - // This will assign each field a complexity of 1 if no other estimator - // returned a value. - simpleEstimator({ - defaultComplexity: 1, - }), - ], - }), */ - ] - - // TODO Versioning? - server.use( - '/api', - graphqlHTTP({ - schema, - graphiql: false, - validationRules, - }), - ) // Graphiql interface + let playground = false if (CONFIG.GRAPHIQL) { - server.use( - '/graphiql', - graphqlHTTP({ - schema, - graphiql: true, - validationRules, - }), - ) + playground = true } + // Express Server + const server = express() + + // Apollo Server + const apollo = new ApolloServer({ schema, playground }) + apollo.applyMiddleware({ app: server }) + + // Start Server server.listen(CONFIG.PORT, () => { // eslint-disable-next-line no-console - console.log(`Server is running, GraphIQL available at http://localhost:${CONFIG.PORT}/graphiql`) + console.log(`Server is running at http://localhost:${CONFIG.PORT}`) + if (CONFIG.GRAPHIQL) { + // eslint-disable-next-line no-console + console.log(`GraphIQL available at http://localhost:${CONFIG.PORT}/graphql`) + } }) } diff --git a/backend/yarn.lock b/backend/yarn.lock index f5ec125e6..9a2dce567 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2,6 +2,50 @@ # yarn lockfile v1 +"@apollo/protobufjs@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c" + integrity sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.0" + "@types/node" "^10.1.0" + long "^4.0.0" + +"@apollographql/apollo-tools@^0.5.0": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz#f0baef739ff7e2fafcb8b98ad29f6ac817e53e32" + integrity sha512-ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA== + +"@apollographql/graphql-playground-html@1.6.27": + version "1.6.27" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" + integrity sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw== + dependencies: + xss "^1.0.8" + +"@apollographql/graphql-upload-8-fork@^8.1.3": + version "8.1.3" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc" + integrity sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g== + dependencies: + "@types/express" "*" + "@types/fs-capacitor" "*" + "@types/koa" "*" + busboy "^0.3.1" + fs-capacitor "^2.0.4" + http-errors "^1.7.3" + object-path "^0.11.4" + "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -38,6 +82,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@josephg/resolvable@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb" + integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -59,6 +108,59 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -96,7 +198,14 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.1.tgz#a6ca6a9a0ff366af433f42f5f0e124794ff6b8f1" integrity sha512-FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA== -"@types/body-parser@*": +"@types/accepts@*", "@types/accepts@^1.3.5": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" + integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== + dependencies: + "@types/node" "*" + +"@types/body-parser@*", "@types/body-parser@1.19.0": version "1.19.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== @@ -111,6 +220,26 @@ dependencies: "@types/node" "*" +"@types/content-disposition@*": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.3.tgz#0aa116701955c2faa0717fc69cd1596095e49d96" + integrity sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg== + +"@types/cookies@*": + version "0.7.6" + resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.6.tgz#71212c5391a976d3bae57d4b09fac20fc6bda504" + integrity sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w== + dependencies: + "@types/connect" "*" + "@types/express" "*" + "@types/keygrip" "*" + "@types/node" "*" + +"@types/cors@2.8.10": + version "2.8.10" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" + integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== + "@types/express-serve-static-core@^4.17.18": version "4.17.21" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz#a427278e106bca77b83ad85221eae709a3414d42" @@ -120,7 +249,16 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@^4.17.12": +"@types/express-serve-static-core@^4.17.21": + version "4.17.22" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.22.tgz#e011c55de3f17ddf1161f790042a15c5a218744d" + integrity sha512-WdqmrUsRS4ootGha6tVwk/IVHM1iorU8tGehftQD2NWiPniw/sm7xdJOIlXLwqdInL9wBw/p7oO8vaYEF3NDmA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@*", "@types/express@^4.17.12": version "4.17.12" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350" integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q== @@ -130,6 +268,13 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/fs-capacitor@*": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e" + integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ== + dependencies: + "@types/node" "*" + "@types/glob@^7.1.3": version "7.1.3" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" @@ -138,6 +283,16 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/http-assert@*": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" + integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ== + +"@types/http-errors@*": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz#682477dbbbd07cd032731cb3b0e7eaee3d026b69" + integrity sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA== + "@types/json-schema@^7.0.7": version "7.0.7" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" @@ -155,6 +310,37 @@ dependencies: "@types/node" "*" +"@types/keygrip@*": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" + integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw== + +"@types/koa-compose@*": + version "3.2.5" + resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d" + integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ== + dependencies: + "@types/koa" "*" + +"@types/koa@*": + version "2.13.3" + resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.3.tgz#5b44c0956d7f7bf41f74ccfb530fec60fbed45ca" + integrity sha512-TaujBV+Dhe/FvmSMZJtCFBms+bqQacgUebk/M2C2tq8iGmHE/DDf4DcW2Hc7NqusVZmy5xzrWOjtdPKNP+fTfw== + dependencies: + "@types/accepts" "*" + "@types/content-disposition" "*" + "@types/cookies" "*" + "@types/http-assert" "*" + "@types/http-errors" "*" + "@types/keygrip" "*" + "@types/koa-compose" "*" + "@types/node" "*" + +"@types/long@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -170,6 +356,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== +"@types/node@^10.1.0": + version "10.17.60" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" + integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== + "@types/node@^14.11.2": version "14.17.4" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" @@ -198,6 +389,13 @@ "@types/mime" "^1" "@types/node" "*" +"@types/ws@^7.0.0": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.5.tgz#8ff0f7efcd8fea19f51f9dd66cb8b498d172a752" + integrity sha512-8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA== + dependencies: + "@types/node" "*" + "@types/zen-observable@^0.8.2": version "0.8.2" resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" @@ -272,12 +470,19 @@ "@typescript-eslint/types" "4.28.0" eslint-visitor-keys "^2.0.0" +"@wry/equality@^0.1.2": + version "0.1.11" + resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" + integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA== + dependencies: + tslib "^1.9.3" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@^1.3.7, accepts@~1.3.7: +accepts@^1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== @@ -374,6 +579,156 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +apollo-cache-control@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz#95f20c3e03e7994e0d1bd48c59aeaeb575ed0ce7" + integrity sha512-qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w== + dependencies: + apollo-server-env "^3.1.0" + apollo-server-plugin-base "^0.13.0" + +apollo-datasource@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.9.0.tgz#b0b2913257a6103a5f4c03cb56d78a30e9d850db" + integrity sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA== + dependencies: + apollo-server-caching "^0.7.0" + apollo-server-env "^3.1.0" + +apollo-graphql@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.3.tgz#1ca6f625322ae10a66f57a39642849a07a7a5dc9" + integrity sha512-rcAl2E841Iko4kSzj4Pt3PRBitmyq1MvoEmpl04TQSpGnoVgl1E/ZXuLBYxMTSnEAm7umn2IsoY+c6Ll9U/10A== + dependencies: + core-js-pure "^3.10.2" + lodash.sortby "^4.7.0" + sha.js "^2.4.11" + +apollo-link@^1.2.14: + version "1.2.14" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" + integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== + dependencies: + apollo-utilities "^1.3.0" + ts-invariant "^0.4.0" + tslib "^1.9.3" + zen-observable-ts "^0.8.21" + +apollo-reporting-protobuf@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9" + integrity sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg== + dependencies: + "@apollo/protobufjs" "1.2.2" + +apollo-server-caching@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39" + integrity sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw== + dependencies: + lru-cache "^6.0.0" + +apollo-server-core@^2.25.2: + version "2.25.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.25.2.tgz#ff65da5e512d9b5ca54c8e5e8c78ee28b5987247" + integrity sha512-lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA== + dependencies: + "@apollographql/apollo-tools" "^0.5.0" + "@apollographql/graphql-playground-html" "1.6.27" + "@apollographql/graphql-upload-8-fork" "^8.1.3" + "@josephg/resolvable" "^1.0.0" + "@types/ws" "^7.0.0" + apollo-cache-control "^0.14.0" + apollo-datasource "^0.9.0" + apollo-graphql "^0.9.0" + apollo-reporting-protobuf "^0.8.0" + apollo-server-caching "^0.7.0" + apollo-server-env "^3.1.0" + apollo-server-errors "^2.5.0" + apollo-server-plugin-base "^0.13.0" + apollo-server-types "^0.9.0" + apollo-tracing "^0.15.0" + async-retry "^1.2.1" + fast-json-stable-stringify "^2.0.0" + graphql-extensions "^0.15.0" + graphql-tag "^2.11.0" + graphql-tools "^4.0.8" + loglevel "^1.6.7" + lru-cache "^6.0.0" + sha.js "^2.4.11" + subscriptions-transport-ws "^0.9.19" + uuid "^8.0.0" + +apollo-server-env@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0" + integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ== + dependencies: + node-fetch "^2.6.1" + util.promisify "^1.0.0" + +apollo-server-errors@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68" + integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA== + +apollo-server-express@^2.25.2: + version "2.25.2" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.25.2.tgz#58cd819694ff4c2dec6945a95c5dff6aa2719ef6" + integrity sha512-A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ== + dependencies: + "@apollographql/graphql-playground-html" "1.6.27" + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.0" + "@types/cors" "2.8.10" + "@types/express" "^4.17.12" + "@types/express-serve-static-core" "^4.17.21" + accepts "^1.3.5" + apollo-server-core "^2.25.2" + apollo-server-types "^0.9.0" + body-parser "^1.18.3" + cors "^2.8.5" + express "^4.17.1" + graphql-subscriptions "^1.0.0" + graphql-tools "^4.0.8" + parseurl "^1.3.2" + subscriptions-transport-ws "^0.9.19" + type-is "^1.6.16" + +apollo-server-plugin-base@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13" + integrity sha512-L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg== + dependencies: + apollo-server-types "^0.9.0" + +apollo-server-types@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b" + integrity sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg== + dependencies: + apollo-reporting-protobuf "^0.8.0" + apollo-server-caching "^0.7.0" + apollo-server-env "^3.1.0" + +apollo-tracing@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a" + integrity sha512-UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA== + dependencies: + apollo-server-env "^3.1.0" + apollo-server-plugin-base "^0.13.0" + +apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: + version "1.3.4" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" + integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig== + dependencies: + "@wry/equality" "^0.1.2" + fast-json-stable-stringify "^2.0.0" + ts-invariant "^0.4.0" + tslib "^1.10.0" + app-root-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" @@ -431,6 +786,13 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +async-retry@^1.2.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.1.tgz#139f31f8ddce50c0870b0ba558a6079684aaed55" + integrity sha512-aiieFW/7h3hY0Bq5d+ktDBejxuwR78vRu9hDUdR8rNhSaQ29VzPL4AoIRG7D/c7tdenwOcKvgPM6tIxB3cB6HA== + dependencies: + retry "0.12.0" + axios@^0.21.1: version "0.21.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" @@ -438,6 +800,11 @@ axios@^0.21.1: dependencies: follow-redirects "^1.10.0" +backo2@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -453,7 +820,7 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.19.0: +body-parser@1.19.0, body-parser@^1.18.3: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== @@ -516,6 +883,13 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +busboy@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" + integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== + dependencies: + dicer "0.3.0" + bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" @@ -665,6 +1039,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +commander@^2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -689,7 +1068,7 @@ content-disposition@0.5.3: dependencies: safe-buffer "5.1.2" -content-type@^1.0.4, content-type@~1.0.4: +content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== @@ -704,6 +1083,19 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +core-js-pure@^3.10.2: + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce" + integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA== + +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -723,6 +1115,11 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +cssfilter@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" + integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4= + debug@2.6.9, debug@^2.2.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -778,11 +1175,23 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= +deprecated-decorator@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37" + integrity sha1-AJZjF7ehL+kvPMgx91g68ym4bDc= + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +dicer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" + integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== + dependencies: + streamsearch "0.1.2" + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -1134,15 +1543,10 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -express-graphql@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/express-graphql/-/express-graphql-0.12.0.tgz#58deabc309909ca2c9fe2f83f5fbe94429aa23df" - integrity sha512-DwYaJQy0amdy3pgNtiTDuGGM2BLdj+YO2SgbKoLliCfuHv3VVTt7vNG/ZqK2hRYjtYHE2t2KB705EU94mE64zg== - dependencies: - accepts "^1.3.7" - content-type "^1.0.4" - http-errors "1.8.0" - raw-body "^2.4.1" +eventemitter3@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" + integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== express@^4.17.1: version "4.17.1" @@ -1276,6 +1680,13 @@ follow-redirects@^1.10.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -1286,6 +1697,11 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fs-capacitor@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c" + integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA== + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -1401,6 +1817,15 @@ graceful-fs@^4.1.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graphql-extensions@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817" + integrity sha512-bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA== + dependencies: + "@apollographql/apollo-tools" "^0.5.0" + apollo-server-env "^3.1.0" + apollo-server-types "^0.9.0" + graphql-query-complexity@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/graphql-query-complexity/-/graphql-query-complexity-0.7.2.tgz#7fc6bb20930ab1b666ecf3bbfb24b65b6f08ecc4" @@ -1408,13 +1833,31 @@ graphql-query-complexity@^0.7.0: dependencies: lodash.get "^4.4.2" -graphql-subscriptions@^1.1.0: +graphql-subscriptions@^1.0.0, graphql-subscriptions@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d" integrity sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g== dependencies: iterall "^1.3.0" +graphql-tag@^2.11.0: + version "2.12.5" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f" + integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ== + dependencies: + tslib "^2.1.0" + +graphql-tools@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.8.tgz#e7fb9f0d43408fb0878ba66b522ce871bafe9d30" + integrity sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg== + dependencies: + apollo-link "^1.2.14" + apollo-utilities "^1.0.1" + deprecated-decorator "^0.1.6" + iterall "^1.1.3" + uuid "^3.1.0" + graphql@^15.5.1: version "15.5.1" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad" @@ -1485,18 +1928,7 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@1.7.3, http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@1.8.0: +http-errors@^1.7.3: version "1.8.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== @@ -1507,6 +1939,17 @@ http-errors@1.8.0: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1609,7 +2052,7 @@ is-boolean-object@^1.1.0: dependencies: call-bind "^1.0.2" -is-callable@^1.1.4, is-callable@^1.2.3: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== @@ -1728,7 +2171,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -iterall@^1.3.0: +iterall@^1.1.3, iterall@^1.2.1, iterall@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== @@ -1908,11 +2351,26 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= +loglevel@^1.6.7: + version "1.7.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" + integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -2048,6 +2506,11 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +node-fetch@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + nodemon@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32" @@ -2091,7 +2554,7 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== -object-assign@^4.0.1: +object-assign@^4, object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -2106,6 +2569,11 @@ object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +object-path@^0.11.4: + version "0.11.5" + resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a" + integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg== + object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" @@ -2116,6 +2584,15 @@ object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" +object.getownpropertydescriptors@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" + integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + object.values@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" @@ -2222,7 +2699,7 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseurl@~1.3.3: +parseurl@^1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -2373,16 +2850,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" - integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== - dependencies: - bytes "3.1.0" - http-errors "1.7.3" - iconv-lite "0.4.24" - unpipe "1.0.0" - rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -2471,6 +2938,11 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +retry@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -2661,6 +3133,11 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +streamsearch@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" + integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= + string-width@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -2731,6 +3208,17 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +subscriptions-transport-ws@^0.9.19: + version "0.9.19" + resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" + integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== + dependencies: + backo2 "^1.0.2" + eventemitter3 "^3.1.0" + iterall "^1.2.1" + symbol-observable "^1.0.4" + ws "^5.2.0 || ^6.0.0 || ^7.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -2750,6 +3238,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +symbol-observable@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + table@^6.0.9: version "6.7.1" resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" @@ -2810,6 +3303,13 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" +ts-invariant@^0.4.0: + version "0.4.4" + resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" + integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== + dependencies: + tslib "^1.9.3" + ts-node@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" @@ -2836,7 +3336,7 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.8.1: +tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -2884,7 +3384,7 @@ type-graphql@^1.1.1: semver "^7.3.2" tslib "^2.0.1" -type-is@~1.6.17, type-is@~1.6.18: +type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -2989,11 +3489,32 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +util.promisify@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" + integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + for-each "^0.3.3" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.1" + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +uuid@^3.1.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +uuid@^8.0.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" @@ -3007,7 +3528,7 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vary@~1.1.2: +vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -3066,6 +3587,11 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +"ws@^5.2.0 || ^6.0.0 || ^7.0.0": + version "7.5.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" + integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" @@ -3084,6 +3610,14 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xss@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2" + integrity sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ== + dependencies: + commander "^2.20.3" + cssfilter "0.0.10" + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -3126,6 +3660,14 @@ yn@3.1.1: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== +zen-observable-ts@^0.8.21: + version "0.8.21" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" + integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg== + dependencies: + tslib "^1.9.3" + zen-observable "^0.8.0" + zen-observable-ts@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.0.0.tgz#30d1202b81d8ba4c489e3781e8ca09abf0075e70" @@ -3134,7 +3676,7 @@ zen-observable-ts@^1.0.0: "@types/zen-observable" "^0.8.2" zen-observable "^0.8.15" -zen-observable@^0.8.15: +zen-observable@^0.8.0, zen-observable@^0.8.15: version "0.8.15" resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== From b7cb158369e4c5a18b0e202b0d8883c2066422de Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 13 Jul 2021 16:26:08 +0200 Subject: [PATCH 0023/1843] logs for debug --- backend/src/graphql/resolvers/UserResolver.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index be03354ca..f296dc176 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -10,8 +10,9 @@ import CONFIG from '../../config' const apiPost = async (url: string, payload: any): Promise => { try { + console.log(url, payload) const result = await axios.post(url, payload) - console.log(result) + console.log('-----', result) if (result.status !== 200) { throw new Error('HTTP Status Error ' + result.status) } @@ -23,6 +24,7 @@ const apiPost = async (url: string, payload: any): Promise => { } return { success: true, result } } catch (error) { + console.log(error) return { success: false, result: error } } } @@ -42,7 +44,7 @@ export class UserResolver { @Query(() => String) async login(@Arg('email') email: string, @Arg('password') password: string): Promise { email = email.trim().toLowerCase() - + console.log(email, password, CONFIG.LOGIN_API_URL) const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) // if there is no user, throw an authentication error From 8443888e964c70662e1d818df6e0a460a2cd226f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 13 Jul 2021 18:34:50 +0200 Subject: [PATCH 0024/1843] login resolver returns data that the frontend could use without major changes --- backend/.env.dist | 2 +- backend/src/graphql/models/User.ts | 85 +++++++++++++++++++ backend/src/graphql/resolvers/BookResolver.ts | 2 + backend/src/graphql/resolvers/UserResolver.ts | 35 +++++--- 4 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 backend/src/graphql/models/User.ts diff --git a/backend/.env.dist b/backend/.env.dist index 21127b9ed..fe9d5e566 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -1,4 +1,4 @@ PORT=4000 GRAPHIQL=false -// LOGIN_API_URL=http://localhost/login_api/ +// LOGIN_API_URL=http://login-server:1201/ // COMMUNITY_API_URL=http://localhost/api/ \ No newline at end of file diff --git a/backend/src/graphql/models/User.ts b/backend/src/graphql/models/User.ts new file mode 100644 index 000000000..d17a3dacd --- /dev/null +++ b/backend/src/graphql/models/User.ts @@ -0,0 +1,85 @@ +import { Entity, BaseEntity, Column } from 'typeorm' +import { ObjectType, Field } from 'type-graphql' + +@Entity() +@ObjectType() +export class User extends BaseEntity { + /* + @Field(() => ID) + @PrimaryGeneratedColumn() + id: number + */ + + @Field(() => String) + @Column({ length: 191 }) + email: string + + @Field(() => String) + @Column({ length: 150 }) + firstName: string + + @Field(() => String) + @Column() + lastName: string + + @Field(() => String) + @Column() + username: string + + @Field(() => String) + @Column('text') + description: string + + /* + @Field(() => String) + @Column({ length: 64 }) + pubkey: string + + // not sure about the type here. Maybe better to have a string + @Field(() => number) + @Column({ type: 'datetime' }) + created: number + + @Field(() => Boolean) + @Column({ default: false }) + emailChecked: boolean + + @Field(() => Boolean) + @Column({ default: false }) + passphraseShown: boolean + */ + + @Field(() => String) + @Column({ default: 'de' }) + language: string + + /* + @Field(() => Boolean) + @Column({ default: false }) + disabled: boolean + */ + + /* I suggest to have a group as type here + @Field(() => ID) + @Column() + groupId: number + + // what is puvlisherId? + @Field(() => ID) + @Column({ default: 0 }) + publisherId: number + */ +} + +// temporaray solution until we have JWT implemented +@Entity() +@ObjectType() +export class LoginResponse extends BaseEntity { + @Field(() => Number) + @Column() + sessionId: number + + @Field(() => User) + @Column() + user: User +} diff --git a/backend/src/graphql/resolvers/BookResolver.ts b/backend/src/graphql/resolvers/BookResolver.ts index 9e5b6d1b3..df7e553bc 100644 --- a/backend/src/graphql/resolvers/BookResolver.ts +++ b/backend/src/graphql/resolvers/BookResolver.ts @@ -1,3 +1,4 @@ +/* import { Resolver, Query, Mutation, Arg } from 'type-graphql' import { Book } from '../models/Book' import { CreateBookInput } from '../inputs/CreateBookInput' @@ -39,3 +40,4 @@ export class BookResolver { return true } } +*/ diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index f296dc176..959c101e8 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -1,18 +1,18 @@ -import jwt from 'jsonwebtoken' +// import jwt from 'jsonwebtoken' import axios from 'axios' import { Resolver, Query, /* Mutation, */ Arg } from 'type-graphql' import CONFIG from '../../config' -// import { User } from '../models/User' +import { LoginResponse } from '../models/User' // import { LoginUserInput } from '../inputs/LoginUserInput' // import { loginAPI, LoginResult } from '../../apis/loginAPI' // import { CreateBookInput } from '../inputs/CreateBookInput' // import { UpdateBookInput } from '../inputs/UpdateBookInput' -const apiPost = async (url: string, payload: any): Promise => { +const apiPost = async (url: string, payload: unknown): Promise => { try { - console.log(url, payload) + // console.log(url, payload) const result = await axios.post(url, payload) - console.log('-----', result) + // console.log('-----', result) if (result.status !== 200) { throw new Error('HTTP Status Error ' + result.status) } @@ -24,7 +24,7 @@ const apiPost = async (url: string, payload: any): Promise => { } return { success: true, result } } catch (error) { - console.log(error) + // console.log(error) return { success: false, result: error } } } @@ -41,10 +41,9 @@ export class UserResolver { return User.findOne({ where: { id } }) } */ - @Query(() => String) - async login(@Arg('email') email: string, @Arg('password') password: string): Promise { + @Query(() => LoginResponse) + async login(@Arg('email') email: string, @Arg('password') password: string): Promise { email = email.trim().toLowerCase() - console.log(email, password, CONFIG.LOGIN_API_URL) const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) // if there is no user, throw an authentication error @@ -52,13 +51,29 @@ export class UserResolver { throw new Error(result.result) } + // temporary solution until we have JWT implemented + // console.log(result.result.data) + return { + sessionId: result.result.data.session_id, + user: { + email: result.result.data.user.email, + language: result.result.data.user.language, + username: result.result.data.user.username, + firstName: result.result.data.user.first_name, + lastName: result.result.data.user.last_name, + description: result.result.data.user.description, + }, + } + // create and return the json web token // The expire doesn't help us here. The client needs to track when the token expires on its own, // since every action prolongs the time the session is valid. + /* return jwt.sign( { result, role: 'todo' }, - CONFIG.JWT_SECRET /* , { expiresIn: CONFIG.JWT_EXPIRES_IN } */, + CONFIG.JWT_SECRET, // * , { expiresIn: CONFIG.JWT_EXPIRES_IN } , ) + */ // return (await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', login)).result.data // const loginResult: LoginResult = await loginAPI.login(data) // return loginResult.user ? loginResult.user : new User() From a2f932f040831beda7dfed5edc737bc103e70914 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 13 Jul 2021 18:44:04 +0200 Subject: [PATCH 0025/1843] fix linting, I need to learn more TS --- backend/src/graphql/resolvers/UserResolver.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 959c101e8..9c9161a80 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -8,7 +8,8 @@ import { LoginResponse } from '../models/User' // import { CreateBookInput } from '../inputs/CreateBookInput' // import { UpdateBookInput } from '../inputs/UpdateBookInput' -const apiPost = async (url: string, payload: unknown): Promise => { +// eslint-disable-next-line @typescript-eslint/no-explicit-any +const apiPost = async (url: string, payload: unknown): Promise => { try { // console.log(url, payload) const result = await axios.post(url, payload) @@ -42,7 +43,8 @@ export class UserResolver { } */ @Query(() => LoginResponse) - async login(@Arg('email') email: string, @Arg('password') password: string): Promise { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + async login(@Arg('email') email: string, @Arg('password') password: string): Promise { email = email.trim().toLowerCase() const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) From ae4edf46054a48bcdd8aeaafb16c68e546ed58ef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 13 Jul 2021 19:18:17 +0200 Subject: [PATCH 0026/1843] clean up, use inputs --- backend/package.json | 1 + backend/src/apis/loginAPI.ts | 20 ++++++ backend/src/graphql/inputs/CreateBookInput.ts | 10 --- ...oginUserInput.ts.old => LoginUserInput.ts} | 13 +++- backend/src/graphql/inputs/UpdateBookInput.ts | 13 ---- backend/src/graphql/models/Book.ts | 22 ------- backend/src/graphql/models/User.ts.old | 62 ------------------- backend/src/graphql/resolvers/BookResolver.ts | 43 ------------- backend/src/graphql/resolvers/UserResolver.ts | 42 ++----------- backend/yarn.lock | 24 +++++++ 10 files changed, 62 insertions(+), 188 deletions(-) create mode 100644 backend/src/apis/loginAPI.ts delete mode 100644 backend/src/graphql/inputs/CreateBookInput.ts rename backend/src/graphql/inputs/{LoginUserInput.ts.old => LoginUserInput.ts} (54%) delete mode 100644 backend/src/graphql/inputs/UpdateBookInput.ts delete mode 100644 backend/src/graphql/models/Book.ts delete mode 100644 backend/src/graphql/models/User.ts.old delete mode 100644 backend/src/graphql/resolvers/BookResolver.ts diff --git a/backend/package.json b/backend/package.json index 822a2e019..ac94d10f3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -17,6 +17,7 @@ "dependencies": { "apollo-server-express": "^2.25.2", "axios": "^0.21.1", + "class-validator": "^0.13.1", "express": "^4.17.1", "graphql": "^15.5.1", "jsonwebtoken": "^8.5.1", diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts new file mode 100644 index 000000000..69f22cf92 --- /dev/null +++ b/backend/src/apis/loginAPI.ts @@ -0,0 +1,20 @@ +import axios from 'axios' + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export const apiPost = async (url: string, payload: unknown): Promise => { + try { + const result = await axios.post(url, payload) + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (result.data.state === 'warning') { + return { success: true, result: result.data.errors } + } + if (result.data.state !== 'success') { + throw new Error(result.data.msg) + } + return { success: true, result } + } catch (error) { + return { success: false, result: error } + } +} diff --git a/backend/src/graphql/inputs/CreateBookInput.ts b/backend/src/graphql/inputs/CreateBookInput.ts deleted file mode 100644 index ac4108afd..000000000 --- a/backend/src/graphql/inputs/CreateBookInput.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { InputType, Field } from 'type-graphql' - -@InputType() -export class CreateBookInput { - @Field() - title: string - - @Field() - author: string -} diff --git a/backend/src/graphql/inputs/LoginUserInput.ts.old b/backend/src/graphql/inputs/LoginUserInput.ts similarity index 54% rename from backend/src/graphql/inputs/LoginUserInput.ts.old rename to backend/src/graphql/inputs/LoginUserInput.ts index ee6fb1814..7edc3089e 100644 --- a/backend/src/graphql/inputs/LoginUserInput.ts.old +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -1,5 +1,6 @@ -import { InputType, Field } from 'type-graphql' +import { ArgsType, Field } from 'type-graphql' +/* @InputType() export class LoginUserInput { @Field({ nullable: true }) @@ -14,3 +15,13 @@ export class LoginUserInput { @Field() password: string } +*/ + +@ArgsType() +export class UnsecureLoginArgs { + @Field(() => String) + email: string + + @Field(() => String) + password: string +} diff --git a/backend/src/graphql/inputs/UpdateBookInput.ts b/backend/src/graphql/inputs/UpdateBookInput.ts deleted file mode 100644 index 3f5042ecf..000000000 --- a/backend/src/graphql/inputs/UpdateBookInput.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { InputType, Field } from 'type-graphql' - -@InputType() -export class UpdateBookInput { - @Field({ nullable: true }) - title?: string - - @Field({ nullable: true }) - author?: string - - @Field({ nullable: true }) - isPublished?: boolean -} diff --git a/backend/src/graphql/models/Book.ts b/backend/src/graphql/models/Book.ts deleted file mode 100644 index fb95979dd..000000000 --- a/backend/src/graphql/models/Book.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Entity, BaseEntity, PrimaryGeneratedColumn, Column } from 'typeorm' -import { ObjectType, Field, ID } from 'type-graphql' - -@Entity() -@ObjectType() -export class Book extends BaseEntity { - @Field(() => ID) - @PrimaryGeneratedColumn() - id: string - - @Field(() => String) - @Column() - title: string - - @Field(() => String) - @Column() - author: string - - @Field(() => Boolean) - @Column({ default: false }) - isPublished: boolean -} diff --git a/backend/src/graphql/models/User.ts.old b/backend/src/graphql/models/User.ts.old deleted file mode 100644 index 8f3ababf7..000000000 --- a/backend/src/graphql/models/User.ts.old +++ /dev/null @@ -1,62 +0,0 @@ -import { Entity, BaseEntity, PrimaryGeneratedColumn, Column } from 'typeorm' -import { ObjectType, Field, ID, GraphQLISODateTime } from 'type-graphql' - -@Entity() -@ObjectType() -export class User extends BaseEntity { - @Field(() => ID) - @PrimaryGeneratedColumn() - id: number - - @Field(() => String) - @Column({ length: 191 }) - email: string - - @Field(() => String) - @Column({ length: 150 }) - firstName: string - - @Field(() => String) - @Column() - lastName: string - - @Field(() => String) - @Column() - username: string - - @Field(() => String) - @Column('text') - description: string - - @Field(() => String) - @Column({ length: 64 }) - pubkey: string - - @Field(() => GraphQLISODateTime) - @Column({ type: 'datetime' }) - created: Date - - @Field(() => Boolean) - @Column({ default: false }) - emailChecked: boolean - - @Field(() => Boolean) - @Column({ default: false }) - passphraseShown: boolean - - @Field(() => String) - @Column({ default: 'de' }) - language: string - - @Field(() => Boolean) - @Column({ default: false }) - disabled: boolean - - @Field(() => ID) - @Column() - groupId: number - - @Field(() => ID) - @Column({ default: 0 }) - publisherId: number -} diff --git a/backend/src/graphql/resolvers/BookResolver.ts b/backend/src/graphql/resolvers/BookResolver.ts deleted file mode 100644 index df7e553bc..000000000 --- a/backend/src/graphql/resolvers/BookResolver.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* -import { Resolver, Query, Mutation, Arg } from 'type-graphql' -import { Book } from '../models/Book' -import { CreateBookInput } from '../inputs/CreateBookInput' -import { UpdateBookInput } from '../inputs/UpdateBookInput' - -@Resolver() -export class BookResolver { - @Query(() => [Book]) - books() { - return Book.find() - } - - @Query(() => Book) - book(@Arg('id') id: string) { - return Book.findOne({ where: { id } }) - } - - @Mutation(() => Book) - async createBook(@Arg('data') data: CreateBookInput) { - const book = Book.create(data) - await book.save() - return book - } - - @Mutation(() => Book) - async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { - const book = await Book.findOne({ where: { id } }) - if (!book) throw new Error('Book not found!') - Object.assign(book, data) - await book.save() - return book - } - - @Mutation(() => Boolean) - async deleteBook(@Arg('id') id: string) { - const book = await Book.findOne({ where: { id } }) - if (!book) throw new Error('Book not found!') - await book.remove() - return true - } -} -*/ diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 9c9161a80..aa83894e4 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -1,35 +1,12 @@ // import jwt from 'jsonwebtoken' -import axios from 'axios' -import { Resolver, Query, /* Mutation, */ Arg } from 'type-graphql' +import { Resolver, Query, /* Mutation, */ Args } from 'type-graphql' import CONFIG from '../../config' import { LoginResponse } from '../models/User' -// import { LoginUserInput } from '../inputs/LoginUserInput' -// import { loginAPI, LoginResult } from '../../apis/loginAPI' +import { UnsecureLoginArgs } from '../inputs/LoginUserInput' +import { apiPost } from '../../apis/loginAPI' // import { CreateBookInput } from '../inputs/CreateBookInput' // import { UpdateBookInput } from '../inputs/UpdateBookInput' -// eslint-disable-next-line @typescript-eslint/no-explicit-any -const apiPost = async (url: string, payload: unknown): Promise => { - try { - // console.log(url, payload) - const result = await axios.post(url, payload) - // console.log('-----', result) - if (result.status !== 200) { - throw new Error('HTTP Status Error ' + result.status) - } - if (result.data.state === 'warning') { - return { success: true, result: result.data.errors } - } - if (result.data.state !== 'success') { - throw new Error(result.data.msg) - } - return { success: true, result } - } catch (error) { - // console.log(error) - return { success: false, result: error } - } -} - @Resolver() export class UserResolver { /* @Query(() => [User]) @@ -44,7 +21,7 @@ export class UserResolver { @Query(() => LoginResponse) // eslint-disable-next-line @typescript-eslint/no-explicit-any - async login(@Arg('email') email: string, @Arg('password') password: string): Promise { + async login(@Args() { email, password }: UnsecureLoginArgs): Promise { email = email.trim().toLowerCase() const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) @@ -54,7 +31,6 @@ export class UserResolver { } // temporary solution until we have JWT implemented - // console.log(result.result.data) return { sessionId: result.result.data.session_id, user: { @@ -88,16 +64,8 @@ export class UserResolver { await book.save() return book } + */ - @Mutation(() => Book) - async updateBook(@Arg('id') id: string, @Arg('data') data: UpdateBookInput) { - const book = await Book.findOne({ where: { id } }) - if (!book) throw new Error('Book not found!') - Object.assign(book, data) - await book.save() - return book - } -*/ /* @Mutation(() => Boolean) async deleteUser(@Arg('id') id: string): Promise { const user = await User.findOne({ where: { id } }) diff --git a/backend/yarn.lock b/backend/yarn.lock index 9a2dce567..ff8d358dd 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -389,6 +389,11 @@ "@types/mime" "^1" "@types/node" "*" +"@types/validator@^13.1.3": + version "13.6.3" + resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.6.3.tgz#31ca2e997bf13a0fffca30a25747d5b9f7dbb7de" + integrity sha512-fWG42pMJOL4jKsDDZZREnXLjc3UE0R8LOJfARWYg6U966rxDT7TYejYzLnUF5cvSObGg34nd0+H2wHHU5Omdfw== + "@types/ws@^7.0.0": version "7.4.5" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.5.tgz#8ff0f7efcd8fea19f51f9dd66cb8b498d172a752" @@ -982,6 +987,15 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +class-validator@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.13.1.tgz#381b2001ee6b9e05afd133671fbdf760da7dec67" + integrity sha512-zWIeYFhUitvAHBwNhDdCRK09hWx+P0HUwFE8US8/CxFpMVzkUK8RJl7yOIE+BVu2lxyPNgeOaFv78tLE47jBIg== + dependencies: + "@types/validator" "^13.1.3" + libphonenumber-js "^1.9.7" + validator "^13.5.2" + cli-boxes@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" @@ -2283,6 +2297,11 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +libphonenumber-js@^1.9.7: + version "1.9.22" + resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.22.tgz#b6b460603dedbd58f2d71f15500f216d70850fad" + integrity sha512-nE0aF0wrNq09ewF36s9FVqRW73hmpw6cobVDlbexmsu1432LEfuN24BCudNuRx4t2rElSeK/N0JbedzRW/TC4A== + load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -3528,6 +3547,11 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +validator@^13.5.2: + version "13.6.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059" + integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" From 2ab92d1a539235c4df7798a856e20eb6d53bc28b Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 14 Jul 2021 20:22:15 +0200 Subject: [PATCH 0027/1843] send email for password reset --- backend/src/graphql/resolvers/UserResolver.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index aa83894e4..85571c5ab 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -1,5 +1,5 @@ // import jwt from 'jsonwebtoken' -import { Resolver, Query, /* Mutation, */ Args } from 'type-graphql' +import { Resolver, Query, /* Mutation, */ Args, Arg } from 'type-graphql' import CONFIG from '../../config' import { LoginResponse } from '../models/User' import { UnsecureLoginArgs } from '../inputs/LoginUserInput' @@ -43,6 +43,16 @@ export class UserResolver { }, } + // forgot password request + /* + @Query(() => null) + // eslint-disable-next-line @typescript-eslint/no-explicit-any + async sendEmail(@Arg() email: String): Promise { + const result = await apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', { email }) + return + } + */ + // create and return the json web token // The expire doesn't help us here. The client needs to track when the token expires on its own, // since every action prolongs the time the session is valid. From b8c75bd50ab07c42648d546188ad9a9e4c332362 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 16 Jul 2021 15:45:29 +0200 Subject: [PATCH 0028/1843] olli test 1 --- frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a6613bec1..a2d4a0fa8 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/components/Inputs/InputPassword.vue b/frontend/src/components/Inputs/InputPassword.vue index 6b72f0b01..15ce116c9 100644 --- a/frontend/src/components/Inputs/InputPassword.vue +++ b/frontend/src/components/Inputs/InputPassword.vue @@ -19,7 +19,11 @@ :state="validated ? valid : false" > - + diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 7f475ebae..f8a018a6e 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -121,7 +121,11 @@ > - + @@ -147,7 +151,11 @@ > - + From a8422c690820ea80e3e25331bfce42f9e00bce6e Mon Sep 17 00:00:00 2001 From: ogerly Date: Sat, 17 Jul 2021 11:13:19 +0200 Subject: [PATCH 0031/1843] remove ttt test mit olli --- frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index a2d4a0fa8..a6613bec1 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,5 +1,5 @@ From 9e155758553f5525dc3e33b0d44e8249ed0909a3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 21 Jul 2021 16:45:59 +0200 Subject: [PATCH 0035/1843] api calls for sendEmail and loginViaEmailVerificationCode --- backend/src/apis/loginAPI.ts | 16 ++++++ backend/src/graphql/models/User.ts | 12 ++++ backend/src/graphql/resolvers/UserResolver.ts | 57 ++++++++++--------- 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts index 69f22cf92..b81316b3f 100644 --- a/backend/src/apis/loginAPI.ts +++ b/backend/src/apis/loginAPI.ts @@ -18,3 +18,19 @@ export const apiPost = async (url: string, payload: unknown): Promise => { return { success: false, result: error } } } + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export const apiGet = async (url: string): Promise => { + try { + const result = await axios.get(url) + if (result.status !== 200) { + throw new Error('HTTP Status Error ' + result.status) + } + if (!['success', 'warning'].includes(result.data.state)) { + throw new Error(result.data.msg) + } + return { success: true, result } + } catch (error) { + return { success: false, result: error } + } +} diff --git a/backend/src/graphql/models/User.ts b/backend/src/graphql/models/User.ts index d17a3dacd..938d0a9f9 100644 --- a/backend/src/graphql/models/User.ts +++ b/backend/src/graphql/models/User.ts @@ -83,3 +83,15 @@ export class LoginResponse extends BaseEntity { @Column() user: User } + +@Entity() +@ObjectType() +export class LoginViaVerificationCode extends BaseEntity { + @Field(() => Number) + @Column() + sessionId: number + + @Field(() => String) + @Column() + email: string +} diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 85571c5ab..34ceae7c7 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -1,11 +1,9 @@ // import jwt from 'jsonwebtoken' import { Resolver, Query, /* Mutation, */ Args, Arg } from 'type-graphql' import CONFIG from '../../config' -import { LoginResponse } from '../models/User' +import { LoginResponse, LoginViaVerificationCode } from '../models/User' import { UnsecureLoginArgs } from '../inputs/LoginUserInput' -import { apiPost } from '../../apis/loginAPI' -// import { CreateBookInput } from '../inputs/CreateBookInput' -// import { UpdateBookInput } from '../inputs/UpdateBookInput' +import { apiPost, apiGet } from '../../apis/loginAPI' @Resolver() export class UserResolver { @@ -43,16 +41,6 @@ export class UserResolver { }, } - // forgot password request - /* - @Query(() => null) - // eslint-disable-next-line @typescript-eslint/no-explicit-any - async sendEmail(@Arg() email: String): Promise { - const result = await apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', { email }) - return - } - */ - // create and return the json web token // The expire doesn't help us here. The client needs to track when the token expires on its own, // since every action prolongs the time the session is valid. @@ -67,20 +55,33 @@ export class UserResolver { // return loginResult.user ? loginResult.user : new User() } - /* - @Mutation(() => User) - async createBook(@Arg('data') data: CreateBookInput) { - const book = User.create(data) - await book.save() - return book + // forgot password request + @Query(() => String) + // eslint-disable-next-line @typescript-eslint/no-explicit-any + async sendEmail(@Arg('email') email: string): Promise { + const payload = { + email, + email_text: 7, + email_verification_code_type: 'resetPassword', + } + const result = await apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', payload) + if (result.success) return result.result.data.state + return result.result } - */ - /* @Mutation(() => Boolean) - async deleteUser(@Arg('id') id: string): Promise { - const user = await User.findOne({ where: { id } }) - if (!user) throw new Error('User not found!') - await user.remove() - return true - } */ + @Query(() => LoginViaVerificationCode) + // eslint-disable-next-line @typescript-eslint/no-explicit-any + async loginViaEmailVerificationCode(@Arg('optin') optin: string): Promise { + // I cannot use number as type here. + // The value received is not the same as sent by the query + const result = await apiGet( + CONFIG.LOGIN_API_URL + 'loginViaEmailVerificationCode?emailVerificationCode=' + optin, + ) + if (result.success) + return { + sessionId: result.result.data.session_id, + email: result.result.data.user.email, + } + return result.result + } } From 00fc4056b1dabf25f318e49c3b8a3fc972ec8da6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 21 Jul 2021 18:07:05 +0200 Subject: [PATCH 0036/1843] test step 1 --- frontend/src/views/Pages/Register.spec.js | 1 + frontend/src/views/Pages/Register.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 85f3ca38f..8b4f99594 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -80,6 +80,7 @@ describe('Register', () => { expect(wrapper.find('button[type="submit"]').exists()).toBe(false) }) + it('shows a warning when no valid Email is entered', async () => { wrapper.find('#registerEmail').setValue('no_valid@Email') await flushPromises() diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 6f3e3af12..27448c8b3 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -79,8 +79,8 @@
- - + +
From e61ca1ffa41d0bf0afb358aa3c18fe82d45217ec Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Jul 2021 12:47:21 +0200 Subject: [PATCH 0037/1843] pre merge moritz --- .../Inputs/InputPasswordConfirmation.vue | 16 ++-- frontend/src/views/Pages/Register.spec.js | 11 ++- frontend/src/views/Pages/Register.vue | 82 +++++-------------- frontend/src/views/Pages/ResetPassword.vue | 3 +- .../UserProfile/UserCard_FormUserPasswort.vue | 3 +- 5 files changed, 42 insertions(+), 73 deletions(-) diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue index 08efaccfd..02b1796ef 100644 --- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue +++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue @@ -3,6 +3,7 @@ @@ -22,9 +23,10 @@ @@ -44,6 +46,10 @@ export default { type: Object, required: true, }, + register: { + type: Boolean, + required: false, + } }, data() { return { diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 8b4f99594..3d4c93897 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -61,15 +61,15 @@ describe('Register', () => { }) it('has email input fields', () => { - expect(wrapper.find('#registerEmail').exists()).toBeTruthy() + expect(wrapper.find('#Email-input-field').exists()).toBeTruthy() }) it('has password input fields', () => { - expect(wrapper.find('#registerPassword').exists()).toBeTruthy() + expect(wrapper.find('#inputPassword').exists()).toBeTruthy() }) it('has password repeat input fields', () => { - expect(wrapper.find('#registerPasswordRepeat').exists()).toBeTruthy() + expect(wrapper.find('#inputPasswordRepeat').exists()).toBeTruthy() }) it('has 1 checkbox input fields', () => { @@ -80,11 +80,10 @@ describe('Register', () => { expect(wrapper.find('button[type="submit"]').exists()).toBe(false) }) - it('shows a warning when no valid Email is entered', async () => { - wrapper.find('#registerEmail').setValue('no_valid@Email') + wrapper.find('#Email-input-field').setValue('no_valid@Email') await flushPromises() - await expect(wrapper.find('#registerEmailLiveFeedback').text()).toEqual( + await expect(wrapper.find('#Email-input-field b-form-invalid-feedback').text()).toEqual( 'validations.messages.email', ) }) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 27448c8b3..c9a0d8772 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -76,27 +76,14 @@ - +
- - + - -
-
    -
  • - {{ error }} -
    • -
-
-
-

- {{ $t('site.signup.dont_match') }} - -

-
- - +
{{ $t('reset') }} @@ -65,6 +65,7 @@ export default { sessionId: null, email: null, pending: true, + register: false, } }, methods: { diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue index 7921f4037..59ce13c52 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue @@ -28,7 +28,7 @@ > - +
@@ -66,6 +66,7 @@ export default { passwordRepeat: '', }, }, + register: false, } }, methods: { From 212b56766257539167f76315db4c1b3bee7a48b1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 22 Jul 2021 13:28:34 +0200 Subject: [PATCH 0038/1843] fix lint, fix test, fix merge --- .../Inputs/InputPasswordConfirmation.vue | 7 ++++--- frontend/src/views/Pages/Register.spec.js | 4 ++-- frontend/src/views/Pages/Register.vue | 16 +++++++++++----- frontend/src/views/Pages/ResetPassword.vue | 2 +- .../UserProfile/UserCard_FormUserPasswort.vue | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/Inputs/InputPasswordConfirmation.vue b/frontend/src/components/Inputs/InputPasswordConfirmation.vue index f47f809c4..19d4ab02e 100644 --- a/frontend/src/components/Inputs/InputPasswordConfirmation.vue +++ b/frontend/src/components/Inputs/InputPasswordConfirmation.vue @@ -12,9 +12,9 @@ }" :label="register ? $t('form.password') : $t('form.password_new')" :showAllErrors="true" - :immediate="true" + :immediate="true" :name="createId(register ? $t('form.password') : $t('form.password_new'))" - :placeholder="register ? $t('form.password') : $t('form.password_new')" + :placeholder="register ? $t('form.password') : $t('form.password_new')" v-model="password" > @@ -22,6 +22,7 @@ { }) it('has password input fields', () => { - expect(wrapper.find('input[name="form.password_new"]').exists()).toBeTruthy() + expect(wrapper.find('input[name="form.password"]').exists()).toBeTruthy() }) it('has password repeat input fields', () => { - expect(wrapper.find('input[name="form.password_new_repeat"]').exists()).toBeTruthy() + expect(wrapper.find('input[name="form.passwordRepeat"]').exists()).toBeTruthy() }) it('has 1 checkbox input fields', () => { diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 170365bdb..b0b2e4cd6 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -76,10 +76,10 @@ - +
- @@ -180,15 +180,21 @@ export default { this.form.password.password, ) if (result.success) { - this.$store.dispatch('login', { + /* this.$store.dispatch('login', { sessionId: result.result.data.session_id, - email: this.form.email, + user: { + email: this.form.email, + firstName: this.form.firstname, + lastName: this.form.lastname + } + }) + */ this.form.email = '' this.form.firstname = '' this.form.lastname = '' this.form.password.password = '' - + this.$router.push('/thx/register') } else { this.showError = true diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index 8d1fe05cd..be565333a 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -26,7 +26,7 @@ - +
{{ $t('reset') }} diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue index 59ce13c52..74dc87ddb 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue @@ -28,7 +28,7 @@ > - +
From 318e52eac845836716b46103988b01c282f8bb00 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 23 Jul 2021 12:39:15 +0200 Subject: [PATCH 0039/1843] fix bug, fix lint, fix test --- .../views/Pages/AccountOverview/GddSend/TransactionForm.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue index 01fc8a97a..364f54ac7 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue @@ -104,6 +104,7 @@ rows="3" v-model="form.memo" class="pl-3" + style="font-size: large" > @@ -197,4 +198,9 @@ export default { span.errors { color: red; } +#input-1:focus, +#input-2:focus, +#input-3:focus { + font-weight: bold; +} From 7cfae4e6b1eec4a1d1711233d80dc83b7d61ef9e Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 26 Jul 2021 17:45:21 +0200 Subject: [PATCH 0040/1843] main-content max-width to 1000px --- frontend/src/views/Layout/DashboardLayout_gdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index bf0385400..cec65606a 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -23,7 +23,7 @@ > -
+
From 16a55995581ea4b064a259c17448462a36ef4abe Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 26 Jul 2021 17:48:59 +0200 Subject: [PATCH 0041/1843] fix lint --- frontend/src/views/Layout/DashboardLayout_gdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index cec65606a..1bde53e60 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -23,7 +23,7 @@ > -
+
From 593eb77c0a79ac2e1b8ae276b9685c7097ea7606 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Mon, 26 Jul 2021 18:13:29 +0000 Subject: [PATCH 0042/1843] update list GDT API Call --- .../src/Controller/AppRequestsController.php | 55 ++++++++++++++++++- .../Controller/StateBalancesController.php | 1 - 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 271265257..346efc544 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -25,7 +25,10 @@ class AppRequestsController extends AppController $this->loadComponent('GradidoNumber'); //$this->loadComponent('JsonRpcRequestClient'); //$this->Auth->allow(['add', 'edit']); - $this->Auth->allow(['index', 'sendCoins', 'createCoins', 'getBalance', 'listTransactions', 'getDecayStartBlock']); + $this->Auth->allow([ + 'index', 'sendCoins', 'createCoins', 'getBalance', + 'listTransactions','listGDTTransactions', 'getDecayStartBlock' + ]); } @@ -403,6 +406,56 @@ class AppRequestsController extends AppController $this->set('body', $body); } + public function listGDTTransactions($page = 1, $count = 25, $orderDirection = 'ASC', $session_id = 0) + { + $timeBegin = microtime(true); + $gdtSum = 0; + $gdtCount = -1; + $this->viewBuilder()->setLayout('ajax'); + + $login_result = $this->requestLogin($session_id, false); + + if($login_result !== true) { + return $this->returnJson($login_result); + } + $session = $this->getRequest()->getSession(); + $user = $session->read('StateUser'); + + if(!$user) { + return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'exist a valid session cookie?']); + } + $gdtEntries = $this->JsonRequestClient->sendRequestGDT([ + 'email' => $user['email'], + 'page' => $page, + 'count' => $count, + 'orderDirection' => $orderDirection + ], 'GdtEntries' . DS . 'sumPerEmailApi'); + //var_dump($gdtEntries); + $transactions = []; + if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { + $gdtSum = intval($gdtEntries['data']['sum']); + if(isset($gdtEntries['data']['count'])) { + $gdtCount = intval($gdtEntries['data']['count']); + } + if(isset($gdtEntries['data']['ownEntries'])) { + $transactions = $gdtEntries['data']['ownEntries']; + } + } else { + if($user) { + $this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, $user['id']); + } else { + $this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, 0); + } + } + $timeEnd = microtime(true); + return $this->returnJson([ + 'state' => 'success', + 'transactions' => $transactions, + 'count' => $gdtEntries['data']['count'], + 'timeUsed' => ($timeEnd - $timeBegin) . ' s' + ]); + } + public function getDecayStartBlock() { $transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); diff --git a/community_server/src/Controller/StateBalancesController.php b/community_server/src/Controller/StateBalancesController.php index 5dcc14f02..a87af5e48 100644 --- a/community_server/src/Controller/StateBalancesController.php +++ b/community_server/src/Controller/StateBalancesController.php @@ -94,7 +94,6 @@ class StateBalancesController extends AppController $gdtSum = 0; $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); - if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { $gdtSum = intval($gdtEntries['data']['sum']); } else { From 1dd3d427531497c10792c6a4e1e98166d623fa6d Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Tue, 27 Jul 2021 10:57:16 +0000 Subject: [PATCH 0043/1843] remove double call of sumPerEmailApi --- .../Controller/StateBalancesController.php | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/community_server/src/Controller/StateBalancesController.php b/community_server/src/Controller/StateBalancesController.php index a87af5e48..f150be489 100644 --- a/community_server/src/Controller/StateBalancesController.php +++ b/community_server/src/Controller/StateBalancesController.php @@ -65,33 +65,12 @@ class StateBalancesController extends AppController if($update_balance_result['success'] !== true) { $this->addAdminError('StateBalances', 'overview', $update_balance_result, $user['id']); } - - // sendRequestGDT - // listPerEmailApi - - $gdtSum = 0; - //if('admin' === $user['role']) { - $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); - //var_dump($gdtEntries); - if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { - $gdtSum = intval($gdtEntries['data']['sum']); - } else { - if($user) { - $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id']); - } else { - $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, 0); - } - } - //} - // - // + $stateBalancesTable = TableRegistry::getTableLocator()->get('StateBalances'); $stateUserTransactionsTable = TableRegistry::getTableLocator()->get('StateUserTransactions'); - $transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); - + $transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); $stateBalancesTable->updateBalances($user['id']); - $gdtSum = 0; $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { From 3b0c3ee53f096403ddae9a7703a31e7dde227b0e Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 28 Jul 2021 13:19:56 +0200 Subject: [PATCH 0044/1843] mobile friendly, add text, change text --- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + .../src/views/Pages/UserProfile/UserCard.vue | 37 +++++++++---------- .../UserProfile/UserCard_FormUserData.spec.js | 6 +-- .../UserProfile/UserCard_FormUserData.vue | 31 ++++++---------- .../UserProfile/UserCard_FormUserPasswort.vue | 20 +++++++--- .../src/views/Pages/UserProfileOverview.vue | 9 +++-- 7 files changed, 54 insertions(+), 51 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 75c07acf8..daf2bf2e9 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -59,6 +59,7 @@ "password_new_repeat":"neues Passwort wiederholen", "change": "ändern", "change-password": "Passwort ändern", + "change-name": "Name ändern", "amount":"Betrag", "memo":"Nachricht", "message":"Nachricht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 7286c8153..9e574a9ce 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -59,6 +59,7 @@ "password_new_repeat":"Repeat new password", "change": "change", "change-password": "Change password", + "change-name": "Change name", "amount":"Amount", "memo":"Message", "message":"Message", diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue index 891bddf6a..6beee221a 100755 --- a/frontend/src/views/Pages/UserProfile/UserCard.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard.vue @@ -3,26 +3,23 @@
- - -
-
- - {{ $n(balance, 'decimal') }} - - GDD -
-
- {{ transactionCount }} - {{ $t('transactions') }} -
-
- -- - {{ $t('community') }} -
-
- - + +
+
+ + {{ $n(balance, 'decimal') }} + + GDD +
+
+ {{ transactionCount }} + {{ $t('transactions') }} +
+
+ -- + {{ $t('community') }} +
+
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue new file mode 100644 index 000000000..775d4b70e --- /dev/null +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue @@ -0,0 +1,46 @@ + + + + diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue index e6a25b436..75d296306 100644 --- a/frontend/src/views/Pages/UserProfileTransactionList.vue +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -10,6 +10,7 @@ :show-pagination="true" @update-transactions="updateTransactions" /> + @@ -17,17 +18,22 @@ From c4a01aec7383215574bdf04e5903d1dcad25f383 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Tue, 3 Aug 2021 15:44:51 +0000 Subject: [PATCH 0065/1843] fill missing lines of list gdt transactions --- .../src/Controller/AppRequestsController.php | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 346efc544..1ca96b3f8 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -424,21 +424,35 @@ class AppRequestsController extends AppController if(!$user) { return $this->returnJson(['state' => 'error', 'msg' => 'user not found', 'details' => 'exist a valid session cookie?']); } + $gdtEntries = $this->JsonRequestClient->sendRequestGDT([ 'email' => $user['email'], 'page' => $page, 'count' => $count, 'orderDirection' => $orderDirection - ], 'GdtEntries' . DS . 'sumPerEmailApi'); - //var_dump($gdtEntries); + ], 'GdtEntries' . DS . 'listPerEmailApi'); + $transactions = []; + $result = ['state' => 'success']; if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { - $gdtSum = intval($gdtEntries['data']['sum']); + $gdtSum = 0; + if(isset($gdtEntries['data']['gdtSumPerEmail'])) { + foreach($gdtEntries['data']['gdtSumPerEmail'] as $email => $sum) { + $gdtSum += floatval($sum/100.0); + } + } + $result['sum'] = $gdtSum; if(isset($gdtEntries['data']['count'])) { - $gdtCount = intval($gdtEntries['data']['count']); + $result['count'] = intval($gdtEntries['data']['count']); } if(isset($gdtEntries['data']['ownEntries'])) { - $transactions = $gdtEntries['data']['ownEntries']; + $result['ownEntries'] = $gdtEntries['data']['ownEntries']; + } + if(isset($gdtEntries['data']['publisherPath'])) { + $result['publisherPath'] = $gdtEntries['data']['publisherPath']; + } + if(isset($gdtEntries['data']['connectEntrys'])) { + $result['connectEntrys'] = $gdtEntries['data']['connectEntrys']; } } else { if($user) { @@ -448,12 +462,9 @@ class AppRequestsController extends AppController } } $timeEnd = microtime(true); - return $this->returnJson([ - 'state' => 'success', - 'transactions' => $transactions, - 'count' => $gdtEntries['data']['count'], - 'timeUsed' => ($timeEnd - $timeBegin) . ' s' - ]); + + $result['timeUsed'] = ($timeEnd - $timeBegin) . ' s'; + return $this->returnJson($result); } public function getDecayStartBlock() From 729aa02035b567c02da8200743a68042377cba79 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 3 Aug 2021 18:54:31 +0200 Subject: [PATCH 0066/1843] fix update user infos --- backend/src/graphql/inputs/LoginUserInput.ts | 15 ++++++----- backend/src/graphql/resolvers/UserResolver.ts | 26 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts index 68ddad628..1668c5191 100644 --- a/backend/src/graphql/inputs/LoginUserInput.ts +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -82,22 +82,25 @@ export class UpdateUserInfosArgs { @Field(() => String) email!: string - @Field(() => String) + @Field({ nullable: true }) firstName?: string - @Field(() => String) + @Field({ nullable: true }) lastName?: string - @Field(() => String) + @Field({ nullable: true }) + description?: string + + @Field({ nullable: true }) username?: string - @Field(() => String) + @Field({ nullable: true }) language?: string - @Field(() => String) + @Field({ nullable: true }) password?: string - @Field(() => String) + @Field({ nullable: true }) passwordNew?: string } diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 4361bd0ed..c50b8d9f0 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -137,24 +137,26 @@ export class UserResolver { { sessionId, email, - firstName = '', - lastName = '', - username = '', - language = '', - password = '', - passwordNew = '', + firstName, + lastName, + description, + username, + language, + password, + passwordNew, }: UpdateUserInfosArgs, ): Promise { const payload = { session_id: sessionId, email, update: { - 'User.first_name': firstName !== '' ? firstName : undefined, - 'User.last_name': lastName !== '' ? lastName : undefined, - 'User.username': username !== '' ? username : undefined, - 'User.language': language !== '' ? language : undefined, - 'User.password': passwordNew !== '' ? passwordNew : undefined, - 'User.password_old': password !== '' ? password : undefined, + 'User.first_name': firstName || undefined, + 'User.last_name': lastName || undefined, + 'User.description': description || undefined, + 'User.username': username || undefined, + 'User.language': language || undefined, + 'User.password': passwordNew || undefined, + 'User.password_old': password || undefined, }, } const result = await apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) From 403826a6d9ad5e512ce29b1b2f2cb4ac43c3caa8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 Aug 2021 11:51:50 +0200 Subject: [PATCH 0067/1843] final changes before merge --- backend/src/apis/loginAPI.ts | 2 - backend/src/graphql/inputs/LoginUserInput.ts | 31 +------------- .../src/graphql/inputs/TransactionInput.ts | 24 ++--------- backend/src/graphql/models/Decay.ts | 10 ++--- backend/src/graphql/models/Server.ts | 16 -------- backend/src/graphql/models/Transaction.ts | 7 +++- backend/src/graphql/models/UserInfoData.ts | 40 ------------------- backend/src/graphql/resolvers/UserResolver.ts | 9 ++--- 8 files changed, 17 insertions(+), 122 deletions(-) delete mode 100644 backend/src/graphql/models/Server.ts delete mode 100644 backend/src/graphql/models/UserInfoData.ts diff --git a/backend/src/apis/loginAPI.ts b/backend/src/apis/loginAPI.ts index 965b1ccfc..c1f99dc46 100644 --- a/backend/src/apis/loginAPI.ts +++ b/backend/src/apis/loginAPI.ts @@ -32,8 +32,6 @@ export const apiGet = async (url: string): Promise => { return { success: true, data: result.data } }) .catch((error) => { - // eslint-disable-next-line no-console - console.log('IN apiGet.ERROR: ', { success: false, result: error }) return { success: false, data: error.message } }) } diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts index 1668c5191..3d5299d84 100644 --- a/backend/src/graphql/inputs/LoginUserInput.ts +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -1,22 +1,5 @@ import { ArgsType, Field } from 'type-graphql' -/* -@InputType() -export class LoginUserInput { - @Field({ nullable: true }) - username?: string - - @Field({ nullable: true }) - email?: string - - @Field({ nullable: true }) - pubkey?: string - - @Field() - password: string -} -*/ - @ArgsType() export class UnsecureLoginArgs { @Field(() => String) @@ -41,18 +24,6 @@ export class CreateUserArgs { password: string } -@ArgsType() -export class SendEmailArgs { - @Field(() => String) - email: string - - @Field(() => Number) - emailText: number - - @Field(() => String) - emailVerificationCodeType: string -} - @ArgsType() export class GetUserInfoArgs { @Field(() => Number) @@ -109,6 +80,6 @@ export class CheckUsernameArgs { @Field(() => String) username: string - @Field(() => Number) + @Field(() => Number, { nullable: true }) groupId?: number } diff --git a/backend/src/graphql/inputs/TransactionInput.ts b/backend/src/graphql/inputs/TransactionInput.ts index 049a9b2a9..7f83cd82d 100644 --- a/backend/src/graphql/inputs/TransactionInput.ts +++ b/backend/src/graphql/inputs/TransactionInput.ts @@ -1,14 +1,14 @@ -import { ArgsType, Field } from 'type-graphql' +import { ArgsType, Field, Int } from 'type-graphql' @ArgsType() export class TransactionListInput { @Field(() => Number) sessionId: number - @Field(() => Number) + @Field(() => Int) firstPage: number - @Field(() => Number) + @Field(() => Int) items: number @Field(() => String) @@ -29,21 +29,3 @@ export class TransactionSendArgs { @Field(() => String) memo: string } - -@ArgsType() -export class TransactionCreateArgs { - @Field(() => Number) - sessionId: number - - @Field(() => String) - email: string - - @Field(() => Number) - amount: number - - @Field(() => String) - memo: string - - @Field(() => Date) - targetDate: Date -} diff --git a/backend/src/graphql/models/Decay.ts b/backend/src/graphql/models/Decay.ts index 3d918ce7a..c6ce85548 100644 --- a/backend/src/graphql/models/Decay.ts +++ b/backend/src/graphql/models/Decay.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { ObjectType, Field } from 'type-graphql' +import { ObjectType, Field, Int } from 'type-graphql' @ObjectType() export class Decay { @@ -14,12 +14,12 @@ export class Decay { @Field(() => Number) balance: number - @Field({ nullable: true }) + @Field(() => Int, { nullable: true }) decayStart?: number - @Field({ nullable: true }) + @Field(() => Int, { nullable: true }) decayEnd?: number - @Field(() => String) - decayDuration: string + @Field(() => String, { nullable: true }) + decayDuration?: string } diff --git a/backend/src/graphql/models/Server.ts b/backend/src/graphql/models/Server.ts deleted file mode 100644 index 1b6f01627..000000000 --- a/backend/src/graphql/models/Server.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { Entity, BaseEntity } from 'typeorm' -import { ObjectType, Field } from 'type-graphql' - -@Entity() -@ObjectType() -export class Server extends BaseEntity { - constructor(json: any) { - super() - this.loginServerPath = json.login_server_path - } - - @Field(() => String) - loginServerPath: string -} diff --git a/backend/src/graphql/models/Transaction.ts b/backend/src/graphql/models/Transaction.ts index 61670b06a..fb17866c4 100644 --- a/backend/src/graphql/models/Transaction.ts +++ b/backend/src/graphql/models/Transaction.ts @@ -11,6 +11,7 @@ import { Decay } from './Decay' @ObjectType() export class Transaction { constructor(json: any) { + // console.log('Transaction constructor', json) this.type = json.type this.balance = Number(json.balance) this.decayStart = json.decay_start @@ -21,7 +22,7 @@ export class Transaction { this.name = json.name this.email = json.email this.date = json.date - this.decay = json.decay + this.decay = json.decay ? new Decay(json.decay) : undefined } @Field(() => String) @@ -66,7 +67,9 @@ export class TransactionList { this.balance = Number(json.balance) this.decay = Number(json.decay) this.decayDate = json.decay_date - this.transactions = json.transactions + this.transactions = json.transactions.map((el: any) => { + return new Transaction(el) + }) } @Field(() => Number) diff --git a/backend/src/graphql/models/UserInfoData.ts b/backend/src/graphql/models/UserInfoData.ts deleted file mode 100644 index 2e65aca82..000000000 --- a/backend/src/graphql/models/UserInfoData.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { Entity, BaseEntity } from 'typeorm' -import { ObjectType, Field } from 'type-graphql' -import { Server } from './Server' -import { User } from './User' - -@Entity() -@ObjectType() -export class UserInfoData extends BaseEntity { - constructor(json: any) { - super() - this.state = json.state - this.userData = new User(json.user_data) - this.server = new Server(json.server) - this.errors = json.errors - } - - @Field(() => String) - state: string - - @Field(() => User) - userData: User - - @Field(() => Server) - server: Server - - @Field(() => [String]) - errors: [string] -} - -@Entity() -@ObjectType() -export class GetUserInfoResponse extends BaseEntity { - @Field(() => Boolean) - success: boolean - - @Field(() => UserInfoData) - data: UserInfoData -} diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index c50b8d9f0..acd70ab5c 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -12,7 +12,6 @@ import { CheckUsernameArgs, CreateUserArgs, GetUserInfoArgs, - SendEmailArgs, UnsecureLoginArgs, UpdateUserInfosArgs, } from '../inputs/LoginUserInput' @@ -89,16 +88,14 @@ export class UserResolver { return 'success' } - // TODO @Query(() => SendPasswordResetEmailResponse) async sendResetPasswordEmail( - @Args() - { email, emailText = 7, emailVerificationCodeType = 'resetPassword' }: SendEmailArgs, + @Arg('email') email: string, ): Promise { const payload = { email, - email_text: emailText, - email_verification_code_type: emailVerificationCodeType, + email_text: 7, + email_verification_code_type: 'resetPassword', } const response = await apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', payload) if (!response.success) throw new Error(response.data) From 8ad64d85a06b630a69cb9240de637d35c3c757d8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 Aug 2021 11:58:15 +0200 Subject: [PATCH 0068/1843] remove remains of GetUserInfo --- backend/src/graphql/inputs/LoginUserInput.ts | 9 --------- backend/src/graphql/resolvers/UserResolver.ts | 13 ------------- 2 files changed, 22 deletions(-) diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts index 3d5299d84..19326689e 100644 --- a/backend/src/graphql/inputs/LoginUserInput.ts +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -24,15 +24,6 @@ export class CreateUserArgs { password: string } -@ArgsType() -export class GetUserInfoArgs { - @Field(() => Number) - sessionId: number - - @Field(() => String) - email: string -} - @ArgsType() export class ChangePasswordArgs { @Field(() => Number) diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index acd70ab5c..cad1642f1 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -2,7 +2,6 @@ import { Resolver, Query, Args, Arg } from 'type-graphql' import CONFIG from '../../config' import { CheckUsernameResponse } from '../models/CheckUsernameResponse' -import { GetUserInfoResponse } from '../models/UserInfoData' import { LoginResponse } from '../models/LoginResponse' import { LoginViaVerificationCode } from '../models/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../models/SendPasswordResetEmailResponse' @@ -11,7 +10,6 @@ import { ChangePasswordArgs, CheckUsernameArgs, CreateUserArgs, - GetUserInfoArgs, UnsecureLoginArgs, UpdateUserInfosArgs, } from '../inputs/LoginUserInput' @@ -102,17 +100,6 @@ export class UserResolver { return new SendPasswordResetEmailResponse(response.data) } - @Query(() => GetUserInfoResponse) - // eslint-disable-next-line @typescript-eslint/no-explicit-any - async getUserInfos(@Args() { sessionId, email }: GetUserInfoArgs): Promise { - const payload = { - session_id: sessionId, - email: email, - ask: ['user.first_name', 'user.last_name'], - } - return apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', payload) - } - @Query(() => String) async resetPassword( @Args() From cf8262c6cc58e6553c05f9e9021fdb673e2c534c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 Aug 2021 16:50:41 +0200 Subject: [PATCH 0069/1843] fix: cancel edit is called when cancel is clicked --- .../views/Pages/UserProfile/UserCard_FormUserData.spec.js | 6 +++--- .../src/views/Pages/UserProfile/UserCard_FormUserData.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js index 6df58c8e3..5237a8d63 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.spec.js @@ -86,9 +86,9 @@ describe('UserCard_FormUsername', () => { await wrapper.findAll('input').at(1).setValue('Lustiger') await wrapper.find('textarea').setValue('Keine Nickelbrille') await wrapper.find('svg.bi-x-circle').trigger('click') - expect(wrapper.findAll('div.col').at(2).text()).toBe('Petra') - expect(wrapper.findAll('div.col').at(4).text()).toBe('Lustiger') - expect(wrapper.findAll('div.col').at(6).text()).toBe('Keine Nickelbrille') + expect(wrapper.findAll('div.col').at(2).text()).toBe('Peter') + expect(wrapper.findAll('div.col').at(4).text()).toBe('Lustig') + expect(wrapper.findAll('div.col').at(6).text()).toBe('') }) it('has a submit button', () => { diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue index 8f278a4f6..17598e628 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue @@ -8,7 +8,7 @@ - + {{ $t('form.change-name') }} From dcf3b78b953c74b51a944ef00449b71d58583541 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 Aug 2021 17:22:28 +0200 Subject: [PATCH 0070/1843] remove unused class/css, check that email is present before rendering qrcode --- frontend/src/components/Inputs/InputEmail.vue | 10 ---------- frontend/src/components/SidebarPlugin/SideBar.vue | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue index b83d25fdb..2aa153486 100644 --- a/frontend/src/components/Inputs/InputEmail.vue +++ b/frontend/src/components/Inputs/InputEmail.vue @@ -15,7 +15,6 @@ type="email" :state="validated ? valid : false" trim - class="email-form-input" > {{ errors[0] }} @@ -60,12 +59,3 @@ export default { }, } - diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 495dec3d2..c3f991297 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -16,7 +16,11 @@
    - +
From 343789c30911bdf5e0bde2c4c6c871b973d33149 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Thu, 5 Aug 2021 11:18:31 +0000 Subject: [PATCH 0071/1843] handing over result from updated gdt server --- .../src/Controller/AppRequestsController.php | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 1ca96b3f8..136b75080 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -434,26 +434,11 @@ class AppRequestsController extends AppController $transactions = []; $result = ['state' => 'success']; - if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { - $gdtSum = 0; - if(isset($gdtEntries['data']['gdtSumPerEmail'])) { - foreach($gdtEntries['data']['gdtSumPerEmail'] as $email => $sum) { - $gdtSum += floatval($sum/100.0); - } - } - $result['sum'] = $gdtSum; - if(isset($gdtEntries['data']['count'])) { - $result['count'] = intval($gdtEntries['data']['count']); - } - if(isset($gdtEntries['data']['ownEntries'])) { - $result['ownEntries'] = $gdtEntries['data']['ownEntries']; - } - if(isset($gdtEntries['data']['publisherPath'])) { - $result['publisherPath'] = $gdtEntries['data']['publisherPath']; - } - if(isset($gdtEntries['data']['connectEntrys'])) { - $result['connectEntrys'] = $gdtEntries['data']['connectEntrys']; - } + if('success' == $gdtEntries['state']) { + $timeEnd = microtime(true); + $gdtEntries['data']['timeUsed'] = $timeEnd - $timeBegin; + return $this->returnJson($gdtEntries['data']); + } else { if($user) { $this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, $user['id']); @@ -461,10 +446,7 @@ class AppRequestsController extends AppController $this->addAdminError('StateBalancesController', 'ajaxGdtOverview', $gdtEntries, 0); } } - $timeEnd = microtime(true); - - $result['timeUsed'] = ($timeEnd - $timeBegin) . ' s'; - return $this->returnJson($result); + return $this->returnJson(['state' => 'error', 'msg' => 'error by requesting gdt server', 'details' => $gdtEntries]); } public function getDecayStartBlock() From 402a0af5c1a0476c9f025c37cc0f1c84a8afca1c Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Thu, 5 Aug 2021 11:47:04 +0000 Subject: [PATCH 0072/1843] add doc --- docu/community-server.api.md | 110 +++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/docu/community-server.api.md b/docu/community-server.api.md index 64127dd81..9a153101d 100644 --- a/docu/community-server.api.md +++ b/docu/community-server.api.md @@ -125,6 +125,116 @@ Transaction: - `creation_amount`: only for creation transaction, created account before decay - `target_date`: only by creation transaction, target date for creation, start time for decay calculation (if < as global decay start time) +## List GDT Transactions +`GET http://localhost/api/listGDTTransactions/[1]/[25]/[DESC]/[session_id]` +Parts symbolized by [] are optional + - first parameter (1) is page for paging + - second parameter (25) is count for paging + - third parameter is ordering of resulting array, default is ASC + - fourth parameter is session_id (session will be searched in php session and GRADIDO_LOGIN cookie and if not found use this ) + +#### Paging +With count you say how many entrys you like to have in the result. +With page you say on which page you are. +For example 50 transactions are in db. +With 1/25 you get the first 25 transactions (1-25) +With 2/20 you get the second 20 transactions (21-40) + +### Response +Assuming session was valid and gdt server was setup correct +{ + "state": "success", + "count": 4, + "gdtEntries": [ + { + "id": 1, + "amount": 99, + "date": "2020-01-01T13:47:12+00:00", + "email": "dariofrodo@gmx.de", + "comment": "", + "coupon_code": null, + "gdt_entry_type_id": 1, + "factor": 18, + "amount2": 0, + "factor2": 1, + "gdt": 1782 + }, + { + "id": 10, + "amount": 100.12, + "date": "2021-07-28T13:58:00+00:00", + "comment": null, + "coupon_code": "", + "gdt_entry_type_id": 4, + "factor": 15, + "amount2": 0, + "factor2": 0.05, + "gdt": 75.09000000000002, + "publisher": { + "id": 12, + "first_name": "Dario", + "last_name": "Frodo", + "email": "dariofrodo@gmx.de" + } + }, + { + "id": 6, + "amount": 1782, + "date": "2021-07-30T13:21:46+00:00", + "email": "dariofrodo@gmx.de", + "comment": "Event 20-20", + "coupon_code": null, + "gdt_entry_type_id": 7, + "factor": 0.2, + "amount2": 0, + "factor2": 1, + "gdt": 356.40000000000006 + }, + { + "id": 8, + "amount": 10, + "date": "2021-07-31T13:58:00+00:00", + "comment": null, + "coupon_code": "", + "gdt_entry_type_id": 4, + "factor": 15, + "amount2": 0, + "factor2": 0.05, + "gdt": 7.5, + "publisher": { + "id": 12, + "first_name": "Dario", + "last_name": "Frodo", + "email": "dariofrodo@gmx.de" + } + } + ], + "gdtSum": 2220.99, + "timeUsed": 0.19156503677368165 +} + +- `count`: Count of total gdt transactions for user +- `gdtEntries`: array with gdt entries, sort by date + - `amount`: amount of payed money in euro, expect by gdt_entry_type_id = 7, then it is GDT Sum for Global Modificator time span + - `date`: date of transaction with let create gdt transaction, date for picking factor and Global Modificator + - `comment`: custom comment or Global Modificator name if gdt_entry_type_id = 7 + - `gdt_entry_type_id`: type of gdt entry + (1) Form: Single GDT Entry directly created by admin via formular + (2) CVS: Created by importing a CVS-List with multiple GDT Entries + (3) Elopage: Automatic created by Elopage Transaction (with revenue > 0 and payment state success) + (4) Elopage Publisher: Automatic created by Elopage Transaction (with revenue > 0 and payment state success) for publisher, containing publisher object + (5) Digistore: Automatic created by Digistore Transaction + (6) CVS2: Created by importing a CVS-List with multiple GDT Entries, other format (used by Bernds old Accounting Tool) + (7) Global Modificator: Global Modificator which grand percental bonus on GDT in possession in event time span + - `factor`: Mulitplication factor for calculating gdt, change(d) over time + - `amount2`: Bonus add amount for gdt, sparly used + - `factor2`: Bonus mulitplication factor used by elopage publisher entry + - `gdt`: GDT Value, calculatedt from other value: gdt = amount * factor * factor2 + amount2 + - `publisher`: exist only on Elopage Publisher (gdt_entry_type_id = 4) GDT Entries +- `gdtSum`: Total GDT Sum of user +- `timeUsed`: GDT Server isn't optimized, this is for easy checking if it is still fast enough + + ## Creation transaction Makes a creation transaction to create new Gradido From 79f80e2af8742657f4acfb39f15b5de4ea31b96e Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Thu, 5 Aug 2021 12:12:50 +0000 Subject: [PATCH 0073/1843] update doc --- docu/community-server.api.md | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/docu/community-server.api.md b/docu/community-server.api.md index 9a153101d..5bdb468bb 100644 --- a/docu/community-server.api.md +++ b/docu/community-server.api.md @@ -163,19 +163,14 @@ Assuming session was valid and gdt server was setup correct "id": 10, "amount": 100.12, "date": "2021-07-28T13:58:00+00:00", + "email": "tester2@gmail.com", "comment": null, "coupon_code": "", "gdt_entry_type_id": 4, "factor": 15, "amount2": 0, "factor2": 0.05, - "gdt": 75.09000000000002, - "publisher": { - "id": 12, - "first_name": "Dario", - "last_name": "Frodo", - "email": "dariofrodo@gmx.de" - } + "gdt": 75.09000000000002 }, { "id": 6, @@ -194,35 +189,31 @@ Assuming session was valid and gdt server was setup correct "id": 8, "amount": 10, "date": "2021-07-31T13:58:00+00:00", + "email": "tester1@gmail.com", "comment": null, "coupon_code": "", "gdt_entry_type_id": 4, "factor": 15, "amount2": 0, "factor2": 0.05, - "gdt": 7.5, - "publisher": { - "id": 12, - "first_name": "Dario", - "last_name": "Frodo", - "email": "dariofrodo@gmx.de" - } + "gdt": 7.5 } ], "gdtSum": 2220.99, - "timeUsed": 0.19156503677368165 + "timeUsed": 0.012517929077148438 } - `count`: Count of total gdt transactions for user - `gdtEntries`: array with gdt entries, sort by date - `amount`: amount of payed money in euro, expect by gdt_entry_type_id = 7, then it is GDT Sum for Global Modificator time span - `date`: date of transaction with let create gdt transaction, date for picking factor and Global Modificator + - `email`: email of user which has payed money, for gdt_entry_type_id = 4 it is the email of user who was recruited - `comment`: custom comment or Global Modificator name if gdt_entry_type_id = 7 - `gdt_entry_type_id`: type of gdt entry (1) Form: Single GDT Entry directly created by admin via formular (2) CVS: Created by importing a CVS-List with multiple GDT Entries (3) Elopage: Automatic created by Elopage Transaction (with revenue > 0 and payment state success) - (4) Elopage Publisher: Automatic created by Elopage Transaction (with revenue > 0 and payment state success) for publisher, containing publisher object + (4) Elopage Publisher: Automatic created by Elopage Transaction (with revenue > 0 and payment state success) for publisher (5) Digistore: Automatic created by Digistore Transaction (6) CVS2: Created by importing a CVS-List with multiple GDT Entries, other format (used by Bernds old Accounting Tool) (7) Global Modificator: Global Modificator which grand percental bonus on GDT in possession in event time span @@ -230,7 +221,6 @@ Assuming session was valid and gdt server was setup correct - `amount2`: Bonus add amount for gdt, sparly used - `factor2`: Bonus mulitplication factor used by elopage publisher entry - `gdt`: GDT Value, calculatedt from other value: gdt = amount * factor * factor2 + amount2 - - `publisher`: exist only on Elopage Publisher (gdt_entry_type_id = 4) GDT Entries - `gdtSum`: Total GDT Sum of user - `timeUsed`: GDT Server isn't optimized, this is for easy checking if it is still fast enough From 69cb87044456ca94eadbfee359e465f96cfda479 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 5 Aug 2021 14:31:17 +0200 Subject: [PATCH 0074/1843] optimize --- backend/src/graphql/models/GdtEntryList.ts | 30 ++++++---------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/backend/src/graphql/models/GdtEntryList.ts b/backend/src/graphql/models/GdtEntryList.ts index 257691e60..233d8472d 100644 --- a/backend/src/graphql/models/GdtEntryList.ts +++ b/backend/src/graphql/models/GdtEntryList.ts @@ -19,37 +19,23 @@ export class GdtSumPerEmail { export class GdtEntryList { constructor(json: any) { this.state = json.state - this.moreEntrysAsShown = json.moreEntrysAsShown - this.ownEntries = [] - if (typeof json.ownEntries !== undefined) { - for (const entry in json.ownEntries) { - // eslint-disable-next-line no-console - console.log(entry) - this.ownEntries.push(new GdtEntry(json.ownEntries[entry])) - } - } - this.gdtSumPerEmail = [] - for (const email in json.gdtSumPerEmail) { - this.gdtSumPerEmail.push(new GdtSumPerEmail(email, json.gdtSumPerEmail[email])) - } - this.email = json.email + this.count = json.count + this.gdtEntries = json.gdtEntries ? json.gdtEntries.map((json: any) => new GdtEntry(json)) : [] + this.gdtSum = json.gdtSum this.timeUsed = json.timeUsed } @Field(() => String) state: string - @Field(() => Boolean) - moreEntrysAsShown: boolean + @Field(() => Number) + count: number @Field(() => [GdtEntry]) - ownEntries: GdtEntry[] + gdtEntries: GdtEntry[] - @Field(() => [GdtSumPerEmail]) - gdtSumPerEmail: GdtSumPerEmail[] - - @Field(() => String) - email: string + @Field(() => Number) + gdtSum: number @Field(() => Number) timeUsed: number From afdf112a9c418782e88d9621c24f2bace0f9119b Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 5 Aug 2021 14:54:40 +0200 Subject: [PATCH 0075/1843] call createTransaction directly from login-server --- backend/src/graphql/resolvers/TransactionResolver.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolvers/TransactionResolver.ts b/backend/src/graphql/resolvers/TransactionResolver.ts index a2853f08a..c09ce8e15 100644 --- a/backend/src/graphql/resolvers/TransactionResolver.ts +++ b/backend/src/graphql/resolvers/TransactionResolver.ts @@ -23,12 +23,14 @@ export class TransactionResolver { ): Promise { const payload = { session_id: sessionId, - email, + target_email: email, amount, memo, auto_sign: true, + transaction_type: 'transfer', + blockchain_type: 'mysql' } - const result = await apiPost(CONFIG.COMMUNITY_API_URL + 'sendCoins', payload) + const result = await apiPost(CONFIG.LOGIN_API_URL + 'createTransaction', payload) if (!result.success) { throw new Error(result.data) } From c17871f82b44d7fd593a62fcdac9e91ef046d0a3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 5 Aug 2021 15:40:46 +0200 Subject: [PATCH 0076/1843] pull dario --- frontend/README.md | 4 +- frontend/src/apis/communityAPI.js | 8 +- .../src/views/Layout/DashboardLayout_gdd.vue | 115 ++++++++---------- .../AccountOverview/GddTransactionGdtList.vue | 46 ++++--- .../Pages/UserProfileTransactionList.vue | 10 +- 5 files changed, 96 insertions(+), 87 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index d94034c15..e9ac0b097 100755 --- a/frontend/README.md +++ b/frontend/README.md @@ -342,7 +342,7 @@ Ein GDT Eintrag sieht so aus: ``` { "id": 8857, - "amount": 1000, // = 10,00 Euro + "amount": 1000, // GDT "date": "2020-06-17T14:12:00+00:00", "email": "foerderkreis-1@gradido.org", "comment": null, @@ -379,8 +379,10 @@ Bis zum 5. (Bernd ist 2.) Diese Beziehung wird durch die connectEntries dargestellt. Insbesondere durch den publishersPath, connect enthält einfach nur alle mögliche Daten. + # TODO TODO: Update GDT-Server um paging und Zugriff auf alle Einträge zu erhalten, optimierter Zugriff GET https://staging.gradido.net/state-balances/ajaxGdtTransactions Liefert wenn alles in Ordnung ist: +wenn nicht type 7 dann "amount" in euro ansonsten in GDT \ No newline at end of file diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index 65b9d40b9..ed1d336df 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -45,10 +45,10 @@ const communityAPI = { `${CONFIG.COMMUNITY_API_URL}state-balances/ajaxGdtOverview/${firstPage}/${items}/${order}/${sessionId}`, ) }, - //http://localhost/vue/public/json-example/admin_transactionGdt_list.json - //http://localhost/state-balances/ajaxGdtOverview - /* create: async (sessionId, email, amount, memo, target_date = new Date() ) => { - const payload = { + /* http://localhost/vue/public/json-example/admin_transactionGdt_list.json + http://localhost/state-balances/ajaxGdtOverview + create: async (sessionId, email, amount, memo, target_date = new Date() ) => { + const payload = { sessionId, email, amount, diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 302fe5039..2b07e3884 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -49,7 +49,6 @@
-
-
@@ -75,11 +72,9 @@ import 'perfect-scrollbar/css/perfect-scrollbar.css' import loginAPI from '../../apis/loginAPI' import ContentFooter from './ContentFooter.vue' -// import DashboardContent from './Content.vue'; import { FadeTransition } from 'vue2-transitions' import communityAPI from '../../apis/communityAPI' import VueQrcode from 'vue-qrcode' -//import { gdt } from '../../../public/json-example/admin_transactionGdt_list.json' function hasElement(className) { return document.getElementsByClassName(className).length > 0 @@ -112,7 +107,7 @@ export default { transactionCount: 0, pending: true, transactionsGdt: [], - } + } }, methods: { initScrollbar() { @@ -147,60 +142,59 @@ export default { // what to do when loading balance fails? } }, - async updateGdt(){ - //this.transactionsGdt = gdt - // const result = await communityAPI.transactionsGdt( - // this.$store.state.sessionId - // ) - - this.transactionsGdt = [{"state":"success", "gdt": - [ - { - "id": 8821, - "amount": 1000, - "date": "2020-08-12T14:12:00+00:00", - "email": "foerderkreis-1@gradido.org", - "comment": null, - "coupon_code": "", - "gdt_entry_type_id": 4, - "factor": "20.0000", - "amount2": 0, - "factor2": "0.0500", - "gdt": 1000 - }, - { - "id": 8552, - "amount": 1000, - "date": "2020-06-17T14:12:00+00:00", - "email": "foerderkreis-1@gradido.org", - "comment": null, - "coupon_code": "", - "gdt_entry_type_id": 4, - "factor": "20.0000", - "amount2": 0, - "factor2": "0.0500", - "gdt": 1000 - }, - { - "id": 8317, - "amount": 1000, - "date": "2020-03-16T14:12:00+00:00", - "email": "foerderkreis-1@gradido.org", - "comment": null, - "coupon_code": "", - "gdt_entry_type_id": 4, - "factor": "20.0000", - "amount2": 0, - "factor2": "0.0500", - "gdt": 1000 - } - ], - "transactionGdtExecutingCount": 3000, - "count": 3 -}] + async updateGdt() { + // const result = await communityAPI.transactionsGdt( + // this.$store.state.sessionId + // ) - //console.log("DashboardLayout_gdd.vue") - //console.log(this.result) + this.transactionsGdt = [ + { + state: 'success', + gdt: [ + { + id: 8821, + amount: 1000, + date: '2020-08-12T14:12:00+00:00', + email: 'foerderkreis-1@gradido.org', + comment: null, + coupon_code: '', + gdt_entry_type_id: 4, + factor: '20.0000', + amount2: 0, + factor2: '0.0500', + gdt: 1000, + }, + { + id: 8552, + amount: 1000, + date: '2020-06-17T14:12:00+00:00', + email: 'foerderkreis-1@gradido.org', + comment: null, + coupon_code: '', + gdt_entry_type_id: 4, + factor: '20.0000', + amount2: 0, + factor2: '0.0500', + gdt: 1000, + }, + { + id: 8317, + amount: 1000, + date: '2020-03-16T14:12:00+00:00', + email: 'foerderkreis-1@gradido.org', + comment: null, + coupon_code: '', + gdt_entry_type_id: 4, + factor: '20.0000', + amount2: 0, + factor2: '0.0500', + gdt: 1000, + }, + ], + transactionGdtExecutingCount: 3000, + count: 3, + }, + ] }, updateBalance(ammount) { this.balance -= ammount @@ -209,7 +203,6 @@ export default { mounted() { this.initScrollbar() this.updateGdt() - console.log(this.transactionsGdt) }, } diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue index 775d4b70e..f19db82d3 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue @@ -1,26 +1,36 @@ @@ -34,7 +44,7 @@ export default { methods: { updateGdt() { this.$emit('update-gdt') - }, + }, }, } diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue index 75d296306..20e9bcb93 100644 --- a/frontend/src/views/Pages/UserProfileTransactionList.vue +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -1,6 +1,6 @@ - diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue new file mode 100644 index 000000000..1155fded5 --- /dev/null +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -0,0 +1,79 @@ + + + + diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue index 20e9bcb93..d50000de0 100644 --- a/frontend/src/views/Pages/UserProfileTransactionList.vue +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -1,36 +1,46 @@ - + From ac91c59a596928d8b8267a977086156a54dfaa67 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 6 Aug 2021 16:52:45 +0200 Subject: [PATCH 0084/1843] logout in graphql, test for logout --- frontend/src/graphql/queries.js | 5 + .../views/Layout/DashboardLayout_gdd.spec.js | 118 +++++++++--------- .../src/views/Layout/DashboardLayout_gdd.vue | 52 ++------ 3 files changed, 78 insertions(+), 97 deletions(-) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 6a51b3858..e02e7fcdf 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -15,3 +15,8 @@ export const login = gql` } } ` +export const logout = gql` + query($sessionId: Float!) { + logout(sessionId: $sessionId) + } +` diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index 9221ff59a..cfed75cbd 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -1,5 +1,4 @@ import { mount, RouterLinkStub } from '@vue/test-utils' -import Vuex from 'vuex' import flushPromises from 'flush-promises' import DashboardLayoutGdd from './DashboardLayout_gdd' @@ -13,6 +12,15 @@ const transitionStub = () => ({ }, }) +const storeDispatchMock = jest.fn() +const storeCommitMock = jest.fn() +const routerPushMock = jest.fn() +const logoutQueryMock = jest.fn().mockResolvedValue({ + data: { + logout: 'success', + }, +}) + describe('DashboardLayoutGdd', () => { let wrapper @@ -28,17 +36,19 @@ describe('DashboardLayoutGdd', () => { }, }, $router: { - push: jest.fn(), + push: routerPushMock, }, - } - - const state = { - user: { - name: 'Peter Lustig', - balance: 2546, - balance_gdt: 20, + $apollo: { + query: logoutQueryMock, + }, + $store: { + state: { + sessionId: 1, + email: 'user@example.org', + }, + dispatch: storeDispatchMock, + commit: storeCommitMock, }, - email: 'peter.lustig@example.org', } const stubs = { @@ -47,15 +57,8 @@ describe('DashboardLayoutGdd', () => { RouterView: transitionStub(), } - const store = new Vuex.Store({ - state, - mutations: { - language: jest.fn(), - }, - }) - const Wrapper = () => { - return mount(DashboardLayoutGdd, { localVue, mocks, store, stubs }) + return mount(DashboardLayoutGdd, { localVue, mocks, stubs }) } describe('mount', () => { @@ -82,7 +85,7 @@ describe('DashboardLayoutGdd', () => { navbar = wrapper.findAll('ul.navbar-nav').at(0) }) - it('has five items in the navbar', () => { + it('has three items in the navbar', () => { expect(navbar.findAll('ul > a')).toHaveLength(3) }) @@ -99,54 +102,55 @@ describe('DashboardLayoutGdd', () => { expect(navbar.findAll('ul > a').at(1).text()).toEqual('transactions') }) - // to do: get this working! - it.skip('has second item "transactions" linked to transactions in navbar', async () => { - navbar.findAll('ul > a').at(1).trigger('click') - await flushPromises() - await jest.runAllTimers() - await flushPromises() - expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/transactions') + it('has second item "transactions" linked to transactions in navbar', async () => { + expect(wrapper.findAll('a').at(3).attributes('href')).toBe('/transactions') }) - it('has tree items in the navbar', () => { + it('has three items in the navbar', () => { expect(navbar.findAll('ul > a')).toHaveLength(3) }) - it('has third item "My profile" in navbar', () => { - expect(navbar.findAll('ul > a').at(2).text()).toEqual('site.navbar.my-profil') + it('has third item "My profile" linked to profile in navbar', async () => { + expect(wrapper.findAll('a').at(5).attributes('href')).toBe('/profile') }) - it.skip('has third item "My profile" linked to profile in navbar', async () => { - navbar.findAll('ul > a').at(2).trigger('click') - await flushPromises() - await jest.runAllTimers() - await flushPromises() - expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profile') + it('has a link to the members area', () => { + expect(wrapper.findAll('ul').at(2).text()).toBe('members_area') + expect(wrapper.findAll('ul').at(2).find('a').attributes('href')).toBe( + 'https://elopage.com/s/gradido/sign_in?locale=en', + ) }) - // it('has fourth item "Settigs" in navbar', () => { - // expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings') - // }) - // - // it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => { - // navbar.findAll('ul > li > a').at(3).trigger('click') - // await flushPromises() - // await jest.runAllTimers() - // await flushPromises() - // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit') - // }) + it('has a locale switch', () => { + expect(wrapper.find('div.language-switch').exists()).toBeTruthy() + }) - // it('has fifth item "Activity" in navbar', () => { - // expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity') - // }) - // - // it.skip('has fourth item "Activity" linked to activity in navbar', async () => { - // navbar.findAll('ul > li > a').at(4).trigger('click') - // await flushPromises() - // await jest.runAllTimers() - // await flushPromises() - // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity') - // }) + it('has a logout button', () => { + expect(wrapper.findAll('ul').at(3).text()).toBe('logout') + }) + + describe('logout', () => { + beforeEach(async () => { + await wrapper.findComponent({ name: 'sidebar' }).vm.$emit('logout') + await flushPromises() + }) + + it('calls the API', async () => { + expect(logoutQueryMock).toBeCalledWith( + expect.objectContaining({ + variables: { sessionId: 1 }, + }), + ) + }) + + it('dispatches logout to store', () => { + expect(storeDispatchMock).toBeCalledWith('logout') + }) + + it('redirects to login page', () => { + expect(routerPushMock).toBeCalledWith('/login') + }) + }) }) }) }) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 1bde53e60..7a04e39ab 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -66,32 +66,13 @@
- From 572abb9e3fd581ccb190f23835cb7954e23fa7b2 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 6 Aug 2021 18:28:12 +0200 Subject: [PATCH 0085/1843] transaction list query in graphql, include decayStartBlock in model, transactionId optional --- backend/src/graphql/models/Decay.ts | 4 ++ backend/src/graphql/models/Transaction.ts | 4 +- .../graphql/resolvers/TransactionResolver.ts | 1 + frontend/src/components/DecayInformation.vue | 25 ++++++----- frontend/src/graphql/queries.js | 31 +++++++++++++ .../src/views/Layout/DashboardLayout_gdd.vue | 44 +++++++++++-------- .../AccountOverview/GddTransactionList.vue | 4 +- 7 files changed, 78 insertions(+), 35 deletions(-) diff --git a/backend/src/graphql/models/Decay.ts b/backend/src/graphql/models/Decay.ts index c6ce85548..e0234f588 100644 --- a/backend/src/graphql/models/Decay.ts +++ b/backend/src/graphql/models/Decay.ts @@ -9,6 +9,7 @@ export class Decay { this.decayStart = json.decay_start this.decayEnd = json.decay_end this.decayDuration = json.decay_duration + this.decayStartBlock = json.decay_start_block } @Field(() => Number) @@ -22,4 +23,7 @@ export class Decay { @Field(() => String, { nullable: true }) decayDuration?: string + + @Field(() => Int, { nullable: true }) + decayStartBlock?: number } diff --git a/backend/src/graphql/models/Transaction.ts b/backend/src/graphql/models/Transaction.ts index fb17866c4..7e1102cce 100644 --- a/backend/src/graphql/models/Transaction.ts +++ b/backend/src/graphql/models/Transaction.ts @@ -43,8 +43,8 @@ export class Transaction { @Field(() => String) memo: string - @Field(() => Number) - transactionId: number + @Field(() => Number, { nullable: true }) + transactionId?: number @Field({ nullable: true }) name?: string diff --git a/backend/src/graphql/resolvers/TransactionResolver.ts b/backend/src/graphql/resolvers/TransactionResolver.ts index a2853f08a..a9e38bdb4 100644 --- a/backend/src/graphql/resolvers/TransactionResolver.ts +++ b/backend/src/graphql/resolvers/TransactionResolver.ts @@ -10,6 +10,7 @@ export class TransactionResolver { async transactionList( @Args() { sessionId, firstPage = 1, items = 25, order = 'DESC' }: TransactionListInput, ): Promise { + const result = await apiGet( `${CONFIG.COMMUNITY_API_URL}listTransactions/${firstPage}/${items}/${order}/${sessionId}`, ) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 81654be94..4a543e573 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -19,16 +19,17 @@ {{ $t('decay.last_transaction') }}
-
+ {{ decay.decayStartBlock }} +
{{ $t('decay.Starting_block_decay') }}
{{ $t('decay.decay_introduced') }} : - {{ $d($moment.unix(decay.decay_start), 'long') }} + {{ $d($moment.unix(decay.decayStart), 'long') }}
- {{ $d($moment.unix(decay.decay_start), 'long') }} + {{ $d($moment.unix(decay.decayStart), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
@@ -40,7 +41,7 @@ {{ $t('decay.past_time') }}
-
{{ $t('decay.since_introduction') }}
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, {{ duration.months }} {{ $t('decay.months') }}, @@ -62,24 +63,24 @@ export default { props: { decay: { balance: '', - decay_duration: '', - decay_start: 0, - decay_end: 0, - decay_start_block: 0, + decayDuration: '', + decayStart: 0, + decayEnd: 0, + decayStartBlock: 0, }, decaytyp: { type: String, default: '' }, }, computed: { decayStartBlockTextShort() { - return this.decay.decay_start_block - ? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decay_start_block)) + return this.decay.decayStartBlock + ? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decayStartBlock)) : '' }, duration() { return this.$moment.duration( this.$moment - .unix(new Date(this.decay.decay_end)) - .diff(this.$moment.unix(new Date(this.decay.decay_start))), + .unix(new Date(this.decay.decayEnd)) + .diff(this.$moment.unix(new Date(this.decay.decayStart))), )._data }, }, diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index e02e7fcdf..5f7d52570 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -20,3 +20,34 @@ export const logout = gql` logout(sessionId: $sessionId) } ` + +export const transactionsQuery = gql` + query($sessionId: Float!, $firstPage: Int = 1, $items: Int = 25, $order: String = "DESC") { + transactionList(sessionId: $sessionId, firstPage: $firstPage, items: $items, order: $order) { + gdtSum + count + balance + decay + decayDate + transactions { + type + balance + decayStart + decayEnd + decayDuration + memo + transactionId + name + email + date + decay { + balance + decayStart + decayEnd + decayDuration + decayStartBlock + } + } + } + } +` diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 7a04e39ab..8884cd47f 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -66,11 +66,9 @@
- + From af6ab4d470fe8916135de19efa228d609b9d00ba Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 9 Aug 2021 10:19:03 +0200 Subject: [PATCH 0091/1843] GraphQL Query to create a new user. --- frontend/src/graphql/queries.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 2eaa7eb56..5ecb1ad09 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -94,3 +94,9 @@ export const transactionsQuery = gql` } } ` + +export const resgisterUserQuery = gql` + query($firstName: String!, $lastName: String!, $email: String!, $password: String!) { + create(email: $email, firstName: $firstName, lastName: $lastName, password: $password) + } +` From 06549f66cd07e4568a9f29465c53e1e7574fada1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Mon, 9 Aug 2021 10:22:23 +0200 Subject: [PATCH 0092/1843] Withdrew the loginAPI call and replaced it with the Apollo query. --- frontend/src/views/Pages/Register.vue | 47 +++++++++++++-------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index b0b2e4cd6..570bd83db 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -128,9 +128,9 @@
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js index 1c71b7f6c..fe616b200 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js @@ -119,15 +119,15 @@ describe('GddTransactionList', () => { }) it('shows the message of the transaction', () => { - expect(transaction.findAll('div').at(5).text()).toContain('Alles Gute zum Geburtstag') + expect(transaction.findAll('div').at(6).text()).toContain('Alles Gute zum Geburtstag') }) it('shows the date of the transaction', () => { - expect(transaction.findAll('div').at(8).text()).toContain('Tue May 25 2021') + expect(transaction.findAll('div').at(9).text()).toContain('Tue May 25 2021') }) it('shows the decay calculation', () => { - expect(transaction.findAll('div').at(9).text()).toContain('-0.5') + expect(transaction.findAll('div').at(10).text()).toContain('-0.5') }) }) diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 1e107fb91..3c8a20950 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -24,8 +24,10 @@ {{ $t('form.memo') }}
-
-
+
+ {{ $t('form.date') }} +
+
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index a8e358140..be5744ee5 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -6,42 +6,153 @@ id, amount, date, - email, + /*email,*/ comment, - coupon_code, + /*coupon_code,*/ gdt_entry_type_id, factor, - amount2, - factor2, + /*amount2,*/ + /*factor2,*/ gdt, } in this.transactionsGdt" :key="id" > -
-
Gradido Transform (GDT) erhalten {{ comment ? ': '+comment : '' }}
+
+
+ {{ $t('gdt.gdt-received') }} {{ comment ? ': [' + comment + ']' : '' }} +
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
- + +
+ +
+ +
+
+
+ - + {{ $n(amount, 'decimal') }} +
+
+{{ $n(gdt, 'decimal') }}
+
-
{{ amount }} GDT * {{factor}} = {{gdt}}
-
{{ amount }} € ⊢ {{ gdt}} GDT
- - {{ id }} {{ amount }} {{ date }} {{ email }} {{ comment }} {{ coupon_code }} - {{ gdt_entry_type_id }} {{ factor }} {{ amount2 }} {{ factor2 }} {{ gdt }} - +
+ + {{ $t('form.memo') }} + +
+
+ {{ $t('form.date') }} +
+
+ {{ $t('gdt.factor') }} +
+
+ +
+
+
EURO
+
GDT
+
+ +
+ + {{ comment }} + +
+ +
+ {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} +
+ +
+ {{ factor }} +
+
+ +
+ + i + +
+
+ + + + +
+ {{ $t('gdt.conversion-gdt-euro') }} +
+
+ {{ $t('gdt.calculation') }} +
+ + + +
+
+
{{ $t('gdt.factor') }}
+
{{ $t('gdt.conversion') }}
+
+
+
{{ factor }}
+
{{ amount }} € ⊢ {{ gdt }} GDT
+
+
+ + + + +
+
{{ $t('gdt.formula') }}:
+
{{ amount }} GDT * {{ factor }} = {{ gdt }}
+
+ + + +
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index 9d211d22d..9303bd837 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -17,13 +17,6 @@ } in this.transactionsGdt" :key="id" > -
-
- {{ $t('gdt.gdt-received') }} {{ comment ? ': [' + comment + ']' : '' }} -
- {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} -
-
@@ -124,16 +117,6 @@ - + From 392271011fda84630f805583431687805accea23 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 12 Aug 2021 09:44:53 +0200 Subject: [PATCH 0163/1843] change style from starting block decay --- frontend/src/components/DecayInformation.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 8dd232994..ef0108d83 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -7,7 +7,7 @@
-
+
{{ $t('decay.calculation_decay') }} @@ -16,7 +16,7 @@
- {{ $t('decay.last_transaction') }} +
{{ $t('decay.last_transaction') }}
@@ -35,12 +35,12 @@
-
+
{{ $t('decay.past_time') }}
-
{{ $t('decay.since_introduction') }}
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, From 151acea10853518ee53ca5c969e2c6f26ddf010f Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 12 Aug 2021 11:38:57 +0200 Subject: [PATCH 0164/1843] gdt transaction header change --- frontend/src/components/DecayInformation.vue | 8 ++++---- frontend/src/locales/de.json | 4 ++-- .../AccountOverview/GdtTransactionList.vue | 20 +++++++++---------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index ef0108d83..413e8f885 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -19,7 +19,7 @@
{{ $t('decay.last_transaction') }}
-
+
{{ $t('decay.Starting_block_decay') }}
{{ $t('decay.decay_introduced') }} : @@ -35,12 +35,12 @@
-
+
- {{ $t('decay.past_time') }} +
{{ $t('decay.past_time') }}
-
{{ $t('decay.since_introduction') }}
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e497f86f3..d301792a9 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -178,8 +178,8 @@ "formula":"Berechungsformel", "no-transactions":"Du hast zur Zeit keine Transaktionen", "publisher":"Dein geworbenes Mitglied hat gespendet.", - "gdt-receive":"GDT erhalten", - "your-share":"Dein Anteil", + "gdt-receive":"Aktion", + "your-share":"Geworbenes Mitglied", "donation":"Spende" } } diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index a0efb39f9..d70807d10 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -34,42 +34,40 @@
{{ $t('gdt.gdt-receive') }}
-
{{ $n(gdt, 'decimal') }}
+
Gutschrift
-
---
-
GDT
+
{{ comment }}
+
{{ $n(gdt, 'decimal') }} GDT
{{ $t('gdt.your-share') }}
-
{{ $n(amount, 'decimal') }}
+
Gutschrift
5%
-
GDT
+
{{ $n(amount, 'decimal') }} GDT
{{ $t('gdt.donation') }}
-
{{ $n(amount, 'decimal') }}
-
{{ $n(gdt, 'decimal') }}
+
Gutschrift
-
---
-
EURO
-
GDT
+
{{ $n(amount, 'decimal') }} €
+
{{ $n(gdt, 'decimal') }} GDT
 - +
{{ $t('form.memo') }}
From c49a55ece032ba197fce9498081f800d5b8bb25f Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 12 Aug 2021 12:09:57 +0200 Subject: [PATCH 0165/1843] change passwort reset link to use new frontend --- .../src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp | 8 ++++++++ .../src/cpp/HTTPInterface/PageRequestMessagedHandler.h | 1 + login_server/src/cpsp/Login.cpsp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp index 3403e06a9..a5d6740a0 100644 --- a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp +++ b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.cpp @@ -83,4 +83,12 @@ std::string PageRequestMessagedHandler::getBaseUrl() return "http://" + mHost + mLoginServerPath; } return "https://" + mHost + mLoginServerPath; +} + +std::string PageRequestMessagedHandler::getHost() +{ + if (ServerConfig::g_ServerSetupType == ServerConfig::SERVER_TYPE_TEST) { + return "http://" + mHost; + } + return "https://" + mHost; } \ No newline at end of file diff --git a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h index 587aad77f..9e30f1a7f 100644 --- a/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h +++ b/login_server/src/cpp/HTTPInterface/PageRequestMessagedHandler.h @@ -29,6 +29,7 @@ protected: unsigned long long getLastGetAsU64(const std::string& uri); std::string getBaseUrl(); + std::string getHost(); Profiler mTimeProfiler; std::string mHost; diff --git a/login_server/src/cpsp/Login.cpsp b/login_server/src/cpsp/Login.cpsp index 8a198a91e..6ddd8a066 100644 --- a/login_server/src/cpsp/Login.cpsp +++ b/login_server/src/cpsp/Login.cpsp @@ -299,7 +299,7 @@
- <%= langCatalog->gettext("Passwort vergessen") %> + <%= langCatalog->gettext("Passwort vergessen") %>
From e7967fe14611cbbcd1b2d853d3447b229a64a1d5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 12 Aug 2021 12:20:49 +0200 Subject: [PATCH 0166/1843] change startblock infobox text --- frontend/src/components/DecayInformation.vue | 4 +-- frontend/src/locales/de.json | 2 +- .../AccountOverview/GdtTransactionList.vue | 26 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 413e8f885..8b076af73 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -1,7 +1,7 @@ + diff --git a/admin/src/assets/logo.png b/admin/src/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
+

{{ msg }}

+

+ For a guide and recipes on how to configure / customize this project,
+ check out the + vue-cli documentation. +

+

Installed CLI Plugins

+ +

Essential Links

+ +

Ecosystem

+ +
+ + + + + + diff --git a/admin/src/main.js b/admin/src/main.js new file mode 100644 index 000000000..63eb05f71 --- /dev/null +++ b/admin/src/main.js @@ -0,0 +1,8 @@ +import Vue from 'vue' +import App from './App.vue' + +Vue.config.productionTip = false + +new Vue({ + render: h => h(App), +}).$mount('#app') diff --git a/admin/yarn.lock b/admin/yarn.lock index 87cc99136..b52259e97 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -2,44 +2,2303 @@ # yarn lockfile v1 -"@nuxt/opencollective@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz#83cb70cdb2bac5fad6f8c93529e7b11187d49c02" - integrity sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" + integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== dependencies: - chalk "^4.1.0" - consola "^2.15.0" - node-fetch "^2.6.1" + "@babel/highlight" "^7.14.5" -ansi-styles@^4.1.0: +"@babel/compat-data@^7.13.11", "@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.11.0": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10" + integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og== + dependencies: + "@babel/code-frame" "^7.15.8" + "@babel/generator" "^7.15.8" + "@babel/helper-compilation-targets" "^7.15.4" + "@babel/helper-module-transforms" "^7.15.8" + "@babel/helpers" "^7.15.4" + "@babel/parser" "^7.15.8" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.6" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.1.2" + semver "^6.3.0" + source-map "^0.5.0" + +"@babel/generator@^7.15.4", "@babel/generator@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1" + integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g== + dependencies: + "@babel/types" "^7.15.6" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835" + integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f" + integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q== + dependencies: + "@babel/helper-explode-assignable-expression" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.9.6": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9" + integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ== + dependencies: + "@babel/compat-data" "^7.15.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", "@babel/helper-create-class-features-plugin@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e" + integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-member-expression-to-functions" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + +"@babel/helper-create-regexp-features-plugin@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4" + integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + regexpu-core "^4.7.1" + +"@babel/helper-define-polyfill-provider@^0.2.2": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6" + integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew== + dependencies: + "@babel/helper-compilation-targets" "^7.13.0" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" + "@babel/traverse" "^7.13.0" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + semver "^6.1.2" + +"@babel/helper-explode-assignable-expression@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c" + integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc" + integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw== + dependencies: + "@babel/helper-get-function-arity" "^7.15.4" + "@babel/template" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/helper-get-function-arity@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b" + integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-hoist-variables@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df" + integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-member-expression-to-functions@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef" + integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.8.3": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f" + integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2" + integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg== + dependencies: + "@babel/helper-module-imports" "^7.15.4" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-simple-access" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + "@babel/helper-validator-identifier" "^7.15.7" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.6" + +"@babel/helper-optimise-call-expression@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171" + integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f" + integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-wrap-function" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a" + integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/helper-simple-access@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b" + integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb" + integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-split-export-declaration@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257" + integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw== + dependencies: + "@babel/types" "^7.15.4" + +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== + +"@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helper-wrap-function@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7" + integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw== + dependencies: + "@babel/helper-function-name" "^7.15.4" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/helpers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43" + integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ== + dependencies: + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.0": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016" + integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA== + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e" + integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + +"@babel/plugin-proposal-async-generator-functions@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz#a3100f785fab4357987c4223ab1b02b599048403" + integrity sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.15.4" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e" + integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-proposal-class-static-block@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7" + integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + +"@babel/plugin-proposal-decorators@^7.8.3": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.8.tgz#eb2969abf8993f15289f09fed762bb1df1521bd5" + integrity sha512-5n8+xGK7YDrXF+WAORg3P7LlCCdiaAyKLZi22eP2BwTy4kJ0kFUMMDCj4nQ8YrKyNZgjhU/9eRVqONnjB3us8g== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-decorators" "^7.14.5" + +"@babel/plugin-proposal-dynamic-import@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c" + integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + +"@babel/plugin-proposal-export-namespace-from@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76" + integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + +"@babel/plugin-proposal-json-strings@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb" + integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-json-strings" "^7.8.3" + +"@babel/plugin-proposal-logical-assignment-operators@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738" + integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6" + integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + +"@babel/plugin-proposal-numeric-separator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18" + integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + +"@babel/plugin-proposal-object-rest-spread@^7.15.6": + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11" + integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg== + dependencies: + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.15.4" + +"@babel/plugin-proposal-optional-catch-binding@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c" + integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + +"@babel/plugin-proposal-optional-chaining@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603" + integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-proposal-private-methods@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d" + integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-proposal-private-property-in-object@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5" + integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-create-class-features-plugin" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + +"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8" + integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-decorators@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20" + integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-dynamic-import@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-export-namespace-from@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201" + integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-top-level-await@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-arrow-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" + integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-async-to-generator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67" + integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.14.5" + +"@babel/plugin-transform-block-scoped-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4" + integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-block-scoping@^7.15.3": + 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.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1" + integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f" + integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-destructuring@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576" + integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a" + integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-duplicate-keys@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954" + integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-exponentiation-operator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493" + integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA== + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-for-of@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2" + integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2" + integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ== + dependencies: + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78" + integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-member-expression-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7" + integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-modules-amd@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" + integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== + dependencies: + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1" + integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA== + dependencies: + "@babel/helper-module-transforms" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-simple-access" "^7.15.4" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132" + integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw== + dependencies: + "@babel/helper-hoist-variables" "^7.15.4" + "@babel/helper-module-transforms" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0" + integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA== + dependencies: + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@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== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + +"@babel/plugin-transform-new-target@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8" + integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-object-super@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45" + integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + +"@babel/plugin-transform-parameters@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62" + integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-property-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34" + integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-regenerator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f" + integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg== + dependencies: + regenerator-transform "^0.14.2" + +"@babel/plugin-transform-reserved-words@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304" + integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-runtime@^7.11.0": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz#9d15b1e94e1c7f6344f65a8d573597d93c6cd886" + integrity sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw== + dependencies: + "@babel/helper-module-imports" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.5" + babel-plugin-polyfill-regenerator "^0.2.2" + semver "^6.3.0" + +"@babel/plugin-transform-shorthand-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58" + integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-spread@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz#79d5aa27f68d700449b2da07691dfa32d2f6d468" + integrity sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4" + +"@babel/plugin-transform-sticky-regex@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9" + integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-template-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93" + integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-typeof-symbol@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4" + integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-unicode-escapes@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b" + integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-unicode-regex@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e" + integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/preset-env@^7.11.0": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba" + integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA== + dependencies: + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.4" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4" + "@babel/plugin-proposal-async-generator-functions" "^7.15.8" + "@babel/plugin-proposal-class-properties" "^7.14.5" + "@babel/plugin-proposal-class-static-block" "^7.15.4" + "@babel/plugin-proposal-dynamic-import" "^7.14.5" + "@babel/plugin-proposal-export-namespace-from" "^7.14.5" + "@babel/plugin-proposal-json-strings" "^7.14.5" + "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" + "@babel/plugin-proposal-numeric-separator" "^7.14.5" + "@babel/plugin-proposal-object-rest-spread" "^7.15.6" + "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-private-methods" "^7.14.5" + "@babel/plugin-proposal-private-property-in-object" "^7.15.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.14.5" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.14.5" + "@babel/plugin-transform-async-to-generator" "^7.14.5" + "@babel/plugin-transform-block-scoped-functions" "^7.14.5" + "@babel/plugin-transform-block-scoping" "^7.15.3" + "@babel/plugin-transform-classes" "^7.15.4" + "@babel/plugin-transform-computed-properties" "^7.14.5" + "@babel/plugin-transform-destructuring" "^7.14.7" + "@babel/plugin-transform-dotall-regex" "^7.14.5" + "@babel/plugin-transform-duplicate-keys" "^7.14.5" + "@babel/plugin-transform-exponentiation-operator" "^7.14.5" + "@babel/plugin-transform-for-of" "^7.15.4" + "@babel/plugin-transform-function-name" "^7.14.5" + "@babel/plugin-transform-literals" "^7.14.5" + "@babel/plugin-transform-member-expression-literals" "^7.14.5" + "@babel/plugin-transform-modules-amd" "^7.14.5" + "@babel/plugin-transform-modules-commonjs" "^7.15.4" + "@babel/plugin-transform-modules-systemjs" "^7.15.4" + "@babel/plugin-transform-modules-umd" "^7.14.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" + "@babel/plugin-transform-new-target" "^7.14.5" + "@babel/plugin-transform-object-super" "^7.14.5" + "@babel/plugin-transform-parameters" "^7.15.4" + "@babel/plugin-transform-property-literals" "^7.14.5" + "@babel/plugin-transform-regenerator" "^7.14.5" + "@babel/plugin-transform-reserved-words" "^7.14.5" + "@babel/plugin-transform-shorthand-properties" "^7.14.5" + "@babel/plugin-transform-spread" "^7.15.8" + "@babel/plugin-transform-sticky-regex" "^7.14.5" + "@babel/plugin-transform-template-literals" "^7.14.5" + "@babel/plugin-transform-typeof-symbol" "^7.14.5" + "@babel/plugin-transform-unicode-escapes" "^7.14.5" + "@babel/plugin-transform-unicode-regex" "^7.14.5" + "@babel/preset-modules" "^0.1.4" + "@babel/types" "^7.15.6" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.5" + babel-plugin-polyfill-regenerator "^0.2.2" + core-js-compat "^3.16.0" + semver "^6.3.0" + +"@babel/preset-modules@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" + integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + +"@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" + integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/template@^7.0.0", "@babel/template@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194" + integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.15.4" + "@babel/types" "^7.15.4" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.7.0": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d" + integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-hoist-variables" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + "@babel/parser" "^7.15.4" + "@babel/types" "^7.15.4" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" + integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig== + dependencies: + "@babel/helper-validator-identifier" "^7.14.9" + to-fast-properties "^2.0.0" + +"@hapi/address@2.x.x": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" + integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ== + +"@hapi/bourne@1.x.x": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a" + integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA== + +"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06" + integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow== + +"@hapi/joi@^15.0.1": + version "15.1.1" + resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7" + integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ== + dependencies: + "@hapi/address" "2.x.x" + "@hapi/bourne" "1.x.x" + "@hapi/hoek" "8.x.x" + "@hapi/topo" "3.x.x" + +"@hapi/topo@3.x.x": + version "3.1.6" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29" + integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ== + dependencies: + "@hapi/hoek" "^8.3.0" + +"@intervolga/optimize-cssnano-plugin@^1.0.5": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz#be7c7846128b88f6a9b1d1261a0ad06eb5c0fdf8" + integrity sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA== + dependencies: + cssnano "^4.0.0" + cssnano-preset-default "^4.0.0" + postcss "^7.0.0" + +"@mrmlnc/readdir-enhanced@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g== + dependencies: + call-me-maybe "^1.0.1" + glob-to-regexp "^0.3.0" + +"@nodelib/fs.stat@^1.1.2": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" + integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== + +"@soda/friendly-errors-webpack-plugin@^1.7.1": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz#84751d82a93019d5c92c0cf0e45ac59087cd2240" + integrity sha512-RLotfx6k1+nfLacwNCenj7VnTMPxVwYKoGOcffMFoJDKM8tXzBiCN0hMHFJNnoAojduYAsxuiMm0EOMixgiRow== + dependencies: + chalk "^2.4.2" + error-stack-parser "^2.0.2" + string-width "^2.0.0" + strip-ansi "^5" + +"@soda/get-current-script@^1.0.0": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" + integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w== + +"@types/body-parser@*": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect-history-api-fallback@*": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== + dependencies: + "@types/express-serve-static-core" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@*": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/http-proxy@^1.17.5": + version "1.17.7" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" + integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w== + dependencies: + "@types/node" "*" + +"@types/json-schema@^7.0.5": + 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== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/minimatch@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/minimist@^1.2.0": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + +"@types/node@*": + version "16.11.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.2.tgz#31c249c136c3f9b35d4b60fb8e50e01a1f0cc9a5" + integrity sha512-w34LtBB0OkDTs19FQHXy4Ig/TOXI4zqvXS2Kk1PAsRKZ0I+nik7LlMYxckW0tSNGtvWmzB+mrCTbuEjuB9DVsw== + +"@types/normalize-package-data@^2.4.0": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== + +"@types/q@^1.5.1": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/source-list-map@*": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" + integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== + +"@types/tapable@^1": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" + integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== + +"@types/uglify-js@*": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" + integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== + dependencies: + source-map "^0.6.1" + +"@types/webpack-dev-server@^3.11.0": + version "3.11.6" + resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz#d8888cfd2f0630203e13d3ed7833a4d11b8a34dc" + integrity sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ== + dependencies: + "@types/connect-history-api-fallback" "*" + "@types/express" "*" + "@types/serve-static" "*" + "@types/webpack" "^4" + http-proxy-middleware "^1.0.0" + +"@types/webpack-sources@*": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== + dependencies: + "@types/node" "*" + "@types/source-list-map" "*" + source-map "^0.7.3" + +"@types/webpack@^4", "@types/webpack@^4.0.0": + version "4.41.31" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa" + integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ== + dependencies: + "@types/node" "*" + "@types/tapable" "^1" + "@types/uglify-js" "*" + "@types/webpack-sources" "*" + anymatch "^3.0.0" + source-map "^0.6.0" + +"@vue/babel-helper-vue-jsx-merge-props@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" + integrity sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA== + +"@vue/babel-helper-vue-transform-on@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz#9b9c691cd06fc855221a2475c3cc831d774bc7dc" + integrity sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA== + +"@vue/babel-plugin-jsx@^1.0.3": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz#0c5bac27880d23f89894cd036a37b55ef61ddfc1" + integrity sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.0.0" + "@babel/template" "^7.0.0" + "@babel/traverse" "^7.0.0" + "@babel/types" "^7.0.0" + "@vue/babel-helper-vue-transform-on" "^1.0.2" + camelcase "^6.0.0" + html-tags "^3.1.0" + svg-tags "^1.0.0" + +"@vue/babel-plugin-transform-vue-jsx@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz#646046c652c2f0242727f34519d917b064041ed7" + integrity sha512-HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" + html-tags "^2.0.0" + lodash.kebabcase "^4.1.1" + svg-tags "^1.0.0" + +"@vue/babel-preset-app@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.14.tgz#30883e23bfea35031434db231db77e8784f0dd12" + integrity sha512-P13AJv5FDt2XnpZ92K0VMxBS7Pe+gnibxtXMsa8rXLBkEE1NkmtaG5pyXh3fulkmF2/21efOcuh6yFP7k0KuZg== + dependencies: + "@babel/core" "^7.11.0" + "@babel/helper-compilation-targets" "^7.9.6" + "@babel/helper-module-imports" "^7.8.3" + "@babel/plugin-proposal-class-properties" "^7.8.3" + "@babel/plugin-proposal-decorators" "^7.8.3" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-jsx" "^7.8.3" + "@babel/plugin-transform-runtime" "^7.11.0" + "@babel/preset-env" "^7.11.0" + "@babel/runtime" "^7.11.0" + "@vue/babel-plugin-jsx" "^1.0.3" + "@vue/babel-preset-jsx" "^1.2.4" + babel-plugin-dynamic-import-node "^2.3.3" + core-js "^3.6.5" + core-js-compat "^3.6.5" + semver "^6.1.0" + +"@vue/babel-preset-jsx@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.4.tgz#92fea79db6f13b01e80d3a0099e2924bdcbe4e87" + integrity sha512-oRVnmN2a77bYDJzeGSt92AuHXbkIxbf/XXSE3klINnh9AXBmVS1DGa1f0d+dDYpLfsAKElMnqKTQfKn7obcL4w== + dependencies: + "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" + "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" + "@vue/babel-sugar-composition-api-inject-h" "^1.2.1" + "@vue/babel-sugar-composition-api-render-instance" "^1.2.4" + "@vue/babel-sugar-functional-vue" "^1.2.2" + "@vue/babel-sugar-inject-h" "^1.2.2" + "@vue/babel-sugar-v-model" "^1.2.3" + "@vue/babel-sugar-v-on" "^1.2.3" + +"@vue/babel-sugar-composition-api-inject-h@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz#05d6e0c432710e37582b2be9a6049b689b6f03eb" + integrity sha512-4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-composition-api-render-instance@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.4.tgz#e4cbc6997c344fac271785ad7a29325c51d68d19" + integrity sha512-joha4PZznQMsxQYXtR3MnTgCASC9u3zt9KfBxIeuI5g2gscpTsSKRDzWQt4aqNIpx6cv8On7/m6zmmovlNsG7Q== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-functional-vue@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz#267a9ac8d787c96edbf03ce3f392c49da9bd2658" + integrity sha512-JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-inject-h@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz#d738d3c893367ec8491dcbb669b000919293e3aa" + integrity sha512-y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-v-model@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.3.tgz#fa1f29ba51ebf0aa1a6c35fa66d539bc459a18f2" + integrity sha512-A2jxx87mySr/ulAsSSyYE8un6SIH0NWHiLaCWpodPCVOlQVODCaSpiR4+IMsmBr73haG+oeCuSvMOM+ttWUqRQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1" + "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" + camelcase "^5.0.0" + html-tags "^2.0.0" + svg-tags "^1.0.0" + +"@vue/babel-sugar-v-on@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.3.tgz#342367178586a69f392f04bfba32021d02913ada" + integrity sha512-kt12VJdz/37D3N3eglBywV8GStKNUhNrsxChXIV+o0MwVXORYuhDTHJRKPgLJRb/EY3vM2aRFQdxJBp9CLikjw== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" + camelcase "^5.0.0" + +"@vue/cli-overlay@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.14.tgz#19c2a953bc6c974da79d5566fac057db88ef58dd" + integrity sha512-0LFqTA1uaCTq4N1P9/A0MhWY0tWER3dZkMN1y+ODfrjAcnX96t/qf2jVy9u3QGKHSPbhF5FYBsKEa6uEFYPyfg== + +"@vue/cli-plugin-babel@~4.5.0": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.14.tgz#50f0291a50defc7fc081d350256cbd8536970aca" + integrity sha512-8+K684NwmN7TitdCLB9GVts36582ohusfxAL/v6cWnUgrw79gbdGkY8SqyXWrbXCyWYDJrhB25LQIrqGfsJ6Dg== + dependencies: + "@babel/core" "^7.11.0" + "@vue/babel-preset-app" "^4.5.14" + "@vue/cli-shared-utils" "^4.5.14" + babel-loader "^8.1.0" + cache-loader "^4.1.0" + thread-loader "^2.1.3" + webpack "^4.0.0" + +"@vue/cli-plugin-eslint@~4.5.0": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.14.tgz#7fdea4cae783f696521fd635d264fee52b0b836a" + integrity sha512-8leK9mZ4Ia4hARWMfVAbcgPBFKjdeOW9S0nG+pt6OBnnwK+V1jf/C7ytfXH+H086KgisU8R9nz1xNaz+9QET0g== + dependencies: + "@vue/cli-shared-utils" "^4.5.14" + eslint-loader "^2.2.1" + globby "^9.2.0" + inquirer "^7.1.0" + webpack "^4.0.0" + yorkie "^2.0.0" + +"@vue/cli-plugin-router@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.14.tgz#c67da40a87e4fc266f693d878ee918cfed32b011" + integrity sha512-tTXGAbCoCSSU7U5+CrOnU3BuNq8/lcuJJGtyeObvbt7e5x+96UTOVAVbdINdGGKIOQ58ZD+QvqSP5NXVT1T52Q== + dependencies: + "@vue/cli-shared-utils" "^4.5.14" + +"@vue/cli-plugin-vuex@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.14.tgz#855490ede856a9c49760051e18bd51f7fe024142" + integrity sha512-gZNAQzYSzTHshOrwBdqY54U7H5FlyhC5a6sXioWXBuwShOW+FVrywVl90vlimC0OPju0Q5tL7rPMLp4EgmNvUw== + +"@vue/cli-service@~4.5.0": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.14.tgz#284ce2522fa91b7a9a1205371ace39c0317e9f2f" + integrity sha512-vKdqs9FQH2PYcmANcUm5McE8qqFKPjvoAh3YiNBD0qjMyuX6XGmej8pICJnbbu0Kn3EgQY3haemSIhVkPPyL4g== + dependencies: + "@intervolga/optimize-cssnano-plugin" "^1.0.5" + "@soda/friendly-errors-webpack-plugin" "^1.7.1" + "@soda/get-current-script" "^1.0.0" + "@types/minimist" "^1.2.0" + "@types/webpack" "^4.0.0" + "@types/webpack-dev-server" "^3.11.0" + "@vue/cli-overlay" "^4.5.14" + "@vue/cli-plugin-router" "^4.5.14" + "@vue/cli-plugin-vuex" "^4.5.14" + "@vue/cli-shared-utils" "^4.5.14" + "@vue/component-compiler-utils" "^3.1.2" + "@vue/preload-webpack-plugin" "^1.1.0" + "@vue/web-component-wrapper" "^1.2.0" + acorn "^7.4.0" + acorn-walk "^7.1.1" + address "^1.1.2" + autoprefixer "^9.8.6" + browserslist "^4.12.0" + cache-loader "^4.1.0" + case-sensitive-paths-webpack-plugin "^2.3.0" + cli-highlight "^2.1.4" + clipboardy "^2.3.0" + cliui "^6.0.0" + copy-webpack-plugin "^5.1.1" + css-loader "^3.5.3" + cssnano "^4.1.10" + debug "^4.1.1" + default-gateway "^5.0.5" + dotenv "^8.2.0" + dotenv-expand "^5.1.0" + file-loader "^4.2.0" + fs-extra "^7.0.1" + globby "^9.2.0" + hash-sum "^2.0.0" + html-webpack-plugin "^3.2.0" + launch-editor-middleware "^2.2.1" + lodash.defaultsdeep "^4.6.1" + lodash.mapvalues "^4.6.0" + lodash.transform "^4.6.0" + mini-css-extract-plugin "^0.9.0" + minimist "^1.2.5" + pnp-webpack-plugin "^1.6.4" + portfinder "^1.0.26" + postcss-loader "^3.0.0" + ssri "^8.0.1" + terser-webpack-plugin "^1.4.4" + thread-loader "^2.1.3" + url-loader "^2.2.0" + vue-loader "^15.9.2" + vue-style-loader "^4.1.2" + webpack "^4.0.0" + webpack-bundle-analyzer "^3.8.0" + webpack-chain "^6.4.0" + webpack-dev-server "^3.11.0" + webpack-merge "^4.2.2" + optionalDependencies: + vue-loader-v16 "npm:vue-loader@^16.1.0" + +"@vue/cli-shared-utils@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.14.tgz#4cdc98544205795144fa1a712966a33450d9a4c7" + integrity sha512-OJeabPep8yvQ7n2lgbsw6lzBXmjaBHlCt7k9wnsPiXKtNAnHsv40ejARRnj4HTOuMaW6i1QQ17X3WaozI0zaMw== + dependencies: + "@hapi/joi" "^15.0.1" + chalk "^2.4.2" + execa "^1.0.0" + launch-editor "^2.2.1" + lru-cache "^5.1.1" + node-ipc "^9.1.1" + open "^6.3.0" + ora "^3.4.0" + read-pkg "^5.1.1" + request "^2.88.2" + semver "^6.1.0" + strip-ansi "^6.0.0" + +"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz#2f7ed5feed82ff7f0284acc11d525ee7eff22460" + integrity sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg== + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^7.0.36" + postcss-selector-parser "^6.0.2" + source-map "~0.6.1" + vue-template-es2015-compiler "^1.9.0" + optionalDependencies: + prettier "^1.18.2" + +"@vue/preload-webpack-plugin@^1.1.0": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" + integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== + +"@vue/web-component-wrapper@^1.2.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" + integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA== + +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== + dependencies: + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== + +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== + dependencies: + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== + +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== + +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + "@xtuc/long" "4.2.2" + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-jsx@^5.2.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^6.4.1: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + +acorn@^7.1.1, acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +address@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== + +ajv-errors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" + integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== + +ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +alphanum-sort@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + +ansi-colors@^3.0.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== + +ansi-escapes@^4.2.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-html@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" -bootstrap-vue@^2.21.2: - version "2.21.2" - resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.21.2.tgz#ec38f66c3a2205becccddb6158a991d96509ed0b" - integrity sha512-0Exe+4MZysqhZNXIKf4TzkvXaupxh9EHsoCRez0o5Dc0J7rlafayOEwql63qXv74CgZO8E4U8ugRNJko1vMvNw== +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== dependencies: - "@nuxt/opencollective" "^0.3.2" - bootstrap ">=4.5.3 <5.0.0" - popper.js "^1.16.1" - portal-vue "^2.1.7" - vue-functional-data-merge "^3.1.0" + micromatch "^3.1.4" + normalize-path "^2.1.1" -"bootstrap@>=4.5.3 <5.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" - integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== +anymatch@^3.0.0, anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" -bootstrap@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" - integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== +aproba@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -chalk@^4.1.0: +arch@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-flatten@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== + +array-union@^1.0.1, array-union@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= + dependencies: + array-uniq "^1.0.1" + +array-uniq@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" + integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assert@^1.1.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" + integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== + dependencies: + object-assign "^4.1.1" + util "0.10.3" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@^2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +autoprefixer@^9.8.6: + version "9.8.8" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a" + integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA== + dependencies: + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + picocolors "^0.2.1" + postcss "^7.0.32" + postcss-value-parser "^4.1.0" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +babel-eslint@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" + +babel-loader@^8.1.0: + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== + dependencies: + find-cache-dir "^3.3.1" + loader-utils "^1.4.0" + make-dir "^3.1.0" + schema-utils "^2.6.5" + +babel-plugin-dynamic-import-node@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-polyfill-corejs2@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" + integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ== + dependencies: + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.2" + semver "^6.1.1" + +babel-plugin-polyfill-corejs3@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92" + integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.2" + core-js-compat "^3.16.2" + +babel-plugin-polyfill-regenerator@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077" + integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.2.2" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.0.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +batch@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +bfj@^6.1.1: + version "6.1.2" + resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f" + integrity sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw== + dependencies: + bluebird "^3.5.5" + check-types "^8.0.3" + hoopy "^0.1.4" + tryer "^1.0.1" + +big.js@^3.1.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" + integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^1.0.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +bluebird@^3.1.1, bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +bn.js@^5.0.0, bn.js@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +bonjour@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= + dependencies: + array-flatten "^2.1.0" + deep-equal "^1.0.1" + dns-equal "^1.0.0" + dns-txt "^2.0.2" + multicast-dns "^6.0.1" + multicast-dns-service-types "^1.1.0" + +boolbase@^1.0.0, boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.1, braces@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +brorand@^1.0.1, brorand@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + dependencies: + buffer-xor "^1.0.3" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.3" + inherits "^2.0.1" + safe-buffer "^5.0.1" + +browserify-cipher@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" + integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" + integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + dependencies: + bn.js "^5.0.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== + dependencies: + pako "~1.0.5" + +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.3: + version "4.17.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4" + integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ== + dependencies: + caniuse-lite "^1.0.30001265" + electron-to-chromium "^1.3.867" + escalade "^3.1.1" + node-releases "^2.0.0" + picocolors "^1.0.0" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer-indexof@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" + integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== + +buffer-json@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" + integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== + +buffer-xor@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + +buffer@^4.3.0: + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cacache@^12.0.2, cacache@^12.0.3: + version "12.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== + dependencies: + bluebird "^3.5.5" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.4" + graceful-fs "^4.1.15" + infer-owner "^1.0.3" + lru-cache "^5.1.1" + mississippi "^3.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.3" + ssri "^6.0.1" + unique-filename "^1.1.1" + y18n "^4.0.0" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +cache-loader@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e" + integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw== + dependencies: + buffer-json "^2.0.0" + find-cache-dir "^3.0.0" + loader-utils "^1.2.3" + mkdirp "^0.5.1" + neo-async "^2.6.1" + schema-utils "^2.0.0" + +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +call-me-maybe@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= + +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camel-case@3.0.x: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= + dependencies: + no-case "^2.2.0" + upper-case "^1.1.1" + +camelcase@^5.0.0, camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +caniuse-api@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== + dependencies: + browserslist "^4.0.0" + caniuse-lite "^1.0.0" + lodash.memoize "^4.1.2" + lodash.uniq "^4.5.0" + +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001265: + version "1.0.30001270" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz#cc9c37a4ec5c1a8d616fc7bace902bb053b0cdea" + integrity sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A== + +case-sensitive-paths-webpack-plugin@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" + integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -47,6 +2306,191 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chardet@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== + +check-types@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" + integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== + +chokidar@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== + dependencies: + anymatch "^2.0.0" + async-each "^1.0.1" + braces "^2.3.2" + glob-parent "^3.1.0" + inherits "^2.0.3" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^3.0.0" + path-is-absolute "^1.0.0" + readdirp "^2.2.1" + upath "^1.1.1" + optionalDependencies: + fsevents "^1.2.7" + +chokidar@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== + +cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +clean-css@4.2.x: + version "4.2.4" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178" + integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A== + dependencies: + source-map "~0.6.0" + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-highlight@^2.1.4: + version "2.1.11" + resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" + integrity sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg== + dependencies: + chalk "^4.0.0" + highlight.js "^10.7.1" + mz "^2.4.0" + parse5 "^5.1.1" + parse5-htmlparser2-tree-adapter "^6.0.0" + yargs "^16.0.0" + +cli-spinners@^2.0.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + +cli-width@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" + integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== + +clipboardy@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" + integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== + dependencies: + arch "^2.1.1" + execa "^1.0.0" + is-wsl "^2.1.1" + +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + +coa@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== + dependencies: + "@types/q" "^1.5.1" + chalk "^2.4.1" + q "^1.1.2" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0, color-convert@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -54,37 +2498,5144 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -consola@^2.15.0: - version "2.15.3" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" - integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== +color-string@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@2.17.x: + version "2.17.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" + integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== + +commander@^2.18.0, commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@~2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" + integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.4: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + safe-buffer "5.1.2" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.5.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +connect-history-api-fallback@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== + +console-browserify@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" + integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== + +consolidate@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" + integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== + dependencies: + bluebird "^3.1.1" + +constants-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-concurrently@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" + integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== + dependencies: + aproba "^1.1.1" + fs-write-stream-atomic "^1.0.8" + iferr "^0.1.5" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.0" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +copy-webpack-plugin@^5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz#8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2" + integrity sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ== + dependencies: + cacache "^12.0.3" + find-cache-dir "^2.1.0" + glob-parent "^3.1.0" + globby "^7.1.1" + is-glob "^4.0.1" + loader-utils "^1.2.3" + minimatch "^3.0.4" + normalize-path "^3.0.0" + p-limit "^2.2.1" + schema-utils "^1.0.0" + serialize-javascript "^4.0.0" + webpack-log "^2.0.0" + +core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.6.5: + version "3.18.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.3.tgz#e0e7e87abc55efb547e7fa19169e45fa9df27a67" + integrity sha512-4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw== + dependencies: + browserslist "^4.17.3" + semver "7.0.0" + +core-js@^3.6.5: + version "3.18.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.3.tgz#86a0bba2d8ec3df860fefcc07a8d119779f01509" + integrity sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw== + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cosmiconfig@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + +create-ecdh@^4.0.0: + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== + dependencies: + bn.js "^4.1.0" + elliptic "^6.5.3" + +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + md5.js "^1.3.4" + ripemd160 "^2.0.1" + sha.js "^2.4.0" + +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + dependencies: + cipher-base "^1.0.3" + create-hash "^1.1.0" + inherits "^2.0.1" + ripemd160 "^2.0.0" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^6.0.0, cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-browserify@^3.11.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + randomfill "^1.0.3" + +css-color-names@0.0.4, css-color-names@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" + integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= + +css-declaration-sorter@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" + integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== + dependencies: + postcss "^7.0.1" + timsort "^0.3.0" + +css-loader@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" + integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== + dependencies: + camelcase "^5.3.1" + cssesc "^3.0.0" + icss-utils "^4.1.1" + loader-utils "^1.2.3" + normalize-path "^3.0.0" + postcss "^7.0.32" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.2" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" + postcss-value-parser "^4.1.0" + schema-utils "^2.7.0" + semver "^6.3.0" + +css-select-base-adapter@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== + +css-select@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== + dependencies: + boolbase "^1.0.0" + css-what "^3.2.1" + domutils "^1.7.0" + nth-check "^1.0.2" + +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + +css-tree@1.0.0-alpha.37: + version "1.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== + dependencies: + mdn-data "2.0.4" + source-map "^0.6.1" + +css-tree@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +css-what@^3.2.1: + version "3.4.2" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== + +css-what@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" + integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== + dependencies: + css-declaration-sorter "^4.0.1" + cssnano-util-raw-cache "^4.0.1" + postcss "^7.0.0" + postcss-calc "^7.0.1" + postcss-colormin "^4.0.3" + postcss-convert-values "^4.0.1" + postcss-discard-comments "^4.0.2" + postcss-discard-duplicates "^4.0.2" + postcss-discard-empty "^4.0.1" + postcss-discard-overridden "^4.0.1" + postcss-merge-longhand "^4.0.11" + postcss-merge-rules "^4.0.3" + postcss-minify-font-values "^4.0.2" + postcss-minify-gradients "^4.0.2" + postcss-minify-params "^4.0.2" + postcss-minify-selectors "^4.0.2" + postcss-normalize-charset "^4.0.1" + postcss-normalize-display-values "^4.0.2" + postcss-normalize-positions "^4.0.2" + postcss-normalize-repeat-style "^4.0.2" + postcss-normalize-string "^4.0.2" + postcss-normalize-timing-functions "^4.0.2" + postcss-normalize-unicode "^4.0.1" + postcss-normalize-url "^4.0.1" + postcss-normalize-whitespace "^4.0.2" + postcss-ordered-values "^4.1.2" + postcss-reduce-initial "^4.0.3" + postcss-reduce-transforms "^4.0.2" + postcss-svgo "^4.0.3" + postcss-unique-selectors "^4.0.1" + +cssnano-util-get-arguments@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" + integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= + +cssnano-util-get-match@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" + integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= + +cssnano-util-raw-cache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" + integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== + dependencies: + postcss "^7.0.0" + +cssnano-util-same-parent@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" + integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== + +cssnano@^4.0.0, cssnano@^4.1.10: + version "4.1.11" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" + integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== + dependencies: + cosmiconfig "^5.0.0" + cssnano-preset-default "^4.0.8" + is-resolvable "^1.0.0" + postcss "^7.0.0" + +csso@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== + dependencies: + css-tree "^1.1.2" + +cyclist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" + integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +de-indent@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" + integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.1.1, debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +deep-equal@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" + +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +deepmerge@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" + integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== + +default-gateway@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" + integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== + dependencies: + execa "^1.0.0" + ip-regex "^2.1.0" + +default-gateway@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-5.0.5.tgz#4fd6bd5d2855d39b34cc5a59505486e9aafc9b10" + integrity sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA== + dependencies: + execa "^3.3.0" + +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + +define-properties@^1.1.2, define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +del@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" + integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== + dependencies: + "@types/glob" "^7.1.1" + globby "^6.1.0" + is-path-cwd "^2.0.0" + is-path-in-cwd "^2.0.0" + p-map "^2.0.0" + pify "^4.0.1" + rimraf "^2.6.3" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +des.js@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" + integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +diffie-hellman@^5.0.0: + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + +dir-glob@^2.0.0, dir-glob@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" + integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== + dependencies: + path-type "^3.0.0" + +dns-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= + +dns-packet@^1.3.1: + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== + dependencies: + ip "^1.1.0" + safe-buffer "^5.0.1" + +dns-txt@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= + dependencies: + buffer-indexof "^1.0.0" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dom-converter@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" + integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== + dependencies: + utila "~0.4" + +dom-serializer@0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +dom-serializer@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domain-browser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== + +domelementtype@1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domhandler@^4.0.0, domhandler@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== + dependencies: + domelementtype "^2.2.0" + +domutils@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== + dependencies: + dom-serializer "0" + domelementtype "1" + +domutils@^2.5.2, domutils@^2.6.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^8.2.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +duplexer@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + +duplexify@^3.4.2, duplexify@^3.6.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" + integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== + dependencies: + end-of-stream "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.0" + stream-shift "^1.0.0" + +easy-stack@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066" + integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w== + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +ejs@^2.6.1: + version "2.7.4" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" + integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== + +electron-to-chromium@^1.3.867: + version "1.3.876" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.876.tgz#fe6f65c9740406f4aa69f10faa8e1d79b81bdf34" + integrity sha512-a6LR4738psrubCtGx5HxM/gNlrIsh4eFTNnokgOqvQo81GWd07lLcOjITkAXn2y4lIp18vgS+DGnehj+/oEAxQ== + +elliptic@^6.5.3: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== + dependencies: + bn.js "^4.11.9" + brorand "^1.1.0" + hash.js "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" + integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" + integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== + dependencies: + graceful-fs "^4.1.2" + memory-fs "^0.5.0" + tapable "^1.0.0" + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +errno@^0.1.3, errno@~0.1.7: + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== + dependencies: + prr "~1.0.1" + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +error-stack-parser@^2.0.2: + version "2.0.6" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz#5a99a707bd7a4c58a797902d48d82803ede6aad8" + integrity sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ== + dependencies: + stackframe "^1.1.1" + +es-abstract@^1.17.2, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.1" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +eslint-loader@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" + integrity sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg== + dependencies: + loader-fs-cache "^1.0.0" + loader-utils "^1.0.2" + object-assign "^4.0.1" + object-hash "^1.1.4" + rimraf "^2.6.1" + +eslint-plugin-vue@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" + integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ== + dependencies: + natural-compare "^1.4.0" + semver "^5.6.0" + vue-eslint-parser "^7.0.0" + +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== + dependencies: + esrecurse "^4.1.0" + estraverse "^4.1.1" + +eslint-scope@^5.0.0, eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint@^6.7.2: + version "6.8.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" + integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== + dependencies: + "@babel/code-frame" "^7.0.0" + ajv "^6.10.0" + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^5.0.0" + eslint-utils "^1.4.3" + eslint-visitor-keys "^1.1.0" + espree "^6.1.2" + esquery "^1.0.1" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + inquirer "^7.0.0" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.14" + minimatch "^3.0.4" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.3" + progress "^2.0.0" + regexpp "^2.0.1" + semver "^6.1.2" + strip-ansi "^5.2.0" + strip-json-comments "^3.0.1" + table "^5.2.3" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^6.1.2, espree@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" + integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== + dependencies: + acorn "^7.1.1" + acorn-jsx "^5.2.0" + eslint-visitor-keys "^1.1.0" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.0.1, esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.1.0, esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +event-pubsub@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/event-pubsub/-/event-pubsub-4.3.0.tgz#f68d816bc29f1ec02c539dc58c8dd40ce72cb36e" + integrity sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ== + +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +eventsource@^1.0.7: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== + dependencies: + original "^1.0.0" + +evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== + dependencies: + md5.js "^1.3.4" + safe-buffer "^5.1.1" + +execa@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" + integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" + integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +express@^4.16.3, express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== + dependencies: + chardet "^0.7.0" + iconv-lite "^0.4.24" + tmp "^0.0.33" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^2.2.6: + version "2.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" + integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== + dependencies: + "@mrmlnc/readdir-enhanced" "^2.2.1" + "@nodelib/fs.stat" "^1.1.2" + glob-parent "^3.1.0" + is-glob "^4.0.0" + merge2 "^1.2.3" + micromatch "^3.1.10" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +faye-websocket@^0.11.3: + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== + dependencies: + websocket-driver ">=0.5.1" + +figgy-pudding@^3.5.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== + +figures@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== + dependencies: + escape-string-regexp "^1.0.5" + +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== + dependencies: + flat-cache "^2.0.1" + +file-loader@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" + integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== + dependencies: + loader-utils "^1.2.3" + schema-utils "^2.5.0" + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filesize@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-cache-dir@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" + integrity sha1-yN765XyKUqinhPnjHFfHQumToLk= + dependencies: + commondir "^1.0.1" + mkdirp "^0.5.1" + pkg-dir "^1.0.0" + +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== + dependencies: + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" + +flatted@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== + +flush-write-stream@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" + integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== + dependencies: + inherits "^2.0.3" + readable-stream "^2.3.6" + +follow-redirects@^1.0.0: + version "1.14.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" + integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-write-stream-atomic@^1.0.8: + version "1.0.10" + resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" + integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= + dependencies: + graceful-fs "^4.1.2" + iferr "^0.1.5" + imurmurhash "^0.1.4" + readable-stream "1 || 2" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^1.2.7: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.1, get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= + +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob-parent@^5.0.0, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= + +glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + +globby@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" + integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= + dependencies: + array-union "^1.0.1" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +globby@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" + integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA= + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + +globby@^9.2.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" + integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== + dependencies: + "@types/glob" "^7.1.1" + array-union "^1.0.2" + dir-glob "^2.2.2" + fast-glob "^2.2.6" + glob "^7.1.3" + ignore "^4.0.3" + pify "^4.0.1" + slash "^2.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +gzip-size@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" + integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== + dependencies: + duplexer "^0.1.1" + pify "^4.0.1" + +handle-thing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -node-fetch@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +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: - whatwg-url "^5.0.0" + has-symbols "^1.0.2" -popper.js@^1.16.1: +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has@^1.0.0, has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hash-base@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + dependencies: + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" + +hash-sum@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" + integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ= + +hash-sum@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" + integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== + +hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== + dependencies: + inherits "^2.0.3" + minimalistic-assert "^1.0.1" + +he@1.2.x, he@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +hex-color-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" + integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== + +highlight.js@^10.7.1: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== + +hmac-drbg@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + +hoopy@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hpack.js@^2.1.6: + version "2.1.6" + resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= + dependencies: + inherits "^2.0.1" + obuf "^1.0.0" + readable-stream "^2.0.1" + wbuf "^1.1.0" + +hsl-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" + integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= + +hsla-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" + integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= + +html-entities@^1.3.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" + integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== + +html-minifier@^3.2.3: + version "3.5.21" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" + integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA== + dependencies: + camel-case "3.0.x" + clean-css "4.2.x" + commander "2.17.x" + he "1.2.x" + param-case "2.1.x" + relateurl "0.2.x" + uglify-js "3.4.x" + +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= + +html-tags@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== + +html-webpack-plugin@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b" + integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s= + dependencies: + html-minifier "^3.2.3" + loader-utils "^0.2.16" + lodash "^4.17.3" + pretty-error "^2.0.2" + tapable "^1.0.0" + toposort "^1.0.0" + util.promisify "1.0.0" + +htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + +http-deceiver@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-parser-js@>=0.5.1: + version "0.5.3" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" + integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== + +http-proxy-middleware@0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" + integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== + dependencies: + http-proxy "^1.17.0" + is-glob "^4.0.0" + lodash "^4.17.11" + micromatch "^3.1.10" + +http-proxy-middleware@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665" + integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg== + dependencies: + "@types/http-proxy" "^1.17.5" + http-proxy "^1.18.1" + is-glob "^4.0.1" + is-plain-obj "^3.0.0" + micromatch "^4.0.2" + +http-proxy@^1.17.0, http-proxy@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +iconv-lite@0.4.24, iconv-lite@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" + +ieee754@^1.1.4: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +iferr@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" + integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= + +ignore@^3.3.5: + version "3.3.10" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" + integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== + +ignore@^4.0.3, ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +import-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" + integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= + dependencies: + import-from "^2.1.0" + +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + +import-fresh@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-from@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" + integrity sha1-M1238qev/VOqpHHUuAId7ja387E= + dependencies: + resolve-from "^3.0.0" + +import-local@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" + integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== + dependencies: + pkg-dir "^3.0.0" + resolve-cwd "^2.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indexes-of@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" + integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= + +infer-owner@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +inquirer@^7.0.0, inquirer@^7.1.0: + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== + dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash "^4.17.19" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + +internal-ip@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" + integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== + dependencies: + default-gateway "^4.2.0" + ipaddr.js "^1.9.0" + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + +ip@^1.1.0, ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +ipaddr.js@1.9.1, ipaddr.js@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-absolute-url@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" + integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= + +is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arguments@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + +is-bigint@^1.0.1: + 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" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + dependencies: + binary-extensions "^1.0.0" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + 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" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-callable@^1.1.4, is-callable@^1.2.4: + 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== + +is-ci@^1.0.10: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== + dependencies: + ci-info "^1.5.0" + +is-color-stop@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" + integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= + dependencies: + css-color-names "^0.0.4" + hex-color-regex "^1.1.0" + hsl-regex "^1.0.0" + hsla-regex "^1.0.0" + rgb-regex "^1.0.1" + rgba-regex "^1.0.0" + +is-core-module@^2.2.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== + dependencies: + has "^1.0.3" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-date-object@^1.0.1: + 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" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + +is-number-object@^1.0.4: + 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" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-cwd@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== + +is-path-in-cwd@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" + integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== + dependencies: + is-path-inside "^2.1.0" + +is-path-inside@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" + integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== + dependencies: + path-is-inside "^1.0.2" + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + +is-plain-obj@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-regex@^1.0.4, is-regex@^1.1.4: + 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" + +is-resolvable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-string@^1.0.5, is-string@^1.0.7: + 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" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-weakref@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" + integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + dependencies: + call-bind "^1.0.0" + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +javascript-stringify@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79" + integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== + +js-message@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47" + integrity sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA== + +js-queue@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/js-queue/-/js-queue-2.0.2.tgz#0be590338f903b36c73d33c31883a821412cd482" + integrity sha512-pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA== + dependencies: + easy-stack "^1.0.1" + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json3@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" + integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== + +json5@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + dependencies: + minimist "^1.2.0" + +json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +killable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" + integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +launch-editor-middleware@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157" + integrity sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg== + dependencies: + launch-editor "^2.2.1" + +launch-editor@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.2.1.tgz#871b5a3ee39d6680fcc26d37930b6eeda89db0ca" + integrity sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw== + dependencies: + chalk "^2.3.0" + shell-quote "^1.6.1" + +levn@^0.3.0, levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +loader-fs-cache@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9" + integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA== + dependencies: + find-cache-dir "^0.1.1" + mkdirp "^0.5.1" + +loader-runner@^2.3.1, loader-runner@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" + integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== + +loader-utils@^0.2.16: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" + integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + object-assign "^4.0.1" + +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + +lodash.defaultsdeep@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" + integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== + +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= + +lodash.mapvalues@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" + integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw= + +lodash.memoize@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.transform@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" + integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== + dependencies: + chalk "^2.0.1" + +loglevel@^1.6.8: + version "1.7.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" + integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== + +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= + +lru-cache@^4.0.1, lru-cache@^4.1.2: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-dir@^3.0.2, make-dir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +md5.js@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + safe-buffer "^5.1.2" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdn-data@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" + integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +memory-fs@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" + integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + +memory-fs@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" + integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== + dependencies: + source-map "^0.6.1" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.2.3: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.2: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +miller-rabin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +mime-db@1.50.0, "mime-db@>= 1.43.0 < 2": + version "1.50.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" + integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== + +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.33" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" + integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== + dependencies: + mime-db "1.50.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.4.4: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mini-css-extract-plugin@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e" + integrity sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A== + dependencies: + loader-utils "^1.1.0" + normalize-url "1.9.1" + schema-utils "^1.0.0" + webpack-sources "^1.1.0" + +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +minipass@^3.1.1: + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== + dependencies: + yallist "^4.0.0" + +mississippi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" + integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== + dependencies: + concat-stream "^1.5.0" + duplexify "^3.4.2" + end-of-stream "^1.1.0" + flush-write-stream "^1.0.0" + from2 "^2.1.0" + parallel-transform "^1.1.0" + pump "^3.0.0" + pumpify "^1.3.3" + stream-each "^1.1.0" + through2 "^2.0.0" + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +move-concurrently@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" + integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= + dependencies: + aproba "^1.1.1" + copy-concurrently "^1.0.0" + fs-write-stream-atomic "^1.0.8" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.3" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multicast-dns-service-types@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" + integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= + +multicast-dns@^6.0.1: + version "6.2.3" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== + dependencies: + dns-packet "^1.3.1" + thunky "^1.0.2" + +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + +mz@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +nan@^2.12.1: + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" + +node-forge@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== + +node-ipc@^9.1.1: + version "9.2.1" + resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b" + integrity sha512-mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ== + dependencies: + event-pubsub "4.3.0" + js-message "1.0.7" + js-queue "2.0.2" + +node-libs-browser@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" + integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== + dependencies: + assert "^1.1.1" + browserify-zlib "^0.2.0" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^3.0.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" + path-browserify "0.0.1" + process "^0.11.10" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.3.3" + stream-browserify "^2.0.1" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.11.0" + vm-browserify "^1.0.1" + +node-releases@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" + integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k= + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + +normalize-url@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" + integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= + dependencies: + object-assign "^4.0.1" + prepend-http "^1.0.0" + query-string "^4.1.0" + sort-keys "^1.0.0" + +normalize-url@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" + integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +nth-check@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +nth-check@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== + dependencies: + boolbase "^1.0.0" + +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-hash@^1.1.4: + version "1.3.1" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" + integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== + +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + +object-is@^1.0.1: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.assign@^4.1.0, object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +object.values@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +obuf@^1.0.0, obuf@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +open@^6.3.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9" + integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg== + dependencies: + is-wsl "^1.1.0" + +opener@^1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== + +opn@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== + dependencies: + is-wsl "^1.1.0" + +optionator@^0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +ora@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" + integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg== + dependencies: + chalk "^2.4.2" + cli-cursor "^2.1.0" + cli-spinners "^2.0.0" + log-symbols "^2.2.0" + strip-ansi "^5.2.0" + wcwidth "^1.0.1" + +original@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" + integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== + dependencies: + url-parse "^1.4.3" + +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + +p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-retry@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" + integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== + dependencies: + retry "^0.12.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +pako@~1.0.5: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + +parallel-transform@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" + integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== + dependencies: + cyclist "^1.0.1" + inherits "^2.0.3" + readable-stream "^2.1.5" + +param-case@2.1.x: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= + dependencies: + no-case "^2.2.0" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== + dependencies: + asn1.js "^5.2.0" + browserify-aes "^1.0.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5-htmlparser2-tree-adapter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + +parse5@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + +parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + +parseurl@~1.3.2, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-browserify@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" + integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + dependencies: + pinkie-promise "^2.0.0" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-is-inside@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + +pbkdf2@^3.0.3: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== + dependencies: + create-hash "^1.1.2" + create-hmac "^1.1.4" + ripemd160 "^2.0.1" + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picocolors@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +pkg-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" + integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q= + dependencies: + find-up "^1.0.0" + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkg-dir@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pnp-webpack-plugin@^1.6.4: + version "1.7.0" + resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9" + integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg== + dependencies: + ts-pnp "^1.1.6" + +portfinder@^1.0.26: + version "1.0.28" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" + integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== + dependencies: + async "^2.6.2" + debug "^3.1.1" + mkdirp "^0.5.5" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +postcss-calc@^7.0.1: + version "7.0.5" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" + integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== + dependencies: + postcss "^7.0.27" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" + +postcss-colormin@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" + integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== + dependencies: + browserslist "^4.0.0" + color "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-convert-values@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" + integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-discard-comments@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" + integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== + dependencies: + postcss "^7.0.0" + +postcss-discard-duplicates@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" + integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== + dependencies: + postcss "^7.0.0" + +postcss-discard-empty@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" + integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== + dependencies: + postcss "^7.0.0" + +postcss-discard-overridden@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" + integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== + dependencies: + postcss "^7.0.0" + +postcss-load-config@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" + integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw== + dependencies: + cosmiconfig "^5.0.0" + import-cwd "^2.0.0" + +postcss-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" + integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== + dependencies: + loader-utils "^1.1.0" + postcss "^7.0.0" + postcss-load-config "^2.0.0" + schema-utils "^1.0.0" + +postcss-merge-longhand@^4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" + integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== + dependencies: + css-color-names "0.0.4" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + stylehacks "^4.0.0" + +postcss-merge-rules@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" + integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + cssnano-util-same-parent "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + vendors "^1.0.0" + +postcss-minify-font-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" + integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-gradients@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" + integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + is-color-stop "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-minify-params@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" + integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== + dependencies: + alphanum-sort "^1.0.0" + browserslist "^4.0.0" + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + uniqs "^2.0.0" + +postcss-minify-selectors@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" + integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== + dependencies: + alphanum-sort "^1.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== + dependencies: + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== + dependencies: + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" + +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + dependencies: + icss-utils "^4.0.0" + postcss "^7.0.6" + +postcss-normalize-charset@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" + integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== + dependencies: + postcss "^7.0.0" + +postcss-normalize-display-values@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" + integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-positions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" + integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== + dependencies: + cssnano-util-get-arguments "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-repeat-style@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" + integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== + dependencies: + cssnano-util-get-arguments "^4.0.0" + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-string@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" + integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== + dependencies: + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-timing-functions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" + integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== + dependencies: + cssnano-util-get-match "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-unicode@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" + integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-url@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" + integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== + dependencies: + is-absolute-url "^2.0.0" + normalize-url "^3.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-normalize-whitespace@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" + integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-ordered-values@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" + integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== + dependencies: + cssnano-util-get-arguments "^4.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-reduce-initial@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" + integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== + dependencies: + browserslist "^4.0.0" + caniuse-api "^3.0.0" + has "^1.0.0" + postcss "^7.0.0" + +postcss-reduce-transforms@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" + integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== + dependencies: + cssnano-util-get-match "^4.0.0" + has "^1.0.0" + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + +postcss-selector-parser@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" + integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== + dependencies: + dot-prop "^5.2.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-svgo@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" + integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== + dependencies: + postcss "^7.0.0" + postcss-value-parser "^3.0.0" + svgo "^1.0.0" + +postcss-unique-selectors@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" + integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== + dependencies: + alphanum-sort "^1.0.0" + postcss "^7.0.0" + uniqs "^2.0.0" + +postcss-value-parser@^3.0.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" + integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== + +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.39" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== + dependencies: + picocolors "^0.2.1" + source-map "^0.6.1" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prepend-http@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +prettier@^1.18.2: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + +pretty-error@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6" + integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw== + dependencies: + lodash "^4.17.20" + renderkid "^2.0.4" + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +promise-inflight@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +public-encrypt@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" + integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + safe-buffer "^5.1.2" + +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pumpify@^1.3.3: + version "1.5.1" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" + integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== + dependencies: + duplexify "^3.6.0" + inherits "^2.0.3" + pump "^2.0.0" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +q@^1.1.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +query-string@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" + integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + dependencies: + object-assign "^4.1.0" + strict-uri-encode "^1.0.0" + +querystring-es3@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +randomfill@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== + dependencies: + randombytes "^2.0.5" + safe-buffer "^5.1.0" + +range-parser@^1.2.1, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +read-pkg@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.0.6, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +regenerate-unicode-properties@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== + dependencies: + regenerate "^1.4.2" + +regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.13.4: + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== + +regenerator-transform@^0.14.2: + version "0.14.5" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== + dependencies: + "@babel/runtime" "^7.8.4" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexp.prototype.flags@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" + integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== + +regexpu-core@^4.7.1: + version "4.8.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== + dependencies: + regenerate "^1.4.2" + regenerate-unicode-properties "^9.0.0" + regjsgen "^0.5.2" + regjsparser "^0.7.0" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.0.0" + +regjsgen@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== + +regjsparser@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" + integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== + dependencies: + jsesc "~0.5.0" + +relateurl@0.2.x: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +renderkid@^2.0.4: + version "2.0.7" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" + integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== + dependencies: + css-select "^4.1.3" + dom-converter "^0.2.0" + htmlparser2 "^6.1.0" + lodash "^4.17.21" + strip-ansi "^3.0.1" + +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request@^2.88.2: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +resolve-cwd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" + integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= + dependencies: + resolve-from "^3.0.0" + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha1-six699nWiBvItuZTM17rywoYh0g= + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + +rgb-regex@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" + integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= + +rgba-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" + integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= + +rimraf@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +ripemd160@^2.0.0, ripemd160@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== + dependencies: + hash-base "^3.0.0" + inherits "^2.0.1" + +run-async@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +run-queue@^1.0.0, run-queue@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" + integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= + dependencies: + aproba "^1.1.1" + +rxjs@^6.6.0: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@>=5.1.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.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== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sax@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +schema-utils@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" + integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== + dependencies: + ajv "^6.1.0" + ajv-errors "^1.0.0" + ajv-keywords "^3.1.0" + +schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= + +selfsigned@^1.10.8: + version "1.10.11" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" + integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== + dependencies: + node-forge "^0.10.0" + +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + +semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-javascript@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== + dependencies: + randombytes "^2.1.0" + +serve-index@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= + dependencies: + accepts "~1.3.4" + batch "0.6.1" + debug "2.6.9" + escape-html "~1.0.3" + http-errors "~1.6.2" + mime-types "~2.1.17" + parseurl "~1.3.2" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setimmediate@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +sha.js@^2.4.0, sha.js@^2.4.8: + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shell-quote@^1.6.1: + version "1.7.3" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== + dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" + is-fullwidth-code-point "^2.0.0" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +sockjs-client@^1.5.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3" + integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ== + dependencies: + debug "^3.2.6" + eventsource "^1.0.7" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.5.3" + +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== + dependencies: + faye-websocket "^0.11.3" + uuid "^3.4.0" + websocket-driver "^0.7.4" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + +source-list-map@^2.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== + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@~0.5.12: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + +source-map@^0.5.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + 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== + +spdy-transport@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== + dependencies: + debug "^4.1.0" + detect-node "^2.0.4" + hpack.js "^2.1.6" + obuf "^1.1.2" + readable-stream "^3.0.6" + wbuf "^1.7.3" + +spdy@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== + dependencies: + debug "^4.1.0" + handle-thing "^2.0.0" + http-deceiver "^1.2.7" + select-hose "^2.0.0" + spdy-transport "^3.0.0" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" -portal-vue@^2.1.7: - version "2.1.7" - resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4" - integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g== +ssri@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== + dependencies: + figgy-pudding "^3.5.1" + +ssri@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + dependencies: + minipass "^3.1.1" + +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + +stackframe@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" + integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-browserify@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +stream-each@^1.1.0: + version "1.2.3" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" + integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== + dependencies: + end-of-stream "^1.1.0" + stream-shift "^1.0.0" + +stream-http@^2.7.2: + version "2.8.3" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" + integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.1" + readable-stream "^2.3.6" + to-arraybuffer "^1.0.0" + xtend "^4.0.0" + +stream-shift@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== + +strict-uri-encode@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" + integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= + +string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.0.0, string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^5, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= + +strip-json-comments@^3.0.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +stylehacks@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" + integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== + dependencies: + browserslist "^4.0.0" + postcss "^7.0.0" + postcss-selector-parser "^3.0.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" supports-color@^7.1.0: version "7.2.0" @@ -93,30 +7644,905 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -vue-functional-data-merge@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657" - integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA== +svgo@^1.0.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== + dependencies: + chalk "^2.4.1" + coa "^2.0.2" + css-select "^2.0.0" + css-select-base-adapter "^0.1.1" + css-tree "1.0.0-alpha.37" + csso "^4.0.2" + js-yaml "^3.13.1" + mkdirp "~0.5.1" + object.values "^1.1.0" + sax "~1.2.4" + stable "^0.1.8" + unquote "~1.1.1" + util.promisify "~1.0.0" -vue@^2.6.14: +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== + dependencies: + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" + +tapable@^1.0.0, tapable@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== + +terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^1.4.4: + version "1.4.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" + integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== + dependencies: + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^4.0.0" + source-map "^0.6.1" + terser "^4.1.2" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" + +terser@^4.1.2: + version "4.8.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + +thread-loader@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-2.1.3.tgz#cbd2c139fc2b2de6e9d28f62286ab770c1acbdda" + integrity sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg== + dependencies: + loader-runner "^2.3.1" + loader-utils "^1.1.0" + neo-async "^2.6.0" + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +thunky@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== + +timers-browserify@^2.0.4: + version "2.0.12" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" + integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== + dependencies: + setimmediate "^1.0.4" + +timsort@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-arraybuffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +toposort@^1.0.0: + version "1.0.7" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" + integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk= + +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tryer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== + +ts-pnp@^1.1.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" + integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== + +tslib@^1.9.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tty-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +uglify-js@3.4.x: + version "3.4.10" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f" + integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw== + dependencies: + commander "~2.19.0" + source-map "~0.6.1" + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== + +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== + dependencies: + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" + +unicode-match-property-value-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== + +unicode-property-aliases-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +uniq@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" + integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= + +uniqs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" + integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= + +unique-filename@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +unquote@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +upath@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== + +upper-case@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +url-loader@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b" + integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog== + dependencies: + loader-utils "^1.2.3" + mime "^2.4.4" + schema-utils "^2.5.0" + +url-parse@^1.4.3, url-parse@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util.promisify@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" + integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== + dependencies: + define-properties "^1.1.2" + object.getownpropertydescriptors "^2.0.3" + +util.promisify@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" + +util@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + dependencies: + inherits "2.0.1" + +util@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" + integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== + dependencies: + inherits "2.0.3" + +utila@~0.4: + version "0.4.0" + resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +uuid@^3.3.2, uuid@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +vendors@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vm-browserify@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" + integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== + +vue-eslint-parser@^7.0.0: + version "7.11.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf" + integrity sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg== + dependencies: + debug "^4.1.1" + eslint-scope "^5.1.1" + eslint-visitor-keys "^1.1.0" + espree "^6.2.1" + esquery "^1.4.0" + lodash "^4.17.21" + semver "^6.3.0" + +vue-hot-reload-api@^2.3.0: + version "2.3.4" + resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" + integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== + +"vue-loader-v16@npm:vue-loader@^16.1.0": + version "16.8.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.1.tgz#354f12bc0897954158b71590f800295713a7792d" + integrity sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ== + dependencies: + chalk "^4.1.0" + hash-sum "^2.0.0" + loader-utils "^2.0.0" + +vue-loader@^15.9.2: + version "15.9.8" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz#4b0f602afaf66a996be1e534fb9609dc4ab10e61" + integrity sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog== + dependencies: + "@vue/component-compiler-utils" "^3.1.0" + hash-sum "^1.0.2" + loader-utils "^1.1.0" + vue-hot-reload-api "^2.3.0" + vue-style-loader "^4.1.0" + +vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" + integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg== + dependencies: + hash-sum "^1.0.2" + loader-utils "^1.0.2" + +vue-template-compiler@^2.6.11: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" + integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== + dependencies: + de-indent "^1.0.2" + he "^1.1.0" + +vue-template-es2015-compiler@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" + integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== + +vue@^2.6.11: version "2.6.14" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= +watchpack-chokidar2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" + integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" + chokidar "^2.1.8" + +watchpack@^1.7.4: + version "1.7.5" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" + integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== + dependencies: + graceful-fs "^4.1.2" + neo-async "^2.5.0" + optionalDependencies: + chokidar "^3.4.1" + watchpack-chokidar2 "^2.0.1" + +wbuf@^1.1.0, wbuf@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== + dependencies: + minimalistic-assert "^1.0.0" + +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + dependencies: + defaults "^1.0.3" + +webpack-bundle-analyzer@^3.8.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz#f6f94db108fb574e415ad313de41a2707d33ef3c" + integrity sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + bfj "^6.1.1" + chalk "^2.4.1" + commander "^2.18.0" + ejs "^2.6.1" + express "^4.16.3" + filesize "^3.6.1" + gzip-size "^5.0.0" + lodash "^4.17.19" + mkdirp "^0.5.1" + opener "^1.5.1" + ws "^6.0.0" + +webpack-chain@^6.4.0: + version "6.5.1" + resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.5.1.tgz#4f27284cbbb637e3c8fbdef43eef588d4d861206" + integrity sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA== + dependencies: + deepmerge "^1.5.2" + javascript-stringify "^2.0.1" + +webpack-dev-middleware@^3.7.2: + version "3.7.3" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" + integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== + dependencies: + memory-fs "^0.4.1" + mime "^2.4.4" + mkdirp "^0.5.1" + range-parser "^1.2.1" + webpack-log "^2.0.0" + +webpack-dev-server@^3.11.0: + version "3.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" + integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== + dependencies: + ansi-html "0.0.7" + bonjour "^3.5.0" + chokidar "^2.1.8" + compression "^1.7.4" + connect-history-api-fallback "^1.6.0" + debug "^4.1.1" + del "^4.1.1" + express "^4.17.1" + html-entities "^1.3.1" + http-proxy-middleware "0.19.1" + import-local "^2.0.0" + internal-ip "^4.3.0" + ip "^1.1.5" + is-absolute-url "^3.0.3" + killable "^1.0.1" + loglevel "^1.6.8" + opn "^5.5.0" + p-retry "^3.0.1" + portfinder "^1.0.26" + schema-utils "^1.0.0" + selfsigned "^1.10.8" + semver "^6.3.0" + serve-index "^1.9.1" + sockjs "^0.3.21" + sockjs-client "^1.5.0" + spdy "^4.0.2" + strip-ansi "^3.0.1" + supports-color "^6.1.0" + url "^0.11.0" + webpack-dev-middleware "^3.7.2" + webpack-log "^2.0.0" + ws "^6.2.1" + yargs "^13.3.2" + +webpack-log@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" + integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== + dependencies: + ansi-colors "^3.0.0" + uuid "^3.3.2" + +webpack-merge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" + integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== + dependencies: + lodash "^4.17.15" + +webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: + version "1.4.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== + dependencies: + source-list-map "^2.0.0" + source-map "~0.6.1" + +webpack@^4.0.0: + version "4.46.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" + integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + acorn "^6.4.1" + ajv "^6.10.2" + ajv-keywords "^3.4.1" + chrome-trace-event "^1.0.2" + enhanced-resolve "^4.5.0" + eslint-scope "^4.0.3" + json-parse-better-errors "^1.0.2" + loader-runner "^2.4.0" + loader-utils "^1.2.3" + memory-fs "^0.4.1" + micromatch "^3.1.10" + mkdirp "^0.5.3" + neo-async "^2.6.1" + node-libs-browser "^2.2.1" + schema-utils "^1.0.0" + tapable "^1.1.3" + terser-webpack-plugin "^1.4.3" + watchpack "^1.7.4" + webpack-sources "^1.4.1" + +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== + dependencies: + http-parser-js ">=0.5.1" + safe-buffer ">=5.1.0" + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +worker-farm@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" + integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== + dependencies: + errno "~0.1.7" + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== + dependencies: + mkdirp "^0.5.1" + +ws@^6.0.0, ws@^6.2.1: + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== + dependencies: + async-limiter "~1.0.0" + +xtend@^4.0.0, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^13.3.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" + +yargs@^16.0.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yorkie@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9" + integrity sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw== + dependencies: + execa "^0.8.0" + is-ci "^1.0.10" + normalize-path "^1.0.0" + strip-indent "^2.0.0" From 75f20378ac68a0d67328311392fd3add33cf69d0 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Thu, 21 Oct 2021 16:48:03 +0200 Subject: [PATCH 0957/1843] Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index dc933328d..499e0ee9e 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -106,7 +106,7 @@ describe('DashboardLayoutGdd', () => { expect(navbar.findAll('ul > a').at(1).text()).toEqual('send') }) - it('has second item "send" linked to sendoverview in navbar', () => { + it('has second item "send" linked to /send in navbar', () => { navbar.findAll('ul > a').at(1).trigger('click') expect(wrapper.findAll('ul > a').at(1).attributes('href')).toBe('/send') }) From 976e8ffbedcbea06422b5a435a47533998a82909 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 20:51:20 +0200 Subject: [PATCH 0958/1843] only migrate login database if available --- database/migrations/0004-login_server_data.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts index 6a6668bd9..dad7d1e34 100644 --- a/database/migrations/0004-login_server_data.ts +++ b/database/migrations/0004-login_server_data.ts @@ -9,9 +9,18 @@ * databases. */ -const LOGIN_SERVER_DB = '`gradido_login`' +const LOGIN_SERVER_DB = 'gradido_login' export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + const loginDatabaseExists = await queryFn(` + SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${LOGIN_SERVER_DB}' + `) + if (loginDatabaseExists.length === 0) { + // eslint-disable-next-line no-console + console.log(`Skipping Login Server Database migration - Database ${LOGIN_SERVER_DB} not found`) + return + } + await queryFn(` INSERT INTO \`login_app_access_tokens\` SELECT * FROM ${LOGIN_SERVER_DB}.\`app_access_tokens\`; `) From 8f517f1b2655a383fa427f72c62e4dbc45f16a05 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 21 Oct 2021 22:02:09 +0200 Subject: [PATCH 0959/1843] GddGdtStatus.vue changed to component Status.vue --- .../GddGdtStatus.spec.js => components/Status.spec.js} | 6 +++--- .../Pages/GddGdtStatus.vue => components/Status.vue} | 2 +- frontend/src/views/Layout/DashboardLayout_gdd.spec.js | 2 +- frontend/src/views/Pages/AccountOverview.vue | 8 ++++---- frontend/src/views/Pages/SendOverview.vue | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename frontend/src/{views/Pages/GddGdtStatus.spec.js => components/Status.spec.js} (82%) rename frontend/src/{views/Pages/GddGdtStatus.vue => components/Status.vue} (95%) diff --git a/frontend/src/views/Pages/GddGdtStatus.spec.js b/frontend/src/components/Status.spec.js similarity index 82% rename from frontend/src/views/Pages/GddGdtStatus.spec.js rename to frontend/src/components/Status.spec.js index 8a16310c6..4e203c315 100644 --- a/frontend/src/views/Pages/GddGdtStatus.spec.js +++ b/frontend/src/components/Status.spec.js @@ -1,9 +1,9 @@ import { mount } from '@vue/test-utils' -import GddStatus from './GddGdtStatus' +import Status from './Status' const localVue = global.localVue -describe('GddStatus', () => { +describe('Status', () => { let wrapper const mocks = { @@ -16,7 +16,7 @@ describe('GddStatus', () => { } const Wrapper = () => { - return mount(GddStatus, { localVue, mocks, propsData }) + return mount(Status, { localVue, mocks, propsData }) } describe('mount', () => { diff --git a/frontend/src/views/Pages/GddGdtStatus.vue b/frontend/src/components/Status.vue similarity index 95% rename from frontend/src/views/Pages/GddGdtStatus.vue rename to frontend/src/components/Status.vue index 20308690a..7900763f7 100644 --- a/frontend/src/views/Pages/GddGdtStatus.vue +++ b/frontend/src/components/Status.vue @@ -8,7 +8,7 @@ From db6cea4cbdb03e077962808af8d7c41574ff660a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 22 Oct 2021 08:58:37 +0200 Subject: [PATCH 0971/1843] only one describe block on top level --- .../GdtTransactionList.spec.js | 125 +++++++----------- 1 file changed, 51 insertions(+), 74 deletions(-) diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js index 359260db1..77507cb69 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.spec.js @@ -4,7 +4,7 @@ import GdtTransactionList from './GdtTransactionList' const localVue = global.localVue -const apolloMockNull = jest.fn().mockResolvedValue({ +const apolloMock = jest.fn().mockResolvedValue({ data: { listGDTEntries: { count: 0, @@ -13,48 +13,6 @@ const apolloMockNull = jest.fn().mockResolvedValue({ }, }) -const apolloMock = jest.fn().mockResolvedValue({ - data: { - listGDTEntries: { - count: 4, - gdtEntries: [ - { - amount: 100, - gdt: 1700, - factor: 17, - comment: '', - date: '2021-05-02T17:20:11+00:00', - gdtEntryType: GdtEntryType.FORM, - }, - { - amount: 1810, - gdt: 362, - factor: 0.2, - comment: 'Dezember 20', - date: '2020-12-31T12:00:00+00:00', - gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR, - }, - { - amount: 100, - gdt: 1700, - factor: 17, - comment: '', - date: '2020-05-07T17:00:00+00:00', - gdtEntryType: GdtEntryType.FORM, - }, - { - amount: 100, - gdt: 110, - factor: 22, - comment: '', - date: '2020-04-10T13:28:00+00:00', - gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER, - }, - ], - }, - }, -}) - const toastErrorMock = jest.fn() const windowScrollToMock = jest.fn() @@ -82,7 +40,7 @@ describe('GdtTransactionList ', () => { error: toastErrorMock, }, $apollo: { - query: apolloMockNull, + query: apolloMock, }, } @@ -100,40 +58,59 @@ describe('GdtTransactionList ', () => { }) it('links to https://gradido.net/en/memberships/ when clicking', async () => { - const link = 'https://gradido.net/' + state.language + '/memberships/' - expect(wrapper.find('.gdt-funding').attributes('href')).toBe(link) + expect(wrapper.find('.gdt-funding').attributes('href')).toBe( + 'https://gradido.net/' + state.language + '/memberships/', + ) }) }) -}) - -describe('GdtTransactionList', () => { - let wrapper - - const mocks = { - $store: { - state, - commit: jest.fn(), - }, - $i18n: { - locale: 'en', - }, - $t: jest.fn((t) => t), - $n: jest.fn((n) => n), - $d: jest.fn((d) => d), - $toasted: { - error: toastErrorMock, - }, - $apollo: { - query: apolloMock, - }, - } - - const Wrapper = () => { - return mount(GdtTransactionList, { localVue, mocks }) - } describe('mount - When transactions are loaded', () => { beforeEach(() => { + apolloMock.mockResolvedValue({ + data: { + listGDTEntries: { + count: 4, + gdtEntries: [ + { + id: 1, + amount: 100, + gdt: 1700, + factor: 17, + comment: '', + date: '2021-05-02T17:20:11+00:00', + gdtEntryType: GdtEntryType.FORM, + }, + { + id: 2, + amount: 1810, + gdt: 362, + factor: 0.2, + comment: 'Dezember 20', + date: '2020-12-31T12:00:00+00:00', + gdtEntryType: GdtEntryType.GLOBAL_MODIFICATOR, + }, + { + id: 3, + amount: 100, + gdt: 1700, + factor: 17, + comment: '', + date: '2020-05-07T17:00:00+00:00', + gdtEntryType: GdtEntryType.FORM, + }, + { + id: 4, + amount: 100, + gdt: 110, + factor: 22, + comment: '', + date: '2020-04-10T13:28:00+00:00', + gdtEntryType: GdtEntryType.ELOPAGE_PUBLISHER, + }, + ], + }, + }, + }) wrapper = Wrapper() }) @@ -141,7 +118,7 @@ describe('GdtTransactionList', () => { expect(wrapper.find('div.gdt-transaction-list').exists()).toBeTruthy() }) - it('renders the not funding button ', () => { + it('does not render the funding button ', () => { expect(wrapper.find('.gdt-funding').exists()).toBe(false) }) From af43222736c312adb93e2947bbf61bba816329eb Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 22 Oct 2021 16:04:23 +0200 Subject: [PATCH 0972/1843] Withdrew the code that signed the transactions. --- .../graphql/resolver/TransactionResolver.ts | 139 ++++++++---------- 1 file changed, 62 insertions(+), 77 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 48799471e..6263fbc6f 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -33,19 +33,7 @@ import { calculateDecay, calculateDecayWithInterval } from '../../util/decay' import { TransactionTypeId } from '../enum/TransactionTypeId' import { TransactionType } from '../enum/TransactionType' import { hasUserAmount, isHexPublicKey } from '../../util/validate' -import { - from_hex as fromHex, - to_base64 as toBase64, - from_base64 as fromBase64, - base64_variants as base64Variants, - crypto_sign_verify_detached as cryptoSignVerifyDetached, - crypto_generichash_init as cryptoGenerichashInit, - crypto_generichash_update as cryptoGenerichashUpdate, - crypto_generichash_final as cryptoGenerichashFinal, - crypto_generichash_BYTES as cryptoGenericHashBytes, -} from 'libsodium-wrappers' - -import { proto } from '../../proto/bundle' +import { from_hex as fromHex } from 'libsodium-wrappers' // Helper function async function calculateAndAddDecayTransactions( @@ -241,13 +229,15 @@ async function updateStateBalance( balance = new DbBalance() balance.userId = user.id balance.amount = centAmount + balance.modified = received } else { - const decaiedBalance = calculateDecay(balance.amount, balance.recordDate, received).catch( + const decaiedBalance = await calculateDecay(balance.amount, balance.recordDate, received).catch( () => { throw new Error('error by calculating decay') }, ) - balance.amount = Number(await decaiedBalance) + centAmount + balance.amount = Number(decaiedBalance) + centAmount + balance.modified = new Date() } if (balance.amount <= 0) { throw new Error('error new balance <= 0') @@ -310,7 +300,6 @@ async function sendCoins( recipiantPublicKey: string, amount: number, memo: string, - sessionId: number, groupId = 0, ): Promise { if (senderUser.pubkey.length !== 32) { @@ -333,44 +322,44 @@ async function sendCoins( } const centAmount = Math.trunc(amount * 10000) - const transferAmount = new proto.gradido.TransferAmount({ - pubkey: senderUser.pubkey, - amount: centAmount, - }) + // const transferAmount = new proto.gradido.TransferAmount({ + // pubkey: senderUser.pubkey, + // amount: centAmount, + // }) // no group id is given so we assume it is a local transfer if (!groupId) { - const localTransfer = new proto.gradido.LocalTransfer({ - sender: transferAmount, - recipiant: fromHex(recipiantPublicKey), - }) - const transferTransaction = new proto.gradido.GradidoTransfer({ local: localTransfer }) - const transactionBody = new proto.gradido.TransactionBody({ - memo: memo, - created: { seconds: new Date().getTime() / 1000 }, - transfer: transferTransaction, - }) + // const localTransfer = new proto.gradido.LocalTransfer({ + // sender: transferAmount, + // recipiant: fromHex(recipiantPublicKey), + // }) + // const transferTransaction = new proto.gradido.GradidoTransfer({ local: localTransfer }) + // const transactionBody = new proto.gradido.TransactionBody({ + // memo: memo, + // created: { seconds: new Date().getTime() / 1000 }, + // transfer: transferTransaction, + // }) - const bodyBytes = proto.gradido.TransactionBody.encode(transactionBody).finish() - const bodyBytesBase64 = toBase64(bodyBytes, base64Variants.ORIGINAL) + // const bodyBytes = proto.gradido.TransactionBody.encode(transactionBody).finish() + // const bodyBytesBase64 = toBase64(bodyBytes, base64Variants.ORIGINAL) // let Login-Server sign transaction - const result = await apiPost(CONFIG.LOGIN_API_URL + 'signTransaction', { - session_id: sessionId, - bodyBytes: bodyBytesBase64, - }) - if (!result.success) throw new Error(result.data) - // verify - const sign = fromBase64(result.data.sign, base64Variants.ORIGINAL) - if (!cryptoSignVerifyDetached(sign, bodyBytesBase64, senderUser.pubkey)) { - throw new Error('Could not verify signature') - } + // const result = await apiPost(CONFIG.LOGIN_API_URL + 'signTransaction', { + // session_id: sessionId, + // bodyBytes: bodyBytesBase64, + // }) + // if (!result.success) throw new Error(result.data) + // // verify + // const sign = fromBase64(result.data.sign, base64Variants.ORIGINAL) + // if (!cryptoSignVerifyDetached(sign, bodyBytesBase64, senderUser.pubkey)) { + // throw new Error('Could not verify signature') + // } - const sigPair = new proto.gradido.SignaturePair({ - pubKey: senderUser.pubkey, - ed25519: sign, - }) - const sigMap = new proto.gradido.SignatureMap({ sigPair: [sigPair] }) + // const sigPair = new proto.gradido.SignaturePair({ + // pubKey: senderUser.pubkey, + // ed25519: sign, + // }) + // const sigMap = new proto.gradido.SignatureMap({ sigPair: [sigPair] }) // process db updates as transaction to able to rollback if an error occure @@ -445,35 +434,35 @@ async function sendCoins( }) // tx hash - const state = cryptoGenerichashInit(null, cryptoGenericHashBytes) - if (transaction.id > 1) { - const previousTransaction = await transactionRepository.findOne({ id: transaction.id - 1 }) - if (!previousTransaction) { - throw new Error('Error previous transaction not found, please try again') - } - if (!previousTransaction.txHash) { - throw new Error('Previous tx hash is null') - } - cryptoGenerichashUpdate(state, previousTransaction.txHash) - } - cryptoGenerichashUpdate(state, transaction.id.toString()) - // should match previous used format: yyyy-MM-dd HH:mm:ss - const receivedString = transaction.received.toISOString().slice(0, 19).replace('T', ' ') - cryptoGenerichashUpdate(state, receivedString) - cryptoGenerichashUpdate(state, proto.gradido.SignatureMap.encode(sigMap).finish()) - transaction.txHash = Buffer.from(cryptoGenerichashFinal(state, cryptoGenericHashBytes)) + // const state = cryptoGenerichashInit(null, cryptoGenericHashBytes) + // if (transaction.id > 1) { + // const previousTransaction = await transactionRepository.findOne({ id: transaction.id - 1 }) + // if (!previousTransaction) { + // throw new Error('Error previous transaction not found, please try again') + // } + // if (!previousTransaction.txHash) { + // throw new Error('Previous tx hash is null') + // } + // cryptoGenerichashUpdate(state, previousTransaction.txHash) + // } + // cryptoGenerichashUpdate(state, transaction.id.toString()) + // // should match previous used format: yyyy-MM-dd HH:mm:ss + // const receivedString = transaction.received.toISOString().slice(0, 19).replace('T', ' ') + // cryptoGenerichashUpdate(state, receivedString) + // cryptoGenerichashUpdate(state, proto.gradido.SignatureMap.encode(sigMap).finish()) + // transaction.txHash = Buffer.from(cryptoGenerichashFinal(state, cryptoGenericHashBytes)) await queryRunner.manager.save(transaction).catch((error) => { throw new Error('error saving transaction with tx hash: ' + error) }) // save signature - const signature = new DbTransactionSignature() - signature.transactionId = transaction.id - signature.signature = Buffer.from(sign) - signature.pubkey = senderUser.pubkey - await queryRunner.manager.save(signature).catch((error) => { - throw new Error('error saving signature: ' + error) - }) + // const signature = new DbTransactionSignature() + // signature.transactionId = transaction.id + // signature.signature = Buffer.from('sign') + // signature.pubkey = senderUser.pubkey + // await queryRunner.manager.save(signature).catch((error) => { + // throw new Error('error saving signature: ' + error) + // }) await queryRunner.commitTransaction() // great way de debug mysql querys / typeorm @@ -548,11 +537,7 @@ async function sendCoins( // helper function // target can be email, username or public_key // groupId if not null and another community, try to get public key from there -async function getPublicKey( - target: string, - sessionId: number, - groupId = 0, -): Promise { +async function getPublicKey(target: string, sessionId: number): Promise { // if it is already a public key, return it if (isHexPublicKey(target)) { return target @@ -628,7 +613,7 @@ export class TransactionResolver { const userRepository = getCustomRepository(UserRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey) - await sendCoins(userEntity, recipiantPublicKey, amount, memo, context.sessionId) + await sendCoins(userEntity, recipiantPublicKey, amount, memo) return 'success' } } From ba3b1dc69a3c372cb0eaf9f0a1a32bf3cf5a4b9b Mon Sep 17 00:00:00 2001 From: elweyn Date: Sat, 23 Oct 2021 15:30:14 +0200 Subject: [PATCH 0973/1843] Withdrew blue border of safari on the gdd list items. --- .../src/views/Pages/AccountOverview/GddTransactionList.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 11dc6ee00..1e24c14d0 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -198,4 +198,8 @@ export default { padding-left: 0px; padding-right: 0px; } + +.gdd-transaction-list-item { + outline: none !important; +} From 4ff13d3959750e925c76ef543170d882014b23f9 Mon Sep 17 00:00:00 2001 From: elweyn Date: Sat, 23 Oct 2021 15:30:25 +0200 Subject: [PATCH 0974/1843] Withdrew blue border of safari on the gdt list items. --- .../src/views/Pages/AccountOverview/GdtTransactionList.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index f727d6297..a96e592aa 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -102,4 +102,8 @@ export default { .nav-tabs .nav-item.show .nav-link { background-color: #f8f9fe38; } + +.gdt-transaction-list-item { + outline: none !important; +} From 0402bdbc86d7ec62d5debd3e3e99fa591e1d72bf Mon Sep 17 00:00:00 2001 From: elweyn Date: Sat, 23 Oct 2021 15:30:58 +0200 Subject: [PATCH 0975/1843] Withdrew blue border of safari on the GDD and GDT tab. --- frontend/src/views/Pages/UserProfileTransactionList.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue index 5f52bb540..f9240008d 100644 --- a/frontend/src/views/Pages/UserProfileTransactionList.vue +++ b/frontend/src/views/Pages/UserProfileTransactionList.vue @@ -62,4 +62,8 @@ export default { background-color: aquamarine; font-size: larger; } + +.nav-tabs > li > a { + outline: none !important; +} From 863a9204e9011ddb439c7c8ac7d84b5523de7f12 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Mon, 25 Oct 2021 08:12:39 +0200 Subject: [PATCH 0976/1843] Update frontend/src/views/Pages/Register.vue Co-authored-by: Hannes Heine --- frontend/src/views/Pages/Register.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 7ca62f8f0..5c31b08d9 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -235,14 +235,6 @@ export default { return this.form.email !== '' }, }, - created() { - this.messageError = '' - this.form.email = '' - this.form.firstname = '' - this.form.lastname = '' - this.form.password.password = '' - this.form.password.passwordRepeat = '' - }, } From 4974cfd79a66533bbcfac1736968d8d9a5da1f7f Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 25 Oct 2021 09:32:34 +0200 Subject: [PATCH 0977/1843] Text changes for german and english. --- frontend/src/locales/de.json | 4 ++-- frontend/src/locales/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e46f9bb83..2db5f6e0d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -132,8 +132,8 @@ }, "newsletter": { "newsletter": "Newsletter", - "newsletterFalse": "Du bist aus Newslettersystem ausgetragen.", - "newsletterTrue": "Du bist im Newslettersystem eingetragen." + "newsletterFalse": "Du erhältst keine Informationen per E-Mail.", + "newsletterTrue": "Du erhältst Informationen per E-Mail." }, "password": { "change-password": "Passwort ändern", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 23d551272..99fcd46a7 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -132,8 +132,8 @@ }, "newsletter": { "newsletter": "Newsletter", - "newsletterFalse": "You are unsubscribed from newsletter system.", - "newsletterTrue": "You are subscribed to newsletter system." + "newsletterFalse": "You will not receive any information by e-mail.", + "newsletterTrue": "You will receive information by e-mail." }, "password": { "change-password": "Change password", From 35b01d90107aea8ba2bd5124c9e90804d4243a4f Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 25 Oct 2021 10:53:56 +0200 Subject: [PATCH 0978/1843] Change the register site so that it loads community information if their is none. --- frontend/src/views/Pages/Register.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index ff83f84fc..d7909c964 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -161,6 +161,7 @@ import InputEmail from '../../components/Inputs/InputEmail.vue' import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue' import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue' import { registerUser } from '../../graphql/mutations' +import { communityInfo } from '../../graphql/queries' export default { components: { InputPasswordConfirmation, InputEmail, LanguageSwitchSelect }, @@ -228,6 +229,20 @@ export default { this.form.password.passwordRepeat = '' this.language = '' }, + async onCreated() { + if (!this.$state.store.community) { + this.$apollo + .query({ + query: communityInfo, + }) + .then((result) => { + this.$store.commit('community', result.data.getCommunityInfo) + }) + .catch((error) => { + this.$toasted.error(error.message) + }) + } + }, }, computed: { namesFilled() { @@ -242,6 +257,9 @@ export default { return this.form.email !== '' }, }, + created() { + this.onCreated() + }, } From 5febfc337e09b57339aef4ff3ee6b65cd9c7ebb9 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 25 Oct 2021 10:54:21 +0200 Subject: [PATCH 0979/1843] Changed the register community page so that it loads community informations if not provided. --- .../src/views/Pages/RegisterCommunity.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/RegisterCommunity.vue b/frontend/src/views/Pages/RegisterCommunity.vue index 9512edd1a..94137e09c 100644 --- a/frontend/src/views/Pages/RegisterCommunity.vue +++ b/frontend/src/views/Pages/RegisterCommunity.vue @@ -49,12 +49,32 @@
From f482eb7db6e7ff8ccc9d1841b1689bfd6f85ecae Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 07:52:49 +0200 Subject: [PATCH 0980/1843] mock console error only in the test for the error --- frontend/src/components/Transaction.spec.js | 10 ++++------ frontend/src/components/TransactionCollapse.spec.js | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/Transaction.spec.js b/frontend/src/components/Transaction.spec.js index d0bb009b7..aaad023e0 100644 --- a/frontend/src/components/Transaction.spec.js +++ b/frontend/src/components/Transaction.spec.js @@ -2,16 +2,10 @@ import { mount } from '@vue/test-utils' import Transaction from './Transaction' import Vue from 'vue' -// disable throwing Errors on warnings to catch the warning -Vue.config.warnHandler = (w) => {} - const localVue = global.localVue const consoleErrorMock = jest.fn() -// eslint-disable-next-line no-console -console.error = consoleErrorMock - describe('Transaction', () => { let wrapper @@ -43,6 +37,10 @@ describe('Transaction', () => { describe('no valid GDT entry type', () => { beforeEach(async () => { + // disable throwing Errors on warnings to catch the warning + Vue.config.warnHandler = (w) => {} + // eslint-disable-next-line no-console + console.error = consoleErrorMock await wrapper.setProps({ gdtEntryType: 'NOT_VALID' }) }) diff --git a/frontend/src/components/TransactionCollapse.spec.js b/frontend/src/components/TransactionCollapse.spec.js index c25bb5aad..58385700a 100644 --- a/frontend/src/components/TransactionCollapse.spec.js +++ b/frontend/src/components/TransactionCollapse.spec.js @@ -4,16 +4,10 @@ import { GdtEntryType } from '../graphql/enums' import Vue from 'vue' -// disable throwing Errors on warnings to catch the warning -Vue.config.warnHandler = (w) => {} - const localVue = global.localVue const consoleErrorMock = jest.fn() -// eslint-disable-next-line no-console -console.error = consoleErrorMock - describe('TransactionCollapse', () => { let wrapper @@ -28,6 +22,10 @@ describe('TransactionCollapse', () => { describe('no valid GDT entry type', () => { beforeEach(async () => { + // disable throwing Errors on warnings to catch the warning + Vue.config.warnHandler = (w) => {} + // eslint-disable-next-line no-console + console.error = consoleErrorMock const propsData = { amount: 100, gdt: 110, From 40f2dcc85c2cc7c004420f96a663482ec3674a30 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 08:35:50 +0200 Subject: [PATCH 0981/1843] dockerfile, docker-compose and nginx --- admin/Dockerfile | 98 +++++++++++++++++++++++++++++++++++++ admin/package.json | 4 +- admin/run/server.js | 15 ++++++ docker-compose.override.yml | 20 ++++++++ docker-compose.yml | 24 +++++++++ nginx/nginx.conf | 14 +++++- 6 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 admin/Dockerfile create mode 100644 admin/run/server.js diff --git a/admin/Dockerfile b/admin/Dockerfile new file mode 100644 index 000000000..60fc35f7a --- /dev/null +++ b/admin/Dockerfile @@ -0,0 +1,98 @@ +################################################################################## +# BASE ########################################################################### +################################################################################## +FROM node:12.19.0-alpine3.10 as base + +# ENVs (available in production aswell, can be overwritten by commandline or env file) +## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame +ENV DOCKER_WORKDIR="/app" +## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0 +ENV BUILD_DATE="1970-01-01T00:00:00.00Z" +## We cannot do $(npm run version).${BUILD_NUMBER} here so we default to 0.0.0.0 +ENV BUILD_VERSION="0.0.0.0" +## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000 +ENV BUILD_COMMIT="0000000" +## SET NODE_ENV +ENV NODE_ENV="production" +## App relevant Envs +ENV PORT="8080" + +# Labels +LABEL org.label-schema.build-date="${BUILD_DATE}" +LABEL org.label-schema.name="gradido:admin" +LABEL org.label-schema.description="Gradido Vue Admin Interface" +LABEL org.label-schema.usage="https://github.com/gradido/gradido/admin/README.md" +LABEL org.label-schema.url="https://gradido.net" +LABEL org.label-schema.vcs-url="https://github.com/gradido/gradido/backend" +LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}" +LABEL org.label-schema.vendor="gradido Community" +LABEL org.label-schema.version="${BUILD_VERSION}" +LABEL org.label-schema.schema-version="1.0" +LABEL maintainer="support@ogradido.net" + +# Install Additional Software +## install: git +#RUN apk --no-cache add git + +# Settings +## Expose Container Port +EXPOSE ${PORT} + +## Workdir +RUN mkdir -p ${DOCKER_WORKDIR} +WORKDIR ${DOCKER_WORKDIR} + +################################################################################## +# DEVELOPMENT (Connected to the local environment, to reload on demand) ########## +################################################################################## +FROM base as development + +# We don't need to copy or build anything since we gonna bind to the +# local filesystem which will need a rebuild anyway + +# Run command +# (for development we need to execute yarn install since the +# node_modules are on another volume and need updating) +CMD /bin/sh -c "yarn install && yarn run dev" + +################################################################################## +# BUILD (Does contain all files and is therefore bloated) ######################## +################################################################################## +FROM base as build + +# Copy everything +COPY . . +# yarn install +RUN yarn install --production=false --frozen-lockfile --non-interactive +# yarn build +RUN yarn run build + +################################################################################## +# TEST ########################################################################### +################################################################################## +FROM build as test + +# Install Additional Software +RUN apk add --no-cache bash jq + +# Run command +CMD /bin/sh -c "yarn run dev" + +################################################################################## +# PRODUCTION (Does contain only "binary"- and static-files to reduce image size) # +################################################################################## +FROM base as production + +# Copy "binary"-files from build image +COPY --from=build ${DOCKER_WORKDIR}/dist ./dist +# We also copy the node_modules express and serve-static for the run script +COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules +# Copy static files +COPY --from=build ${DOCKER_WORKDIR}/public ./public +# Copy package.json for script definitions (lock file should not be needed) +COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json +# Copy run scripts run/ +COPY --from=build ${DOCKER_WORKDIR}/run ./run + +# Run command +CMD /bin/sh -c "yarn run start" diff --git a/admin/package.json b/admin/package.json index aac46eb3b..fd8f100d8 100644 --- a/admin/package.json +++ b/admin/package.json @@ -7,7 +7,9 @@ "license": "MIT", "private": false, "scripts": { - "serve": "vue-cli-service serve", + "start": "node run/server.js", + "serve": "vue-cli-service serve --open", + "dev": "yarn run serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint" }, diff --git a/admin/run/server.js b/admin/run/server.js new file mode 100644 index 000000000..97a525427 --- /dev/null +++ b/admin/run/server.js @@ -0,0 +1,15 @@ +// Imports +const express = require('express') +const serveStatic = require('serve-static') + +// Port +const port = process.env.PORT || 8080 + +// Express Server +const app = express() +// eslint-disable-next-line node/no-path-concat +app.use(serveStatic(__dirname + '/../dist')) +app.listen(port) + +// eslint-disable-next-line no-console +console.log(`http://admin:${port} server started.`) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 1fa6c7e23..3c94e34ee 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -20,6 +20,25 @@ services: # bind the local folder to the docker to allow live reload - ./frontend:/app + ######################################################## + # ADMIN INTERFACE ###################################### + ######################################################## + admin: + image: gradido/admin:development + build: + target: development + networks: + - external-net + environment: + - NODE_ENV="development" + # - DEBUG=true + volumes: + # This makes sure the docker container has its own node modules. + # Therefore it is possible to have a different node version on the host machine + - admin_node_modules:/app/node_modules + # bind the local folder to the docker to allow live reload + - ./admin:/app + ######################################################## # BACKEND ############################################## ######################################################## @@ -154,6 +173,7 @@ services: volumes: frontend_node_modules: + admin_node_modules: backend_node_modules: backend_database_node_modules: backend_database_build: diff --git a/docker-compose.yml b/docker-compose.yml index b85d155fe..954b5158d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,30 @@ services: # - ./.env # - ./frontend/.env + ######################################################## + # ADMIN INTERFACE ###################################### + ######################################################## + admin: + image: gradido/admin:latest + build: + context: ./admin + target: production + networks: + - internal-net + ports: + - 8080:8080 + environment: + # Envs used in Dockerfile + # - DOCKER_WORKDIR="/app" + # - PORT=8090 + # - BUILD_DATE="1970-01-01T00:00:00.00Z" + # - BUILD_VERSION="0.0.0.0" + # - BUILD_COMMIT="0000000" + - NODE_ENV="production" + # env_file: + # - ./.env + # - ./frontend/.env + ######################################################### ## MARIADB ############################################## ######################################################### diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 240144cc3..48d703997 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -69,7 +69,19 @@ server { proxy_redirect off; } - location /sockjs-node { + location /admin { + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + + proxy_pass http://admin:8080; + proxy_redirect off; + } + +location /sockjs-node { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; From 2309dae92dcdc7f0cb054bb8bff97fb45950f95c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 08:51:41 +0200 Subject: [PATCH 0982/1843] add hidden dockerignore and gitattributes --- admin/.dockerignore | 3 +++ admin/.gitattributes | 15 +++++++++++++++ docker-compose.yml | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 admin/.dockerignore create mode 100644 admin/.gitattributes diff --git a/admin/.dockerignore b/admin/.dockerignore new file mode 100644 index 000000000..88249539f --- /dev/null +++ b/admin/.dockerignore @@ -0,0 +1,3 @@ +node_modules +.git +.gitignore \ No newline at end of file diff --git a/admin/.gitattributes b/admin/.gitattributes new file mode 100644 index 000000000..aa70f3c26 --- /dev/null +++ b/admin/.gitattributes @@ -0,0 +1,15 @@ +# Auto detect text files and perform LF normalization +*.scss linguist-language=Vue +*.css linguist-language=Vue + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/docker-compose.yml b/docker-compose.yml index 954b5158d..5878f6472 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: - NODE_ENV="production" # env_file: # - ./.env - # - ./frontend/.env + # - ./admin/.env ######################################################### ## MARIADB ############################################## From 9d17e31d8fd8e0e90e366b1c8993222980a585fc Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 26 Oct 2021 11:35:25 +0200 Subject: [PATCH 0983/1843] Change the dropbox functionality so that the language is set when changing the language in the register form. --- frontend/src/views/Pages/Register.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index ff83f84fc..e4e9650fc 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -161,6 +161,7 @@ import InputEmail from '../../components/Inputs/InputEmail.vue' import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue' import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue' import { registerUser } from '../../graphql/mutations' +import { localeChanged } from 'vee-validate' export default { components: { InputPasswordConfirmation, InputEmail, LanguageSwitchSelect }, @@ -187,6 +188,10 @@ export default { methods: { updateLanguage(e) { this.language = e + console.log('language', this.language) + this.$store.commit('language', this.language) + this.$i18n.locale = this.language + localeChanged(this.language) }, getValidationState({ dirty, validated, valid = null }) { return dirty || validated ? valid : null From d78f78accc97d6c466556aacb53e00ce7fc25d96 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 12:01:50 +0200 Subject: [PATCH 0984/1843] setup unit tests for admin interface --- admin/babel.config.js | 13 +- admin/jest.config.js | 25 + admin/package.json | 20 +- admin/src/App.vue | 4 +- admin/src/components/HelloWorld.vue | 58 - admin/src/main.test.js | 7 + admin/test/testSetup.js | 11 + admin/yarn.lock | 3766 ++++++++++++++++++++++++++- 8 files changed, 3704 insertions(+), 200 deletions(-) create mode 100644 admin/jest.config.js delete mode 100644 admin/src/components/HelloWorld.vue create mode 100644 admin/src/main.test.js create mode 100644 admin/test/testSetup.js diff --git a/admin/babel.config.js b/admin/babel.config.js index e9558405f..bc77ba078 100644 --- a/admin/babel.config.js +++ b/admin/babel.config.js @@ -1,5 +1,12 @@ module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] + "presets": [ + ["env", { "modules": false }] + ], + "env": { + "test": { + "presets": [ + ["env", { "targets": { "node": "current" }}] + ] + } + } } diff --git a/admin/jest.config.js b/admin/jest.config.js new file mode 100644 index 000000000..5a1c98a43 --- /dev/null +++ b/admin/jest.config.js @@ -0,0 +1,25 @@ +require('jsdom-global') +module.exports = { + verbose: true, + collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'], + moduleFileExtensions: [ + 'js', + // 'jsx', + 'json', + 'vue', + ], + // coverageReporters: ['lcov', 'text'], + moduleNameMapper: { + '^@/(.*)$': '/src/$1', + '\\.(css|less)$': 'identity-obj-proxy', + }, + transform: { + '^.+\\.vue$': 'vue-jest', + '^.+\\.(js|jsx)?$': 'babel-jest', + '/node_modules/vee-validate/dist/rules': 'babel-jest', + }, + setupFiles: ['/test/testSetup.js'], + testMatch: ['**/?(*.)+(spec|test).js?(x)'], + // snapshotSerializers: ['jest-serializer-vue'], + transformIgnorePatterns: ['/node_modules/(?!vee-validate/dist/rules)'], +} diff --git a/admin/package.json b/admin/package.json index fd8f100d8..1db4ddae5 100644 --- a/admin/package.json +++ b/admin/package.json @@ -11,11 +11,25 @@ "serve": "vue-cli-service serve --open", "dev": "yarn run serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint", + "test": "jest --coverage" }, "dependencies": { + "@babel/core": "^7.15.8", + "@babel/node": "^7.15.8", + "@babel/preset-env": "^7.15.8", + "@vue/cli-plugin-unit-jest": "^4.5.14", + "@vue/test-utils": "^1.2.2", + "babel-core": "7.0.0-bridge.0", + "babel-jest": "^27.3.1", + "babel-plugin-component": "^1.1.1", + "babel-preset-env": "^1.7.0", + "babel-preset-vue": "^2.0.2", "core-js": "^3.6.5", - "vue": "^2.6.11" + "jest": "^27.3.1", + "jsdom-global": "^3.0.2", + "vue": "^2.6.11", + "vue-jest": "^3.0.7" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", @@ -43,6 +57,6 @@ "browserslist": [ "> 1%", "last 2 versions", - "not dead" + "not ie <= 10" ] } diff --git a/admin/src/App.vue b/admin/src/App.vue index 61f073ee6..b31d477bf 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -6,9 +6,7 @@ diff --git a/admin/src/components/HelloWorld.vue b/admin/src/components/HelloWorld.vue deleted file mode 100644 index 879051a29..000000000 --- a/admin/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/admin/src/main.test.js b/admin/src/main.test.js new file mode 100644 index 000000000..cf16183dc --- /dev/null +++ b/admin/src/main.test.js @@ -0,0 +1,7 @@ +import './main' + +describe('main', () => { + it('is there', () => { + expect(true).toBeTruthy() + }) +}) diff --git a/admin/test/testSetup.js b/admin/test/testSetup.js new file mode 100644 index 000000000..9ce942654 --- /dev/null +++ b/admin/test/testSetup.js @@ -0,0 +1,11 @@ +import { createLocalVue } from '@vue/test-utils' +import Vue from 'vue' + +require('jsdom-global')() + +global.localVue = createLocalVue() + +// throw errors for vue warnings to force the programmers to take care about warnings +Vue.config.warnHandler = (w) => { + throw new Error(w) +} diff --git a/admin/yarn.lock b/admin/yarn.lock index b52259e97..ced684fbc 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== @@ -14,7 +14,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== -"@babel/core@^7.11.0": +"@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.12.3", "@babel/core@^7.15.8", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10" integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og== @@ -35,7 +35,7 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.15.4", "@babel/generator@^7.15.8": +"@babel/generator@^7.15.4", "@babel/generator@^7.15.8", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1" integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g== @@ -140,6 +140,14 @@ dependencies: "@babel/types" "^7.15.4" +"@babel/helper-module-imports@7.0.0-beta.35": + version "7.0.0-beta.35" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz#308e350e731752cdb4d0f058df1d704925c64e0a" + integrity sha512-vaC1KyIZSuyWb3Lj277fX0pxivyHwuDU4xZsofqgYAbkDxNieMg2vuhzP5AgMweMY7fCQUMTi+BgPqTLjkxXFg== + dependencies: + "@babel/types" "7.0.0-beta.35" + lodash "^4.2.0" + "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.8.3": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f" @@ -251,7 +259,19 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.7.0": +"@babel/node@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.15.8.tgz#5d6b815d0232ae4893727971f53deabfe06c4ca7" + integrity sha512-JbgTCrnx6IUECznEbQ7e2rbVYtrXKixSbEG2bxxbMkV648WdUf3tdc+ZUW2++dvnnAswcpwc76cRwf0xEQqsrw== + dependencies: + "@babel/register" "^7.15.3" + commander "^4.0.1" + core-js "^3.16.0" + node-environment-flags "^1.0.5" + regenerator-runtime "^0.13.4" + v8flags "^3.1.1" + +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016" integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA== @@ -409,7 +429,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.13": +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== @@ -444,6 +471,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" @@ -458,7 +492,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -472,14 +506,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4": +"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-object-rest-spread@^7.8.3": +"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== @@ -507,13 +541,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-top-level-await@^7.14.5": +"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" +"@babel/plugin-syntax-typescript@^7.7.2": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-transform-arrow-functions@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" @@ -632,7 +673,7 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.15.4": +"@babel/plugin-transform-modules-commonjs@^7.15.4", "@babel/plugin-transform-modules-commonjs@^7.9.6": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1" integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA== @@ -774,7 +815,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/preset-env@^7.11.0": +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.15.8": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba" integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA== @@ -854,9 +895,9 @@ semver "^6.3.0" "@babel/preset-modules@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" - integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== + version "0.1.5" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" @@ -864,6 +905,17 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" +"@babel/register@^7.15.3": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.15.3.tgz#6b40a549e06ec06c885b2ec42c3dd711f55fe752" + integrity sha512-mj4IY1ZJkorClxKTImccn4T81+UKTo4Ux0+OFSV9hME1ooqS9UV+pJ6BjD0qXPK4T3XW/KNa79XByjeEMZz+fw== + dependencies: + clone-deep "^4.0.1" + find-cache-dir "^2.0.0" + make-dir "^2.1.0" + pirates "^4.0.0" + source-map-support "^0.5.16" + "@babel/runtime@^7.11.0", "@babel/runtime@^7.8.4": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" @@ -871,7 +923,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.0.0", "@babel/template@^7.15.4": +"@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.3.3", "@babel/template@^7.4.0": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194" integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg== @@ -880,7 +932,7 @@ "@babel/parser" "^7.15.4" "@babel/types" "^7.15.4" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.7.0": +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d" integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA== @@ -895,7 +947,16 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.4.4", "@babel/types@^7.7.0": +"@babel/types@7.0.0-beta.35": + version "7.0.0-beta.35" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960" + integrity sha512-y9XT11CozHDgjWcTdxmhSj13rJVXpa5ZXwjjOiTedjaM0ba5ItqdS02t31EhPl7HtOWxsZkYCCUNrSfrOisA6w== + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + +"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0": version "7.15.6" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig== @@ -903,6 +964,19 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@cnakazawa/watch@^1.0.3": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" + integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ== + dependencies: + exec-sh "^0.3.2" + minimist "^1.2.0" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -944,6 +1018,339 @@ cssnano-preset-default "^4.0.0" postcss "^7.0.0" +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== + +"@jest/console@^24.7.1", "@jest/console@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" + integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ== + dependencies: + "@jest/source-map" "^24.9.0" + chalk "^2.0.1" + slash "^2.0.0" + +"@jest/console@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.3.1.tgz#e8ea3a475d3f8162f23d69efbfaa9cbe486bee93" + integrity sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw== + dependencies: + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^27.3.1" + jest-util "^27.3.1" + slash "^3.0.0" + +"@jest/core@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4" + integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A== + dependencies: + "@jest/console" "^24.7.1" + "@jest/reporters" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/transform" "^24.9.0" + "@jest/types" "^24.9.0" + ansi-escapes "^3.0.0" + chalk "^2.0.1" + exit "^0.1.2" + graceful-fs "^4.1.15" + jest-changed-files "^24.9.0" + jest-config "^24.9.0" + jest-haste-map "^24.9.0" + jest-message-util "^24.9.0" + jest-regex-util "^24.3.0" + jest-resolve "^24.9.0" + jest-resolve-dependencies "^24.9.0" + jest-runner "^24.9.0" + jest-runtime "^24.9.0" + jest-snapshot "^24.9.0" + jest-util "^24.9.0" + jest-validate "^24.9.0" + jest-watcher "^24.9.0" + micromatch "^3.1.10" + p-each-series "^1.0.0" + realpath-native "^1.1.0" + rimraf "^2.5.4" + slash "^2.0.0" + strip-ansi "^5.0.0" + +"@jest/core@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.3.1.tgz#04992ef1b58b17c459afb87ab56d81e63d386925" + integrity sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg== + dependencies: + "@jest/console" "^27.3.1" + "@jest/reporters" "^27.3.1" + "@jest/test-result" "^27.3.1" + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.8.1" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-changed-files "^27.3.0" + jest-config "^27.3.1" + jest-haste-map "^27.3.1" + jest-message-util "^27.3.1" + jest-regex-util "^27.0.6" + jest-resolve "^27.3.1" + jest-resolve-dependencies "^27.3.1" + jest-runner "^27.3.1" + jest-runtime "^27.3.1" + jest-snapshot "^27.3.1" + jest-util "^27.3.1" + jest-validate "^27.3.1" + jest-watcher "^27.3.1" + micromatch "^4.0.4" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^24.3.0", "@jest/environment@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18" + integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ== + dependencies: + "@jest/fake-timers" "^24.9.0" + "@jest/transform" "^24.9.0" + "@jest/types" "^24.9.0" + jest-mock "^24.9.0" + +"@jest/environment@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.3.1.tgz#2182defbce8d385fd51c5e7c7050f510bd4c86b1" + integrity sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw== + dependencies: + "@jest/fake-timers" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + jest-mock "^27.3.0" + +"@jest/fake-timers@^24.3.0", "@jest/fake-timers@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93" + integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A== + dependencies: + "@jest/types" "^24.9.0" + jest-message-util "^24.9.0" + jest-mock "^24.9.0" + +"@jest/fake-timers@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.3.1.tgz#1fad860ee9b13034762cdb94266e95609dfce641" + integrity sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA== + dependencies: + "@jest/types" "^27.2.5" + "@sinonjs/fake-timers" "^8.0.1" + "@types/node" "*" + jest-message-util "^27.3.1" + jest-mock "^27.3.0" + jest-util "^27.3.1" + +"@jest/globals@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.3.1.tgz#ce1dfb03d379237a9da6c1b99ecfaca1922a5f9e" + integrity sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg== + dependencies: + "@jest/environment" "^27.3.1" + "@jest/types" "^27.2.5" + expect "^27.3.1" + +"@jest/reporters@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43" + integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw== + dependencies: + "@jest/environment" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/transform" "^24.9.0" + "@jest/types" "^24.9.0" + chalk "^2.0.1" + exit "^0.1.2" + glob "^7.1.2" + istanbul-lib-coverage "^2.0.2" + istanbul-lib-instrument "^3.0.1" + istanbul-lib-report "^2.0.4" + istanbul-lib-source-maps "^3.0.1" + istanbul-reports "^2.2.6" + jest-haste-map "^24.9.0" + jest-resolve "^24.9.0" + jest-runtime "^24.9.0" + jest-util "^24.9.0" + jest-worker "^24.6.0" + node-notifier "^5.4.2" + slash "^2.0.0" + source-map "^0.6.0" + string-length "^2.0.0" + +"@jest/reporters@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.3.1.tgz#28b5c1f5789481e23788048fa822ed15486430b9" + integrity sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^27.3.1" + "@jest/test-result" "^27.3.1" + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.4" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.3" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.2" + jest-haste-map "^27.3.1" + jest-resolve "^27.3.1" + jest-util "^27.3.1" + jest-worker "^27.3.1" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^8.1.0" + +"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714" + integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.1.15" + source-map "^0.6.0" + +"@jest/source-map@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" + integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.4" + source-map "^0.6.0" + +"@jest/test-result@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca" + integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA== + dependencies: + "@jest/console" "^24.9.0" + "@jest/types" "^24.9.0" + "@types/istanbul-lib-coverage" "^2.0.0" + +"@jest/test-result@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.3.1.tgz#89adee8b771877c69b3b8d59f52f29dccc300194" + integrity sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg== + dependencies: + "@jest/console" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31" + integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A== + dependencies: + "@jest/test-result" "^24.9.0" + jest-haste-map "^24.9.0" + jest-runner "^24.9.0" + jest-runtime "^24.9.0" + +"@jest/test-sequencer@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz#4b3bde2dbb05ee74afdae608cf0768e3354683b1" + integrity sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA== + dependencies: + "@jest/test-result" "^27.3.1" + graceful-fs "^4.2.4" + jest-haste-map "^27.3.1" + jest-runtime "^27.3.1" + +"@jest/transform@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56" + integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^24.9.0" + babel-plugin-istanbul "^5.1.0" + chalk "^2.0.1" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.1.15" + jest-haste-map "^24.9.0" + jest-regex-util "^24.9.0" + jest-util "^24.9.0" + micromatch "^3.1.10" + pirates "^4.0.1" + realpath-native "^1.1.0" + slash "^2.0.0" + source-map "^0.6.1" + write-file-atomic "2.4.1" + +"@jest/transform@^27.3.1": + version "27.3.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.3.1.tgz#ff80eafbeabe811e9025e4b6f452126718455220" + integrity sha512-3fSvQ02kuvjOI1C1ssqMVBKJpZf6nwoCiSu00zAKh5nrp3SptNtZy/8s5deayHnqxhjD9CWDJ+yqQwuQ0ZafXQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^27.2.5" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^27.3.1" + jest-regex-util "^27.0.6" + jest-util "^27.3.1" + micromatch "^4.0.4" + pirates "^4.0.1" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^24.3.0", "@jest/types@^24.9.0": + version "24.9.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" + integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^13.0.0" + +"@jest/types@^27.2.5": + version "27.2.5" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132" + integrity sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^16.0.0" + chalk "^4.0.0" + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -957,6 +1364,20 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@sinonjs/commons@^1.7.0": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz#1c1c9a91419f804e59ae8df316a07dd1c3a76b94" + integrity sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@soda/friendly-errors-webpack-plugin@^1.7.1": version "1.8.0" resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz#84751d82a93019d5c92c0cf0e45ac59087cd2240" @@ -972,6 +1393,44 @@ resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w== +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.14": + version "7.1.16" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702" + integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" + integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== + dependencies: + "@babel/types" "^7.3.0" + "@types/body-parser@*": version "1.19.1" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" @@ -1022,6 +1481,13 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/graceful-fs@^4.1.2": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + dependencies: + "@types/node" "*" + "@types/http-proxy@^1.17.5": version "1.17.7" resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" @@ -1029,6 +1495,40 @@ dependencies: "@types/node" "*" +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" + integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== + dependencies: + "@types/istanbul-lib-coverage" "*" + "@types/istanbul-lib-report" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/jest@^24.0.19": + version "24.9.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534" + integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q== + dependencies: + jest-diff "^24.3.0" + "@types/json-schema@^7.0.5": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -1050,15 +1550,20 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "16.11.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.2.tgz#31c249c136c3f9b35d4b60fb8e50e01a1f0cc9a5" - integrity sha512-w34LtBB0OkDTs19FQHXy4Ig/TOXI4zqvXS2Kk1PAsRKZ0I+nik7LlMYxckW0tSNGtvWmzB+mrCTbuEjuB9DVsw== + version "16.11.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" + integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== +"@types/prettier@^2.1.5": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb" + integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw== + "@types/q@^1.5.1": version "1.5.5" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" @@ -1087,6 +1592,26 @@ resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== +"@types/stack-utils@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" + integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== + +"@types/stack-utils@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== + +"@types/strip-bom@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2" + integrity sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I= + +"@types/strip-json-comments@0.0.30": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" + integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== + "@types/tapable@^1": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" @@ -1131,6 +1656,25 @@ anymatch "^3.0.0" source-map "^0.6.0" +"@types/yargs-parser@*": + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + +"@types/yargs@^13.0.0": + version "13.0.12" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.12.tgz#d895a88c703b78af0465a9de88aa92c61430b092" + integrity sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ== + dependencies: + "@types/yargs-parser" "*" + +"@types/yargs@^16.0.0": + version "16.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== + dependencies: + "@types/yargs-parser" "*" + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -1290,6 +1834,27 @@ dependencies: "@vue/cli-shared-utils" "^4.5.14" +"@vue/cli-plugin-unit-jest@^4.5.14": + version "4.5.14" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-4.5.14.tgz#27ffe12e8e973cda4f5c718a3338f874e29d7015" + integrity sha512-vv2qPnJxBaRh7aGhYNsCYIq0QFBKrRIRNytat7gLtUo9BlA8n+4RN2O8LOikO8qrSDE3HGTRvJnrYQrNG/xA2Q== + dependencies: + "@babel/core" "^7.11.0" + "@babel/plugin-transform-modules-commonjs" "^7.9.6" + "@types/jest" "^24.0.19" + "@vue/cli-shared-utils" "^4.5.14" + babel-core "^7.0.0-bridge.0" + babel-jest "^24.9.0" + babel-plugin-transform-es2015-modules-commonjs "^6.26.2" + deepmerge "^4.2.2" + jest "^24.9.0" + jest-environment-jsdom-fifteen "^1.0.2" + jest-serializer-vue "^2.0.2" + jest-transform-stub "^2.0.0" + jest-watch-typeahead "^0.4.2" + ts-jest "^24.2.0" + vue-jest "^3.0.5" + "@vue/cli-plugin-vuex@^4.5.14": version "4.5.14" resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.14.tgz#855490ede856a9c49760051e18bd51f7fe024142" @@ -1377,9 +1942,9 @@ strip-ansi "^6.0.0" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz#2f7ed5feed82ff7f0284acc11d525ee7eff22460" - integrity sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9" + integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -1390,13 +1955,22 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" optionalDependencies: - prettier "^1.18.2" + prettier "^1.18.2 || ^2.0.0" "@vue/preload-webpack-plugin@^1.1.0": version "1.1.2" resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== +"@vue/test-utils@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.2.2.tgz#0242ea4e202d4853541bb167fead3f2249140ab7" + integrity sha512-P+yiAsszoy8z1TqXiVUnAZaJj0WGGz5fCxm4bOSI6Cpwy1+PNYwYxDv0ROAA/SUtOPppV+aD8tp/QWwxf8ROJw== + dependencies: + dom-event-types "^1.0.0" + lodash "^4.17.15" + pretty "^2.0.0" + "@vue/web-component-wrapper@^1.2.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" @@ -1557,6 +2131,16 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +abab@^2.0.0, abab@^2.0.3, abab@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -1565,31 +2149,69 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +acorn-globals@^4.1.0, acorn-globals@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" + integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== + dependencies: + acorn "^6.0.1" + acorn-walk "^6.0.1" + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + acorn-jsx@^5.2.0: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +acorn-walk@^6.0.1: + version "6.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" + integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== + acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn@^6.4.1: +acorn@^5.5.3: + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== + +acorn@^6.0.1, acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^7.1.1, acorn@^7.4.0: +acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn@^8.2.4: + version "8.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" + integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== + address@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -1620,6 +2242,11 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== +ansi-escapes@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== + ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -1642,7 +2269,7 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: +ansi-regex@^4.0.0, ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== @@ -1652,6 +2279,11 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1666,6 +2298,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -1679,7 +2316,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@^3.0.0, anymatch@~3.1.2: +anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -1719,6 +2356,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" + integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= + array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -1836,6 +2478,20 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== +babel-code-frame@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + +babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== + babel-eslint@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" @@ -1848,6 +2504,143 @@ babel-eslint@^10.1.0: eslint-visitor-keys "^1.0.0" resolve "^1.12.0" +babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" + integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ= + dependencies: + babel-helper-explode-assignable-expression "^6.24.1" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-call-delegate@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" + integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= + dependencies: + babel-helper-hoist-variables "^6.24.1" + babel-runtime "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-define-map@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" + integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-helper-explode-assignable-expression@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" + integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo= + dependencies: + babel-runtime "^6.22.0" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-function-name@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" + integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk= + dependencies: + babel-helper-get-function-arity "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-get-function-arity@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" + integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-hoist-variables@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" + integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-optimise-call-expression@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" + integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-helper-regex@^6.24.1: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" + integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI= + dependencies: + babel-runtime "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-helper-remap-async-to-generator@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" + integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-replace-supers@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" + integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= + dependencies: + babel-helper-optimise-call-expression "^6.24.1" + babel-messages "^6.23.0" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-helper-vue-jsx-merge-props@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" + integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== + +babel-jest@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54" + integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw== + dependencies: + "@jest/transform" "^24.9.0" + "@jest/types" "^24.9.0" + "@types/babel__core" "^7.1.0" + babel-plugin-istanbul "^5.1.0" + babel-preset-jest "^24.9.0" + chalk "^2.4.2" + slash "^2.0.0" + +babel-jest@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.3.1.tgz#0636a3404c68e07001e434ac4956d82da8a80022" + integrity sha512-SjIF8hh/ir0peae2D6S6ZKRhUy7q/DnpH7k/V6fT4Bgs/LXXUztOpX4G2tCgq8mLo5HA9mN6NmlFMeYtKmIsTQ== + dependencies: + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^27.2.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" + babel-loader@^8.1.0: version "8.2.3" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" @@ -1858,6 +2651,27 @@ babel-loader@^8.1.0: make-dir "^3.1.0" schema-utils "^2.6.5" +babel-messages@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" + integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-check-es2015-constants@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" + integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-component@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-component/-/babel-plugin-component-1.1.1.tgz#9b023a23ff5c9aae0fd56c5a18b9cab8c4d45eea" + integrity sha512-WUw887kJf2GH80Ng/ZMctKZ511iamHNqPhd9uKo14yzisvV7Wt1EckIrb8oq/uCz3B3PpAW7Xfl7AkTLDYT6ag== + dependencies: + "@babel/helper-module-imports" "7.0.0-beta.35" + babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" @@ -1865,6 +2679,58 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" +babel-plugin-istanbul@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854" + integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + find-up "^3.0.0" + istanbul-lib-instrument "^3.3.0" + test-exclude "^5.2.3" + +babel-plugin-istanbul@^6.0.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^5.0.4" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756" + integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw== + dependencies: + "@types/babel__traverse" "^7.0.6" + +babel-plugin-jest-hoist@^27.2.0: + version "27.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz#79f37d43f7e5c4fdc4b2ca3e10cc6cf545626277" + integrity sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-plugin-jsx-event-modifiers@^2.0.2: + version "2.0.5" + resolved "https://registry.yarnpkg.com/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz#93e6ebb5d7553bb08f9fedbf7a0bee3af09a0472" + integrity sha512-tWGnCk0whZ+nZcj9tYLw4+y08tPJXqaEjIxRJZS6DkUUae72Kz4BsoGpxt/Kow7mmgQJpvFCw8IPLSNh5rkZCg== + +babel-plugin-jsx-v-model@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/babel-plugin-jsx-v-model/-/babel-plugin-jsx-v-model-2.0.3.tgz#c396416b99cb1af782087315ae1d3e62e070f47d" + integrity sha512-SIx3Y3XxwGEz56Q1atwr5GaZsxJ2IRYmn5dl38LFkaTAvjnbNQxsZHO+ylJPsd+Hmv+ixJBYYFEekPBTHwiGfQ== + dependencies: + babel-plugin-syntax-jsx "^6.18.0" + html-tags "^2.0.0" + svg-tags "^1.0.0" + babel-plugin-polyfill-corejs2@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" @@ -1889,6 +2755,386 @@ babel-plugin-polyfill-regenerator@^0.2.2: dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" +babel-plugin-syntax-async-functions@^6.8.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" + integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU= + +babel-plugin-syntax-exponentiation-operator@^6.8.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" + integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4= + +babel-plugin-syntax-jsx@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" + integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + +babel-plugin-syntax-trailing-function-commas@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" + integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= + +babel-plugin-transform-async-to-generator@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" + integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E= + dependencies: + babel-helper-remap-async-to-generator "^6.24.1" + babel-plugin-syntax-async-functions "^6.8.0" + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-arrow-functions@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" + integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" + integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-block-scoping@^6.23.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" + integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= + dependencies: + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + lodash "^4.17.4" + +babel-plugin-transform-es2015-classes@^6.23.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" + integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= + dependencies: + babel-helper-define-map "^6.24.1" + babel-helper-function-name "^6.24.1" + babel-helper-optimise-call-expression "^6.24.1" + babel-helper-replace-supers "^6.24.1" + babel-messages "^6.23.0" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-computed-properties@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" + integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= + dependencies: + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-destructuring@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" + integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-duplicate-keys@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" + integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-for-of@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" + integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-function-name@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" + integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= + dependencies: + babel-helper-function-name "^6.24.1" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-literals@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" + integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" + integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ= + dependencies: + babel-plugin-transform-es2015-modules-commonjs "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-es2015-modules-commonjs@^6.26.2: + version "6.26.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" + integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== + dependencies: + babel-plugin-transform-strict-mode "^6.24.1" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-types "^6.26.0" + +babel-plugin-transform-es2015-modules-systemjs@^6.23.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" + integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM= + dependencies: + babel-helper-hoist-variables "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-modules-umd@^6.23.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" + integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg= + dependencies: + babel-plugin-transform-es2015-modules-amd "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + +babel-plugin-transform-es2015-object-super@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" + integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= + dependencies: + babel-helper-replace-supers "^6.24.1" + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-parameters@^6.23.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" + integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= + dependencies: + babel-helper-call-delegate "^6.24.1" + babel-helper-get-function-arity "^6.24.1" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-traverse "^6.24.1" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-shorthand-properties@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" + integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-spread@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" + integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-sticky-regex@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" + integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw= + dependencies: + babel-helper-regex "^6.24.1" + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-es2015-template-literals@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" + integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-typeof-symbol@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" + integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I= + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-transform-es2015-unicode-regex@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" + integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek= + dependencies: + babel-helper-regex "^6.24.1" + babel-runtime "^6.22.0" + regexpu-core "^2.0.0" + +babel-plugin-transform-exponentiation-operator@^6.22.0: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" + integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4= + dependencies: + babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" + babel-plugin-syntax-exponentiation-operator "^6.8.0" + babel-runtime "^6.22.0" + +babel-plugin-transform-regenerator@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" + integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8= + dependencies: + regenerator-transform "^0.10.0" + +babel-plugin-transform-strict-mode@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" + integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= + dependencies: + babel-runtime "^6.22.0" + babel-types "^6.24.1" + +babel-plugin-transform-vue-jsx@^3.5.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz#d40492e6692a36b594f7e9a1928f43e969740960" + integrity sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw== + dependencies: + esutils "^2.0.2" + +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-env@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" + integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== + dependencies: + babel-plugin-check-es2015-constants "^6.22.0" + babel-plugin-syntax-trailing-function-commas "^6.22.0" + babel-plugin-transform-async-to-generator "^6.22.0" + babel-plugin-transform-es2015-arrow-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoping "^6.23.0" + babel-plugin-transform-es2015-classes "^6.23.0" + babel-plugin-transform-es2015-computed-properties "^6.22.0" + babel-plugin-transform-es2015-destructuring "^6.23.0" + babel-plugin-transform-es2015-duplicate-keys "^6.22.0" + babel-plugin-transform-es2015-for-of "^6.23.0" + babel-plugin-transform-es2015-function-name "^6.22.0" + babel-plugin-transform-es2015-literals "^6.22.0" + babel-plugin-transform-es2015-modules-amd "^6.22.0" + babel-plugin-transform-es2015-modules-commonjs "^6.23.0" + babel-plugin-transform-es2015-modules-systemjs "^6.23.0" + babel-plugin-transform-es2015-modules-umd "^6.23.0" + babel-plugin-transform-es2015-object-super "^6.22.0" + babel-plugin-transform-es2015-parameters "^6.23.0" + babel-plugin-transform-es2015-shorthand-properties "^6.22.0" + babel-plugin-transform-es2015-spread "^6.22.0" + babel-plugin-transform-es2015-sticky-regex "^6.22.0" + babel-plugin-transform-es2015-template-literals "^6.22.0" + babel-plugin-transform-es2015-typeof-symbol "^6.23.0" + babel-plugin-transform-es2015-unicode-regex "^6.22.0" + babel-plugin-transform-exponentiation-operator "^6.22.0" + babel-plugin-transform-regenerator "^6.22.0" + browserslist "^3.2.6" + invariant "^2.2.2" + semver "^5.3.0" + +babel-preset-jest@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc" + integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg== + dependencies: + "@babel/plugin-syntax-object-rest-spread" "^7.0.0" + babel-plugin-jest-hoist "^24.9.0" + +babel-preset-jest@^27.2.0: + version "27.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz#556bbbf340608fed5670ab0ea0c8ef2449fba885" + integrity sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg== + dependencies: + babel-plugin-jest-hoist "^27.2.0" + babel-preset-current-node-syntax "^1.0.0" + +babel-preset-vue@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/babel-preset-vue/-/babel-preset-vue-2.0.2.tgz#cfadf1bd736125397481b5f8525ced0049a0c71f" + integrity sha1-z63xvXNhJTl0gbX4UlztAEmgxx8= + dependencies: + babel-helper-vue-jsx-merge-props "^2.0.2" + babel-plugin-jsx-event-modifiers "^2.0.2" + babel-plugin-jsx-v-model "^2.0.1" + babel-plugin-syntax-jsx "^6.18.0" + babel-plugin-transform-vue-jsx "^3.5.0" + +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +babel-template@^6.24.1, babel-template@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" + integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + dependencies: + babel-runtime "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + lodash "^4.17.4" + +babel-traverse@^6.24.1, babel-traverse@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" + integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= + dependencies: + babel-code-frame "^6.26.0" + babel-messages "^6.23.0" + babel-runtime "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + debug "^2.6.8" + globals "^9.18.0" + invariant "^2.2.2" + lodash "^4.17.4" + +babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" + integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= + dependencies: + babel-runtime "^6.26.0" + esutils "^2.0.2" + lodash "^4.17.4" + to-fast-properties "^1.0.3" + +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" + integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -2045,6 +3291,18 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +browser-resolve@^1.11.3: + version "1.11.3" + resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" + integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== + dependencies: + resolve "1.1.7" + browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -2106,18 +3364,40 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.3: - version "4.17.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4" - integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ== +browserslist@^3.2.6: + version "3.2.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" + integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ== dependencies: - caniuse-lite "^1.0.30001265" - electron-to-chromium "^1.3.867" + caniuse-lite "^1.0.30000844" + electron-to-chromium "^1.3.47" + +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.5: + version "4.17.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.5.tgz#c827bbe172a4c22b123f5e337533ceebadfdd559" + integrity sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA== + dependencies: + caniuse-lite "^1.0.30001271" + electron-to-chromium "^1.3.878" escalade "^3.1.1" - node-releases "^2.0.0" + node-releases "^2.0.1" picocolors "^1.0.0" -buffer-from@^1.0.0: +bs-logger@0.x: + version "0.2.6" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== + dependencies: + fast-json-stable-stringify "2.x" + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + +buffer-from@1.x, buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== @@ -2254,12 +3534,17 @@ camel-case@3.0.x: no-case "^2.2.0" upper-case "^1.1.1" +camelcase@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= + camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.0.0, camelcase@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -2274,10 +3559,17 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001265: - version "1.0.30001270" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz#cc9c37a4ec5c1a8d616fc7bace902bb053b0cdea" - integrity sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001271: + version "1.0.30001271" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz#0dda0c9bcae2cf5407cd34cac304186616cc83e8" + integrity sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA== + +capture-exit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" + integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== + dependencies: + rsvp "^4.8.4" case-sensitive-paths-webpack-plugin@^2.3.0: version "2.4.0" @@ -2289,6 +3581,17 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -2306,6 +3609,11 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2365,6 +3673,16 @@ ci-info@^1.5.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" + integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -2373,6 +3691,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" +cjs-module-lexer@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -2462,11 +3785,30 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone@2.x: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -2476,6 +3818,11 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -2524,7 +3871,7 @@ color@^3.0.0: color-convert "^1.9.3" color-string "^1.6.0" -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -2536,11 +3883,16 @@ commander@2.17.x: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.18.0, commander@^2.20.0: +commander@^2.18.0, commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -2591,6 +3943,23 @@ concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" +condense-newlines@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" + integrity sha1-PemFVTE5R10yUCyDsC9gaE0kxV8= + dependencies: + extend-shallow "^2.0.1" + is-whitespace "^0.3.0" + kind-of "^3.0.2" + +config-chain@^1.1.12: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" @@ -2625,7 +3994,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -2678,17 +4047,22 @@ copy-webpack-plugin@^5.1.1: webpack-log "^2.0.0" core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.6.5: - version "3.18.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.3.tgz#e0e7e87abc55efb547e7fa19169e45fa9df27a67" - integrity sha512-4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw== + version "3.19.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.0.tgz#b3b93f93c8721b3ed52b91f12f964cc410967f8b" + integrity sha512-R09rKZ56ccGBebjTLZHvzDxhz93YPT37gBm6qUhnwj3Kt7aCjjZWD1injyNbyeFHxNKfeZBSyds6O9n3MKq1sw== dependencies: - browserslist "^4.17.3" + browserslist "^4.17.5" semver "7.0.0" -core-js@^3.6.5: - version "3.18.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.3.tgz#86a0bba2d8ec3df860fefcc07a8d119779f01509" - integrity sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw== +core-js@^2.4.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +core-js@^3.16.0, core-js@^3.6.5: + version "3.19.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.0.tgz#9e40098a9bc326c7e81b486abbd5e12b9d275176" + integrity sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg== core-util-is@1.0.2: version "1.0.2" @@ -2761,7 +4135,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.0, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -2871,6 +4245,16 @@ css-what@^5.0.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css@^2.1.0: + version "2.2.4" + resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" + integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw== + dependencies: + inherits "^2.0.3" + source-map "^0.6.1" + source-map-resolve "^0.5.2" + urix "^0.1.0" + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -2951,6 +4335,30 @@ csso@^4.0.2: dependencies: css-tree "^1.1.2" +cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssom@^0.4.1, cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssstyle@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1" + integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA== + dependencies: + cssom "0.3.x" + +cssstyle@^2.0.0, cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + cyclist@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" @@ -2963,18 +4371,51 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-urls@^1.0.0, data-urls@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" + integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== + dependencies: + abab "^2.0.0" + whatwg-mimetype "^2.2.0" + whatwg-url "^7.0.0" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +deasync@^0.1.15: + version "0.1.23" + resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.23.tgz#d52bb1f9cebb511933bb977f2820af1af5d1ec08" + integrity sha512-CGZSokFwidI50GOAmkz/7z3QdMzTQqAiUOzt95PuhKgi6VVztn9D03ZCzzi93uUWlp/v6A9osvNWpIvqHvKjTA== + dependencies: + bindings "^1.5.0" + node-addon-api "^1.7.1" + +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + debug@^3.1.1, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -2982,23 +4423,26 @@ debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + deep-equal@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" @@ -3021,6 +4465,11 @@ deepmerge@^1.5.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + default-gateway@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" @@ -3108,11 +4557,31 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-newline@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= + +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== +diff-sequences@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" + integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== + +diff-sequences@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" + integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -3163,6 +4632,11 @@ dom-converter@^0.2.0: dependencies: utila "~0.4" +dom-event-types@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.0.0.tgz#5830a0a29e1bf837fe50a70cd80a597232813cae" + integrity sha512-2G2Vwi2zXTHBGqXHsJ4+ak/iP0N8Ar+G8a7LiD2oup5o4sQWytwqqrZu/O6hIMV0KMID2PL69OhpshLO0n7UJQ== + dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" @@ -3195,6 +4669,20 @@ domelementtype@^2.0.1, domelementtype@^2.2.0: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== +domexception@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" + integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug== + dependencies: + webidl-conversions "^4.0.2" + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + domhandler@^4.0.0, domhandler@^4.2.0: version "4.2.2" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" @@ -3264,6 +4752,16 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +editorconfig@^0.15.3: + version "0.15.3" + resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" + integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== + dependencies: + commander "^2.19.0" + lru-cache "^4.1.5" + semver "^5.6.0" + sigmund "^1.0.1" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3274,10 +4772,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.867: - version "1.3.876" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.876.tgz#fe6f65c9740406f4aa69f10faa8e1d79b81bdf34" - integrity sha512-a6LR4738psrubCtGx5HxM/gNlrIsh4eFTNnokgOqvQo81GWd07lLcOjITkAXn2y4lIp18vgS+DGnehj+/oEAxQ== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.878: + version "1.3.879" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.879.tgz#4aba9700cfb241fb95c6ed69e31785e3d1605a43" + integrity sha512-zJo+D9GwbJvM31IdFmwcGvychhk4KKbKYo2GWlsn+C/dxz2NwmbhGJjWwTfFSF2+eFH7VvfA8MCZ8SOqTrlnpw== elliptic@^6.5.3: version "6.5.4" @@ -3292,6 +4790,11 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" +emittery@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" + integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -3404,11 +4907,40 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.11.1, escodegen@^1.9.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + eslint-loader@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" @@ -3509,7 +5041,7 @@ espree@^6.1.2, espree@^6.2.1: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" -esprima@^4.0.0: +esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -3528,15 +5060,15 @@ esrecurse@^4.1.0, esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -3578,6 +5110,11 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +exec-sh@^0.3.2: + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== + execa@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" @@ -3620,6 +5157,26 @@ execa@^3.3.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -3633,6 +5190,30 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" +expect@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" + integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q== + dependencies: + "@jest/types" "^24.9.0" + ansi-styles "^3.2.0" + jest-get-type "^24.9.0" + jest-matcher-utils "^24.9.0" + jest-message-util "^24.9.0" + jest-regex-util "^24.9.0" + +expect@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.3.1.tgz#d0f170b1f5c8a2009bab0beffd4bb94f043e38e7" + integrity sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg== + dependencies: + "@jest/types" "^27.2.5" + ansi-styles "^5.0.0" + jest-get-type "^27.3.1" + jest-matcher-utils "^27.3.1" + jest-message-util "^27.3.1" + jest-regex-util "^27.0.6" + express@^4.16.3, express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -3712,6 +5293,13 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" +extract-from-css@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/extract-from-css/-/extract-from-css-0.4.4.tgz#1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92" + integrity sha1-HqffLnx8brmSL6COitrqSG9vj5I= + dependencies: + css "^2.1.0" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -3739,7 +5327,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -3756,6 +5344,13 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -3823,6 +5418,14 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +find-babel-config@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2" + integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA== + dependencies: + json5 "^0.5.1" + path-exists "^3.0.0" + find-cache-dir@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9" @@ -3832,7 +5435,7 @@ find-cache-dir@^0.1.1: mkdirp "^0.5.1" pkg-dir "^1.0.0" -find-cache-dir@^2.1.0: +find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== @@ -3865,7 +5468,7 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^4.0.0: +find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -3900,6 +5503,13 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -3910,6 +5520,15 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -3976,7 +5595,7 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.3.2: +fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -4010,6 +5629,11 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.1" +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -4029,6 +5653,11 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -4069,7 +5698,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -4093,6 +5722,11 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^9.18.0: + version "9.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" + integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -4130,11 +5764,16 @@ globby@^9.2.0: pify "^4.0.1" slash "^2.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + gzip-size@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" @@ -4161,6 +5800,13 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" @@ -4277,6 +5923,13 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" +homedir-polyfill@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" + integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== + dependencies: + parse-passwd "^1.0.0" + hoopy@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" @@ -4307,11 +5960,30 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= +html-encoding-sniffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" + integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== + dependencies: + whatwg-encoding "^1.0.1" + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + html-entities@^1.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + html-minifier@^3.2.3: version "3.5.21" resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c" @@ -4400,6 +6072,15 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -4444,11 +6125,24 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + human-signals@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -4521,6 +6215,14 @@ import-local@^2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" +import-local@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" + integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -4559,6 +6261,11 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@^1.3.4: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + inquirer@^7.0.0, inquirer@^7.1.0: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" @@ -4595,6 +6302,13 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" +invariant@^2.2.2, invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -4686,7 +6400,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.4: +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: 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== @@ -4698,6 +6412,13 @@ is-ci@^1.0.10: dependencies: ci-info "^1.5.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" @@ -4793,6 +6514,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -4872,6 +6598,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -4914,7 +6645,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -4926,6 +6657,11 @@ is-weakref@^1.0.1: dependencies: call-bind "^1.0.0" +is-whitespace@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f" + integrity sha1-Fjnssb4DauxppUy7QBz77XEUq38= + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4970,11 +6706,914 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" + integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== + +istanbul-lib-coverage@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== + +istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" + integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== + dependencies: + "@babel/generator" "^7.4.0" + "@babel/parser" "^7.4.3" + "@babel/template" "^7.4.0" + "@babel/traverse" "^7.4.3" + "@babel/types" "^7.4.0" + istanbul-lib-coverage "^2.0.5" + semver "^6.0.0" + +istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-instrument@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.0.4.tgz#e976f2aa66ebc6737f236d3ab05b76e36f885c80" + integrity sha512-W6jJF9rLGEISGoCyXRqa/JCGQGmmxPO10TMu7izaUTynxvBvTjqzAIIGCK9USBmIbQAaSWD6XJPrM9Pv5INknw== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-report@^2.0.4: + version "2.0.8" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" + integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ== + dependencies: + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + supports-color "^6.1.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^3.0.1: + version "3.0.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" + integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + rimraf "^2.6.3" + source-map "^0.6.1" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^2.2.6: + version "2.2.7" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931" + integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg== + dependencies: + html-escaper "^2.0.0" + +istanbul-reports@^3.0.2: + version "3.0.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384" + integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + javascript-stringify@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79" integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== +jest-changed-files@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039" + integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg== + dependencies: + "@jest/types" "^24.9.0" + execa "^1.0.0" + throat "^4.0.0" + +jest-changed-files@^27.3.0: + version "27.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.3.0.tgz#22a02cc2b34583fc66e443171dc271c0529d263c" + integrity sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg== + dependencies: + "@jest/types" "^27.2.5" + execa "^5.0.0" + throat "^6.0.1" + +jest-circus@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.3.1.tgz#1679e74387cbbf0c6a8b42de963250a6469e0797" + integrity sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw== + dependencies: + "@jest/environment" "^27.3.1" + "@jest/test-result" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^0.7.0" + expect "^27.3.1" + is-generator-fn "^2.0.0" + jest-each "^27.3.1" + jest-matcher-utils "^27.3.1" + jest-message-util "^27.3.1" + jest-runtime "^27.3.1" + jest-snapshot "^27.3.1" + jest-util "^27.3.1" + pretty-format "^27.3.1" + slash "^3.0.0" + stack-utils "^2.0.3" + throat "^6.0.1" + +jest-cli@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af" + integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg== + dependencies: + "@jest/core" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + chalk "^2.0.1" + exit "^0.1.2" + import-local "^2.0.0" + is-ci "^2.0.0" + jest-config "^24.9.0" + jest-util "^24.9.0" + jest-validate "^24.9.0" + prompts "^2.0.1" + realpath-native "^1.1.0" + yargs "^13.3.0" + +jest-cli@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.3.1.tgz#b576f9d146ba6643ce0a162d782b40152b6b1d16" + integrity sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q== + dependencies: + "@jest/core" "^27.3.1" + "@jest/test-result" "^27.3.1" + "@jest/types" "^27.2.5" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + import-local "^3.0.2" + jest-config "^27.3.1" + jest-util "^27.3.1" + jest-validate "^27.3.1" + prompts "^2.0.1" + yargs "^16.2.0" + +jest-config@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5" + integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^24.9.0" + "@jest/types" "^24.9.0" + babel-jest "^24.9.0" + chalk "^2.0.1" + glob "^7.1.1" + jest-environment-jsdom "^24.9.0" + jest-environment-node "^24.9.0" + jest-get-type "^24.9.0" + jest-jasmine2 "^24.9.0" + jest-regex-util "^24.3.0" + jest-resolve "^24.9.0" + jest-util "^24.9.0" + jest-validate "^24.9.0" + micromatch "^3.1.10" + pretty-format "^24.9.0" + realpath-native "^1.1.0" + +jest-config@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.3.1.tgz#cb3b7f6aaa8c0a7daad4f2b9573899ca7e09bbad" + integrity sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^27.3.1" + "@jest/types" "^27.2.5" + babel-jest "^27.3.1" + chalk "^4.0.0" + ci-info "^3.2.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.4" + jest-circus "^27.3.1" + jest-environment-jsdom "^27.3.1" + jest-environment-node "^27.3.1" + jest-get-type "^27.3.1" + jest-jasmine2 "^27.3.1" + jest-regex-util "^27.0.6" + jest-resolve "^27.3.1" + jest-runner "^27.3.1" + jest-util "^27.3.1" + jest-validate "^27.3.1" + micromatch "^4.0.4" + pretty-format "^27.3.1" + +jest-diff@^24.3.0, jest-diff@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" + integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== + dependencies: + chalk "^2.0.1" + diff-sequences "^24.9.0" + jest-get-type "^24.9.0" + pretty-format "^24.9.0" + +jest-diff@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.3.1.tgz#d2775fea15411f5f5aeda2a5e02c2f36440f6d55" + integrity sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^27.0.6" + jest-get-type "^27.3.1" + pretty-format "^27.3.1" + +jest-docblock@^24.3.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2" + integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA== + dependencies: + detect-newline "^2.1.0" + +jest-docblock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" + integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== + dependencies: + detect-newline "^3.0.0" + +jest-each@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05" + integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog== + dependencies: + "@jest/types" "^24.9.0" + chalk "^2.0.1" + jest-get-type "^24.9.0" + jest-util "^24.9.0" + pretty-format "^24.9.0" + +jest-each@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.3.1.tgz#14c56bb4f18dd18dc6bdd853919b5f16a17761ff" + integrity sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ== + dependencies: + "@jest/types" "^27.2.5" + chalk "^4.0.0" + jest-get-type "^27.3.1" + jest-util "^27.3.1" + pretty-format "^27.3.1" + +jest-environment-jsdom-fifteen@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom-fifteen/-/jest-environment-jsdom-fifteen-1.0.2.tgz#49a0af55e0d32737a6114a1575dd714702ad63b0" + integrity sha512-nfrnAfwklE1872LIB31HcjM65cWTh1wzvMSp10IYtPJjLDUbTTvDpajZgIxUnhRmzGvogdHDayCIlerLK0OBBg== + dependencies: + "@jest/environment" "^24.3.0" + "@jest/fake-timers" "^24.3.0" + "@jest/types" "^24.3.0" + jest-mock "^24.0.0" + jest-util "^24.0.0" + jsdom "^15.2.1" + +jest-environment-jsdom@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b" + integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA== + dependencies: + "@jest/environment" "^24.9.0" + "@jest/fake-timers" "^24.9.0" + "@jest/types" "^24.9.0" + jest-mock "^24.9.0" + jest-util "^24.9.0" + jsdom "^11.5.1" + +jest-environment-jsdom@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz#63ac36d68f7a9303494df783494856222b57f73e" + integrity sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg== + dependencies: + "@jest/environment" "^27.3.1" + "@jest/fake-timers" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + jest-mock "^27.3.0" + jest-util "^27.3.1" + jsdom "^16.6.0" + +jest-environment-node@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3" + integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA== + dependencies: + "@jest/environment" "^24.9.0" + "@jest/fake-timers" "^24.9.0" + "@jest/types" "^24.9.0" + jest-mock "^24.9.0" + jest-util "^24.9.0" + +jest-environment-node@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.3.1.tgz#af7d0eed04edafb740311b303f3fe7c8c27014bb" + integrity sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw== + dependencies: + "@jest/environment" "^27.3.1" + "@jest/fake-timers" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + jest-mock "^27.3.0" + jest-util "^27.3.1" + +jest-get-type@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" + integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== + +jest-get-type@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff" + integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg== + +jest-haste-map@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d" + integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ== + dependencies: + "@jest/types" "^24.9.0" + anymatch "^2.0.0" + fb-watchman "^2.0.0" + graceful-fs "^4.1.15" + invariant "^2.2.4" + jest-serializer "^24.9.0" + jest-util "^24.9.0" + jest-worker "^24.9.0" + micromatch "^3.1.10" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^1.2.7" + +jest-haste-map@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.3.1.tgz#7656fbd64bf48bda904e759fc9d93e2c807353ee" + integrity sha512-lYfNZIzwPccDJZIyk9Iz5iQMM/MH56NIIcGj7AFU1YyA4ewWFBl8z+YPJuSCRML/ee2cCt2y3W4K3VXPT6Nhzg== + dependencies: + "@jest/types" "^27.2.5" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + jest-regex-util "^27.0.6" + jest-serializer "^27.0.6" + jest-util "^27.3.1" + jest-worker "^27.3.1" + micromatch "^4.0.4" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.3.2" + +jest-jasmine2@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0" + integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + chalk "^2.0.1" + co "^4.6.0" + expect "^24.9.0" + is-generator-fn "^2.0.0" + jest-each "^24.9.0" + jest-matcher-utils "^24.9.0" + jest-message-util "^24.9.0" + jest-runtime "^24.9.0" + jest-snapshot "^24.9.0" + jest-util "^24.9.0" + pretty-format "^24.9.0" + throat "^4.0.0" + +jest-jasmine2@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz#df6d3d07c7dafc344feb43a0072a6f09458d32b0" + integrity sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^27.3.1" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^27.3.1" + is-generator-fn "^2.0.0" + jest-each "^27.3.1" + jest-matcher-utils "^27.3.1" + jest-message-util "^27.3.1" + jest-runtime "^27.3.1" + jest-snapshot "^27.3.1" + jest-util "^27.3.1" + pretty-format "^27.3.1" + throat "^6.0.1" + +jest-leak-detector@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a" + integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA== + dependencies: + jest-get-type "^24.9.0" + pretty-format "^24.9.0" + +jest-leak-detector@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz#7fb632c2992ef707a1e73286e1e704f9cc1772b2" + integrity sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg== + dependencies: + jest-get-type "^27.3.1" + pretty-format "^27.3.1" + +jest-matcher-utils@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073" + integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA== + dependencies: + chalk "^2.0.1" + jest-diff "^24.9.0" + jest-get-type "^24.9.0" + pretty-format "^24.9.0" + +jest-matcher-utils@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz#257ad61e54a6d4044e080d85dbdc4a08811e9c1c" + integrity sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w== + dependencies: + chalk "^4.0.0" + jest-diff "^27.3.1" + jest-get-type "^27.3.1" + pretty-format "^27.3.1" + +jest-message-util@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" + integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + "@types/stack-utils" "^1.0.1" + chalk "^2.0.1" + micromatch "^3.1.10" + slash "^2.0.0" + stack-utils "^1.0.1" + +jest-message-util@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.3.1.tgz#f7c25688ad3410ab10bcb862bcfe3152345c6436" + integrity sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^27.2.5" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.4" + pretty-format "^27.3.1" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^24.0.0, jest-mock@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6" + integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w== + dependencies: + "@jest/types" "^24.9.0" + +jest-mock@^27.3.0: + version "27.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.3.0.tgz#ddf0ec3cc3e68c8ccd489bef4d1f525571a1b867" + integrity sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw== + dependencies: + "@jest/types" "^27.2.5" + "@types/node" "*" + +jest-pnp-resolver@^1.2.1, jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^24.3.0, jest-regex-util@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" + integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== + +jest-regex-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" + integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== + +jest-resolve-dependencies@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab" + integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g== + dependencies: + "@jest/types" "^24.9.0" + jest-regex-util "^24.3.0" + jest-snapshot "^24.9.0" + +jest-resolve-dependencies@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz#85b99bdbdfa46e2c81c6228fc4c91076f624f6e2" + integrity sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A== + dependencies: + "@jest/types" "^27.2.5" + jest-regex-util "^27.0.6" + jest-snapshot "^27.3.1" + +jest-resolve@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321" + integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ== + dependencies: + "@jest/types" "^24.9.0" + browser-resolve "^1.11.3" + chalk "^2.0.1" + jest-pnp-resolver "^1.2.1" + realpath-native "^1.1.0" + +jest-resolve@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.3.1.tgz#0e5542172a1aa0270be6f66a65888647bdd74a3e" + integrity sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw== + dependencies: + "@jest/types" "^27.2.5" + chalk "^4.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^27.3.1" + jest-pnp-resolver "^1.2.2" + jest-util "^27.3.1" + jest-validate "^27.3.1" + resolve "^1.20.0" + resolve.exports "^1.1.0" + slash "^3.0.0" + +jest-runner@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42" + integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg== + dependencies: + "@jest/console" "^24.7.1" + "@jest/environment" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + chalk "^2.4.2" + exit "^0.1.2" + graceful-fs "^4.1.15" + jest-config "^24.9.0" + jest-docblock "^24.3.0" + jest-haste-map "^24.9.0" + jest-jasmine2 "^24.9.0" + jest-leak-detector "^24.9.0" + jest-message-util "^24.9.0" + jest-resolve "^24.9.0" + jest-runtime "^24.9.0" + jest-util "^24.9.0" + jest-worker "^24.6.0" + source-map-support "^0.5.6" + throat "^4.0.0" + +jest-runner@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.3.1.tgz#1d594dcbf3bd8600a7e839e790384559eaf96e3e" + integrity sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww== + dependencies: + "@jest/console" "^27.3.1" + "@jest/environment" "^27.3.1" + "@jest/test-result" "^27.3.1" + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.8.1" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-docblock "^27.0.6" + jest-environment-jsdom "^27.3.1" + jest-environment-node "^27.3.1" + jest-haste-map "^27.3.1" + jest-leak-detector "^27.3.1" + jest-message-util "^27.3.1" + jest-resolve "^27.3.1" + jest-runtime "^27.3.1" + jest-util "^27.3.1" + jest-worker "^27.3.1" + source-map-support "^0.5.6" + throat "^6.0.1" + +jest-runtime@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac" + integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw== + dependencies: + "@jest/console" "^24.7.1" + "@jest/environment" "^24.9.0" + "@jest/source-map" "^24.3.0" + "@jest/transform" "^24.9.0" + "@jest/types" "^24.9.0" + "@types/yargs" "^13.0.0" + chalk "^2.0.1" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.1.15" + jest-config "^24.9.0" + jest-haste-map "^24.9.0" + jest-message-util "^24.9.0" + jest-mock "^24.9.0" + jest-regex-util "^24.3.0" + jest-resolve "^24.9.0" + jest-snapshot "^24.9.0" + jest-util "^24.9.0" + jest-validate "^24.9.0" + realpath-native "^1.1.0" + slash "^2.0.0" + strip-bom "^3.0.0" + yargs "^13.3.0" + +jest-runtime@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.3.1.tgz#80fa32eb85fe5af575865ddf379874777ee993d7" + integrity sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg== + dependencies: + "@jest/console" "^27.3.1" + "@jest/environment" "^27.3.1" + "@jest/globals" "^27.3.1" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.3.1" + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/yargs" "^16.0.0" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + execa "^5.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.4" + jest-haste-map "^27.3.1" + jest-message-util "^27.3.1" + jest-mock "^27.3.0" + jest-regex-util "^27.0.6" + jest-resolve "^27.3.1" + jest-snapshot "^27.3.1" + jest-util "^27.3.1" + jest-validate "^27.3.1" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^16.2.0" + +jest-serializer-vue@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-2.0.2.tgz#b238ef286357ec6b480421bd47145050987d59b3" + integrity sha1-sjjvKGNX7GtIBCG9RxRQUJh9WbM= + dependencies: + pretty "2.0.0" + +jest-serializer@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" + integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== + +jest-serializer@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" + integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" + +jest-snapshot@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba" + integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew== + dependencies: + "@babel/types" "^7.0.0" + "@jest/types" "^24.9.0" + chalk "^2.0.1" + expect "^24.9.0" + jest-diff "^24.9.0" + jest-get-type "^24.9.0" + jest-matcher-utils "^24.9.0" + jest-message-util "^24.9.0" + jest-resolve "^24.9.0" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + pretty-format "^24.9.0" + semver "^6.2.0" + +jest-snapshot@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.3.1.tgz#1da5c0712a252d70917d46c037054f5918c49ee4" + integrity sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg== + dependencies: + "@babel/core" "^7.7.2" + "@babel/generator" "^7.7.2" + "@babel/parser" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.0.0" + "@jest/transform" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^27.3.1" + graceful-fs "^4.2.4" + jest-diff "^27.3.1" + jest-get-type "^27.3.1" + jest-haste-map "^27.3.1" + jest-matcher-utils "^27.3.1" + jest-message-util "^27.3.1" + jest-resolve "^27.3.1" + jest-util "^27.3.1" + natural-compare "^1.4.0" + pretty-format "^27.3.1" + semver "^7.3.2" + +jest-transform-stub@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d" + integrity sha512-lspHaCRx/mBbnm3h4uMMS3R5aZzMwyNpNIJLXj4cEsV0mIUtS4IjYJLSoyjRCtnxb6RIGJ4NL2quZzfIeNhbkg== + +jest-util@^24.0.0, jest-util@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162" + integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg== + dependencies: + "@jest/console" "^24.9.0" + "@jest/fake-timers" "^24.9.0" + "@jest/source-map" "^24.9.0" + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + callsites "^3.0.0" + chalk "^2.0.1" + graceful-fs "^4.1.15" + is-ci "^2.0.0" + mkdirp "^0.5.1" + slash "^2.0.0" + source-map "^0.6.0" + +jest-util@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.3.1.tgz#a58cdc7b6c8a560caac9ed6bdfc4e4ff23f80429" + integrity sha512-8fg+ifEH3GDryLQf/eKZck1DEs2YuVPBCMOaHQxVVLmQwl/CDhWzrvChTX4efLZxGrw+AA0mSXv78cyytBt/uw== + dependencies: + "@jest/types" "^27.2.5" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.4" + picomatch "^2.2.3" + +jest-validate@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab" + integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ== + dependencies: + "@jest/types" "^24.9.0" + camelcase "^5.3.1" + chalk "^2.0.1" + jest-get-type "^24.9.0" + leven "^3.1.0" + pretty-format "^24.9.0" + +jest-validate@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.3.1.tgz#3a395d61a19cd13ae9054af8cdaf299116ef8a24" + integrity sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q== + dependencies: + "@jest/types" "^27.2.5" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^27.3.1" + leven "^3.1.0" + pretty-format "^27.3.1" + +jest-watch-typeahead@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz#e5be959698a7fa2302229a5082c488c3c8780a4a" + integrity sha512-f7VpLebTdaXs81rg/oj4Vg/ObZy2QtGzAmGLNsqUS5G5KtSN68tFcIsbvNODfNyQxU78g7D8x77o3bgfBTR+2Q== + dependencies: + ansi-escapes "^4.2.1" + chalk "^2.4.1" + jest-regex-util "^24.9.0" + jest-watcher "^24.3.0" + slash "^3.0.0" + string-length "^3.1.0" + strip-ansi "^5.0.0" + +jest-watcher@^24.3.0, jest-watcher@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b" + integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw== + dependencies: + "@jest/test-result" "^24.9.0" + "@jest/types" "^24.9.0" + "@types/yargs" "^13.0.0" + ansi-escapes "^3.0.0" + chalk "^2.0.1" + jest-util "^24.9.0" + string-length "^2.0.0" + +jest-watcher@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.3.1.tgz#ba5e0bc6aa843612b54ddb7f009d1cbff7e05f3e" + integrity sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA== + dependencies: + "@jest/test-result" "^27.3.1" + "@jest/types" "^27.2.5" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^27.3.1" + string-length "^4.0.1" + +jest-worker@^24.6.0, jest-worker@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" + integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw== + dependencies: + merge-stream "^2.0.0" + supports-color "^6.1.0" + +jest-worker@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2" + integrity sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" + integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw== + dependencies: + import-local "^2.0.0" + jest-cli "^24.9.0" + +jest@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.3.1.tgz#b5bab64e8f56b6f7e275ba1836898b0d9f1e5c8a" + integrity sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng== + dependencies: + "@jest/core" "^27.3.1" + import-local "^3.0.2" + jest-cli "^27.3.1" + +js-beautify@^1.6.12, js-beautify@^1.6.14: + version "1.14.0" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.0.tgz#2ce790c555d53ce1e3d7363227acf5dc69024c2d" + integrity sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ== + dependencies: + config-chain "^1.1.12" + editorconfig "^0.15.3" + glob "^7.1.3" + nopt "^5.0.0" + js-message@1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.7.tgz#fbddd053c7a47021871bb8b2c95397cc17c20e47" @@ -4987,11 +7626,16 @@ js-queue@2.0.2: dependencies: easy-stack "^1.0.1" -js-tokens@^4.0.0: +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= + js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" @@ -5005,6 +7649,108 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsdom-global@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" + integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk= + +jsdom@^11.5.1: + version "11.12.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" + integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw== + dependencies: + abab "^2.0.0" + acorn "^5.5.3" + acorn-globals "^4.1.0" + array-equal "^1.0.0" + cssom ">= 0.3.2 < 0.4.0" + cssstyle "^1.0.0" + data-urls "^1.0.0" + domexception "^1.0.1" + escodegen "^1.9.1" + html-encoding-sniffer "^1.0.2" + left-pad "^1.3.0" + nwsapi "^2.0.7" + parse5 "4.0.0" + pn "^1.1.0" + request "^2.87.0" + request-promise-native "^1.0.5" + sax "^1.2.4" + symbol-tree "^3.2.2" + tough-cookie "^2.3.4" + w3c-hr-time "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.3" + whatwg-mimetype "^2.1.0" + whatwg-url "^6.4.1" + ws "^5.2.0" + xml-name-validator "^3.0.0" + +jsdom@^15.2.1: + version "15.2.1" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" + integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== + dependencies: + abab "^2.0.0" + acorn "^7.1.0" + acorn-globals "^4.3.2" + array-equal "^1.0.0" + cssom "^0.4.1" + cssstyle "^2.0.0" + data-urls "^1.1.0" + domexception "^1.0.1" + escodegen "^1.11.1" + html-encoding-sniffer "^1.0.2" + nwsapi "^2.2.0" + parse5 "5.1.0" + pn "^1.1.0" + request "^2.88.0" + request-promise-native "^1.0.7" + saxes "^3.1.9" + symbol-tree "^3.2.2" + tough-cookie "^3.0.1" + w3c-hr-time "^1.0.1" + w3c-xmlserializer "^1.1.2" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^7.0.0" + ws "^7.0.0" + xml-name-validator "^3.0.0" + +jsdom@^16.6.0: + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== + dependencies: + abab "^2.0.5" + acorn "^8.2.4" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.3.0" + data-urls "^2.0.0" + decimal.js "^10.2.1" + domexception "^2.0.1" + escodegen "^2.0.0" + form-data "^3.0.0" + html-encoding-sniffer "^2.0.1" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "6.0.1" + saxes "^5.0.1" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.5.0" + ws "^7.4.6" + xml-name-validator "^3.0.0" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -5050,7 +7796,14 @@ json3@^3.3.3: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== -json5@^0.5.0: +json5@2.x, json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= @@ -5062,13 +7815,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5115,6 +7861,11 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + launch-editor-middleware@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157" @@ -5130,6 +7881,16 @@ launch-editor@^2.2.1: chalk "^2.3.0" shell-quote "^1.6.1" +left-pad@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" + integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -5143,6 +7904,16 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + loader-fs-cache@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9" @@ -5219,11 +7990,16 @@ lodash.mapvalues@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw= -lodash.memoize@^4.1.2: +lodash.memoize@4.x, lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + lodash.transform@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" @@ -5234,7 +8010,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: +lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5251,12 +8027,19 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== +loose-envify@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -lru-cache@^4.0.1, lru-cache@^4.1.2: +lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -5271,7 +8054,14 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -make-dir@^2.0.0: +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -5279,13 +8069,25 @@ make-dir@^2.0.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" +make-error@1.x: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== + dependencies: + tmpl "1.0.5" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -5384,7 +8186,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: +micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -5459,7 +8261,7 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -5495,7 +8297,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@0.x, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -5610,11 +8412,37 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" +node-addon-api@^1.7.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-cache@^4.1.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.1.tgz#efd8474dee4edec4138cdded580f5516500f7334" + integrity sha512-BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A== + dependencies: + clone "2.x" + lodash "^4.17.15" + +node-environment-flags@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" + integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw== + dependencies: + object.getownpropertydescriptors "^2.0.3" + semver "^5.7.0" + node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + node-ipc@^9.1.1: version "9.2.1" resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b" @@ -5653,12 +8481,35 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^2.0.0: +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + +node-notifier@^5.4.2: + version "5.4.5" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.5.tgz#0cbc1a2b0f658493b4025775a13ad938e96091ef" + integrity sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ== + dependencies: + growly "^1.3.0" + is-wsl "^1.1.0" + semver "^5.5.0" + shellwords "^0.1.1" + which "^1.3.0" + +node-releases@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== -normalize-package-data@^2.5.0: +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -5712,7 +8563,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -5738,6 +8589,11 @@ num2fraction@^1.2.2: resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= +nwsapi@^2.0.7, nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -5797,7 +8653,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0, object.getownpropertydescriptors@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== @@ -5853,7 +8709,7 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -5879,7 +8735,7 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" -optionator@^0.8.3: +optionator@^0.8.1, optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -5920,6 +8776,13 @@ os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= +p-each-series@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71" + integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E= + dependencies: + p-reduce "^1.0.0" + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -5956,6 +8819,11 @@ p-map@^2.0.0: resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== +p-reduce@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" + integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= + p-retry@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" @@ -6025,6 +8893,11 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-passwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" + integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + parse5-htmlparser2-tree-adapter@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" @@ -6032,16 +8905,26 @@ parse5-htmlparser2-tree-adapter@^6.0.0: dependencies: parse5 "^6.0.1" +parse5@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" + integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== + +parse5@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" + integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== + +parse5@6.0.1, parse5@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + parse5@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== -parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -6174,6 +9057,13 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pirates@^4.0.0, pirates@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" + integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== + dependencies: + node-modules-regexp "^1.0.0" + pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -6188,13 +9078,18 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -pkg-dir@^4.1.0: +pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== + pnp-webpack-plugin@^1.6.4: version "1.7.0" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9" @@ -6558,10 +9453,10 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@^1.18.2: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +"prettier@^1.18.2 || ^2.0.0": + version "2.4.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" + integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== pretty-error@^2.0.2: version "2.1.2" @@ -6571,6 +9466,40 @@ pretty-error@^2.0.2: lodash "^4.17.20" renderkid "^2.0.4" +pretty-format@^24.9.0: + version "24.9.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" + integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== + dependencies: + "@jest/types" "^24.9.0" + ansi-regex "^4.0.0" + ansi-styles "^3.2.0" + react-is "^16.8.4" + +pretty-format@^27.3.1: + version "27.3.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5" + integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA== + dependencies: + "@jest/types" "^27.2.5" + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^17.0.1" + +pretty@2.0.0, pretty@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5" + integrity sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU= + dependencies: + condense-newlines "^0.2.1" + extend-shallow "^2.0.1" + js-beautify "^1.6.12" + +private@^0.1.6: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -6591,6 +9520,19 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +prompts@^2.0.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -6609,7 +9551,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -6734,6 +9676,33 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +react-is@^16.8.4: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +read-pkg-up@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" + integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== + dependencies: + find-up "^3.0.0" + read-pkg "^3.0.0" + +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + read-pkg@^5.1.1: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -6782,6 +9751,13 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" +realpath-native@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" + integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA== + dependencies: + util.promisify "^1.0.0" + regenerate-unicode-properties@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" @@ -6789,16 +9765,30 @@ regenerate-unicode-properties@^9.0.0: dependencies: regenerate "^1.4.2" -regenerate@^1.4.2: +regenerate@^1.2.1, regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-transform@^0.10.0: + version "0.10.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" + integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== + dependencies: + babel-runtime "^6.18.0" + babel-types "^6.19.0" + private "^0.1.6" + regenerator-transform@^0.14.2: version "0.14.5" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" @@ -6827,6 +9817,15 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpu-core@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" + integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA= + dependencies: + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + regexpu-core@^4.7.1: version "4.8.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" @@ -6839,11 +9838,23 @@ regexpu-core@^4.7.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" +regjsgen@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= + regjsgen@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== +regjsparser@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= + dependencies: + jsesc "~0.5.0" + regjsparser@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" @@ -6882,7 +9893,23 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -request@^2.88.2: +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + +request-promise-native@^1.0.5, request-promise-native@^1.0.7: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== + dependencies: + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + +request@^2.87.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -6930,6 +9957,13 @@ resolve-cwd@^2.0.0: dependencies: resolve-from "^3.0.0" +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -6940,12 +9974,27 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2: +resolve.exports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + +resolve@1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= + +resolve@1.x, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -7003,6 +10052,13 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -7011,6 +10067,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rsvp@^4.8.4: + version "4.8.5" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" + integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -7052,11 +10113,40 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@~1.2.4: +sane@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" + integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^2.0.0" + capture-exit "^2.0.0" + exec-sh "^0.3.2" + execa "^1.0.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^3.1.9: + version "3.1.11" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" + integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== + dependencies: + xmlchars "^2.1.1" + +saxes@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -7087,7 +10177,7 @@ selfsigned@^1.10.8: dependencies: node-forge "^0.10.0" -"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7097,11 +10187,18 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.3.2: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -7189,6 +10286,13 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -7218,6 +10322,11 @@ shell-quote@^1.6.1: resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -7227,7 +10336,12 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +sigmund@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== @@ -7239,6 +10353,11 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -7249,6 +10368,11 @@ slash@^2.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -7321,7 +10445,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-resolve@^0.5.0: +source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== @@ -7332,7 +10456,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@~0.5.12: +source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== @@ -7455,6 +10579,20 @@ stable@^0.1.8: resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +stack-utils@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz#a19b0b01947e0029c8e451d5d61a498f5bb1471b" + integrity sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ== + dependencies: + escape-string-regexp "^2.0.0" + +stack-utils@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + dependencies: + escape-string-regexp "^2.0.0" + stackframe@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" @@ -7473,6 +10611,11 @@ static-extend@^0.1.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +stealthy-require@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + stream-browserify@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" @@ -7510,6 +10653,30 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= +string-length@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" + integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0= + dependencies: + astral-regex "^1.0.0" + strip-ansi "^4.0.0" + +string-length@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" + integrity sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA== + dependencies: + astral-regex "^1.0.0" + strip-ansi "^5.2.0" + +string-length@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + string-width@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -7566,7 +10733,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.1: +strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -7594,6 +10761,16 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -7609,6 +10786,11 @@ strip-indent@^2.0.0: resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= +strip-json-comments@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strip-json-comments@^3.0.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -7623,6 +10805,11 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -7637,13 +10824,28 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" @@ -7668,6 +10870,11 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-tree@^3.2.2, symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -7683,6 +10890,14 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^1.4.4: version "1.4.5" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" @@ -7707,6 +10922,25 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" +test-exclude@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" + integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g== + dependencies: + glob "^7.1.3" + minimatch "^3.0.4" + read-pkg-up "^4.0.0" + require-main-filename "^2.0.0" + +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -7735,6 +10969,16 @@ thread-loader@^2.1.3: loader-utils "^1.1.0" neo-async "^2.6.0" +throat@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" + integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= + +throat@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" + integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -7772,11 +11016,21 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= +to-fast-properties@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" + integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= + to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -7824,7 +11078,7 @@ toposort@^1.0.0: resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk= -tough-cookie@~2.5.0: +tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -7832,16 +11086,74 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.1.2" + +tr46@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= + dependencies: + punycode "^2.1.0" + +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== + dependencies: + punycode "^2.1.1" + tryer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-jest@^24.2.0: + version "24.3.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.3.0.tgz#b97814e3eab359ea840a1ac112deae68aa440869" + integrity sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ== + dependencies: + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + json5 "2.x" + lodash.memoize "4.x" + make-error "1.x" + mkdirp "0.x" + resolve "1.x" + semver "^5.5" + yargs-parser "10.x" + ts-pnp@^1.1.6: version "1.2.0" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tsconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7" + integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== + dependencies: + "@types/strip-bom" "^3.0.0" + "@types/strip-json-comments" "0.0.30" + strip-bom "^3.0.0" + strip-json-comments "^2.0.0" + tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -7871,6 +11183,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + type-fest@^0.21.3: version "0.21.3" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" @@ -7894,6 +11211,13 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -7974,7 +11298,7 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.0: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -8062,6 +11386,17 @@ util.promisify@1.0.0: define-properties "^1.1.2" object.getownpropertydescriptors "^2.0.3" +util.promisify@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" + integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + for-each "^0.3.3" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.1" + util.promisify@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" @@ -8106,6 +11441,22 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== +v8-to-istanbul@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c" + integrity sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + +v8flags@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" + integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== + dependencies: + homedir-polyfill "^1.0.1" + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -8156,10 +11507,27 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== +vue-jest@^3.0.5, vue-jest@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.7.tgz#a6d29758a5cb4d750f5d1242212be39be4296a33" + integrity sha512-PIOxFM+wsBMry26ZpfBvUQ/DGH2hvp5khDQ1n51g3bN0TwFwTy4J85XVfxTRMukqHji/GnAoGUnlZ5Ao73K62w== + dependencies: + babel-plugin-transform-es2015-modules-commonjs "^6.26.0" + chalk "^2.1.0" + deasync "^0.1.15" + extract-from-css "^0.4.4" + find-babel-config "^1.1.0" + js-beautify "^1.6.14" + node-cache "^4.1.1" + object-assign "^4.1.1" + source-map "^0.5.6" + tsconfig "^7.0.0" + vue-template-es2015-compiler "^1.6.0" + "vue-loader-v16@npm:vue-loader@^16.1.0": - version "16.8.1" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.1.tgz#354f12bc0897954158b71590f800295713a7792d" - integrity sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ== + version "16.8.2" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.2.tgz#78552d6558207a93f09e4fb68b068d44964eb740" + integrity sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q== dependencies: chalk "^4.1.0" hash-sum "^2.0.0" @@ -8192,7 +11560,7 @@ vue-template-compiler@^2.6.11: de-indent "^1.0.2" he "^1.1.0" -vue-template-es2015-compiler@^1.9.0: +vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== @@ -8202,6 +11570,36 @@ vue@^2.6.11: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== +w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" + integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== + dependencies: + domexception "^1.0.1" + webidl-conversions "^4.0.2" + xml-name-validator "^3.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walker@^1.0.7, walker@~1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== + dependencies: + makeerror "1.0.12" + watchpack-chokidar2@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" @@ -8234,6 +11632,21 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webidl-conversions@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + webpack-bundle-analyzer@^3.8.0: version "3.9.0" resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz#f6f94db108fb574e415ad313de41a2707d33ef3c" @@ -8377,6 +11790,45 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^6.4.1: + version "6.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" + integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + +whatwg-url@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== + dependencies: + lodash "^4.7.0" + tr46 "^2.1.0" + webidl-conversions "^6.1.0" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -8393,7 +11845,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.9: +which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -8451,6 +11903,25 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write-file-atomic@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529" + integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" @@ -8458,6 +11929,13 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" +ws@^5.2.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" + integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== + dependencies: + async-limiter "~1.0.0" + ws@^6.0.0, ws@^6.2.1: version "6.2.2" resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" @@ -8465,6 +11943,21 @@ ws@^6.0.0, ws@^6.2.1: dependencies: async-limiter "~1.0.0" +ws@^7.0.0, ws@^7.4.6: + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.1.1, xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -8495,6 +11988,13 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yargs-parser@10.x: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== + dependencies: + camelcase "^4.1.0" + yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -8508,7 +12008,7 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^13.3.2: +yargs@^13.3.0, yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== @@ -8524,7 +12024,7 @@ yargs@^13.3.2: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^16.0.0: +yargs@^16.0.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From cec7ece2714f2c1497ab2b543d857c743f7cdf94 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 12:04:39 +0200 Subject: [PATCH 0985/1843] update readme --- admin/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/README.md b/admin/README.md index 2e380c03a..da551c8b8 100644 --- a/admin/README.md +++ b/admin/README.md @@ -20,5 +20,7 @@ yarn build yarn lint ``` -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). +### Unit tests +``` +yarn test +``` From 6c65b047d93c2162d3885fe710de27a4b16e9a68 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 12:12:12 +0200 Subject: [PATCH 0986/1843] clean up public folder --- admin/public/favicon.ico | Bin 4286 -> 0 bytes admin/public/favicon.png | Bin 0 -> 18030 bytes admin/public/index.html | 35 ++++++++++++++++++++--------------- admin/src/assets/logo.png | Bin 6849 -> 0 bytes 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 admin/public/favicon.ico create mode 100644 admin/public/favicon.png delete mode 100644 admin/src/assets/logo.png diff --git a/admin/public/favicon.ico b/admin/public/favicon.ico deleted file mode 100644 index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S diff --git a/admin/public/favicon.png b/admin/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..578b9925c0a6257704a412566be4f3c82ae75b57 GIT binary patch literal 18030 zcmeIZbyQr>)-8&=d(fsKxYIZUcM0y+c;jvXg1c)VcyM9LX027b_n>x!vXV493NZ>46coCwjD+gTU-I7{B!rjW0&G?J zP*9Ac-s;+}s$dU*qqBnr#MT_(>g8w-F!zL5KtXvfRAxe)U-QKVKVRVa!W{$R`etnH z*@kk)UyW8&F4~S+FfhI@yfl=Ehax?OqVssV@2a|=?Rvs*$DG+Vsl3(|dfv`{N9yza z;bzs7B53?%^Cs@%qW*OD88ryr#(~BnulG}qz%I2;&*TPSB zhbt^gv;&^1GTCwL11HdlPY7uUMxZyLX6+NSn+M7K6kpy!Zn?KskCL9J)LOgrwr{l7 zg?*kKq-3w|J2y$*FOS{bUvxeC(Y?Qa8i!wA+z?*ot6cSX`f_s0jH z-tuq?bER<9U1RbMK5M3}m$yUt1N##}XVXpbMKNEy2l)IbE$2ZeFDzWgei$5vZO?mh zff6M>b|#^KW2#Riw`%jDWGJP*Pgm!CZ%k+!i>U>;b%w`;|_e9fCqVU2;K)y+%NNMirdU|*ip63GhoHw=B zcCYVxMCkO!IgG?ja=LDWgp3J2v%%NBUYPxn9x*IUuR|nBI}v^qd(U!o#v^ijua;ARy0h0 zDJk92wXW2J_v=eEXVm;!q0{_b^-E>LLIu~XH;K?S9B-=O=c^y@D1ts>R0(?CtihX( z@lK7^kMY|z&F^ZrjE|OAwApes-w_KOH}pgpG#@qHlhcyw|J+hj5^`VoX{oP&RP@oI z^=iScdG&13y2sbzaVY1xW2Tq2e87^vW5Q1_ra9xWO#&+uZyqgbfV8G%1cui&`Ku2q zpET{%h()J#e!fI@-7v4fu!%NX4%Qd+F1wqs?I#nSw2S8v`?Iv|Oof|gFdyyIBjT6G zDf{O^YrT1kUt8HBc%cjGIY`2Wjtk*-bfu3M7nzUTj9fLHU)@>`Gh6xW^(xaKHq9yD z40l<&t%}#BPi(GLQ$tKN)yg+3-u2deVHgYdJ^2FB%UMPW`ilA~i(5LP&0^GMunvQu zr;gh;m2}^%-h;XJX80U4^$Yu1#}6TH1$)>x#RKz*pAF~AC%M_@y&Bx-60;UNxGngv z3=aiVqY8&?*)zv*8{B-1KDW%X-Oz=gqppL7WxHO(>r~YA*-6`;j5Fm9l9lVDwa~uD zL{3%jP6-Z}PjRlb%D&aqYU{i5`D#8Q?w-|=qwOp#v9rgyx!{rG_+`)X8@s@}R=I8a zsyf;!sLKiB`Mk_&md~k&YveaYjZ;F+h)eb7Y@R-6Bqxbe*_&Q=Kht(S7S8YhrWF*RF&nc4K67tah7wut2*ll!aWxrul=!3?zH2~Y{b&YloecG!FBa; z>o&PN;&P~FTAm=^V$;?H6xpcL;-VuyMu9X4pgqoHy(gMhDoMRj7#90C+s#T1(fE>RZ z-WUm{c}C=yw7Xm#oK@9PX~N_&l)ITrGLIWDg0Mo)6kw zkZBn&m0)CV-XA+$X#6mLH8nci?xGOTsnBxnA8Fp6Kq00pI^yS3>h-x+6~OP*8gBVR zz~O^SOz(o_9DO6Fj>qfMQp5+FS2U}bH#+np*K0tCo(CPrkNDLuind}F2w)~I&?;gnGXe5ZObVir3*&@vn zpx?m3|haF-1z3{ae%v;Wu}sd#$%LFL1S4`q}gS*Iaj*W-B@0p55nP# zjab%aOsc-Blj)Nzi%9{n?153>e$bTNQ-*(8tDiG>jfCfS#whkL!HYdwk=V=n^pQ2E z;hH^T3W-n=$a>@!eS()TL^&6@tHE|6*qQ;xrq>D#4Ki|xSPGt_L3>ECcLC*_pzd#F z;sRJTTzjMhYpkhjj5ax?o5=CV9O_-X)We_qg2m%iEe}NeYgZ38u02m|TUn|r0Vx=1 zJ6S^2^#XZbtjPV=O28Vj*yM004pbH#8*no~wK>JwGF}lAF5r0x*g+u8dld5(BU_5# z+7l{x#4=H5u+O*imNPy39(v^CP15(1%DXC-tZ-q4-pOS+UZVE2ir3^5@G;m>p`EmpIoEp z4qxxbBJ7Fbp%NQ`g(v35AkDiv2M~3`aXiI#NX}v^m&pb?eZtLfBYSL?G2o?ZItD~e z#9zXiMf8FfX76({&h|8 z);2!C(;u>i;&2|%bHq#uGi+gxK+~vBD42ZTN369bDd7#d0EqAe_s?a2w+25g4S9IIX=$7Kkl^g3^{!*Bgpji&+yQ-#OxRwyAC0N3C>d#e~9PdBk0_)Z^)L zLNaz@^20xWeR6g!V(y8WG%E_$^&lLcWIB};Q#~GwdaNOdFh9<+{=TN9jn)?P+c$$e z3MlM^wfWFSxp{(=i=l5$Xh0kSMGhuxei>_nJxhpgwjx^DW;971;BGhC^073{2%i zxG92Qy=)&emQA?WrBqng>fE>*B$C4uC9I9syOs&`LN*XmC)zcxt3S`j@J9>$X^};! z)MfqaEm4Ii#kW5U6GJ6*fGZ-opE^WV$of@SFf*WAxLiEhd)s6P!qCv7C6+*FB}Bu@ z6u9zHZ$)cMd%puox_LRjKvY=vy;#D(4zwd=GijSpv-4UJ$OONVg_pG9MQ;ws`FfJ? zgOab!do!3oQshtHW1TUK;tEtM++W|JL<}lJ{+4DkIH>%V^=^@gl3L2tDLkxk0aJpN z4nhiL1+3bEvh|wV5u?!XN*a2tpbn!8PaM*}L>(9tM*35^DbxoOWafifk6n8!Xp8}L z`rJrb5}rP1VyJi=`YAMZ&6qhD9vR*=8)5(C^~U~$i8}gL8;Mb0dTPt2E0`Rpa=ng| zi}h_=_E;D9a>~?MhT)51*;#jtF`o0`bV^tc6AMiKuY+#kc-Xa9uTr5p18XQ+BK;&K zsG7`juzU5(dL|e^Yz2Y!@gv4$)QS>GeSKS=@huBp+IY!BW}e<31%Utzf`KD=+sUTC>BfhRgA*jkf{jK7I}{k=CO5;@vjEN*F-E~!(~>fSA^$>nj-S(bB5B*X&AjIK{ztV9ZNW2aOT7It76ABA8T>V zy1UbbBpl*3v;lYiDm%qSLCLTE%_8rV2&4ph{cSRaNJZg+Kj51pZ+p?+5t7&qQ}$s( zzh0pPN?Dy&@g6qNYk1l0Y&cif$a=>AYB=y1X+UFfAC^~syvr!q&CoxOLn*&Kwx-i(kOhA&sp{$_3=L zc=vH9?CcmMsrbl`aU5TyD$3e9PVFSzy%OE(&$QmvnnlYMm5^-=B_(F)+_=f9>Z4qZ z+GE@E5jnOjstybepXepO8jP*!PW1%PWa_sj0n;SNdla|wVv%4}YBD3vBS1)4EY~=x z19sTTDTmb0*biq*WWyBko`MO*WDJsY56gxRXn>TuakXt49M?cY>=b|Ux#9zYmeHe< zD}=f_g4FLE59rK=ktR(WZ1^SY;A@{oDi1xCHk=dyF2R2(}fIg&UWMbaphCAF)9V3C!%V&`0wA29NcF z7wS-I^?RetvxveQI<#||JuZN7t>!gXZt+O!_cNN)C~ctf87MVs?lm3P$;Gew>k1QpM&gc}`Tf(~esjEF_&H z13rs7iaxl)hAV$$vrOomG81d8L?Y6^SX%&o9TrImp}p%6S_^^Fm|YzD8V@tPj*1z$ zks%bb6vp%=yJSoMlH5J*K02MjSb5IV(MJ?H)MGb)>#Y21VlEbSs!5q_UzyQzL;;il zJYR-B`Rk!R9DLXf?p$4+*SO(NPCl~x>KlQj_|6R3kxYa_>VY>QAHV1f~qVqbXG=TrODs z-o^Z~8V&q#ctihlI^yRN4jIC<+E&}MV`=Pab@&5PD+%>qK)za-X_ch0>(iYv;_)6l z9nVC}wHgn}IA=!BHx>4$xcXr1xd|C(40V#n2^G?J{PTCqAIA`j<*+2VHCdKqTNn`b zu-mM=Wr`)L#J-`dPVpovh^k{VU7c{{eKQn`4f&Nl}XpP*~>AN)_2XpG~tX?p_0f{ z-IV*VIL{OuYS7MEnC+FKuSBBtI%)yrQ>bJ~0`xQSHAx&qzViepZ(dVp*Pxa}a?_FA zcliiaRG_bCN{5)8J8`Nt!;b8@T@`ehpS3XdQiE+h(dqew9RjQ8OXM#TwsF7JP(+6} z$zomr2p*VZAG(Jq&1~m-;Xg%K4vCVJpnnsuN>>pgyY9*$#xtWmp9pO((4KMC#Ed{o zxi1gg4h#yGQ+3kj6f0+~4q$Nyv~J|+k#dnKAZ;2W&V|;B8FQY+MSDUMz~&jxabR$% zXAy2jywM8z+(Nm8f6cN4^$zB#e{@b6N1otQur8X$vNEUQGsY>L=b@tk;Tj3q2~nq* zu_$Hxsm9G?mz@bDD=VUiaOu2!8+2g2@%3PQdZl^YU&y471Y?0y_uEP9^lD$2*Mjqxr;J zV&NYN7mQ#eVNZOOd&yvPJYg&@&}UfdBf-tjj3G9?7^_$y49(w_U_7yuFg zHhFE-R=N=Kqo{_;=$NVoVJQWl`EyOEI$X+Di$_Uhnlez|8@w-sV!9|uOX;|PFz2} z63SX|39nMbq|Gz#RV{ilLI8s8`PFfvC+#J~(@8kY27bbSISeZ6N+5ski_a;3iuy`8 zR32;!#H41JgX{gu?vS!)45!2AgWw*XVhSC5MZLZ9S&YH6a~={a zUL);y;-y&B`1H`>!%`8xHO%|qs_p1~hrqOXej1ZYZr9EVm3m{3Y< z8VT=4$9njUrlPrXM`35M!F_c1D+x} zqJR^q>f#G$EAxi7guQddg1C?9qQlf5)~9V@CjfYc?h>iCiuj}ol(vie>(-*d?`OmD zCeOdy&m`kq)^`oX&*-9=2|s8Zc_+_&kkEMjMo$4V9}@y&*lE#I0>^8jB$=A$N2WzB zzh89>V->{IVQi++&A=BnN7Duy+Z^AdjO7}EIM+@r#0&Ij*-~P5$}S<7aa4@x2GYZ6 zOmJu(ylvT2oPIz$Q?aZ zJ^eTjCdbykp4OI%Tl)QB)^tT+Y7AOk=FtQO@v^dcT(Ma~r@5?&x;eK5o{gflaP9#y zL7=l_X}^cgoHwp>ykB5am~m*JI0+vVS?$Vw2DCO94b=u6&~)FE3j%ySzP#p<1h{A8sCqRlr{JP&s? z%HQy6N0vaRHUGMw?oB5T#gjJ?KJ@8Z>}G4?sS|c1rp)*Dkxt`@ZWukxE?YYg$YX$U zNSY^_C?yj60<)b^F-ih{Y$k!}2?E9H1oa>aH)<2mcgZeWAr@WMc1)+ZEINie?drQp zt`ZnA9pMuR{E<+Oj5%}X`*06qB44X3fC6n4n%KMRh;1gvBAto;?fCG{kBe7SS-3_F zspk1LGG{6TgX3$FXNVE>Jdy>GiU`Uzw1w_t!+Ym8-9Nm{LkKIF{+wai&4N=dhBeo4R=%hWaZvKs7$JGB^IC2Kg&YJ z`Tno3!i_;x6!_3VyfF9WViswvHV+kc*Gx6QCW0~zIZ6L$B#Tdmgl#E!0ZUOeOiS>j zbU0aR5#C)p*x3n&anx@@Dn`h-x6Ln^Oz3Y>3S!*=FACljHwZCMiqHLpQKpPdw)#UL88Q)Ns zaD*eGYZgWXcK@@FLonBNJa0Evq5f!wj&qD;YeDAxP@OqJADad?YO-$vdwEl-N`5HLCg*pb!g99=~Xz|p}Lf29bH}UTxM5s_M;``|K zV$mB0>!6Yy9w}_u>qe!$5E0!x*@AnmSz6wv%kd4CJs&@`=n_YHf-?vtmMaIibqPN4sc+tXSpkv@F%IjZ5i^7^1K41u#qNI$34?C~X-$E2& zkhVBDkXM2n#kRPv4585To%D-MT6LSq9vc9!j<{e1NP^nFc5S?^*P7siJxsV0$Jd{- z-P4RzBC6!gk1%&tTyk2y9Q+BArT`I2(6l(T!b9&awjO~!SQhBhr7F^6We}e-BKE~{NW;*V2;FH!LA0Nk=?<|m4%Sjd_@Hs5DLeg> zB6|kh(o$X!M@0DhEKT&ujXhbQx6L4&Gg`yYhGC|IXP<(~6yF+*cgZi!6=7M)-PbZs zxTm*nz^k1Z%VL0nQskV__%| zAyaiZ>mY*0X#B}EvQ)vcdZ&8Hj*ijiW}6D~NXonH8J4me8-%WKB!=dqHDF-oV&B9} z7CZ$BJIQo#u+)Z_Y^yunm+OK=DF_?d%4U?s?gJ`JFSP)SSNU@YOVpXZ8>TXJbrvGU z7BVav!gtTGP(~gQ@XZ1iuTv6*N!!#gtSbslFNo8EMbx&llLvmdzk8RU{$#NKIy=7!6RH z_kzOM@bIDRwK?kR&YdKz9w$DJY>AhmUJ7ILGnqgl%IG<)bas!-yhU&X-C|} zI@6W0bDV)y`btihBo|8@8xE8gZV{pJs~5k=RzgNEaK4a+ZpEm-`YsLD%ds)GTy8A` zGN+BZyF1T0c1f4(x!<0zwrUe!6+^=~% z@;2tyc@&+`v>@(DPi^yfm7b-Goe%6PN=9iH)6k#|nSTcPcg)YrD(w-YX}(5qOXjlT za5Np!$A7Q>L%arF70Sy3rV{HD(eBT(dmI7T?%L_^!IPv}Iz3Go5pP0vHC6IYNtg6K zZ8~COyQonl>`g8`(3qBqp?=nclFRyW+7`YSd{8wj*m(D@8xc-yn@;66uSyD0qlKoQ zBz3SJpyjUO^`N*gr^dCGHTY&3(bIahyozm;IIp=A&)<=vKwGOff>?{bg;6#Vy|kqs z1d62?++q1oetBEv{wk-c6_ynH*`2A<&LUOXgBE|>@k-7@T!NCYF2 zmE2#@>lEJ%Mn4AM%HBwvnGlTh_VodXon@MX{Lpy5Mt?#b7DT)hzm?9LP{(yIa(H{5 z_Wguu$sLH?3}8U+2e(@-EHfV~|H`ZocIzk858@IP(^+hjG9c z*R3G+@Qt_r-aZDsO!?4Nr-~=1PV}Kc^s;Yqscrf@k)~(c4+?bfXVi6h5v})VRj8TE z`7+;NoIr<*yJDq(9GTbXBU7Z35Esw9K|D|JqaM*D|0R**i^Bb0M88-Y`BGg_PZ#cT zyoi&y*_oMxO~sX8)m~@3jSONPfX>9Xi6a;Dil0BT zPoyq|f0JKG&nl9>2A{E_bp(^zBuO)Hk3VRx0l}ztL@AjkF~84d}gvPH5`2} z)DG*dY(-=kcy}(YBwKAV+4#53kEImcd&E&1P zosOEXquSN1)Hsm`JbEE+rolj7tYE5u`wF+=z=Vzc_Ej2EpghKB)$hmwuzbh!WE!WO zq&?!6<{J!{8Br3Nl%e0T z3edI`$8H(55JhZDs~>*`JGqow+v8*dR}c8r(?aLrbzi|r-C>!ucBkUo_m8ak$$i}? z+n)%!bN_&LDB8a{X7x%$ZeM0~#bigKanuDD`)ubjyXIbKEDf}$4D!V>Bn+PwL0#MW zkaEC}PYwDZUt~{41W&hmNp)PT#+CBbAHHz)=hzDGolV~Bmw!{h&B;tL1j8!wi&H1Z@D3a%+8_@PZML}6l@dqiG3Z9+-2 z+c>p3@tcUC8B~nh=q`Lftbb6{8)|Vv$EJxELtvDK6u}d7UaAR%@9O7)b#qej#53HWg zp=NF4LyH~=RGT&6=&8!AU)Aj^5TP5dgog(KjPm8PT$87V;MI?3kvY)aV32*Y3zDcy z`iks7F|^ClMu5zX-e*X-2V#`Ntp+WIuB|~&tHkjaixKJf6bi!6`86`l49@|XSYu$( z43}83`)eYuFrXEAG*0FmG{vWIr7wC3*HLXzxmJ2wswcb(6hy1?(rJze!HPekF0x=8 zt?=`49>l7mIuaN`pI~z|0HQW6igcqMXZyTqIluN`#|JTIejI8%G8Ok+Q1ZurrjbyB zF^7&~WG}1NM-d&tjrnBbsM4;kD~-SOgd>4e=F0~w|1HENWR%;gZBM1T9F|*HI>nKo z8Wy$0h?~=fL1{6X4jg7^;a@A#;7MGPV0|O+=%w*P)J}w&B#e+ls9!IT^t3jz5F&!cMnzRq87@7_IrNkaRP>25sUQ z&GEjNfhTT#T)K=#uKXbS;_&wx!2QV&)~b2FD>F@Mmp|w1uVV~LdlqMT@=9fgMeysNO9hR z|6}3C(oBFMx=Ych8h)zmU?6%&0GY}x+O~)Rz`sj}#g2wZDkI2@vJR=MCb6|F{L86G z$vB@f6)<9Xs^&+CcPOm0!i>#3;6`l(gY8KR6CuK>YYUu84QXK4{Tku9+6-utC(fPA zf_f={xfd=WR6gZ31;>Z}@-cO3KUMd9UK$vJ|1hSVn~yxxzzG;(gni$@;R zxKeIK7^uJUP4oD}`H-F5BK_^N?n66ZnhNp?(|-V&P8TQS(@xu*?! z5wuTcXK{b|;S+;_;6-Mp!23}eOsyiFwWNFi=Q_tww--*SR+nn$XxmZMzI$z9JstMHo4uevFg=En#a5% zR$m&KSj-YXk0N>`yEGx_o**~YOPWkRu*z4v#&LfzjY-ty%HiT3H}7B77PV78X;5?O()&C7F-i;j-+!b z)caqE&qobS9m&ul_PemZ1m^@}4V%d)wWz?RsF9$w8IV0qCEIozzDf;2`I@2ndg(I; ztN5qc3x-COL0?=J$Lf&Q5LiLf8#c1Ixaz>TnTXhc1!;vJ?rzB@`weq}HX>+E)*p=I zKVIT22(Toic&}JGMhpi`OJcf#KUT+uZL!RV9Rq)y5;-pioUM9%6TUQb=XB!?r?fZz zR7U@teaB7rZj4_s_`dJRcWmnr<-)9f24#yxu=@Sx0AX&D*ed=UH%{HCMJWtQk9ddL z*}ko{N!bQ0L9ZbjRdMzQdKg#3TG6=n$o^cX=~txKr>*c^87*t+a>6qC?HSa}XDW4a z{kJ7kuL5!)`6Zomq9IhWArZ(3XXKJyCNOWDd{$3C%{u5<2e`Z4o!PYe!ZQemq}V@x__KWuZ`F}lpF?~dB6~>(HnhY1 zU`LS+EJs0=#Cavm-GWJOG46W+pOj3hom@WP>Q>?G4SK#>K?qt9JVG&*Qh+Vj*A?u2 z%1OhwGwJY4%A249WEFc%n}}xd_mYP_s@31!1BuS5I2O1jtNJ>qS;zwBiTUA;hBex` z#&|Fa`H(<#&9e!YRo7nrVaBnb)+j^N8hB$h_@T_r0A`G=@)ds=kJJ4~QMkO7C@t#o z0m@NB4X-CGKl+4Ygy``O*h|Gm!z<37+8->ly>FYNp`QEL6VMot@wZXoy2u9(f)hI0 zLj7dnr&(ogVB^>XOg8qSsW0&qh|0=9Zf)D+i68f{_e#9gGCUGtl;seg24Soz-l->^ zR1Q3!9*7zfuVsu)1a$)_6m?e()J@b*$z23Pl@19wqMwrohMH?(s0} zQ7@z<2ZK&!PKFCf?$9+1%-)G9-_o?NVZ^ZPw<{>Sbg?*dCW{Y=(4fgoE6zj}I;+#J zlRL*w*+TVL6tqG$ibP4rZHPEz_)+#ThRMWt)}4Hm6f#1-RW#NTUet1R+TMi+kor|6`kf>3o|Zzb4-N zfrpU4{fUPn;9!PP{!W9FddB}lFH?rW4BurSfcue#jLaTG?2NlJ@>5yK88VzkWc3~3 z>Z@Bm6f2vF^T@r-9t8J?VrrzkqCDd8kW8Nl>41@5lq3W22(S^K z$FGBh?>5bVmnT+&uj|IvdWo6=qNZnw4YcX$i5n;jimI=|s0sw!LT~Ks6zlKe4WSZn+FD& zmR>pcE|&~mNziWsJX3#$O16s%HbQ=8-b8$=pr-HN?f-;e5PzF+Q1`_lGYaG0%VK)C zU^n7ZzgTV1HipG(@z>eZvGiq9zn&_-pzJb#vo0Lez1d<#+igrSubLti!->)kM1tn9 zruzhg>ZHr1s!#wCUSFqheE_zaIj8gt*ZMQ4%fwPVVETF35YP-R7dXNobJ^NLpI#ZO+LZTVc@zeI0*v!GioW;}5@#PdY6qKN_rz6W+hxth0Ji%>f`55DOc#q$k9k1Na67An0sn!LKSI^>>PwmJra&)zy)o zmDR(;gT;fB#lhKE>eoyX#Nfwq_QrFG2nB{8t-kSw-c4+WeN$5@P50$Kp5o zuShe~f8re7oNfPL%uHF$ZO!do0&#g^X8$+5E5zbo3-oXE`91Q#1@hwVpZx!Z{)b+F zV)>&hzl4LS+i$0`5<|6H1|bDNm+nDQ~3f;ml?K_G5kWJU3~HCOO&(b%~; z_}F=PdH6WFxi~?5-2Vb;nmfC^B>8Vnb~Y9cjz1%2ru7oE&mMs zUKakB$-D>){#_d{%zye{=E5)TYz}sHa8`G4uoVLSjur5m@=r+t1pi(v{0a`He+>VC z&CPz-+utir3~b5zrzyz#-+})(CN(Pu5BvXbJpY3JlSS0o)x*Kr=B@Kv6Kiu**Z-d9 zzXJc0N%du~b8&U{lKnqS>i>Zg{9C%pyx2N8d;P_~nz_^8T7TP+Y$1Q70s#JO0{mdp zzsc_cb~iWsvji_X{%y$A3T$s_{<7Qtz105E5BV?B*qpWu}8;1$InHlH5v%5H0xO#w{%|$I=a^Pj1UrOuGIs@qbWFP&%qdlz5Uvh+z zjf0{?0r#H%CWXh`IB>3-gae`G3Lv z#s2R}`F}G1E9`I9;tq~pFGXwR`qsn#zjgm#0RP6I05LVUcX9adLjNn|Z?gR5zVj0E z-}+weXD_!$)_>j~|DG1VE9d{>&)?JS|DuN%>i;=pX(34dS|5?AMz4fr_d=bCc}xUzVSC{yaZNZQ$s`JYye9nfOP71bRRUQ z#jM5Y@MQqXDe8Fv+^_9w@D)sLha!U%+dq?6Te^F&oQ$>a_J(=biNL^+{`BFW{FSxK z_q_W)o9Y&S(DLN{M{BOM8#Dnz`>zpOgJ;eS+9R0z1MOG?Vx1{*+ZQQvKV_=4eJj+B z`1xJFz+Mkr<8|4dO;P-+-#bj7LcFM0a8eR;Z=C6rkwu_U#-%s$+=i<6ODBt~* zsR<}FTW<@RZst)A;qPd~Ul{jA1*d)2{nRMM5R!;OS;rg_O{YndiF9rH=z2&s_5PIp z9S(MUZ%7zBKQ5ZP5%{qxCN4E{Nj^!+5MaFXcBe9bC$7NoGeQU z3kwwdkH^JN2b|3@&{j}MnL@XT%irHr!b@4A%t&EF6q6}lmX9XVB%1w}O{DA#5Ctx0 z@_v0&oxnkQ9|khnN5edL)1DrKYt(y{4GpJ4%Fd_bpxylBz6SlP_TG?+BlyOM)HGQWUYUKNd>-oC?h3QZ9)AA>n6|@_r|u0j~m88Onfe$D{k?9S86JXbWY}%d*y3aZzxv>e3iP80z9o?*uaO&lf3*7qZ&L^>H(q`^yj!ySb%Vt?W50o z4|_-|oxul2)C*_Chdc1yIK!@MzTNNQE-)AW_zK;BTD44}Ud{9>iD#IDc695-~_X#MKoOU4(6cb4e|l>h!~83h#ia zQd3}t18tm+tP4+g>0BGLS6RoKtgkT%ja3M~yTlDmRPJbB?IR_?#939xGgZOe`b=DZ(PQ6g~+-XbVzHN}WgY?LoJ>AB;r$o)3}! z?Kj#Vaqhmfh?49wtst^gUS*WE9DMZN@DR3+^E>X&bKRZ}N=%OYPF+5v{EPVe9G9QYVTO8;C{s-D2)!BeQt*?a%A2 zb>UzAR0im|8%JTYv$3mcSwzRZS9Cnrn^V~KpnkmoHhgvSY`QM=G#cvNXOdMusZ;V@ zp)5|!DFcIi^&Ha*Aa*O>qEX@Ma_;ia+S++4IBlI3+cM96hxPfKhBt2?9HOBwis%D{I(u6BoOA}Zo^;Urt_6Qs*ym9W+BQZsHSP> zY2&T1*LlwSBG}U7mg5Av$Tyv}D^hFNO)<;7lHNZ*&;9T?UEYM7UF8V2HMLZmbPaB# z|G{6;=$S*-D}dOuDV{skSizOlH}kUt^Kr?-;n(+OEBuU{8QpedaNRbu8uALRPq$Z? z2RCj)J?}@!{f@rYN;FT8ZU5z}-G^Uas|m_xNqvs)yWZS}93AaUQOx}E@#%7D7l34` zvK*~vQNe|IJXuceH?OUDWj4R^WF!$IVlj~GT^LwdSM?ni@@PM?2_m%H`?z|Ks8Xf4 zS~{@T)9|>Y|NaQ>QxC$5<;_le-y-u~Dx#$ad3>1+$8-e?D-UAC`;*(tM$BdRRl>*W ztB}^)E(&7Coq@#xt4F)Of+?9q${#wD;5gUmKEAMc?0^sJ6W`x59ck{0O)m3RY~HPQ zT=%WE-jY0KvBXh4EE@1ZKJw`CwEKeUX5XEoz9~s;j1}cLym@zES=lHJ+xi?Xe-YQQ iFSNSXF_$fjFsL3pcLw%)`IZC)B`c})^2U{M;Qs=cizc@K literal 0 HcmV?d00001 diff --git a/admin/public/index.html b/admin/public/index.html index 3e5a13962..74a183da3 100644 --- a/admin/public/index.html +++ b/admin/public/index.html @@ -1,17 +1,22 @@ - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
- - + + + + + + + Gradido Admin Interface + + + + + + + +
+ +
+ + + diff --git a/admin/src/assets/logo.png b/admin/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 Date: Tue, 26 Oct 2021 12:17:57 +0200 Subject: [PATCH 0987/1843] add bootstrap vue --- admin/package.json | 2 ++ admin/src/main.js | 4 +++ admin/yarn.lock | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/admin/package.json b/admin/package.json index 1db4ddae5..14bf80217 100644 --- a/admin/package.json +++ b/admin/package.json @@ -25,6 +25,8 @@ "babel-plugin-component": "^1.1.1", "babel-preset-env": "^1.7.0", "babel-preset-vue": "^2.0.2", + "bootstrap": "^5.1.3", + "bootstrap-vue": "^2.21.2", "core-js": "^3.6.5", "jest": "^27.3.1", "jsdom-global": "^3.0.2", diff --git a/admin/src/main.js b/admin/src/main.js index 63eb05f71..278a7204c 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,6 +1,10 @@ import Vue from 'vue' import App from './App.vue' +import { BootstrapVue } from 'bootstrap-vue' + +Vue.use(BootstrapVue) + Vue.config.productionTip = false new Vue({ diff --git a/admin/yarn.lock b/admin/yarn.lock index ced684fbc..973b77114 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -1364,6 +1364,15 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@nuxt/opencollective@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz#83cb70cdb2bac5fad6f8c93529e7b11187d49c02" + integrity sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A== + dependencies: + chalk "^4.1.0" + consola "^2.15.0" + node-fetch "^2.6.1" + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -3255,6 +3264,27 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +bootstrap-vue@^2.21.2: + version "2.21.2" + resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.21.2.tgz#ec38f66c3a2205becccddb6158a991d96509ed0b" + integrity sha512-0Exe+4MZysqhZNXIKf4TzkvXaupxh9EHsoCRez0o5Dc0J7rlafayOEwql63qXv74CgZO8E4U8ugRNJko1vMvNw== + dependencies: + "@nuxt/opencollective" "^0.3.2" + bootstrap ">=4.5.3 <5.0.0" + popper.js "^1.16.1" + portal-vue "^2.1.7" + vue-functional-data-merge "^3.1.0" + +"bootstrap@>=4.5.3 <5.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" + integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== + +bootstrap@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3965,6 +3995,11 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +consola@^2.15.0: + version "2.15.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== + console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -8433,6 +8468,13 @@ node-environment-flags@^1.0.5: object.getownpropertydescriptors "^2.0.3" semver "^5.7.0" +node-fetch@^2.6.1: + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" + node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" @@ -9097,6 +9139,16 @@ pnp-webpack-plugin@^1.6.4: dependencies: ts-pnp "^1.1.6" +popper.js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" + integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== + +portal-vue@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4" + integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g== + portfinder@^1.0.26: version "1.0.28" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" @@ -11118,6 +11170,11 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + tryer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" @@ -11502,6 +11559,11 @@ vue-eslint-parser@^7.0.0: lodash "^4.17.21" semver "^6.3.0" +vue-functional-data-merge@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657" + integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA== + vue-hot-reload-api@^2.3.0: version "2.3.4" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" @@ -11632,6 +11694,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -11802,6 +11869,14 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^6.4.1: version "6.5.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" From 0fd0586af21031b67ea3cac86943de959f206247 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 13:04:13 +0200 Subject: [PATCH 0988/1843] setup eslint --- admin/.eslintignore | 4 + admin/.eslintrc.js | 26 ++ admin/.prettierrc.js | 8 + admin/Dockerfile | 2 +- admin/babel.config.js | 16 +- admin/package.json | 30 +- admin/src/App.vue | 7 +- admin/src/main.js | 2 +- admin/yarn.lock | 743 +++++++++++++++++++++++++++++++++++------- 9 files changed, 678 insertions(+), 160 deletions(-) create mode 100644 admin/.eslintignore create mode 100644 admin/.eslintrc.js create mode 100644 admin/.prettierrc.js diff --git a/admin/.eslintignore b/admin/.eslintignore new file mode 100644 index 000000000..433390392 --- /dev/null +++ b/admin/.eslintignore @@ -0,0 +1,4 @@ +node_modules +coverage +**/*.min.js +dist \ No newline at end of file diff --git a/admin/.eslintrc.js b/admin/.eslintrc.js new file mode 100644 index 000000000..8c410feba --- /dev/null +++ b/admin/.eslintrc.js @@ -0,0 +1,26 @@ +module.exports = { + root: true, + env: { + browser: true, + node: true, + jest: true, + }, + parserOptions: { + parser: 'babel-eslint', + }, + extends: ['standard', 'plugin:vue/essential', 'plugin:prettier/recommended'], + // required to lint *.vue files + plugins: ['vue', 'prettier', 'jest'], + // add your custom rules here + rules: { + 'no-console': ['error'], + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'vue/component-name-in-template-casing': ['error', 'kebab-case'], + 'prettier/prettier': [ + 'error', + { + htmlWhitespaceSensitivity: 'ignore', + }, + ], + }, +} diff --git a/admin/.prettierrc.js b/admin/.prettierrc.js new file mode 100644 index 000000000..e88113754 --- /dev/null +++ b/admin/.prettierrc.js @@ -0,0 +1,8 @@ +module.exports = { + semi: false, + printWidth: 100, + singleQuote: true, + trailingComma: "all", + tabWidth: 2, + bracketSpacing: true +}; diff --git a/admin/Dockerfile b/admin/Dockerfile index 60fc35f7a..81953daf1 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:12.19.0-alpine3.10 as base +FROM node:14.17.0 as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/admin/babel.config.js b/admin/babel.config.js index bc77ba078..c5ca8e5da 100644 --- a/admin/babel.config.js +++ b/admin/babel.config.js @@ -1,12 +1,8 @@ module.exports = { - "presets": [ - ["env", { "modules": false }] - ], - "env": { - "test": { - "presets": [ - ["env", { "targets": { "node": "current" }}] - ] - } - } + presets: [['env', { modules: false }]], + env: { + test: { + presets: [['env', { targets: { node: 'current' } }]], + }, + }, } diff --git a/admin/package.json b/admin/package.json index 14bf80217..396848c2e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -11,7 +11,7 @@ "serve": "vue-cli-service serve --open", "dev": "yarn run serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint", + "lint": "eslint --ext .js,.vue .", "test": "jest --coverage" }, "dependencies": { @@ -19,6 +19,7 @@ "@babel/node": "^7.15.8", "@babel/preset-env": "^7.15.8", "@vue/cli-plugin-unit-jest": "^4.5.14", + "@vue/eslint-config-prettier": "^6.0.0", "@vue/test-utils": "^1.2.2", "babel-core": "7.0.0-bridge.0", "babel-jest": "^27.3.1", @@ -34,28 +35,23 @@ "vue-jest": "^3.0.7" }, "devDependencies": { + "@babel/eslint-parser": "^7.15.8", "@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-service": "~4.5.0", "babel-eslint": "^10.1.0", - "eslint": "^6.7.2", - "eslint-plugin-vue": "^6.2.2", + "eslint": "7.25.0", + "eslint-config-prettier": "^8.3.0", + "eslint-config-standard": "^16.0.3", + "eslint-loader": "^4.0.2", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-jest": "^25.2.2", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "3.3.1", + "eslint-plugin-promise": "^5.1.1", + "eslint-plugin-vue": "^7.20.0", "vue-template-compiler": "^2.6.11" }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "extends": [ - "plugin:vue/essential", - "eslint:recommended" - ], - "parserOptions": { - "parser": "babel-eslint" - }, - "rules": {} - }, "browserslist": [ "> 1%", "last 2 versions", diff --git a/admin/src/App.vue b/admin/src/App.vue index b31d477bf..9267cc82b 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,12 +1,9 @@ - diff --git a/admin/src/main.js b/admin/src/main.js index 278a7204c..13ac28872 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -8,5 +8,5 @@ Vue.use(BootstrapVue) Vue.config.productionTip = false new Vue({ - render: h => h(App), + render: (h) => h(App), }).$mount('#app') diff --git a/admin/yarn.lock b/admin/yarn.lock index 973b77114..a9120bec5 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" @@ -35,6 +42,15 @@ semver "^6.3.0" source-map "^0.5.0" +"@babel/eslint-parser@^7.15.8": + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.8.tgz#8988660b59d739500b67d0585fd4daca218d9f11" + integrity sha512-fYP7QFngCvgxjUuw8O057SVH5jCXsbFFOoE77CFDcvzwBVgTOkMD/L4mIC5Ud1xf8chK/no2fRbSSn1wvNmKuQ== + dependencies: + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" + semver "^6.3.0" + "@babel/generator@^7.15.4", "@babel/generator@^7.15.8", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1" @@ -250,7 +266,7 @@ "@babel/traverse" "^7.15.4" "@babel/types" "^7.15.4" -"@babel/highlight@^7.14.5": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== @@ -977,6 +993,21 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@eslint/eslintrc@^0.4.0": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -1359,11 +1390,32 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + "@nodelib/fs.stat@^1.1.2": version "1.1.3" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + "@nuxt/opencollective@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz#83cb70cdb2bac5fad6f8c93529e7b11187d49c02" @@ -1538,11 +1590,16 @@ dependencies: jest-diff "^24.3.0" -"@types/json-schema@^7.0.5": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9": 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== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -1684,6 +1741,52 @@ dependencies: "@types/yargs-parser" "*" +"@typescript-eslint/experimental-utils@^5.0.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz#e3b2cb9cd0aff9b50f68d9a414c299fd26b067e6" + integrity sha512-fWyT3Agf7n7HuZZRpvUYdFYbPk3iDCq6fgu3ulia4c7yxmPnwVBovdSOX7RL+k8u6hLbrXcdAehlWUVpGh6IEw== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.2.0" + "@typescript-eslint/types" "5.2.0" + "@typescript-eslint/typescript-estree" "5.2.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/scope-manager@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.2.0.tgz#7ce8e4ab2baaa0ad5282913ea8e13ce03ec6a12a" + integrity sha512-RW+wowZqPzQw8MUFltfKYZfKXqA2qgyi6oi/31J1zfXJRpOn6tCaZtd9b5u9ubnDG2n/EMvQLeZrsLNPpaUiFQ== + dependencies: + "@typescript-eslint/types" "5.2.0" + "@typescript-eslint/visitor-keys" "5.2.0" + +"@typescript-eslint/types@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.2.0.tgz#7ad32d15abddb0ee968a330f0ea182ea544ef7cf" + integrity sha512-cTk6x08qqosps6sPyP2j7NxyFPlCNsJwSDasqPNjEQ8JMD5xxj2NHxcLin5AJQ8pAVwpQ8BMI3bTxR0zxmK9qQ== + +"@typescript-eslint/typescript-estree@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.2.0.tgz#c22e0ff6f8a4a3f78504a80ebd686fe2870a68ae" + integrity sha512-RsdXq2XmVgKbm9nLsE3mjNUM7BTr/K4DYR9WfFVMUuozHWtH5gMpiNZmtrMG8GR385EOSQ3kC9HiEMJWimxd/g== + dependencies: + "@typescript-eslint/types" "5.2.0" + "@typescript-eslint/visitor-keys" "5.2.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/visitor-keys@5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.2.0.tgz#03522d35df98474f08e0357171a7d1b259a88f55" + integrity sha512-Nk7HizaXWWCUBfLA/rPNKMzXzWS8Wg9qHMuGtT+v2/YpPij4nVXrVJc24N/r5WrrmqK31jCrZxeHqIgqRzs0Xg== + dependencies: + "@typescript-eslint/types" "5.2.0" + eslint-visitor-keys "^3.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -1966,6 +2069,13 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" +"@vue/eslint-config-prettier@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#ad5912b308f4ae468458e02a2b05db0b9d246700" + integrity sha512-wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ== + dependencies: + eslint-config-prettier "^6.0.0" + "@vue/preload-webpack-plugin@^1.1.0": version "1.1.2" resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" @@ -2174,7 +2284,7 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.2.0: +acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -2241,6 +2351,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.6.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" + integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -2251,6 +2371,11 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -2380,6 +2505,17 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + is-string "^1.0.7" + array-union@^1.0.1, array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -2387,6 +2523,11 @@ array-union@^1.0.1, array-union@^1.0.2: dependencies: array-uniq "^1.0.1" +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" @@ -2397,6 +2538,15 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13" + integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.0" + asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -2437,6 +2587,11 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -4159,7 +4314,7 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0, cross-spawn@^6.0.5: +cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -4170,7 +4325,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4437,21 +4592,21 @@ deasync@^0.1.15: bindings "^1.5.0" node-addon-api "^1.7.1" -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== dependencies: ms "2.1.2" -debug@^3.1.1, debug@^3.2.6: +debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -4490,7 +4645,7 @@ deep-equal@^1.0.1: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== @@ -4633,6 +4788,13 @@ dir-glob@^2.0.0, dir-glob@^2.2.2: dependencies: path-type "^3.0.0" +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -4653,6 +4815,13 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -4871,6 +5040,13 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -4897,7 +5073,7 @@ error-stack-parser@^2.0.2: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.2, es-abstract@^1.19.1: +es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== @@ -4976,6 +5152,31 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" +eslint-config-prettier@^6.0.0: + version "6.15.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" + integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== + dependencies: + get-stdin "^6.0.0" + +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-config-standard@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== + +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== + dependencies: + debug "^3.2.7" + resolve "^1.20.0" + eslint-loader@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" @@ -4987,14 +5188,93 @@ eslint-loader@^2.2.1: object-hash "^1.1.4" rimraf "^2.6.1" -eslint-plugin-vue@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" - integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ== +eslint-loader@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-4.0.2.tgz#386a1e21bcb613b3cf2d252a3b708023ccfb41ec" + integrity sha512-EDpXor6lsjtTzZpLUn7KmXs02+nIjGcgees9BYjNkWra3jVq5vVa8IoCKgzT2M7dNNeoMBtaSG83Bd40N3poLw== dependencies: + find-cache-dir "^3.3.1" + fs-extra "^8.1.0" + loader-utils "^2.0.0" + object-hash "^2.0.3" + schema-utils "^2.6.5" + +eslint-module-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" + integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== + dependencies: + debug "^3.2.7" + find-up "^2.1.0" + pkg-dir "^2.0.0" + +eslint-plugin-es@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" + integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ== + dependencies: + eslint-utils "^2.0.0" + regexpp "^3.0.0" + +eslint-plugin-import@^2.25.2: + version "2.25.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz#b3b9160efddb702fc1636659e71ba1d10adbe9e9" + integrity sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g== + dependencies: + array-includes "^3.1.4" + array.prototype.flat "^1.2.5" + debug "^2.6.9" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.7.0" + has "^1.0.3" + is-core-module "^2.7.0" + is-glob "^4.0.3" + minimatch "^3.0.4" + object.values "^1.1.5" + resolve "^1.20.0" + tsconfig-paths "^3.11.0" + +eslint-plugin-jest@^25.2.2: + version "25.2.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-25.2.2.tgz#aada85113268e79d4e7423f8ad4e1b740f112e71" + integrity sha512-frn5yhOF60U4kcqozO3zKTNZQUk+mfx037XOy2iiYL8FhorEkuCuL3/flzKcY1ECDP2WYT9ydmvlO3fRW9o4mg== + dependencies: + "@typescript-eslint/experimental-utils" "^5.0.0" + +eslint-plugin-node@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" + integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== + dependencies: + eslint-plugin-es "^3.0.0" + eslint-utils "^2.0.0" + ignore "^5.1.1" + minimatch "^3.0.4" + resolve "^1.10.1" + semver "^6.1.0" + +eslint-plugin-prettier@3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" + integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-promise@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz#9674d11c056d1bafac38e4a3a9060be740988d90" + integrity sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA== + +eslint-plugin-vue@^7.20.0: + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz#98c21885a6bfdf0713c3a92957a5afeaaeed9253" + integrity sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw== + dependencies: + eslint-utils "^2.1.0" natural-compare "^1.4.0" - semver "^5.6.0" - vue-eslint-parser "^7.0.0" + semver "^6.3.0" + vue-eslint-parser "^7.10.0" eslint-scope@^4.0.3: version "4.0.3" @@ -5004,7 +5284,7 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.0.0, eslint-scope@^5.1.1: +eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -5012,62 +5292,79 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== +eslint-utils@^2.0.0, eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^6.7.2: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz#e32e99c6cdc2eb063f204eda5db67bfe58bb4186" + integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q== + +eslint@7.25.0: + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: - "@babel/code-frame" "^7.0.0" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^5.0.1" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" + levn "^0.4.1" + lodash "^4.17.21" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.3" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" - table "^5.2.3" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.2, espree@^6.2.1: +espree@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== @@ -5076,12 +5373,21 @@ espree@^6.1.2, espree@^6.2.1: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1, esquery@^1.4.0: +esquery@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== @@ -5350,6 +5656,11 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + fast-glob@^2.2.6: version "2.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" @@ -5362,16 +5673,34 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" +fast-glob@^3.1.1: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + faye-websocket@^0.11.3: version "0.11.4" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" @@ -5398,12 +5727,12 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: - flat-cache "^2.0.1" + flat-cache "^3.0.4" file-loader@^4.2.0: version "4.3.0" @@ -5496,6 +5825,13 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -5511,19 +5847,18 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" + flatted "^3.1.0" + rimraf "^3.0.2" -flatted@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" - integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.1.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flush-write-stream@^1.0.0: version "1.1.1" @@ -5607,6 +5942,15 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -5669,6 +6013,11 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== +get-stdin@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" + integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -5721,7 +6070,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@~5.1.2: +glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -5750,18 +6099,30 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== +globals@^13.6.0, globals@^13.9.0: + version "13.11.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" + integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== dependencies: - type-fest "^0.8.1" + type-fest "^0.20.2" globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== +globby@^11.0.4: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -5799,7 +6160,7 @@ globby@^9.2.0: pify "^4.0.1" slash "^2.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4: +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.4: version "4.2.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -6212,6 +6573,11 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.1.1, ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -6227,7 +6593,7 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0: +import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -6301,7 +6667,7 @@ ini@^1.3.4: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@^7.0.0, inquirer@^7.1.0: +inquirer@^7.1.0: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== @@ -6466,7 +6832,7 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.2.0: +is-core-module@^2.2.0, is-core-module@^2.7.0: version "2.8.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== @@ -6561,7 +6927,7 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -7811,6 +8177,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -7926,7 +8297,15 @@ leven@^3.1.0: resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== -levn@^0.3.0, levn@~0.3.0: +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= @@ -7990,6 +8369,14 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -8005,6 +8392,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -8040,6 +8432,11 @@ lodash.transform@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -8192,7 +8589,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3: +merge2@^1.2.3, merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -8660,6 +9057,11 @@ object-hash@^1.1.4: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== +object-hash@^2.0.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" + integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== + object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" @@ -8711,7 +9113,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: +object.values@^1.1.0, object.values@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== @@ -8777,7 +9179,7 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" -optionator@^0.8.1, optionator@^0.8.3: +optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -8789,6 +9191,18 @@ optionator@^0.8.1, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + ora@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" @@ -8835,6 +9249,13 @@ p-finally@^2.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== +p-limit@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== + dependencies: + p-try "^1.0.0" + p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -8842,6 +9263,13 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1: dependencies: p-try "^2.0.0" +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -8873,6 +9301,11 @@ p-retry@^3.0.1: dependencies: retry "^0.12.0" +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -9041,6 +9474,11 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pbkdf2@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" @@ -9113,6 +9551,13 @@ pkg-dir@^1.0.0: dependencies: find-up "^1.0.0" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -9495,6 +9940,11 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 picocolors "^0.2.1" source-map "^0.6.1" +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9505,6 +9955,13 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + "prettier@^1.18.2 || ^2.0.0": version "2.4.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" @@ -9698,6 +10155,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -9864,10 +10326,10 @@ regexp.prototype.flags@^1.2.0: call-bind "^1.0.2" define-properties "^1.1.3" -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.0.0, regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^2.0.0: version "2.0.0" @@ -9992,6 +10454,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -10046,7 +10513,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0: +resolve@1.x, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -10080,6 +10547,11 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + rgb-regex@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" @@ -10090,13 +10562,6 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -10104,7 +10569,7 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -10129,6 +10594,13 @@ run-async@^2.4.0: resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" @@ -10244,7 +10716,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -10425,14 +10897,14 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" snapdragon-node@^2.0.1: version "2.1.1" @@ -10746,7 +11218,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0, string-width@^4.2.0: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10843,7 +11315,7 @@ strip-json-comments@^2.0.0: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strip-json-comments@^3.0.1: +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -10927,15 +11399,17 @@ symbol-tree@^3.2.2, symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +table@^6.0.4: + version "6.7.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" + integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" @@ -11201,6 +11675,16 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tsconfig-paths@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" + integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tsconfig@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7" @@ -11211,11 +11695,18 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1.9.0: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -11233,6 +11724,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -11245,6 +11743,11 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.21.3: version "0.21.3" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" @@ -11255,11 +11758,6 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -11546,7 +12044,7 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-eslint-parser@^7.0.0: +vue-eslint-parser@^7.10.0: version "7.11.0" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf" integrity sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg== @@ -11934,7 +12432,7 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== @@ -11997,13 +12495,6 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -write@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== - dependencies: - mkdirp "^0.5.1" - ws@^5.2.0: version "5.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" From 77bbffff9e00847d0d018565743f39624e1be603 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 13:07:02 +0200 Subject: [PATCH 0989/1843] use older node version --- admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 81953daf1..60fc35f7a 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:14.17.0 as base +FROM node:12.19.0-alpine3.10 as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame From b85af2037255911fd0f604a2b05712badd997f78 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 13:42:02 +0200 Subject: [PATCH 0990/1843] add grphql and apollo vue --- admin/Dockerfile | 2 +- admin/babel.config.js | 15 +-- admin/package.json | 5 + admin/src/config/index.js | 33 +++++++ admin/src/main.js | 38 +++++++ admin/vue.config.js | 51 ++++++++++ admin/yarn.lock | 203 +++++++++++++++++++++++++++++++++++++- 7 files changed, 338 insertions(+), 9 deletions(-) create mode 100644 admin/src/config/index.js create mode 100644 admin/vue.config.js diff --git a/admin/Dockerfile b/admin/Dockerfile index 60fc35f7a..81953daf1 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:12.19.0-alpine3.10 as base +FROM node:14.17.0 as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/admin/babel.config.js b/admin/babel.config.js index c5ca8e5da..5907ab074 100644 --- a/admin/babel.config.js +++ b/admin/babel.config.js @@ -1,8 +1,11 @@ module.exports = { - presets: [['env', { modules: false }]], - env: { - test: { - presets: [['env', { targets: { node: 'current' } }]], - }, - }, + presets: ['@babel/preset-env'], + plugins: [ + [ + 'component', + { + styleLibraryName: 'theme-chalk', + }, + ], + ], } diff --git a/admin/package.json b/admin/package.json index 396848c2e..4ef2c993b 100644 --- a/admin/package.json +++ b/admin/package.json @@ -21,6 +21,7 @@ "@vue/cli-plugin-unit-jest": "^4.5.14", "@vue/eslint-config-prettier": "^6.0.0", "@vue/test-utils": "^1.2.2", + "apollo-boost": "^0.4.9", "babel-core": "7.0.0-bridge.0", "babel-jest": "^27.3.1", "babel-plugin-component": "^1.1.1", @@ -29,9 +30,13 @@ "bootstrap": "^5.1.3", "bootstrap-vue": "^2.21.2", "core-js": "^3.6.5", + "dotenv-webpack": "^7.0.3", + "graphql": "^15.6.1", "jest": "^27.3.1", "jsdom-global": "^3.0.2", + "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", + "vue-apollo": "^3.0.8", "vue-jest": "^3.0.7" }, "devDependencies": { diff --git a/admin/src/config/index.js b/admin/src/config/index.js new file mode 100644 index 000000000..eab63e903 --- /dev/null +++ b/admin/src/config/index.js @@ -0,0 +1,33 @@ +// ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env). +// The whole contents is exposed to the client + +// Load Package Details for some default values +const pkg = require('../../package') + +const version = { + APP_VERSION: pkg.version, + BUILD_COMMIT: process.env.BUILD_COMMIT || null, + // self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code + BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').substr(0, 7), +} + +const environment = { + NODE_ENV: process.env.NODE_ENV, + DEBUG: process.env.NODE_ENV !== 'production' || false, + PRODUCTION: process.env.NODE_ENV === 'production' || false, +} + +const server = { + GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', +} + +const options = {} + +const CONFIG = { + ...version, + ...environment, + ...server, + ...options, +} + +export default CONFIG diff --git a/admin/src/main.js b/admin/src/main.js index 13ac28872..064bf483a 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,12 +1,50 @@ import Vue from 'vue' import App from './App.vue' +import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' +import VueApollo from 'vue-apollo' + +import CONFIG from './config' + import { BootstrapVue } from 'bootstrap-vue' +const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) + +const authLink = new ApolloLink((operation, forward) => { + const token = '' // store.state.token + operation.setContext({ + headers: { + Authorization: token && token.length > 0 ? `Bearer ${token}` : '', + }, + }) + return forward(operation) + /* .map((response) => { + if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') { + response.errors[0].message = i18n.t('error.session-expired') + store.dispatch('logout', null) + if (router.currentRoute.path !== '/login') router.push('/login') + return response + } + const newToken = operation.getContext().response.headers.get('token') + if (newToken) store.commit('token', newToken) + return response + }) */ +}) + +const apolloClient = new ApolloClient({ + link: authLink.concat(httpLink), + cache: new InMemoryCache(), +}) + +const apolloProvider = new VueApollo({ + defaultClient: apolloClient, +}) + Vue.use(BootstrapVue) Vue.config.productionTip = false new Vue({ + apolloProvider, render: (h) => h(App), }).$mount('#app') diff --git a/admin/vue.config.js b/admin/vue.config.js new file mode 100644 index 000000000..16807d44a --- /dev/null +++ b/admin/vue.config.js @@ -0,0 +1,51 @@ +const path = require('path') +const webpack = require('webpack') +const Dotenv = require('dotenv-webpack') +const StatsPlugin = require('stats-webpack-plugin') + +// vue.config.js +module.exports = { + devServer: { + port: process.env.PORT || 8080, + }, + pluginOptions: { + i18n: { + locale: 'de', + fallbackLocale: 'de', + localeDir: 'locales', + enableInSFC: false, + }, + }, + lintOnSave: true, + publicPath: '/vue', + configureWebpack: { + // Set up all the aliases we use in our app. + resolve: { + alias: { + assets: path.join(__dirname, 'src/assets'), + }, + }, + plugins: [ + // .env and Environment Variables + new Dotenv(), + new webpack.DefinePlugin({ + // Those are Environment Variables transmitted via Docker and are only available when defined here aswell + // 'process.env.DOCKER_WORKDIR': JSON.stringify(process.env.DOCKER_WORKDIR), + // 'process.env.BUILD_DATE': JSON.stringify(process.env.BUILD_DATE), + // 'process.env.BUILD_VERSION': JSON.stringify(process.env.BUILD_VERSION), + 'process.env.BUILD_COMMIT': JSON.stringify(process.env.BUILD_COMMIT), + // 'process.env.PORT': JSON.stringify(process.env.PORT), + }), + // generate webpack stats to allow analysis of the bundlesize + new StatsPlugin('webpack.stats.json'), + ], + infrastructureLogging: { + level: 'warn', // 'none' | 'error' | 'warn' | 'info' | 'log' | 'verbose' + }, + }, + css: { + // Enable CSS source maps. + sourceMap: process.env.NODE_ENV !== 'production', + }, + outputDir: path.resolve(__dirname, './dist'), +} diff --git a/admin/yarn.lock b/admin/yarn.lock index a9120bec5..55aec725c 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -1615,7 +1615,7 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*": +"@types/node@*", "@types/node@>=6": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== @@ -1741,6 +1741,11 @@ dependencies: "@types/yargs-parser" "*" +"@types/zen-observable@^0.8.0": + version "0.8.3" + resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3" + integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== + "@typescript-eslint/experimental-utils@^5.0.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.2.0.tgz#e3b2cb9cd0aff9b50f68d9a414c299fd26b067e6" @@ -2240,6 +2245,21 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" +"@wry/context@^0.4.0": + version "0.4.4" + resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz#e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8" + integrity sha512-LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag== + dependencies: + "@types/node" ">=6" + tslib "^1.9.3" + +"@wry/equality@^0.1.2": + version "0.1.11" + resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" + integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA== + dependencies: + tslib "^1.9.3" + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -2458,6 +2478,101 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +apollo-boost@^0.4.9: + version "0.4.9" + resolved "https://registry.yarnpkg.com/apollo-boost/-/apollo-boost-0.4.9.tgz#ab3ba539c2ca944e6fd156583a1b1954b17a6791" + integrity sha512-05y5BKcDaa8w47f8d81UVwKqrAjn8uKLv6QM9fNdldoNzQ+rnOHgFlnrySUZRz9QIT3vPftQkEz2UEASp1Mi5g== + dependencies: + apollo-cache "^1.3.5" + apollo-cache-inmemory "^1.6.6" + apollo-client "^2.6.10" + apollo-link "^1.0.6" + apollo-link-error "^1.0.3" + apollo-link-http "^1.3.1" + graphql-tag "^2.4.2" + ts-invariant "^0.4.0" + tslib "^1.10.0" + +apollo-cache-inmemory@^1.6.6: + version "1.6.6" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz#56d1f2a463a6b9db32e9fa990af16d2a008206fd" + integrity sha512-L8pToTW/+Xru2FFAhkZ1OA9q4V4nuvfoPecBM34DecAugUZEBhI2Hmpgnzq2hTKZ60LAMrlqiASm0aqAY6F8/A== + dependencies: + apollo-cache "^1.3.5" + apollo-utilities "^1.3.4" + optimism "^0.10.0" + ts-invariant "^0.4.0" + tslib "^1.10.0" + +apollo-cache@1.3.5, apollo-cache@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.5.tgz#9dbebfc8dbe8fe7f97ba568a224bca2c5d81f461" + integrity sha512-1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA== + dependencies: + apollo-utilities "^1.3.4" + tslib "^1.10.0" + +apollo-client@^2.6.10: + version "2.6.10" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.10.tgz#86637047b51d940c8eaa771a4ce1b02df16bea6a" + integrity sha512-jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA== + dependencies: + "@types/zen-observable" "^0.8.0" + apollo-cache "1.3.5" + apollo-link "^1.0.0" + apollo-utilities "1.3.4" + symbol-observable "^1.0.2" + ts-invariant "^0.4.0" + tslib "^1.10.0" + zen-observable "^0.8.0" + +apollo-link-error@^1.0.3: + version "1.1.13" + resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.13.tgz#c1a1bb876ffe380802c8df0506a32c33aad284cd" + integrity sha512-jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg== + dependencies: + apollo-link "^1.2.14" + apollo-link-http-common "^0.2.16" + tslib "^1.9.3" + +apollo-link-http-common@^0.2.16: + version "0.2.16" + resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc" + integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg== + dependencies: + apollo-link "^1.2.14" + ts-invariant "^0.4.0" + tslib "^1.9.3" + +apollo-link-http@^1.3.1: + version "1.5.17" + resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.17.tgz#499e9f1711bf694497f02c51af12d82de5d8d8ba" + integrity sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg== + dependencies: + apollo-link "^1.2.14" + apollo-link-http-common "^0.2.16" + tslib "^1.9.3" + +apollo-link@^1.0.0, apollo-link@^1.0.6, apollo-link@^1.2.14: + version "1.2.14" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" + integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== + dependencies: + apollo-utilities "^1.3.0" + ts-invariant "^0.4.0" + tslib "^1.9.3" + zen-observable-ts "^0.8.21" + +apollo-utilities@1.3.4, apollo-utilities@^1.3.0, apollo-utilities@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" + integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig== + dependencies: + "@wry/equality" "^0.1.2" + fast-json-stable-stringify "^2.0.0" + ts-invariant "^0.4.0" + tslib "^1.10.0" + aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -4918,11 +5033,25 @@ dot-prop@^5.2.0: dependencies: is-obj "^2.0.0" +dotenv-defaults@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz#6b3ec2e4319aafb70940abda72d3856770ee77ac" + integrity sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg== + dependencies: + dotenv "^8.2.0" + dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== +dotenv-webpack@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-7.0.3.tgz#f50ec3c7083a69ec6076e110566720003b7b107b" + integrity sha512-O0O9pOEwrk+n1zzR3T2uuXRlw64QxHSPeNN1GaiNBloQFNaCUL9V8jxSVz4jlXXFP/CIqK8YecWf8BAvsSgMjw== + dependencies: + dotenv-defaults "^2.0.2" + dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -6165,6 +6294,18 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== +graphql-tag@^2.4.2: + version "2.12.5" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f" + integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ== + dependencies: + tslib "^2.1.0" + +graphql@^15.6.1: + version "15.6.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc" + integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -9179,6 +9320,13 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" +optimism@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz#163268fdc741dea2fb50f300bedda80356445fd7" + integrity sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw== + dependencies: + "@wry/context" "^0.4.0" + optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -11130,6 +11278,13 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" +stats-webpack-plugin@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06" + integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ== + dependencies: + lodash "^4.17.4" + "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -11394,6 +11549,11 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-observable@^1.0.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.2, symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -11505,6 +11665,11 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== +throttle-debounce@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2" + integrity sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ== + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -11654,6 +11819,13 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-invariant@^0.4.0: + version "0.4.4" + resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" + integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== + dependencies: + tslib "^1.9.3" + ts-jest@^24.2.0: version "24.3.0" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.3.0.tgz#b97814e3eab359ea840a1ac112deae68aa440869" @@ -11695,11 +11867,16 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -12044,6 +12221,15 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vue-apollo@^3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.8.tgz#6609a006daf5ba38c19a7ed7d802b907e7361a86" + integrity sha512-RnkC75PMoGwl1sdZdVO3R9P51wqmgOVi4QmljkBaTzlVThVlqfkJhrBcPiw2K9EohvSagvZclNqXktyOCcXbBA== + dependencies: + chalk "^2.4.2" + serialize-javascript "^4.0.0" + throttle-debounce "^2.1.0" + vue-eslint-parser@^7.10.0: version "7.11.0" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf" @@ -12612,3 +12798,16 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" + +zen-observable-ts@^0.8.21: + version "0.8.21" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" + integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg== + dependencies: + tslib "^1.9.3" + zen-observable "^0.8.0" + +zen-observable@^0.8.0: + version "0.8.15" + resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" + integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== From 8497802e91d9df9a23a3c0120fea2a7dc96a185f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 13:45:59 +0200 Subject: [PATCH 0991/1843] get main test working again / mock apollo --- admin/src/main.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/src/main.test.js b/admin/src/main.test.js index cf16183dc..bb70c1e1f 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -1,5 +1,8 @@ +import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import './main' +jest.mock('apollo-boost') + describe('main', () => { it('is there', () => { expect(true).toBeTruthy() From 0f41494f5113b70a9144d738e3cf09eb5f8e3dba Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 13:53:25 +0200 Subject: [PATCH 0992/1843] CI for admin interface --- .github/workflows/test.yml | 99 +++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de7ed6ee6..8012987c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,32 @@ jobs: name: docker-frontend-test path: /tmp/frontend.tar + ############################################################################## + # JOB: DOCKER BUILD TEST ADMIN INTERFACE ##################################### + ############################################################################## + build_test_admin: + name: Docker Build Test - Admin Interface + runs-on: ubuntu-latest + #needs: [nothing] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # ADMIN INTERFACE ######################################################## + ########################################################################## + - name: Admin | Build `test` image + run: | + docker build --target test -t "gradido/admin:test" admin/ + docker save "gradido/admin:test" > /tmp/admin.tar + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: docker-admin-test + path: /tmp/admin.tar + ############################################################################## # JOB: DOCKER BUILD TEST BACKEND ############################################# ############################################################################## @@ -240,7 +266,36 @@ jobs: run: docker run --rm gradido/frontend:test yarn run lint ############################################################################## - # JOB: LINT BACKEND ######################################################### + # JOB: LINT ADMIN INTERFACE ################################################## + ############################################################################## + lint_admin: + name: Lint - Admin Interface + runs-on: ubuntu-latest + needs: [build_test_admin] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # DOWNLOAD DOCKER IMAGE ################################################## + ########################################################################## + - name: Download Docker Image (Admin Interface) + uses: actions/download-artifact@v2 + with: + name: docker-admin-test + path: /tmp + - name: Load Docker Image + run: docker load < /tmp/admin.tar + ########################################################################## + # LINT ADMIN INTERFACE ################################################### + ########################################################################## + - name: Admin Interface | Lint + run: docker run --rm gradido/admin:test yarn run lint + + ############################################################################## + # JOB: LINT BACKEND ########################################################## ############################################################################## lint_backend: name: Lint - Backend @@ -347,6 +402,48 @@ jobs: min_coverage: 83 token: ${{ github.token }} + ############################################################################## + # JOB: UNIT TEST ADMIN INTERFACE ############################################# + ############################################################################## + unit_test_admin: + name: Unit tests - Admin Interface + runs-on: ubuntu-latest + needs: [build_test_admin] + steps: + ########################################################################## + # CHECKOUT CODE ########################################################## + ########################################################################## + - name: Checkout code + uses: actions/checkout@v2 + ########################################################################## + # DOWNLOAD DOCKER IMAGES ################################################# + ########################################################################## + - name: Download Docker Image (Admin Interface) + uses: actions/download-artifact@v2 + with: + name: docker-admin-test + path: /tmp + - name: Load Docker Image + run: docker load < /tmp/admin.tar + ########################################################################## + # UNIT TESTS FRONTEND #################################################### + ########################################################################## + - name: Admin Interface | Unit tests + run: | + docker run -v ~/coverage:/app/coverage --rm gradido/admin:test yarn run test + cp -r ~/coverage ./coverage + ########################################################################## + # COVERAGE CHECK ADMIN INTERFACE########################################## + ########################################################################## + - name: Admin Interface | Coverage check + uses: webcraftmedia/coverage-check-action@master + with: + report_name: Coverage Admin Interface + type: lcov + result_path: ./coverage/lcov.info + min_coverage: 82 + token: ${{ github.token }} + ############################################################################## # JOB: UNIT TEST BACKEND #################################################### ############################################################################## From 1a17d08df6754352c9ba2e698f21a40ab85554fc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 14:03:35 +0200 Subject: [PATCH 0993/1843] try to add alpine --- admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 81953daf1..44ee4850c 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:14.17.0 as base +FROM node:14.17.0-alpine3.10 as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame From 4f8ddec02555fa4ce6edd6e3cd4b8068c65ead01 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 15:37:34 +0200 Subject: [PATCH 0994/1843] fix tests --- admin/src/main.test.js | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/admin/src/main.test.js b/admin/src/main.test.js index bb70c1e1f..0af7dfa9f 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -1,10 +1,33 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import './main' +import CONFIG from './config' -jest.mock('apollo-boost') +jest.mock('apollo-boost', () => { + return { + __esModule: true, + ApolloClient: jest.fn(), + ApolloLink: jest.fn(() => { + return { concat: jest.fn() } + }), + InMemoryCache: jest.fn(), + HttpLink: jest.fn(), + } +}) describe('main', () => { - it('is there', () => { - expect(true).toBeTruthy() + it('calls the HttpLink', () => { + expect(HttpLink).toBeCalledWith({ uri: CONFIG.GRAPHQL_URI }) + }) + + it('calls the ApolloLink', () => { + expect(ApolloLink).toBeCalled() + }) + + it('calls the ApolloClient', () => { + expect(ApolloClient).toBeCalled() + }) + + it('calls the InMemoryCache', () => { + expect(InMemoryCache).toBeCalled() }) }) From 4d7d7b9bf0565e329b0d64b9afb176c1a34478d1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 17:23:52 +0200 Subject: [PATCH 0995/1843] add vue router --- admin/jest.config.js | 2 +- admin/package.json | 6 +- admin/src/components/NotFoundPage.spec.js | 22 + admin/src/components/NotFoundPage.vue | 1261 +++++++++++++++++++++ admin/src/main.js | 6 +- admin/src/main.test.js | 8 + admin/src/router/guards.js | 12 + admin/src/router/router.js | 20 + admin/src/router/routes.js | 16 + admin/test/testSetup.js | 5 +- admin/yarn.lock | 1094 ++++++++++-------- 11 files changed, 2000 insertions(+), 452 deletions(-) create mode 100644 admin/src/components/NotFoundPage.spec.js create mode 100755 admin/src/components/NotFoundPage.vue create mode 100644 admin/src/router/guards.js create mode 100644 admin/src/router/router.js create mode 100644 admin/src/router/routes.js diff --git a/admin/jest.config.js b/admin/jest.config.js index 5a1c98a43..ac132eed2 100644 --- a/admin/jest.config.js +++ b/admin/jest.config.js @@ -1,4 +1,3 @@ -require('jsdom-global') module.exports = { verbose: true, collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'], @@ -22,4 +21,5 @@ module.exports = { testMatch: ['**/?(*.)+(spec|test).js?(x)'], // snapshotSerializers: ['jest-serializer-vue'], transformIgnorePatterns: ['/node_modules/(?!vee-validate/dist/rules)'], + testEnvironment: 'jest-environment-jsdom-sixteen', } diff --git a/admin/package.json b/admin/package.json index 4ef2c993b..d7b9dc40d 100644 --- a/admin/package.json +++ b/admin/package.json @@ -32,12 +32,13 @@ "core-js": "^3.6.5", "dotenv-webpack": "^7.0.3", "graphql": "^15.6.1", - "jest": "^27.3.1", + "jest": "26.6.3", "jsdom-global": "^3.0.2", "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", "vue-apollo": "^3.0.8", - "vue-jest": "^3.0.7" + "vue-jest": "^3.0.7", + "vue-router": "^3.5.3" }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", @@ -55,6 +56,7 @@ "eslint-plugin-prettier": "3.3.1", "eslint-plugin-promise": "^5.1.1", "eslint-plugin-vue": "^7.20.0", + "jest-environment-jsdom-sixteen": "^2.0.0", "vue-template-compiler": "^2.6.11" }, "browserslist": [ diff --git a/admin/src/components/NotFoundPage.spec.js b/admin/src/components/NotFoundPage.spec.js new file mode 100644 index 000000000..709b24807 --- /dev/null +++ b/admin/src/components/NotFoundPage.spec.js @@ -0,0 +1,22 @@ +import { mount } from '@vue/test-utils' +import NotFoundPage from './NotFoundPage' + +const localVue = global.localVue + +describe('NotFoundPage', () => { + let wrapper + + const Wrapper = () => { + return mount(NotFoundPage, { localVue }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('has a svg', () => { + expect(wrapper.find('svg').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/NotFoundPage.vue b/admin/src/components/NotFoundPage.vue new file mode 100755 index 000000000..68a8fb3c4 --- /dev/null +++ b/admin/src/components/NotFoundPage.vue @@ -0,0 +1,1261 @@ + + + + diff --git a/admin/src/main.js b/admin/src/main.js index 064bf483a..4502b29c3 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,6 +1,9 @@ import Vue from 'vue' import App from './App.vue' +import router from './router/router' +// import addNavigationGuards from './router/guards' + import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import VueApollo from 'vue-apollo' @@ -42,9 +45,10 @@ const apolloProvider = new VueApollo({ Vue.use(BootstrapVue) -Vue.config.productionTip = false +// addNavigationGuards(router, ) new Vue({ + router, apolloProvider, render: (h) => h(App), }).$mount('#app') diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 0af7dfa9f..0091b8322 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -2,6 +2,10 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import './main' import CONFIG from './config' +import Vue from 'vue' + +jest.mock('vue') + jest.mock('apollo-boost', () => { return { __esModule: true, @@ -30,4 +34,8 @@ describe('main', () => { it('calls the InMemoryCache', () => { expect(InMemoryCache).toBeCalled() }) + + it('calls Vue', () => { + expect(Vue).toBeCalled() + }) }) diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js new file mode 100644 index 000000000..c9baf61cb --- /dev/null +++ b/admin/src/router/guards.js @@ -0,0 +1,12 @@ +const addNavigationGuards = (router, store) => { + router.beforeEach((to, from, next) => { + // handle authentication + if (to.meta.requiresAuth && !store.state.token) { + next({ path: '/not-found' }) + } else { + next() + } + }) +} + +export default addNavigationGuards diff --git a/admin/src/router/router.js b/admin/src/router/router.js new file mode 100644 index 000000000..250185593 --- /dev/null +++ b/admin/src/router/router.js @@ -0,0 +1,20 @@ +import VueRouter from 'vue-router' +import routes from './routes' + +const router = new VueRouter({ + base: '/admin', + routes, + linkActiveClass: 'active', + mode: 'history', + scrollBehavior: (to, from, savedPosition) => { + if (savedPosition) { + return savedPosition + } + if (to.hash) { + return { selector: to.hash } + } + return { x: 0, y: 0 } + }, +}) + +export default router diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js new file mode 100644 index 000000000..1837f02f3 --- /dev/null +++ b/admin/src/router/routes.js @@ -0,0 +1,16 @@ +import NotFound from '@/components/NotFoundPage.vue' + +const routes = [ + { + path: '/', + meta: { + requiresAuth: true, + }, + }, + { + path: 'not-found', + component: NotFound, + }, +] + +export default routes diff --git a/admin/test/testSetup.js b/admin/test/testSetup.js index 9ce942654..118c0b1ce 100644 --- a/admin/test/testSetup.js +++ b/admin/test/testSetup.js @@ -1,10 +1,11 @@ import { createLocalVue } from '@vue/test-utils' import Vue from 'vue' - -require('jsdom-global')() +import { BootstrapVue } from 'bootstrap-vue' global.localVue = createLocalVue() +global.localVue.use(BootstrapVue) + // throw errors for vue warnings to force the programmers to take care about warnings Vue.config.warnHandler = (w) => { throw new Error(w) diff --git a/admin/yarn.lock b/admin/yarn.lock index 55aec725c..af04ee523 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== @@ -21,7 +21,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== -"@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.12.3", "@babel/core@^7.15.8", "@babel/core@^7.7.2", "@babel/core@^7.7.5": +"@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.12.3", "@babel/core@^7.15.8", "@babel/core@^7.7.5": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10" integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og== @@ -51,7 +51,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.15.4", "@babel/generator@^7.15.8", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2": +"@babel/generator@^7.15.4", "@babel/generator@^7.15.8", "@babel/generator@^7.4.0": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1" integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g== @@ -287,7 +287,7 @@ regenerator-runtime "^0.13.4" v8flags "^3.1.1" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0": version "7.15.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016" integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA== @@ -564,13 +564,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" - integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-transform-arrow-functions@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" @@ -948,7 +941,7 @@ "@babel/parser" "^7.15.4" "@babel/types" "^7.15.4" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d" integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA== @@ -1074,16 +1067,16 @@ chalk "^2.0.1" slash "^2.0.0" -"@jest/console@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.3.1.tgz#e8ea3a475d3f8162f23d69efbfaa9cbe486bee93" - integrity sha512-RkFNWmv0iui+qsOr/29q9dyfKTTT5DCuP31kUwg7rmOKPT/ozLeGLKJKVIiOfbiKyleUZKIrHwhmiZWVe8IMdw== +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== dependencies: - "@jest/types" "^27.2.5" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.3.1" - jest-util "^27.3.1" + jest-message-util "^26.6.2" + jest-util "^26.6.2" slash "^3.0.0" "@jest/core@^24.9.0": @@ -1120,36 +1113,36 @@ slash "^2.0.0" strip-ansi "^5.0.0" -"@jest/core@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.3.1.tgz#04992ef1b58b17c459afb87ab56d81e63d386925" - integrity sha512-DMNE90RR5QKx0EA+wqe3/TNEwiRpOkhshKNxtLxd4rt3IZpCt+RSL+FoJsGeblRZmqdK4upHA/mKKGPPRAifhg== +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== dependencies: - "@jest/console" "^27.3.1" - "@jest/reporters" "^27.3.1" - "@jest/test-result" "^27.3.1" - "@jest/transform" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.3.0" - jest-config "^27.3.1" - jest-haste-map "^27.3.1" - jest-message-util "^27.3.1" - jest-regex-util "^27.0.6" - jest-resolve "^27.3.1" - jest-resolve-dependencies "^27.3.1" - jest-runner "^27.3.1" - jest-runtime "^27.3.1" - jest-snapshot "^27.3.1" - jest-util "^27.3.1" - jest-validate "^27.3.1" - jest-watcher "^27.3.1" - micromatch "^4.0.4" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" + micromatch "^4.0.2" + p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" @@ -1164,15 +1157,15 @@ "@jest/types" "^24.9.0" jest-mock "^24.9.0" -"@jest/environment@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.3.1.tgz#2182defbce8d385fd51c5e7c7050f510bd4c86b1" - integrity sha512-BCKCj4mOVLme6Tanoyc9k0ultp3pnmuyHw73UHRPeeZxirsU/7E3HC4le/VDb/SMzE1JcPnto+XBKFOcoiJzVw== +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== dependencies: - "@jest/fake-timers" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^27.3.0" + jest-mock "^26.6.2" "@jest/fake-timers@^24.3.0", "@jest/fake-timers@^24.9.0": version "24.9.0" @@ -1183,26 +1176,37 @@ jest-message-util "^24.9.0" jest-mock "^24.9.0" -"@jest/fake-timers@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.3.1.tgz#1fad860ee9b13034762cdb94266e95609dfce641" - integrity sha512-M3ZFgwwlqJtWZ+QkBG5NmC23A9w+A6ZxNsO5nJxJsKYt4yguBd3i8TpjQz5NfCX91nEve1KqD9RA2Q+Q1uWqoA== +"@jest/fake-timers@^25.1.0": + version "25.5.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz#46352e00533c024c90c2bc2ad9f2959f7f114185" + integrity sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ== dependencies: - "@jest/types" "^27.2.5" - "@sinonjs/fake-timers" "^8.0.1" - "@types/node" "*" - jest-message-util "^27.3.1" - jest-mock "^27.3.0" - jest-util "^27.3.1" + "@jest/types" "^25.5.0" + jest-message-util "^25.5.0" + jest-mock "^25.5.0" + jest-util "^25.5.0" + lolex "^5.0.0" -"@jest/globals@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.3.1.tgz#ce1dfb03d379237a9da6c1b99ecfaca1922a5f9e" - integrity sha512-Q651FWiWQAIFiN+zS51xqhdZ8g9b88nGCobC87argAxA7nMfNQq0Q0i9zTfQYgLa6qFXk2cGANEqfK051CZ8Pg== +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== dependencies: - "@jest/environment" "^27.3.1" - "@jest/types" "^27.2.5" - expect "^27.3.1" + "@jest/types" "^26.6.2" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" "@jest/reporters@^24.9.0": version "24.9.0" @@ -1231,17 +1235,16 @@ source-map "^0.6.0" string-length "^2.0.0" -"@jest/reporters@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.3.1.tgz#28b5c1f5789481e23788048fa822ed15486430b9" - integrity sha512-m2YxPmL9Qn1emFVgZGEiMwDntDxRRQ2D58tiDQlwYTg5GvbFOKseYCcHtn0WsI8CG4vzPglo3nqbOiT8ySBT/w== +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.3.1" - "@jest/test-result" "^27.3.1" - "@jest/transform" "^27.3.1" - "@jest/types" "^27.2.5" - "@types/node" "*" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -1252,15 +1255,17 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.3.1" - jest-resolve "^27.3.1" - jest-util "^27.3.1" - jest-worker "^27.3.1" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^8.1.0" + v8-to-istanbul "^7.0.0" + optionalDependencies: + node-notifier "^8.0.0" "@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0": version "24.9.0" @@ -1271,10 +1276,10 @@ graceful-fs "^4.1.15" source-map "^0.6.0" -"@jest/source-map@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" - integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" @@ -1289,13 +1294,13 @@ "@jest/types" "^24.9.0" "@types/istanbul-lib-coverage" "^2.0.0" -"@jest/test-result@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.3.1.tgz#89adee8b771877c69b3b8d59f52f29dccc300194" - integrity sha512-mLn6Thm+w2yl0opM8J/QnPTqrfS4FoXsXF2WIWJb2O/GBSyResL71BRuMYbYRsGt7ELwS5JGcEcGb52BNrumgg== +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== dependencies: - "@jest/console" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" @@ -1309,15 +1314,16 @@ jest-runner "^24.9.0" jest-runtime "^24.9.0" -"@jest/test-sequencer@^27.3.1": - version "27.3.1" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.3.1.tgz#4b3bde2dbb05ee74afdae608cf0768e3354683b1" - integrity sha512-siySLo07IMEdSjA4fqEnxfIX8lB/lWYsBPwNFtkOvsFQvmBrL3yj3k3uFNZv/JDyApTakRpxbKLJ3CT8UGVCrA== +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== dependencies: - "@jest/test-result" "^27.3.1" + "@jest/test-result" "^26.6.2" graceful-fs "^4.2.4" - jest-haste-map "^27.3.1" - jest-runtime "^27.3.1" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" "@jest/transform@^24.9.0": version "24.9.0" @@ -1341,6 +1347,27 @@ source-map "^0.6.1" write-file-atomic "2.4.1" +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^26.6.2" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-regex-util "^26.0.0" + jest-util "^26.6.2" + micromatch "^4.0.2" + pirates "^4.0.1" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/transform@^27.3.1": version "27.3.1" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.3.1.tgz#ff80eafbeabe811e9025e4b6f452126718455220" @@ -1371,6 +1398,27 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" +"@jest/types@^25.5.0": + version "25.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" + integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + "@jest/types@^27.2.5": version "27.2.5" resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132" @@ -1432,10 +1480,10 @@ dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz#1c1c9a91419f804e59ae8df316a07dd1c3a76b94" - integrity sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew== +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== dependencies: "@sinonjs/commons" "^1.7.0" @@ -1459,7 +1507,7 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.14": +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7": version "7.1.16" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702" integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ== @@ -1625,7 +1673,7 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@types/prettier@^2.1.5": +"@types/prettier@^2.0.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb" integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw== @@ -1734,6 +1782,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.14" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" + integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== + dependencies: + "@types/yargs-parser" "*" + "@types/yargs@^16.0.0": version "16.0.4" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" @@ -2428,7 +2483,7 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.1: +ansi-regex@^5.0.0, ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== @@ -2452,11 +2507,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -2906,6 +2956,20 @@ babel-jest@^24.9.0: chalk "^2.4.2" slash "^2.0.0" +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== + dependencies: + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" + babel-jest@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.3.1.tgz#0636a3404c68e07001e434ac4956d82da8a80022" @@ -2986,6 +3050,16 @@ babel-plugin-jest-hoist@^24.9.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + babel-plugin-jest-hoist@^27.2.0: version "27.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz#79f37d43f7e5c4fdc4b2ca3e10cc6cf545626277" @@ -3346,6 +3420,14 @@ babel-preset-jest@^24.9.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.9.0" +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== + dependencies: + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" + babel-preset-jest@^27.2.0: version "27.2.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz#556bbbf340608fed5670ab0ea0c8ef2449fba885" @@ -3844,7 +3926,7 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0: +camelcase@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3901,6 +3983,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^4.0.0, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -3991,10 +4081,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -cjs-module-lexer@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" - integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== class-utils@^0.3.5: version "0.3.6" @@ -4440,7 +4530,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4743,11 +4833,6 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= - deep-equal@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" @@ -4882,10 +4967,10 @@ diff-sequences@^24.9.0: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== -diff-sequences@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" - integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== diffie-hellman@^5.0.0: version "5.0.3" @@ -5123,10 +5208,10 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" -emittery@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" - integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== +emittery@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" + integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== emoji-regex@^7.0.1: version "7.0.3" @@ -5627,19 +5712,19 @@ execa@^3.3.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" is-stream "^2.0.0" merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" strip-final-newline "^2.0.0" exit@^0.1.2: @@ -5672,17 +5757,17 @@ expect@^24.9.0: jest-message-util "^24.9.0" jest-regex-util "^24.9.0" -expect@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.3.1.tgz#d0f170b1f5c8a2009bab0beffd4bb94f043e38e7" - integrity sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg== +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== dependencies: - "@jest/types" "^27.2.5" - ansi-styles "^5.0.0" - jest-get-type "^27.3.1" - jest-matcher-utils "^27.3.1" - jest-message-util "^27.3.1" - jest-regex-util "^27.0.6" + "@jest/types" "^26.6.2" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" express@^4.16.3, express@^4.17.1: version "4.17.1" @@ -6103,7 +6188,7 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -6166,11 +6251,6 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -6675,11 +6755,6 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -7214,7 +7289,7 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-wsl@^2.1.1: +is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -7359,39 +7434,14 @@ jest-changed-files@^24.9.0: execa "^1.0.0" throat "^4.0.0" -jest-changed-files@^27.3.0: - version "27.3.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.3.0.tgz#22a02cc2b34583fc66e443171dc271c0529d263c" - integrity sha512-9DJs9garMHv4RhylUMZgbdCJ3+jHSkpL9aaVKp13xtXAD80qLTLrqcDZL1PHA9dYA0bCI86Nv2BhkLpLhrBcPg== +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== dependencies: - "@jest/types" "^27.2.5" - execa "^5.0.0" - throat "^6.0.1" - -jest-circus@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.3.1.tgz#1679e74387cbbf0c6a8b42de963250a6469e0797" - integrity sha512-v1dsM9II6gvXokgqq6Yh2jHCpfg7ZqV4jWY66u7npz24JnhP3NHxI0sKT7+ZMQ7IrOWHYAaeEllOySbDbWsiXw== - dependencies: - "@jest/environment" "^27.3.1" - "@jest/test-result" "^27.3.1" - "@jest/types" "^27.2.5" - "@types/node" "*" - chalk "^4.0.0" - co "^4.6.0" - dedent "^0.7.0" - expect "^27.3.1" - is-generator-fn "^2.0.0" - jest-each "^27.3.1" - jest-matcher-utils "^27.3.1" - jest-message-util "^27.3.1" - jest-runtime "^27.3.1" - jest-snapshot "^27.3.1" - jest-util "^27.3.1" - pretty-format "^27.3.1" - slash "^3.0.0" - stack-utils "^2.0.3" - throat "^6.0.1" + "@jest/types" "^26.6.2" + execa "^4.0.0" + throat "^5.0.0" jest-cli@^24.9.0: version "24.9.0" @@ -7412,23 +7462,24 @@ jest-cli@^24.9.0: realpath-native "^1.1.0" yargs "^13.3.0" -jest-cli@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.3.1.tgz#b576f9d146ba6643ce0a162d782b40152b6b1d16" - integrity sha512-WHnCqpfK+6EvT62me6WVs8NhtbjAS4/6vZJnk7/2+oOr50cwAzG4Wxt6RXX0hu6m1169ZGMlhYYUNeKBXCph/Q== +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== dependencies: - "@jest/core" "^27.3.1" - "@jest/test-result" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.3.1" - jest-util "^27.3.1" - jest-validate "^27.3.1" + is-ci "^2.0.0" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" prompts "^2.0.1" - yargs "^16.2.0" + yargs "^15.4.1" jest-config@^24.9.0: version "24.9.0" @@ -7453,32 +7504,29 @@ jest-config@^24.9.0: pretty-format "^24.9.0" realpath-native "^1.1.0" -jest-config@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.3.1.tgz#cb3b7f6aaa8c0a7daad4f2b9573899ca7e09bbad" - integrity sha512-KY8xOIbIACZ/vdYCKSopL44I0xboxC751IX+DXL2+Wx6DKNycyEfV3rryC3BPm5Uq/BBqDoMrKuqLEUNJmMKKg== +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.3.1" - "@jest/types" "^27.2.5" - babel-jest "^27.3.1" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" chalk "^4.0.0" - ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-circus "^27.3.1" - jest-environment-jsdom "^27.3.1" - jest-environment-node "^27.3.1" - jest-get-type "^27.3.1" - jest-jasmine2 "^27.3.1" - jest-regex-util "^27.0.6" - jest-resolve "^27.3.1" - jest-runner "^27.3.1" - jest-util "^27.3.1" - jest-validate "^27.3.1" - micromatch "^4.0.4" - pretty-format "^27.3.1" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.6.3" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + micromatch "^4.0.2" + pretty-format "^26.6.2" jest-diff@^24.3.0, jest-diff@^24.9.0: version "24.9.0" @@ -7490,15 +7538,15 @@ jest-diff@^24.3.0, jest-diff@^24.9.0: jest-get-type "^24.9.0" pretty-format "^24.9.0" -jest-diff@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.3.1.tgz#d2775fea15411f5f5aeda2a5e02c2f36440f6d55" - integrity sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ== +jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.6" - jest-get-type "^27.3.1" - pretty-format "^27.3.1" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" jest-docblock@^24.3.0: version "24.9.0" @@ -7507,10 +7555,10 @@ jest-docblock@^24.3.0: dependencies: detect-newline "^2.1.0" -jest-docblock@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" - integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== dependencies: detect-newline "^3.0.0" @@ -7525,16 +7573,16 @@ jest-each@^24.9.0: jest-util "^24.9.0" pretty-format "^24.9.0" -jest-each@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.3.1.tgz#14c56bb4f18dd18dc6bdd853919b5f16a17761ff" - integrity sha512-E4SwfzKJWYcvOYCjOxhZcxwL+AY0uFMvdCOwvzgutJiaiodFjkxQQDxHm8FQBeTqDnSmKsQWn7ldMRzTn2zJaQ== +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== dependencies: - "@jest/types" "^27.2.5" + "@jest/types" "^26.6.2" chalk "^4.0.0" - jest-get-type "^27.3.1" - jest-util "^27.3.1" - pretty-format "^27.3.1" + jest-get-type "^26.3.0" + jest-util "^26.6.2" + pretty-format "^26.6.2" jest-environment-jsdom-fifteen@^1.0.2: version "1.0.2" @@ -7548,6 +7596,16 @@ jest-environment-jsdom-fifteen@^1.0.2: jest-util "^24.0.0" jsdom "^15.2.1" +jest-environment-jsdom-sixteen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-2.0.0.tgz#0f8c12663ccd9836d248574decffc575bfb091e1" + integrity sha512-BF+8P67aEJcd78TQzwSb9P4a73cArOWb5KgqI8eU6cHRWDIJdDRE8XTeZAmOuDSDhKpuEXjKkXwWB3GOJvqHJQ== + dependencies: + "@jest/fake-timers" "^25.1.0" + jest-mock "^25.1.0" + jest-util "^25.1.0" + jsdom "^16.2.1" + jest-environment-jsdom@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b" @@ -7560,18 +7618,18 @@ jest-environment-jsdom@^24.9.0: jest-util "^24.9.0" jsdom "^11.5.1" -jest-environment-jsdom@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.3.1.tgz#63ac36d68f7a9303494df783494856222b57f73e" - integrity sha512-3MOy8qMzIkQlfb3W1TfrD7uZHj+xx8Olix5vMENkj5djPmRqndMaXtpnaZkxmxM+Qc3lo+yVzJjzuXbCcZjAlg== +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== dependencies: - "@jest/environment" "^27.3.1" - "@jest/fake-timers" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^27.3.0" - jest-util "^27.3.1" - jsdom "^16.6.0" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" jest-environment-node@^24.9.0: version "24.9.0" @@ -7584,27 +7642,27 @@ jest-environment-node@^24.9.0: jest-mock "^24.9.0" jest-util "^24.9.0" -jest-environment-node@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.3.1.tgz#af7d0eed04edafb740311b303f3fe7c8c27014bb" - integrity sha512-T89F/FgkE8waqrTSA7/ydMkcc52uYPgZZ6q8OaZgyiZkJb5QNNCF6oPZjH9IfPFfcc9uBWh1574N0kY0pSvTXw== +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== dependencies: - "@jest/environment" "^27.3.1" - "@jest/fake-timers" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^27.3.0" - jest-util "^27.3.1" + jest-mock "^26.6.2" + jest-util "^26.6.2" jest-get-type@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== -jest-get-type@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff" - integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg== +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== jest-haste-map@^24.9.0: version "24.9.0" @@ -7625,6 +7683,27 @@ jest-haste-map@^24.9.0: optionalDependencies: fsevents "^1.2.7" +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== + dependencies: + "@jest/types" "^26.6.2" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + jest-regex-util "^26.0.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + jest-haste-map@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.3.1.tgz#7656fbd64bf48bda904e759fc9d93e2c807353ee" @@ -7667,29 +7746,29 @@ jest-jasmine2@^24.9.0: pretty-format "^24.9.0" throat "^4.0.0" -jest-jasmine2@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.3.1.tgz#df6d3d07c7dafc344feb43a0072a6f09458d32b0" - integrity sha512-WK11ZUetDQaC09w4/j7o4FZDUIp+4iYWH/Lik34Pv7ukL+DuXFGdnmmi7dT58J2ZYKFB5r13GyE0z3NPeyJmsg== +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.3.1" - "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.3.1" + expect "^26.6.2" is-generator-fn "^2.0.0" - jest-each "^27.3.1" - jest-matcher-utils "^27.3.1" - jest-message-util "^27.3.1" - jest-runtime "^27.3.1" - jest-snapshot "^27.3.1" - jest-util "^27.3.1" - pretty-format "^27.3.1" - throat "^6.0.1" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" + throat "^5.0.0" jest-leak-detector@^24.9.0: version "24.9.0" @@ -7699,13 +7778,13 @@ jest-leak-detector@^24.9.0: jest-get-type "^24.9.0" pretty-format "^24.9.0" -jest-leak-detector@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.3.1.tgz#7fb632c2992ef707a1e73286e1e704f9cc1772b2" - integrity sha512-78QstU9tXbaHzwlRlKmTpjP9k4Pvre5l0r8Spo4SbFFVy/4Abg9I6ZjHwjg2QyKEAMg020XcjP+UgLZIY50yEg== +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== dependencies: - jest-get-type "^27.3.1" - pretty-format "^27.3.1" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" jest-matcher-utils@^24.9.0: version "24.9.0" @@ -7717,15 +7796,15 @@ jest-matcher-utils@^24.9.0: jest-get-type "^24.9.0" pretty-format "^24.9.0" -jest-matcher-utils@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz#257ad61e54a6d4044e080d85dbdc4a08811e9c1c" - integrity sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w== +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== dependencies: chalk "^4.0.0" - jest-diff "^27.3.1" - jest-get-type "^27.3.1" - pretty-format "^27.3.1" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" jest-message-util@^24.9.0: version "24.9.0" @@ -7741,20 +7820,34 @@ jest-message-util@^24.9.0: slash "^2.0.0" stack-utils "^1.0.1" -jest-message-util@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.3.1.tgz#f7c25688ad3410ab10bcb862bcfe3152345c6436" - integrity sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg== +jest-message-util@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz#ea11d93204cc7ae97456e1d8716251185b8880ea" + integrity sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA== dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.2.5" + "@babel/code-frame" "^7.0.0" + "@jest/types" "^25.5.0" + "@types/stack-utils" "^1.0.1" + chalk "^3.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + slash "^3.0.0" + stack-utils "^1.0.1" + +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/types" "^26.6.2" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" - micromatch "^4.0.4" - pretty-format "^27.3.1" + micromatch "^4.0.2" + pretty-format "^26.6.2" slash "^3.0.0" - stack-utils "^2.0.3" + stack-utils "^2.0.2" jest-mock@^24.0.0, jest-mock@^24.9.0: version "24.9.0" @@ -7763,12 +7856,19 @@ jest-mock@^24.0.0, jest-mock@^24.9.0: dependencies: "@jest/types" "^24.9.0" -jest-mock@^27.3.0: - version "27.3.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.3.0.tgz#ddf0ec3cc3e68c8ccd489bef4d1f525571a1b867" - integrity sha512-ziZiLk0elZOQjD08bLkegBzv5hCABu/c8Ytx45nJKkysQwGaonvmTxwjLqEA4qGdasq9o2I8/HtdGMNnVsMTGw== +jest-mock@^25.1.0, jest-mock@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz#a91a54dabd14e37ecd61665d6b6e06360a55387a" + integrity sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA== dependencies: - "@jest/types" "^27.2.5" + "@jest/types" "^25.5.0" + +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== + dependencies: + "@jest/types" "^26.6.2" "@types/node" "*" jest-pnp-resolver@^1.2.1, jest-pnp-resolver@^1.2.2: @@ -7781,6 +7881,11 @@ jest-regex-util@^24.3.0, jest-regex-util@^24.9.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== + jest-regex-util@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" @@ -7795,14 +7900,14 @@ jest-resolve-dependencies@^24.9.0: jest-regex-util "^24.3.0" jest-snapshot "^24.9.0" -jest-resolve-dependencies@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.3.1.tgz#85b99bdbdfa46e2c81c6228fc4c91076f624f6e2" - integrity sha512-X7iLzY8pCiYOnvYo2YrK3P9oSE8/3N2f4pUZMJ8IUcZnT81vlSonya1KTO9ZfKGuC+svE6FHK/XOb8SsoRUV1A== +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== dependencies: - "@jest/types" "^27.2.5" - jest-regex-util "^27.0.6" - jest-snapshot "^27.3.1" + "@jest/types" "^26.6.2" + jest-regex-util "^26.0.0" + jest-snapshot "^26.6.2" jest-resolve@^24.9.0: version "24.9.0" @@ -7815,20 +7920,18 @@ jest-resolve@^24.9.0: jest-pnp-resolver "^1.2.1" realpath-native "^1.1.0" -jest-resolve@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.3.1.tgz#0e5542172a1aa0270be6f66a65888647bdd74a3e" - integrity sha512-Dfzt25CFSPo3Y3GCbxynRBZzxq9AdyNN+x/v2IqYx6KVT5Z6me2Z/PsSGFSv3cOSUZqJ9pHxilao/I/m9FouLw== +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== dependencies: - "@jest/types" "^27.2.5" + "@jest/types" "^26.6.2" chalk "^4.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.3.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.3.1" - jest-validate "^27.3.1" - resolve "^1.20.0" - resolve.exports "^1.1.0" + jest-util "^26.6.2" + read-pkg-up "^7.0.1" + resolve "^1.18.1" slash "^3.0.0" jest-runner@^24.9.0: @@ -7856,33 +7959,31 @@ jest-runner@^24.9.0: source-map-support "^0.5.6" throat "^4.0.0" -jest-runner@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.3.1.tgz#1d594dcbf3bd8600a7e839e790384559eaf96e3e" - integrity sha512-r4W6kBn6sPr3TBwQNmqE94mPlYVn7fLBseeJfo4E2uCTmAyDFm2O5DYAQAFP7Q3YfiA/bMwg8TVsciP7k0xOww== +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== dependencies: - "@jest/console" "^27.3.1" - "@jest/environment" "^27.3.1" - "@jest/test-result" "^27.3.1" - "@jest/transform" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" - emittery "^0.8.1" + emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-docblock "^27.0.6" - jest-environment-jsdom "^27.3.1" - jest-environment-node "^27.3.1" - jest-haste-map "^27.3.1" - jest-leak-detector "^27.3.1" - jest-message-util "^27.3.1" - jest-resolve "^27.3.1" - jest-runtime "^27.3.1" - jest-util "^27.3.1" - jest-worker "^27.3.1" + jest-config "^26.6.3" + jest-docblock "^26.0.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" source-map-support "^0.5.6" - throat "^6.0.1" + throat "^5.0.0" jest-runtime@^24.9.0: version "24.9.0" @@ -7913,37 +8014,38 @@ jest-runtime@^24.9.0: strip-bom "^3.0.0" yargs "^13.3.0" -jest-runtime@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.3.1.tgz#80fa32eb85fe5af575865ddf379874777ee993d7" - integrity sha512-qtO6VxPbS8umqhEDpjA4pqTkKQ1Hy4ZSi9mDVeE9Za7LKBo2LdW2jmT+Iod3XFaJqINikZQsn2wEi0j9wPRbLg== +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== dependencies: - "@jest/console" "^27.3.1" - "@jest/environment" "^27.3.1" - "@jest/globals" "^27.3.1" - "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.3.1" - "@jest/transform" "^27.3.1" - "@jest/types" "^27.2.5" - "@types/yargs" "^16.0.0" + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/yargs" "^15.0.0" chalk "^4.0.0" - cjs-module-lexer "^1.0.0" + cjs-module-lexer "^0.6.0" collect-v8-coverage "^1.0.0" - execa "^5.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.3.1" - jest-message-util "^27.3.1" - jest-mock "^27.3.0" - jest-regex-util "^27.0.6" - jest-resolve "^27.3.1" - jest-snapshot "^27.3.1" - jest-util "^27.3.1" - jest-validate "^27.3.1" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^16.2.0" + yargs "^15.4.1" jest-serializer-vue@^2.0.2: version "2.0.2" @@ -7957,6 +8059,14 @@ jest-serializer@^24.9.0: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ== +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" + jest-serializer@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" @@ -7984,34 +8094,26 @@ jest-snapshot@^24.9.0: pretty-format "^24.9.0" semver "^6.2.0" -jest-snapshot@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.3.1.tgz#1da5c0712a252d70917d46c037054f5918c49ee4" - integrity sha512-APZyBvSgQgOT0XumwfFu7X3G5elj6TGhCBLbBdn3R1IzYustPGPE38F51dBWMQ8hRXa9je0vAdeVDtqHLvB6lg== +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== dependencies: - "@babel/core" "^7.7.2" - "@babel/generator" "^7.7.2" - "@babel/parser" "^7.7.2" - "@babel/plugin-syntax-typescript" "^7.7.2" - "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/types" "^26.6.2" "@types/babel__traverse" "^7.0.4" - "@types/prettier" "^2.1.5" - babel-preset-current-node-syntax "^1.0.0" + "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^27.3.1" + expect "^26.6.2" graceful-fs "^4.2.4" - jest-diff "^27.3.1" - jest-get-type "^27.3.1" - jest-haste-map "^27.3.1" - jest-matcher-utils "^27.3.1" - jest-message-util "^27.3.1" - jest-resolve "^27.3.1" - jest-util "^27.3.1" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" natural-compare "^1.4.0" - pretty-format "^27.3.1" + pretty-format "^26.6.2" semver "^7.3.2" jest-transform-stub@^2.0.0: @@ -8037,6 +8139,29 @@ jest-util@^24.0.0, jest-util@^24.9.0: slash "^2.0.0" source-map "^0.6.0" +jest-util@^25.1.0, jest-util@^25.5.0: + version "25.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz#31c63b5d6e901274d264a4fec849230aa3fa35b0" + integrity sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA== + dependencies: + "@jest/types" "^25.5.0" + chalk "^3.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + make-dir "^3.0.0" + +jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + jest-util@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.3.1.tgz#a58cdc7b6c8a560caac9ed6bdfc4e4ff23f80429" @@ -8061,17 +8186,17 @@ jest-validate@^24.9.0: leven "^3.1.0" pretty-format "^24.9.0" -jest-validate@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.3.1.tgz#3a395d61a19cd13ae9054af8cdaf299116ef8a24" - integrity sha512-3H0XCHDFLA9uDII67Bwi1Vy7AqwA5HqEEjyy934lgVhtJ3eisw6ShOF1MDmRPspyikef5MyExvIm0/TuLzZ86Q== +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== dependencies: - "@jest/types" "^27.2.5" - camelcase "^6.2.0" + "@jest/types" "^26.6.2" + camelcase "^6.0.0" chalk "^4.0.0" - jest-get-type "^27.3.1" + jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^27.3.1" + pretty-format "^26.6.2" jest-watch-typeahead@^0.4.2: version "0.4.2" @@ -8099,17 +8224,17 @@ jest-watcher@^24.3.0, jest-watcher@^24.9.0: jest-util "^24.9.0" string-length "^2.0.0" -jest-watcher@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.3.1.tgz#ba5e0bc6aa843612b54ddb7f009d1cbff7e05f3e" - integrity sha512-9/xbV6chABsGHWh9yPaAGYVVKurWoP3ZMCv6h+O1v9/+pkOroigs6WzZ0e9gLP/njokUwM7yQhr01LKJVMkaZA== +jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== dependencies: - "@jest/test-result" "^27.3.1" - "@jest/types" "^27.2.5" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.3.1" + jest-util "^26.6.2" string-length "^4.0.1" jest-worker@^24.6.0, jest-worker@^24.9.0: @@ -8120,6 +8245,15 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" +jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest-worker@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2" @@ -8129,6 +8263,15 @@ jest-worker@^27.3.1: merge-stream "^2.0.0" supports-color "^8.0.0" +jest@26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== + dependencies: + "@jest/core" "^26.6.3" + import-local "^3.0.2" + jest-cli "^26.6.3" + jest@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" @@ -8137,15 +8280,6 @@ jest@^24.9.0: import-local "^2.0.0" jest-cli "^24.9.0" -jest@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.3.1.tgz#b5bab64e8f56b6f7e275ba1836898b0d9f1e5c8a" - integrity sha512-U2AX0AgQGd5EzMsiZpYt8HyZ+nSVIh5ujQ9CPp9EQZJMjXIiSZpJNweZl0swatKRoqHWgGKM3zaSwm4Zaz87ng== - dependencies: - "@jest/core" "^27.3.1" - import-local "^3.0.2" - jest-cli "^27.3.1" - js-beautify@^1.6.12, js-beautify@^1.6.14: version "1.14.0" resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.0.tgz#2ce790c555d53ce1e3d7363227acf5dc69024c2d" @@ -8260,7 +8394,7 @@ jsdom@^15.2.1: ws "^7.0.0" xml-name-validator "^3.0.0" -jsdom@^16.6.0: +jsdom@^16.2.1, jsdom@^16.4.0: version "16.7.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== @@ -8600,6 +8734,13 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== +lolex@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" + integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A== + dependencies: + "@sinonjs/commons" "^1.7.0" + loose-envify@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -9077,6 +9218,18 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" +node-notifier@^8.0.0: + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== + dependencies: + growly "^1.3.0" + is-wsl "^2.2.0" + semver "^7.3.2" + shellwords "^0.1.1" + uuid "^8.3.0" + which "^2.0.2" + node-releases@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" @@ -9143,7 +9296,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -9294,7 +9447,7 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -9387,6 +9540,11 @@ p-each-series@^1.0.0: dependencies: p-reduce "^1.0.0" +p-each-series@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== + p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -10133,14 +10291,14 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-format@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5" - integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA== +pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== dependencies: - "@jest/types" "^27.2.5" - ansi-regex "^5.0.1" - ansi-styles "^5.0.0" + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" react-is "^17.0.1" pretty@2.0.0, pretty@^2.0.0: @@ -10356,6 +10514,15 @@ read-pkg-up@^4.0.0: find-up "^3.0.0" read-pkg "^3.0.0" +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" @@ -10365,7 +10532,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -read-pkg@^5.1.1: +read-pkg@^5.1.1, read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== @@ -10651,17 +10818,12 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve.exports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" - integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== - resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0: +resolve@1.x, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -11013,7 +11175,7 @@ sigmund@^1.0.1: resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== @@ -11258,7 +11420,7 @@ stack-utils@^1.0.1: dependencies: escape-string-regexp "^2.0.0" -stack-utils@^2.0.3: +stack-utils@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== @@ -11660,10 +11822,10 @@ throat@^4.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= -throat@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" - integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== throttle-debounce@^2.1.0: version "2.3.0" @@ -11935,6 +12097,11 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -12168,15 +12335,20 @@ uuid@^3.3.2, uuid@^3.4.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c" - integrity sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA== +v8-to-istanbul@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -12290,6 +12462,11 @@ vue-loader@^15.9.2: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" +vue-router@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz#041048053e336829d05dafacf6a8fb669a2e7999" + integrity sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg== + vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" @@ -12611,7 +12788,7 @@ which@^1.2.9, which@^1.3.0: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -12755,6 +12932,14 @@ yargs-parser@^13.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" @@ -12776,7 +12961,24 @@ yargs@^13.3.0, yargs@^13.3.2: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^16.0.0, yargs@^16.2.0: +yargs@^15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^16.0.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From 9a7bc97777ecedfe27f2ee09b901f30e715626a3 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 26 Oct 2021 17:37:28 +0200 Subject: [PATCH 0996/1843] change getCustomRepository to createUser function --- backend/src/graphql/resolver/UserResolver.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 33949197c..4e6f6d882 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,7 +55,8 @@ export class UserResolver { user.hasElopage = result.data.hasElopage // read additional settings from settings table const userRepository = getCustomRepository(UserRepository) - let userEntity: void | DbUser + let userEntity: void | DbUser + console.log("user.pubkey", user.pubkey) userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { userEntity = new DbUser() userEntity.firstName = user.firstName @@ -136,7 +137,7 @@ export class UserResolver { throw new Error(result.data) } - const user = new User(result.data.user) + const user = new User(result.data.user) const dbuser = new DbUser() dbuser.pubkey = Buffer.from(fromHex(user.pubkey)) dbuser.email = user.email @@ -144,7 +145,8 @@ export class UserResolver { dbuser.lastName = user.lastName dbuser.username = user.username - dbuser.save().catch(() => { + const userRepository = getCustomRepository(UserRepository) + userRepository.save(dbuser).catch(() => { throw new Error('error saving user') }) From 0aa5dc3507c16abe9b267d4760d1a075c38b56c4 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 17:44:32 +0200 Subject: [PATCH 0997/1843] add vuex store --- admin/package.json | 3 ++- admin/src/main.js | 7 +++++-- admin/src/main.test.js | 9 +++++++++ admin/src/router/router.js | 3 +++ admin/src/router/routes.js | 5 +---- admin/src/store/store.js | 12 ++++++++++++ admin/yarn.lock | 5 +++++ 7 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 admin/src/store/store.js diff --git a/admin/package.json b/admin/package.json index d7b9dc40d..d279728be 100644 --- a/admin/package.json +++ b/admin/package.json @@ -38,7 +38,8 @@ "vue": "^2.6.11", "vue-apollo": "^3.0.8", "vue-jest": "^3.0.7", - "vue-router": "^3.5.3" + "vue-router": "^3.5.3", + "vuex": "^3.6.2" }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", diff --git a/admin/src/main.js b/admin/src/main.js index 4502b29c3..55d2101ab 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,8 +1,10 @@ import Vue from 'vue' import App from './App.vue' +import store from './store/store' + import router from './router/router' -// import addNavigationGuards from './router/guards' +import addNavigationGuards from './router/guards' import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import VueApollo from 'vue-apollo' @@ -45,10 +47,11 @@ const apolloProvider = new VueApollo({ Vue.use(BootstrapVue) -// addNavigationGuards(router, ) +addNavigationGuards(router, store) new Vue({ router, + store, apolloProvider, render: (h) => h(App), }).$mount('#app') diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 0091b8322..198716ea8 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -3,8 +3,13 @@ import './main' import CONFIG from './config' import Vue from 'vue' +import Vuex from 'vuex' jest.mock('vue') +jest.mock('vuex') + +const storeMock = jest.fn() +Vuex.Store = storeMock jest.mock('apollo-boost', () => { return { @@ -38,4 +43,8 @@ describe('main', () => { it('calls Vue', () => { expect(Vue).toBeCalled() }) + + it.skip('creates a store', () => { + expect(storeMock).toBeCalled() + }) }) diff --git a/admin/src/router/router.js b/admin/src/router/router.js index 250185593..dbad9ac6b 100644 --- a/admin/src/router/router.js +++ b/admin/src/router/router.js @@ -1,6 +1,9 @@ +import Vue from 'vue' import VueRouter from 'vue-router' import routes from './routes' +Vue.use(VueRouter) + const router = new VueRouter({ base: '/admin', routes, diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js index 1837f02f3..40f3ce325 100644 --- a/admin/src/router/routes.js +++ b/admin/src/router/routes.js @@ -7,10 +7,7 @@ const routes = [ requiresAuth: true, }, }, - { - path: 'not-found', - component: NotFound, - }, + { path: '*', component: NotFound }, ] export default routes diff --git a/admin/src/store/store.js b/admin/src/store/store.js new file mode 100644 index 000000000..0b1a6350e --- /dev/null +++ b/admin/src/store/store.js @@ -0,0 +1,12 @@ +import Vuex from 'vuex' +import Vue from 'vue' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + state: { + token: 'some-valid-token', + }, +}) + +export default store diff --git a/admin/yarn.lock b/admin/yarn.lock index af04ee523..39edd0de8 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -12493,6 +12493,11 @@ vue@^2.6.11: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== +vuex@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" + integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== + w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" From 4de667067da7326f4a922f9b9ce933dbf7cdc040 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 26 Oct 2021 17:50:59 +0200 Subject: [PATCH 0998/1843] fix lint --- backend/src/graphql/resolver/UserResolver.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 4e6f6d882..68a61cbeb 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,8 +55,7 @@ export class UserResolver { user.hasElopage = result.data.hasElopage // read additional settings from settings table const userRepository = getCustomRepository(UserRepository) - let userEntity: void | DbUser - console.log("user.pubkey", user.pubkey) + let userEntity: void | DbUser userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { userEntity = new DbUser() userEntity.firstName = user.firstName @@ -137,7 +136,7 @@ export class UserResolver { throw new Error(result.data) } - const user = new User(result.data.user) + const user = new User(result.data.user) const dbuser = new DbUser() dbuser.pubkey = Buffer.from(fromHex(user.pubkey)) dbuser.email = user.email From 21e0b350ba53d237ba9f90fb6f0a24ccbe1e173d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 17:57:48 +0200 Subject: [PATCH 0999/1843] adjust test coverage and remove unused package --- admin/package.json | 1 - admin/yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/admin/package.json b/admin/package.json index d279728be..d70a077d8 100644 --- a/admin/package.json +++ b/admin/package.json @@ -33,7 +33,6 @@ "dotenv-webpack": "^7.0.3", "graphql": "^15.6.1", "jest": "26.6.3", - "jsdom-global": "^3.0.2", "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", "vue-apollo": "^3.0.8", diff --git a/admin/yarn.lock b/admin/yarn.lock index 39edd0de8..04e838ec9 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -8325,11 +8325,6 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom-global@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" - integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk= - jsdom@^11.5.1: version "11.12.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" From 2eb453a4ae36a0931c8a7e229871c56924a6ae57 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 18:29:49 +0200 Subject: [PATCH 1000/1843] Add i18n for Vue with empty locale files --- .github/workflows/test.yml | 6 +-- admin/babel.config.js | 9 +--- admin/package.json | 2 + admin/src/i18n.js | 89 ++++++++++++++++++++++++++++++++++++++ admin/src/locales/de.json | 1 + admin/src/locales/en.json | 1 + admin/src/main.js | 3 ++ admin/src/main.test.js | 6 +++ admin/yarn.lock | 14 +++++- 9 files changed, 119 insertions(+), 12 deletions(-) create mode 100644 admin/src/i18n.js create mode 100644 admin/src/locales/de.json create mode 100644 admin/src/locales/en.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8012987c5..ab57f6b5b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -426,14 +426,14 @@ jobs: - name: Load Docker Image run: docker load < /tmp/admin.tar ########################################################################## - # UNIT TESTS FRONTEND #################################################### + # UNIT TESTS ADMIN INTERFACE ############################################# ########################################################################## - name: Admin Interface | Unit tests run: | docker run -v ~/coverage:/app/coverage --rm gradido/admin:test yarn run test cp -r ~/coverage ./coverage ########################################################################## - # COVERAGE CHECK ADMIN INTERFACE########################################## + # COVERAGE CHECK ADMIN INTERFACE ######################################### ########################################################################## - name: Admin Interface | Coverage check uses: webcraftmedia/coverage-check-action@master @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 82 + min_coverage: 65 token: ${{ github.token }} ############################################################################## diff --git a/admin/babel.config.js b/admin/babel.config.js index 5907ab074..80b148fd1 100644 --- a/admin/babel.config.js +++ b/admin/babel.config.js @@ -1,11 +1,4 @@ module.exports = { presets: ['@babel/preset-env'], - plugins: [ - [ - 'component', - { - styleLibraryName: 'theme-chalk', - }, - ], - ], + plugins: ['transform-require-context'], } diff --git a/admin/package.json b/admin/package.json index d70a077d8..2b4e33c91 100644 --- a/admin/package.json +++ b/admin/package.json @@ -36,6 +36,7 @@ "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", "vue-apollo": "^3.0.8", + "vue-i18n": "^8.26.5", "vue-jest": "^3.0.7", "vue-router": "^3.5.3", "vuex": "^3.6.2" @@ -46,6 +47,7 @@ "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-service": "~4.5.0", "babel-eslint": "^10.1.0", + "babel-plugin-transform-require-context": "^0.1.1", "eslint": "7.25.0", "eslint-config-prettier": "^8.3.0", "eslint-config-standard": "^16.0.3", diff --git a/admin/src/i18n.js b/admin/src/i18n.js new file mode 100644 index 000000000..7ccfec4c9 --- /dev/null +++ b/admin/src/i18n.js @@ -0,0 +1,89 @@ +import Vue from 'vue' +import VueI18n from 'vue-i18n' + +Vue.use(VueI18n) + +const loadLocaleMessages = () => { + const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i) + const messages = {} + locales.keys().forEach((key) => { + const matched = key.match(/([A-Za-z0-9-_]+)\./i) + if (matched && matched.length > 1) { + const locale = matched[1] + messages[locale] = locales(key) + } + }) + return messages +} + +const numberFormats = { + en: { + decimal: { + style: 'decimal', + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }, + ungroupedDecimal: { + style: 'decimal', + minimumFractionDigits: 2, + maximumFractionDigits: 2, + useGrouping: false, + }, + }, + de: { + decimal: { + style: 'decimal', + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }, + ungroupedDecimal: { + style: 'decimal', + minimumFractionDigits: 2, + maximumFractionDigits: 2, + useGrouping: false, + }, + }, +} + +const dateTimeFormats = { + en: { + short: { + year: 'numeric', + month: 'numeric', + day: 'numeric', + }, + long: { + year: 'numeric', + month: 'short', + day: 'numeric', + weekday: 'short', + hour: 'numeric', + minute: 'numeric', + }, + }, + de: { + short: { + day: 'numeric', + month: 'numeric', + year: 'numeric', + }, + long: { + day: 'numeric', + month: 'short', + year: 'numeric', + weekday: 'short', + hour: 'numeric', + minute: 'numeric', + }, + }, +} + +const i18n = new VueI18n({ + locale: 'en', + fallbackLocale: 'en', + messages: loadLocaleMessages(), + numberFormats, + dateTimeFormats, +}) + +export default i18n diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/admin/src/locales/de.json @@ -0,0 +1 @@ +{} diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/admin/src/locales/en.json @@ -0,0 +1 @@ +{} diff --git a/admin/src/main.js b/admin/src/main.js index 55d2101ab..61f65129e 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -6,6 +6,8 @@ import store from './store/store' import router from './router/router' import addNavigationGuards from './router/guards' +import i18n from './i18n' + import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import VueApollo from 'vue-apollo' @@ -52,6 +54,7 @@ addNavigationGuards(router, store) new Vue({ router, store, + i18n, apolloProvider, render: (h) => h(App), }).$mount('#app') diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 198716ea8..27c8898ab 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -4,9 +4,11 @@ import CONFIG from './config' import Vue from 'vue' import Vuex from 'vuex' +import VueI18n from 'vue-i18n' jest.mock('vue') jest.mock('vuex') +jest.mock('vue-i18n') const storeMock = jest.fn() Vuex.Store = storeMock @@ -44,6 +46,10 @@ describe('main', () => { expect(Vue).toBeCalled() }) + it('calls VueI18n', () => { + expect(VueI18n).toBeCalled() + }) + it.skip('creates a store', () => { expect(storeMock).toBeCalled() }) diff --git a/admin/yarn.lock b/admin/yarn.lock index 04e838ec9..59a49674d 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -932,7 +932,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.3.3", "@babel/template@^7.4.0": +"@babel/template@7", "@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.3.3", "@babel/template@^7.4.0": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194" integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg== @@ -3343,6 +3343,13 @@ babel-plugin-transform-regenerator@^6.22.0: dependencies: regenerator-transform "^0.10.0" +babel-plugin-transform-require-context@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-require-context/-/babel-plugin-transform-require-context-0.1.1.tgz#319b545ca83080b5062776b46cc9b8b346fea9a6" + integrity sha512-4ceqYOtzgmq4/QsB8dP7pUrUOCjY/jrRYdt7YkIOWHxtGDQbcf6YZDyLCiPQf6KsEIcIbSQiTRXOsbLiuJfgNQ== + dependencies: + "@babel/template" "7" + babel-plugin-transform-strict-mode@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" @@ -12420,6 +12427,11 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== +vue-i18n@^8.26.5: + version "8.26.5" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.26.5.tgz#b61e994e7ae83564c6aebd004543156bbdc7c7e9" + integrity sha512-qYqfsFd8v2QFSLDAabqXXXpwjGvkuqJtTWqRpZPXpAFO6PArGH4A9vSplnA0HLmnB8km7OB5ZSdP8lkkX0rLew== + vue-jest@^3.0.5, vue-jest@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.7.tgz#a6d29758a5cb4d750f5d1242212be39be4296a33" From bdbfff76e36c0f27f839e8f57d65a23a92cbaace Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 26 Oct 2021 18:33:42 +0200 Subject: [PATCH 1001/1843] set public path to /admin --- admin/vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/vue.config.js b/admin/vue.config.js index 16807d44a..18929c38c 100644 --- a/admin/vue.config.js +++ b/admin/vue.config.js @@ -17,7 +17,7 @@ module.exports = { }, }, lintOnSave: true, - publicPath: '/vue', + publicPath: '/admin', configureWebpack: { // Set up all the aliases we use in our app. resolve: { From a5c936a4912ea3eecd64bc606ca7ecbc0b37c504 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 27 Oct 2021 08:31:45 +0200 Subject: [PATCH 1002/1843] Spelling error fixed 'Berechnungsformel' --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e46f9bb83..f07e3af10 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -96,7 +96,7 @@ "conversion-gdt-euro": "Umrechnung Euro / Gradido Transform (GDT)", "credit": "Gutschrift", "factor": "Faktor", - "formula": "Berechungsformel", + "formula": "Berechnungsformel", "funding": "Zu den Förderbeiträgen", "gdt-received": "Gradido Transform (GDT) erhalten", "no-transactions": "Du hast noch keine Gradido Transform (GDT).", From cf77a9429ee8c7d491bc3036f9d7c4c8afd53ada Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 27 Oct 2021 10:27:28 +0200 Subject: [PATCH 1003/1843] checkEmail.vue page text is displayed correctly now --- frontend/src/views/Pages/CheckEmail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/CheckEmail.vue b/frontend/src/views/Pages/CheckEmail.vue index baeacb34f..1a23f6b09 100644 --- a/frontend/src/views/Pages/CheckEmail.vue +++ b/frontend/src/views/Pages/CheckEmail.vue @@ -5,10 +5,10 @@
-

{{ $t('checkEmail.title') }}

+

{{ $t('site.checkEmail.title') }}

- {{ $t('checkEmail.errorText') }} + {{ $t('site.checkEmail.errorText') }}
From 3d16b1519c1331e9d392c102436e9b208dc3eba2 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 15:06:38 +0200 Subject: [PATCH 1004/1843] Documentation on the coin creation and the steps to have the accounts to do create the currency. --- docu/create-coins-as-admin.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docu/create-coins-as-admin.md diff --git a/docu/create-coins-as-admin.md b/docu/create-coins-as-admin.md new file mode 100644 index 000000000..e496a27f9 --- /dev/null +++ b/docu/create-coins-as-admin.md @@ -0,0 +1,19 @@ +### User creation +A user needs to be created on the login_server we do this when we create a User in the client https://$community_domain/vue/register. + +### Admin user +To set a User admin we need the following SQL query on the gradido_login database: +``` +INSERT INTO user_roles (id, user_id, role_id) VALUES (NULL, '1', '1'); +``` +user_id has to be found in users +Now when we login in on https://$community_domain/account/ we can create coins but we will be restricted cause we can't sign the creations. + +### Signation account +To add a signation account we need to go on the following url: http://$community_domain/server-users/add + +### Coin creation process +The coin creation for work is done in the following url: http://$community_domain/transaction-creations/create-multi +Where we can create coins for a number of as many users as we want excepted for our self. + +Pending_tasks table is used to store the transactions that can't be fulfilled. \ No newline at end of file From c0fc927c23f8cbb014e3434db649c772d5328cce Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 15:37:04 +0200 Subject: [PATCH 1005/1843] Withdrew duplicate code and wrote a mixin for it. --- frontend/src/mixin/getCommunityInfo.js | 18 ++++++++++++++++++ frontend/src/views/Pages/Login.vue | 19 +++---------------- frontend/src/views/Pages/Register.vue | 20 ++------------------ 3 files changed, 23 insertions(+), 34 deletions(-) create mode 100644 frontend/src/mixin/getCommunityInfo.js diff --git a/frontend/src/mixin/getCommunityInfo.js b/frontend/src/mixin/getCommunityInfo.js new file mode 100644 index 000000000..b3feb1267 --- /dev/null +++ b/frontend/src/mixin/getCommunityInfo.js @@ -0,0 +1,18 @@ +import { communityInfo } from '../graphql/queries' + +export const getCommunityInfo = { + created() { + if (!this.$store.state.community) { + this.$apollo + .query({ + query: communityInfo, + }) + .then((result) => { + this.$store.commit('community', result.data.getCommunityInfo) + }) + .catch((error) => { + this.$toasted.error(error.message) + }) + } + }, +} diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 0cdbeb942..9b50c9d71 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -62,7 +62,8 @@ diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index d7909c964..29b1f7dfb 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -161,11 +161,12 @@ import InputEmail from '../../components/Inputs/InputEmail.vue' import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue' import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue' import { registerUser } from '../../graphql/mutations' -import { communityInfo } from '../../graphql/queries' +import { getCommunityInfo } from '../../mixin/getCommunityInfo' export default { components: { InputPasswordConfirmation, InputEmail, LanguageSwitchSelect }, name: 'register', + mixins: [getCommunityInfo], data() { return { form: { @@ -229,20 +230,6 @@ export default { this.form.password.passwordRepeat = '' this.language = '' }, - async onCreated() { - if (!this.$state.store.community) { - this.$apollo - .query({ - query: communityInfo, - }) - .then((result) => { - this.$store.commit('community', result.data.getCommunityInfo) - }) - .catch((error) => { - this.$toasted.error(error.message) - }) - } - }, }, computed: { namesFilled() { @@ -257,9 +244,6 @@ export default { return this.form.email !== '' }, }, - created() { - this.onCreated() - }, } From fe15226f6f1f6a15ee4f962a529e7bfaa3dba650 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 15:53:12 +0200 Subject: [PATCH 1006/1843] Withdrew protobuf from package, ignores, etc. --- .github/workflows/test.yml | 2 -- .gitmodules | 3 --- backend/.eslintignore | 4 +--- backend/package.json | 4 ---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7c4f6b40..b6fd6c31d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,8 +42,6 @@ jobs: ########################################################################## - name: Checkout code uses: actions/checkout@v2 - with: - submodules: true ########################################################################## # BACKEND ################################################################ ########################################################################## diff --git a/.gitmodules b/.gitmodules index 5026a5b8a..22790ccc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,3 @@ [submodule "login_server/dependencies/protobuf"] path = login_server/dependencies/protobuf url = https://github.com/protocolbuffers/protobuf.git -[submodule "backend/src/proto"] - path = backend/src/proto - url = git@github.com:gradido/gradido_protocol.git diff --git a/backend/.eslintignore b/backend/.eslintignore index 43e3327c1..2ae13b30e 100644 --- a/backend/.eslintignore +++ b/backend/.eslintignore @@ -1,4 +1,2 @@ node_modules -**/*.min.js -build -src/proto/bundle.d.ts \ No newline at end of file +**/*.min.js \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index a445c955b..d63450fbd 100644 --- a/backend/package.json +++ b/backend/package.json @@ -8,17 +8,14 @@ "license": "MIT", "private": false, "scripts": { - "prebuild": "mkdir -p build/proto && pbjs -t static-module -w commonjs -o build/proto/bundle.js src/proto/gradido/*.proto && pbts -o src/proto/bundle.d.ts build/proto/bundle.js", "build": "tsc --build", "clean": "tsc --build --clean", "start": "node build/index.js", - "predev": "pbjs -t static-module -w commonjs -o src/proto/bundle.js src/proto/gradido/*.proto && pbts -o src/proto/bundle.d.ts src/proto/bundle.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", "test": "jest --coverage" }, "dependencies": { - "@apollo/protobufjs": "^1.2.2", "@types/jest": "^27.0.2", "apollo-server-express": "^2.25.2", "axios": "^0.21.1", @@ -56,7 +53,6 @@ "eslint-plugin-promise": "^5.1.0", "nodemon": "^2.0.7", "prettier": "^2.3.1", - "protobufjs": "^6.11.2", "ts-node": "^10.0.0", "typescript": "^4.3.4" }, From 9b5d88a53321e98eda06b8f5c6198b5d9b4ace06 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 27 Oct 2021 15:54:20 +0200 Subject: [PATCH 1007/1843] async calls are working, token is tested on app created (to do: add server call to verify token and role) --- admin/package.json | 1 + admin/src/App.vue | 10 ++++++++++ admin/src/main.js | 3 +++ admin/src/store/store.js | 9 ++++++++- admin/yarn.lock | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/admin/package.json b/admin/package.json index 2b4e33c91..4aebfd131 100644 --- a/admin/package.json +++ b/admin/package.json @@ -33,6 +33,7 @@ "dotenv-webpack": "^7.0.3", "graphql": "^15.6.1", "jest": "26.6.3", + "regenerator-runtime": "^0.13.9", "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", "vue-apollo": "^3.0.8", diff --git a/admin/src/App.vue b/admin/src/App.vue index 9267cc82b..8db46b135 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -5,5 +5,15 @@ diff --git a/admin/src/main.js b/admin/src/main.js index 61f65129e..f5ec929f2 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -1,6 +1,9 @@ import Vue from 'vue' import App from './App.vue' +// without this async calls are not working +import 'regenerator-runtime' + import store from './store/store' import router from './router/router' diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 0b1a6350e..92fb37835 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -3,9 +3,16 @@ import Vue from 'vue' Vue.use(Vuex) +export const mutations = { + token: (state, token) => { + state.token = token + }, +} + const store = new Vuex.Store({ + mutations, state: { - token: 'some-valid-token', + token: null, }, }) diff --git a/admin/yarn.lock b/admin/yarn.lock index 59a49674d..fbc12c105 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -10606,7 +10606,7 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.4: +regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.9: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== From b3ec92faf496359b0519d1b804fa0f142574db67 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 15:56:27 +0200 Subject: [PATCH 1008/1843] Withdrew type long and protobuf. --- backend/package.json | 1 - backend/yarn.lock | 25 +++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/backend/package.json b/backend/package.json index d63450fbd..db288ac2f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -39,7 +39,6 @@ "@types/express": "^4.17.12", "@types/jsonwebtoken": "^8.5.2", "@types/libsodium-wrappers": "^0.7.9", - "@types/long": "^4.0.1", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", "@typescript-eslint/eslint-plugin": "^4.28.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index efbc27ee9..00a41db78 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@apollo/protobufjs@1.2.2", "@apollo/protobufjs@^1.2.2": +"@apollo/protobufjs@1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c" integrity sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ== @@ -923,7 +923,7 @@ resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#89c3ad2156d5143e64bce86cfeb0045a983aeccc" integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw== -"@types/long@^4.0.0", "@types/long@^4.0.1": +"@types/long@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== @@ -938,7 +938,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== -"@types/node@*", "@types/node@>=13.7.0", "@types/node@^16.10.3": +"@types/node@*", "@types/node@^16.10.3": version "16.10.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5" integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ== @@ -4614,25 +4614,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -protobufjs@^6.11.2: - version "6.11.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" - integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" From d889df51fef03429afbcde935dff36dd095b9cc8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 27 Oct 2021 15:57:46 +0200 Subject: [PATCH 1009/1843] test store --- admin/src/store/store.test.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 admin/src/store/store.test.js diff --git a/admin/src/store/store.test.js b/admin/src/store/store.test.js new file mode 100644 index 000000000..9ab9d980b --- /dev/null +++ b/admin/src/store/store.test.js @@ -0,0 +1,15 @@ +import { mutations } from './store' + +const { token } = mutations + +describe('Vuex store', () => { + describe('mutations', () => { + describe('token', () => { + it('sets the state of token', () => { + const state = { token: null } + token(state, '1234') + expect(state.token).toEqual('1234') + }) + }) + }) +}) From beb7661c3cfa21cc395fabe6f18d0bed10a3086d Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 16:03:57 +0200 Subject: [PATCH 1010/1843] Withdrew TransactionSignature from the transaction creation. --- .../graphql/resolver/TransactionResolver.ts | 65 ------------------- .../0001-init_db/TransactionSignature.ts | 21 ------ database/entity/TransactionSignature.ts | 1 - 3 files changed, 87 deletions(-) delete mode 100644 database/entity/0001-init_db/TransactionSignature.ts delete mode 100644 database/entity/TransactionSignature.ts diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 6263fbc6f..f9895ec09 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -23,7 +23,6 @@ import { TransactionRepository } from '../../typeorm/repository/Transaction' import { User as dbUser } from '@entity/User' import { UserTransaction as DbUserTransaction } from '@entity/UserTransaction' import { Transaction as DbTransaction } from '@entity/Transaction' -import { TransactionSignature as DbTransactionSignature } from '@entity/TransactionSignature' import { TransactionSendCoin as DbTransactionSendCoin } from '@entity/TransactionSendCoin' import { Balance as DbBalance } from '@entity/Balance' @@ -322,47 +321,9 @@ async function sendCoins( } const centAmount = Math.trunc(amount * 10000) - // const transferAmount = new proto.gradido.TransferAmount({ - // pubkey: senderUser.pubkey, - // amount: centAmount, - // }) // no group id is given so we assume it is a local transfer if (!groupId) { - // const localTransfer = new proto.gradido.LocalTransfer({ - // sender: transferAmount, - // recipiant: fromHex(recipiantPublicKey), - // }) - // const transferTransaction = new proto.gradido.GradidoTransfer({ local: localTransfer }) - // const transactionBody = new proto.gradido.TransactionBody({ - // memo: memo, - // created: { seconds: new Date().getTime() / 1000 }, - // transfer: transferTransaction, - // }) - - // const bodyBytes = proto.gradido.TransactionBody.encode(transactionBody).finish() - // const bodyBytesBase64 = toBase64(bodyBytes, base64Variants.ORIGINAL) - // let Login-Server sign transaction - - // const result = await apiPost(CONFIG.LOGIN_API_URL + 'signTransaction', { - // session_id: sessionId, - // bodyBytes: bodyBytesBase64, - // }) - // if (!result.success) throw new Error(result.data) - // // verify - // const sign = fromBase64(result.data.sign, base64Variants.ORIGINAL) - // if (!cryptoSignVerifyDetached(sign, bodyBytesBase64, senderUser.pubkey)) { - // throw new Error('Could not verify signature') - // } - - // const sigPair = new proto.gradido.SignaturePair({ - // pubKey: senderUser.pubkey, - // ed25519: sign, - // }) - // const sigMap = new proto.gradido.SignatureMap({ sigPair: [sigPair] }) - - // process db updates as transaction to able to rollback if an error occure - const queryRunner = getConnection().createQueryRunner() // belong to debugging mysql query / typeorm line // const startTime = new Date() @@ -433,36 +394,10 @@ async function sendCoins( throw new Error('error saving transaction send coin: ' + error) }) - // tx hash - // const state = cryptoGenerichashInit(null, cryptoGenericHashBytes) - // if (transaction.id > 1) { - // const previousTransaction = await transactionRepository.findOne({ id: transaction.id - 1 }) - // if (!previousTransaction) { - // throw new Error('Error previous transaction not found, please try again') - // } - // if (!previousTransaction.txHash) { - // throw new Error('Previous tx hash is null') - // } - // cryptoGenerichashUpdate(state, previousTransaction.txHash) - // } - // cryptoGenerichashUpdate(state, transaction.id.toString()) - // // should match previous used format: yyyy-MM-dd HH:mm:ss - // const receivedString = transaction.received.toISOString().slice(0, 19).replace('T', ' ') - // cryptoGenerichashUpdate(state, receivedString) - // cryptoGenerichashUpdate(state, proto.gradido.SignatureMap.encode(sigMap).finish()) - // transaction.txHash = Buffer.from(cryptoGenerichashFinal(state, cryptoGenericHashBytes)) await queryRunner.manager.save(transaction).catch((error) => { throw new Error('error saving transaction with tx hash: ' + error) }) - // save signature - // const signature = new DbTransactionSignature() - // signature.transactionId = transaction.id - // signature.signature = Buffer.from('sign') - // signature.pubkey = senderUser.pubkey - // await queryRunner.manager.save(signature).catch((error) => { - // throw new Error('error saving signature: ' + error) - // }) await queryRunner.commitTransaction() // great way de debug mysql querys / typeorm diff --git a/database/entity/0001-init_db/TransactionSignature.ts b/database/entity/0001-init_db/TransactionSignature.ts deleted file mode 100644 index df3e02ba6..000000000 --- a/database/entity/0001-init_db/TransactionSignature.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm' -import { Transaction } from './Transaction' - -@Entity('transaction_signatures') -export class TransactionSignature extends BaseEntity { - @PrimaryGeneratedColumn() - id: number - - @Column({ name: 'transaction_id' }) - transactionId: number - - @Column({ type: 'binary', length: 64 }) - signature: Buffer - - @Column({ type: 'binary', length: 32 }) - pubkey: Buffer - - @ManyToOne(() => Transaction) - @JoinColumn({ name: 'transaction_id' }) - transaction: Transaction -} diff --git a/database/entity/TransactionSignature.ts b/database/entity/TransactionSignature.ts deleted file mode 100644 index e3c9cbe1c..000000000 --- a/database/entity/TransactionSignature.ts +++ /dev/null @@ -1 +0,0 @@ -export { TransactionSignature } from './0001-init_db/TransactionSignature' From 2255974eedfea4f2e369e15c11f2364548c836ba Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 27 Oct 2021 16:10:19 +0200 Subject: [PATCH 1011/1843] Withdrew proto folder. --- backend/src/proto | 1 - 1 file changed, 1 deletion(-) delete mode 160000 backend/src/proto diff --git a/backend/src/proto b/backend/src/proto deleted file mode 160000 index ee3336cdc..000000000 --- a/backend/src/proto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee3336cdc578a5e626375dce45f5711d4c1b0837 From 512a4bd4f98c7903c3c64ca96fb74875307650ca Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Oct 2021 06:46:38 +0200 Subject: [PATCH 1012/1843] Reintroduced build as eslintignore, withdrew an assigned value that was never used. --- backend/.eslintignore | 3 ++- backend/src/graphql/resolver/TransactionResolver.ts | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/.eslintignore b/backend/.eslintignore index 2ae13b30e..f6b255e92 100644 --- a/backend/.eslintignore +++ b/backend/.eslintignore @@ -1,2 +1,3 @@ node_modules -**/*.min.js \ No newline at end of file +**/*.min.js +build \ No newline at end of file diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index f9895ec09..5ca46985a 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -334,7 +334,6 @@ async function sendCoins( let transaction = new DbTransaction() transaction.transactionTypeId = TransactionTypeId.SEND transaction.memo = memo - const transactionRepository = getCustomRepository(TransactionRepository) const insertResult = await queryRunner.manager.insert(DbTransaction, transaction) transaction = await queryRunner.manager .findOneOrFail(DbTransaction, insertResult.generatedMaps[0].id) From cb799ea925864d1c852db6a685b007c1a618fd5f Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Oct 2021 06:50:16 +0200 Subject: [PATCH 1013/1843] Added mixin to the register community page. --- .../src/views/Pages/RegisterCommunity.vue | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/frontend/src/views/Pages/RegisterCommunity.vue b/frontend/src/views/Pages/RegisterCommunity.vue index 94137e09c..4b4dff84c 100644 --- a/frontend/src/views/Pages/RegisterCommunity.vue +++ b/frontend/src/views/Pages/RegisterCommunity.vue @@ -49,32 +49,15 @@
From 8a8cccd540852247b4be08ecc81b83e67427ff26 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Oct 2021 10:34:44 +0200 Subject: [PATCH 1014/1843] [WIP] Test that the mixin does the work. --- frontend/src/mixin/getCommunityInfo.js | 4 +- frontend/src/views/Pages/Login.spec.js | 61 ++++++++++++++------------ 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/frontend/src/mixin/getCommunityInfo.js b/frontend/src/mixin/getCommunityInfo.js index b3feb1267..8c45513dc 100644 --- a/frontend/src/mixin/getCommunityInfo.js +++ b/frontend/src/mixin/getCommunityInfo.js @@ -1,16 +1,18 @@ import { communityInfo } from '../graphql/queries' export const getCommunityInfo = { - created() { + beforeCreate() { if (!this.$store.state.community) { this.$apollo .query({ query: communityInfo, }) .then((result) => { + // console.log('Got a community info: ', result.data.getCommunityInfo) this.$store.commit('community', result.data.getCommunityInfo) }) .catch((error) => { + // console.log('Got a error: ', error.message) this.$toasted.error(error.message) }) } diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index 13d12df85..83558d076 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -1,8 +1,10 @@ -import { mount, RouterLinkStub } from '@vue/test-utils' +import { RouterLinkStub, mount } from '@vue/test-utils' import flushPromises from 'flush-promises' import Login from './Login' +import { getCommunityInfo } from '../../mixin/getCommunityInfo' const localVue = global.localVue +localVue.mixin(getCommunityInfo) const apolloQueryMock = jest.fn().mockResolvedValue({ data: { @@ -17,7 +19,11 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const toastErrorMock = jest.fn() const mockStoreDispach = jest.fn() -const mockStoreCommit = jest.fn() +const mockStoreCommit = jest.fn((target, community) => { + // console.log('mockStoreCommit', global.$store.state.community) + global.$store.state[target] = community + // console.log('mockStoreCommit', global.$store.state.community) +}) const mockRouterPush = jest.fn() const spinnerHideMock = jest.fn() const spinnerMock = jest.fn(() => { @@ -26,6 +32,21 @@ const spinnerMock = jest.fn(() => { } }) +global.$store = { + dispatch: mockStoreDispach, + commit: mockStoreCommit, + state: { + community: null, + publisherId: 12345, + }, +} +global.$toasted = { + error: toastErrorMock, +} +global.$apollo = { + query: apolloQueryMock, +} + describe('Login', () => { let wrapper @@ -34,31 +55,15 @@ describe('Login', () => { locale: 'en', }, $t: jest.fn((t) => t), - $store: { - dispatch: mockStoreDispach, - commit: mockStoreCommit, - state: { - community: { - name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', - description: 'Die lokale Entwicklungsumgebung von Gradido.', - }, - publisherId: 12345, - }, - }, + $store: global.$store, $loading: { show: spinnerMock, }, $router: { push: mockRouterPush, }, - $toasted: { - error: toastErrorMock, - }, - $apollo: { - query: apolloQueryMock, - }, + $toasted: global.$toasted, + $apollo: global.$apollo, } const stubs = { @@ -74,10 +79,6 @@ describe('Login', () => { wrapper = Wrapper() }) - it('renders the Login form', () => { - expect(wrapper.find('div.login-form').exists()).toBeTruthy() - }) - it('commits the community info to the store', () => { expect(mockStoreCommit).toBeCalledWith('community', { name: 'test12', @@ -87,6 +88,10 @@ describe('Login', () => { }) }) + it('renders the Login form', () => { + expect(wrapper.find('div.login-form').exists()).toBeTruthy() + }) + describe('communities gives back error', () => { beforeEach(() => { apolloQueryMock.mockRejectedValue({ @@ -108,13 +113,11 @@ describe('Login', () => { describe('Community Data', () => { it('has a Community name', () => { - expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung') + expect(wrapper.find('.test-communitydata b').text()).toBe('test12') }) it('has a Community description', () => { - expect(wrapper.find('.test-communitydata p').text()).toBe( - 'Die lokale Entwicklungsumgebung von Gradido.', - ) + expect(wrapper.find('.test-communitydata p').text()).toBe('test community 12') }) }) From b15b509e5e0adf3cd89350742744109953532190 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 28 Oct 2021 10:55:46 +0200 Subject: [PATCH 1015/1843] try to test App --- admin/src/App.spec.js | 67 +++++++++++++++++++++++++++++++++++++++++ admin/src/App.vue | 27 +++++++++-------- admin/test/testSetup.js | 3 ++ 3 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 admin/src/App.spec.js diff --git a/admin/src/App.spec.js b/admin/src/App.spec.js new file mode 100644 index 000000000..048493a4d --- /dev/null +++ b/admin/src/App.spec.js @@ -0,0 +1,67 @@ +import { mount } from '@vue/test-utils' +import App from './App' + +const localVue = global.localVue + +const storeCommitMock = jest.fn() + +const mocks = { + $store: { + commit: storeCommitMock, + }, +} + +const storageMock = () => { + let storage = {} + + return { + setItem: function(key, value) { + console.log('SET CALLED') + storage[key] = value || '' + }, + getItem: function(key) { + console.log('GET CALLED') + return key in storage ? storage[key] : null + } + } +} + +// window.localStorage = storageMock() + +describe('App', () => { + let wrapper + + const Wrapper = () => { + return mount(App, { localVue, mocks }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('has a div with id "app"', () => { + expect(wrapper.find('div#app').exists()).toBeTruthy() + }) + }) + + describe('window localStorage is undefined', () => { + it('does not commit a token to the store', () => { + expect(storeCommitMock).not.toBeCalled() + }) + }) + + describe('with token in local storage', () => { + beforeEach(() => { + console.log('Test', window.localStorage) + window.localStorage = { 'foo': 'bar' } + console.log('Test', window.localStorage) + //window.localStorage.setItem('vuex', { token: 1234 }) + }) + + it('commits the token to the store', () => { + expect(storeCommitMock).toBeCalledWith('token', 1234) + }) + }) +}) + diff --git a/admin/src/App.vue b/admin/src/App.vue index 8db46b135..4e7248f1b 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -3,17 +3,18 @@ diff --git a/admin/test/testSetup.js b/admin/test/testSetup.js index 118c0b1ce..3b6b50218 100644 --- a/admin/test/testSetup.js +++ b/admin/test/testSetup.js @@ -2,6 +2,9 @@ import { createLocalVue } from '@vue/test-utils' import Vue from 'vue' import { BootstrapVue } from 'bootstrap-vue' +// without this async calls are not working +import 'regenerator-runtime' + global.localVue = createLocalVue() global.localVue.use(BootstrapVue) From 2ac675287c8cee8d99b2bbd96fea29bfba1a269b Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 28 Oct 2021 11:32:59 +0200 Subject: [PATCH 1016/1843] get tests working, define default community in store with empty name and description --- frontend/src/mixin/getCommunityInfo.js | 36 +++++++++------- frontend/src/store/store.js | 5 ++- frontend/src/views/Pages/Login.spec.js | 60 ++++++++++++++------------ frontend/src/views/Pages/Login.vue | 4 +- 4 files changed, 59 insertions(+), 46 deletions(-) diff --git a/frontend/src/mixin/getCommunityInfo.js b/frontend/src/mixin/getCommunityInfo.js index 8c45513dc..f8fda6e45 100644 --- a/frontend/src/mixin/getCommunityInfo.js +++ b/frontend/src/mixin/getCommunityInfo.js @@ -1,20 +1,24 @@ import { communityInfo } from '../graphql/queries' -export const getCommunityInfo = { - beforeCreate() { - if (!this.$store.state.community) { - this.$apollo - .query({ - query: communityInfo, - }) - .then((result) => { - // console.log('Got a community info: ', result.data.getCommunityInfo) - this.$store.commit('community', result.data.getCommunityInfo) - }) - .catch((error) => { - // console.log('Got a error: ', error.message) - this.$toasted.error(error.message) - }) - } +export const getCommunityInfoMixin = { + methods: { + getCommunityInfo() { + if (this.$store.state.community.name === '') { + this.$apollo + .query({ + query: communityInfo, + }) + .then((result) => { + this.$store.commit('community', result.data.getCommunityInfo) + return result.data.getCommunityInfo + }) + .catch((error) => { + this.$toasted.error(error.message) + }) + } + }, + }, + created() { + this.getCommunityInfo() }, } diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 9f87f0398..6a229c161 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -89,7 +89,10 @@ export const store = new Vuex.Store({ token: null, coinanimation: true, newsletterState: null, - community: null, + community: { + name: '', + description: '', + }, hasElopage: false, publisherId: null, }, diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index 83558d076..60abf8821 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -1,10 +1,10 @@ import { RouterLinkStub, mount } from '@vue/test-utils' import flushPromises from 'flush-promises' import Login from './Login' -import { getCommunityInfo } from '../../mixin/getCommunityInfo' +import { getCommunityInfoMixin } from '../../mixin/getCommunityInfo' const localVue = global.localVue -localVue.mixin(getCommunityInfo) +localVue.mixin(getCommunityInfoMixin) const apolloQueryMock = jest.fn().mockResolvedValue({ data: { @@ -19,11 +19,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const toastErrorMock = jest.fn() const mockStoreDispach = jest.fn() -const mockStoreCommit = jest.fn((target, community) => { - // console.log('mockStoreCommit', global.$store.state.community) - global.$store.state[target] = community - // console.log('mockStoreCommit', global.$store.state.community) -}) +const mockStoreCommit = jest.fn() const mockRouterPush = jest.fn() const spinnerHideMock = jest.fn() const spinnerMock = jest.fn(() => { @@ -32,21 +28,6 @@ const spinnerMock = jest.fn(() => { } }) -global.$store = { - dispatch: mockStoreDispach, - commit: mockStoreCommit, - state: { - community: null, - publisherId: 12345, - }, -} -global.$toasted = { - error: toastErrorMock, -} -global.$apollo = { - query: apolloQueryMock, -} - describe('Login', () => { let wrapper @@ -55,15 +36,29 @@ describe('Login', () => { locale: 'en', }, $t: jest.fn((t) => t), - $store: global.$store, + $store: { + dispatch: mockStoreDispach, + commit: mockStoreCommit, + state: { + community: { + name: '', + description: '', + }, + publisherId: 12345, + }, + }, $loading: { show: spinnerMock, }, $router: { push: mockRouterPush, }, - $toasted: global.$toasted, - $apollo: global.$apollo, + $toasted: { + error: toastErrorMock, + }, + $apollo: { + query: apolloQueryMock, + }, } const stubs = { @@ -112,12 +107,23 @@ describe('Login', () => { }) describe('Community Data', () => { + beforeEach(() => { + mocks.$store.state.community = { + name: 'Gradido Entwicklung', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + } + }) + it('has a Community name', () => { - expect(wrapper.find('.test-communitydata b').text()).toBe('test12') + expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung') }) it('has a Community description', () => { - expect(wrapper.find('.test-communitydata p').text()).toBe('test community 12') + expect(wrapper.find('.test-communitydata p').text()).toBe( + 'Die lokale Entwicklungsumgebung von Gradido.', + ) }) }) diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 9b50c9d71..0bb904983 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -63,7 +63,7 @@ import InputPassword from '../../components/Inputs/InputPassword' import InputEmail from '../../components/Inputs/InputEmail' import { login } from '../../graphql/queries' -import { getCommunityInfo } from '../../mixin/getCommunityInfo' +import { getCommunityInfoMixin } from '../../mixin/getCommunityInfo' export default { name: 'login', @@ -71,7 +71,7 @@ export default { InputPassword, InputEmail, }, - mixins: [getCommunityInfo], + mixins: [getCommunityInfoMixin], data() { return { form: { From 36374b968f71c073979e0dfc41202afa2a460e72 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 28 Oct 2021 11:39:07 +0200 Subject: [PATCH 1017/1843] apply get community info mixin in all Register Components --- frontend/src/views/Pages/Register.vue | 4 ++-- frontend/src/views/Pages/RegisterCommunity.vue | 8 ++------ frontend/src/views/Pages/RegisterSelectCommunity.vue | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 29b1f7dfb..6655cfa7d 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -161,12 +161,12 @@ import InputEmail from '../../components/Inputs/InputEmail.vue' import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue' import LanguageSwitchSelect from '../../components/LanguageSwitchSelect.vue' import { registerUser } from '../../graphql/mutations' -import { getCommunityInfo } from '../../mixin/getCommunityInfo' +import { getCommunityInfoMixin } from '../../mixin/getCommunityInfo' export default { components: { InputPasswordConfirmation, InputEmail, LanguageSwitchSelect }, name: 'register', - mixins: [getCommunityInfo], + mixins: [getCommunityInfoMixin], data() { return { form: { diff --git a/frontend/src/views/Pages/RegisterCommunity.vue b/frontend/src/views/Pages/RegisterCommunity.vue index 4b4dff84c..19a90ca5f 100644 --- a/frontend/src/views/Pages/RegisterCommunity.vue +++ b/frontend/src/views/Pages/RegisterCommunity.vue @@ -49,15 +49,11 @@
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.vue b/frontend/src/views/Pages/RegisterSelectCommunity.vue index 0d3c25220..0a4b72462 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.vue +++ b/frontend/src/views/Pages/RegisterSelectCommunity.vue @@ -49,6 +49,7 @@ From fb7f805b4c269e58f10cc0ab078adab0bd692764 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Thu, 28 Oct 2021 14:01:01 +0200 Subject: [PATCH 1020/1843] Adminarea old eine auflistung aller funktionen des alten adminbereiches --- docu/presentation/adminarea-old-new.pdf | Bin 0 -> 476628 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docu/presentation/adminarea-old-new.pdf diff --git a/docu/presentation/adminarea-old-new.pdf b/docu/presentation/adminarea-old-new.pdf new file mode 100644 index 0000000000000000000000000000000000000000..3fda700eca9278a6b6f4a797b5fbba1b409a3659 GIT binary patch literal 476628 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 BEugt zjT1l{=yrz4;zlet55Pc0by&lG!z5t# z`78RD5E}CQFR+q(u@=#JRuF)S6!%IR_xQLfZpnt>bda^RLtOAHeeVyR-dNDC6h?y= zFbrcS@G$|H0t+g9#LD~ep8Q|R(GX@~Nl72@afUSq@@NrE^!~%gk1G+m)!w}1)?}Nz z+&hHv?eFb%Cgq@4vYe`)F@kue5pLu*Ha0jHjPg95Jb!+t%fO52Vl4B+gJ(xyr&qm; zRzm`^1r$H}bw6MWDzX8kDU;CH>l`OYraJHPYs?&=`+JnqRz?7~62I0Tx}stYMB!im zud@%fz+!x)GsK&Scnt$!nJx|BPN*cx1vvk>y)B4D-3c<>z)v?o^7(_`acdQUh*uHa z{ZBzUJCi#2;URKgWb~YZkmc+|vk&-6aW$Na)Fc)Uw9gs015VcP_^5sfiJ@ z&Ua9CA;4b{jvzMPJ$dF4#{NgPVvladVdzSEmY$HSm!&^k6AE<~f!JW?XLnMrq|MCngU+vegFvh_AdK#)D%B4Q(t z-3Hn7h%f10YTSw~Lbs8<+epdR!;FU%q6)CVhuBy1@4Tf6iBjq!kq51NDT)dhTd0m; z9;^2h=4PwyykoIGSku^;b@{;#cvwX=Op>lW-M(}8UV&IqJAK$;OV)|#s=l6{O25_i zffpbwGb#8LQgoPw&zv~}=P#TwCy!ls?)3P$678NtC*Q>v^s*hNW0P*3aN7##L}FuC zM?;I;W}JFH@Ez~oJr^y_auv>Ruz{Z&nO$FXwJPbbM52^~e6~P0P0!6wyF!SL9U46f zn)=vLe@kmxS);!@V4c;BiHZl!h;A{~tvW%(W**L+LzSUhfwtCq`q5MRoFXioBxso~ zR03)*bs*22V=z|Ek3lgO68nyMKtHnw%ak3X+-hP*KMm&+46yq|VUrpi8y#hGA;}^i zLJrc@(V>%vZH(ee1f`{e&yf?wmP9cFgYMV|SBi9)jssj_PODBZBZW3D26-?B+(3(%XrRI?xW|rNVGd0{`@9laLtBuOOS24YxiK%mn(a! z?{Mf;Xwjf<{m@JRDn@y>04t)8hh}>G>(g*x!{}OyaTf-e4q#YbgSt|%)1nWc*^96` z)?S!G9a`M6uN{hlMWZdJzdRcABd=Oq1};tp>$&xH%?pMlNj^E{jOPt1{D;$C0>1%H z7B4i?I~YMr4f|-V+@pOSPEI7q*lv(yf$HnNsVTRCYiSAVfL7X$|PnM1<5g^d_$0jpf#y;UzIQoO%v0M8d*gIry}`~|c7D=8`Ey_B$yC#yTTnwGmgWqkoi zzeC3_-sdZnKM%NH2g*f}6gN0a($R&1 zP?irkk6#{#+8E&hd=bhjwFH%+LaQbhclUV7&W+F2+suhjxU>HD<_ehlPH#Bh?6cTf zzGf93tf}n6RtNZiCdp*=5|F!;4|j6$AL{M%j+>i3fg@;jNc3|xtC<1s&zJ7hYw$Sk z-mMi0grAItB96X>Yo$SILU)lop8zHa`^fuvjW`hi`Z}oHWf7l;Oj5U2D_L>6Kj5Rh zce^Drs3d6~N(Jr!kS;oQ`azlLjZt`B8v(!it}qv>n}ERtT{du)tUtc{ggf+e7qH4t zN&n2bHsMk{DRx}g@iqVid^)!EDxDmJ>XXacpA#MF7e4*04hdo8je?Pf1DgXL8=n&= z<6AOktP*)%Ar>&lq2e3BbPhMzs#W#(S3qqgXg^~Es3-{o0Pg{~^FHH5fIvcBzzMth zxCG8vM#sN5WRu{{Sy@?8lDa53gyyR&D=Wjl8&icXF(Nkd0`&CsC<7)wqpdRp)V?c3ewqb!g%-8I31O_uK&{!T7>6S1A* zk9C`9uTsB4eDAk?oBnHOV#wt?8+kR9huNCIr`MNlYEl6cokS^5$5fZbhv)iDCiBPL*S%4`* z<$Vi73w-NIfiO0ip>l`oprhZqEJd^w@!#tENU=Kf4|SvK?%ujKn^eI<9;no?{NBO? zd6|{q&!0cV9Qyz=FPcM}Bn^*<5}K^8rY3Uy!1+jSQ|Ztr877#npQ(+Z;?>+|7gsGl zvhUn&>5pnxWh%lhvrFGB>myFD1$U2t=->~5>2WpLwo|mPF)CRSMxxOk+(LCVzvm%v zNox2QqCm?V(R6u&tvicI8AR+YHW(I))5rLCi`e!Rz+G^mz60PuDv)EjM(!-|P>;ja zVYHUk6b2q6sF3HFqRmkwV<}-L#Nkqn;6LE7*aP+32{*|lmmfb<;f`5kb#Vb;IN3(S zqCQi*q=Holy!vx-vcl&l_3-{X8+#<+(%G|rDPCTsZw<)pLD5^>%o1m-Mu^J?K*nCM zbtN9i)zs~z$$)^-_gO9lL)3Tu}aT(K4|6F_d+)BsU34 zAN|Rr@=ns;lWH*e=ZrI(;i3}Qyd}2%ST~8_G(IB)AmY79op#+kCm`IV*iV@L-2Y#2 z-zn>eO0Q31`Dtm={g*sbr0uA>0SjFYpIHv>z6yBH^p-gF#+JmYj$6iSsz+a)*KQ5I{_G7NUm6#0<#7CTQ?5-p13z5r00Nt5I9A6 z0VmdTI`t?+pXKRgxN0aFqA=aWx`=khYqv{SSlDT%?~lJIkNVmrE-3h_`9#CB*BiQ3 z`O(Wp!#eW!jgrm2aJi*SirSuce9Ntwcxc6S@ANAnn}KZ3NJP&y;)L3}$2r=`VvMgd zuLie613=`b_u8F68K#A+I~@sGm)Nd!u*n0HiNMrrm$6>N_Uo?@=)iLbri%EX+;c2hZQ`e*CT^(y9mf1;J#xpd-0?F`Cb z>lEvRkpDR&-dDMBXLu~tak8IIj+(7UEIohzye@~5jqOIWX~l?0YSG9DLvPl!?{ut~ zT`qPWOEWT+(qxHWTuff2p?R=#_mKA3OiIeeq_M^1noc6tb8zkB^S6cC9YwsH({h%R zZqed34}(G+G08J|N0LXzlap&F1dDTubRFxCA#6*$8})6(ZA4aWSD!`NqBTs*Rfg;0 zIYODLkiikN@*P$M6(ZEvsf~A3-7U_Ih`p?dc98U=1VxM%FdH0B!QNy!yVZDBb$L>C zGKAVWDSPnN{uC_M@Y<5z#rG1nGbXof7S7DTu zq51jw8Uc~%wuS2$E_8{XslYYMgfG|ituj@Ii@x3a^jTqYc;(GgPaFop7abYND&=4K z?wwG`OPb**ZTncyA#r_Uxo5VMaKVNOtJREq8P@JNIV?Wt`{4|$`w5hWgB+!gBzdY! z@nrjTKl%z@Xl2Q{-Z43qR2v!{1X4}H&AEQhaYVhtZ1dW5X94pOhr(W5ZCX&+a_PJc0KhwG~#|MRG_JdN0e0d5t_Zo*c;G(!Sd|?rfnI zUp3RUvdRU|;(b}0%X-W*R9%=@%5_l@1HLQ<-RfA6FqBjG41Q2+nTma|v&*UHE-zna zsj~`_V>eydbhGc`3T{S;HFkZB5yM3}XR_Avb__gLaJ6u1thb;e`F1;)x1ZDCQJuM6sCUC9O&97WMh zy5+nE*9F#dN=O)ZvMl-=9xSTelp0vTH(MDt+e7$9{ zgg8a!Br9y%x+m_wNTZFwUpPZ9j`%w0YZkCD-9J+~)~I26^r)v4GAl_*hWTK~@qzKV z^hKwNZ}FT<(&ZlwF*);I~T> z(nLNsi}Y?#A!}JC*is+C=dU*pnCw^{sn34)Y`;X2&ZON1{mEI~;bSIZ#VSbh31^aT z-g^}UaR8Yp8~9*QPXEdjCwgeH@CA1jB*tcYB!xNHwG^UC#k8z$qt9g4?xWp;xEl&h!LP%ok0r%? zCS+G(cJ3fBJh$5&^hjCDwoE5F7maCC+?)&*Bh@i)Bp0pUfAC3z#?}H^wfW;k`Eu2w z3T+MLjM?bF8hFeBr2$MjyiF1Mb-%e7uz6KLrW~z5Sz$h$=E3fN zAywIz`T8lu`#8RH+HxhQ%yJr7`IpN&x40d-yOls9*;ZvVn7&=@0j^s-L?k)aJ92)tpH$M= z)TFA?x2YKGDZ80j=qDW?zED4gXdtwz9%5!VQ!7+*)z&tKZIt`$3>G5L$b}Rc%hS%w zY{gWvIG#Ec@`A#@HM{J7#)CM6#8)?C7IS^sTLrpSy^#wGqz`Md!@e5@nu)oRn82Tr zOz0D1S7%rcXQUx+VsEFOw5x44r5LCq{EIiPM-JCx)R2TO+rI2o8S>=v{_*tMQ3J_p z&eZwnOhVboByT2$$U04e{+46g2j;)V0?fB_JUnm)F82wHT^5$E?3*VW7*%?#)V+cj zF=V?oREpoc*B`%pmOH%;J27#cRKC2Ov6P9CQHHu$h~I2goi4T*=#?f!ZfdC_J=l$RBjtPIWl`TgD})e-5CMJ9Zx(mQFXPtA z`%A%Ogb!Z4ylXAIeAN&NS!H4bJ*f}Zh;q`BK5>mPUWwkhCaIXSj+2W$u;mSNt5K3H zqIZW$&kfSap?v$taN^QJDxniimps&B4El6z`8#_GJ@N1m@QH4sJnuUn9e)1YVi}i( z&tDL4FG1M^@1Z;4L1cCBJiz8Mvo)Bi-7~h0Emc!z+4W>k9v4wEf)Y{u_4W<|GkHC~ zR6n@aHT6|iB&8wMX+z)G=B7lE39UpC^F@2{6zpeBBt;gsUK-kC%4@0*)MG_AXNOx% zhK}1d;9utLEvu*rO*}=@jL1`pZ=_X^#Xy|sHG3g?>sH>}L8Mt4)`iJsurr0p;2_xC z^w9|@a6VtD&eEKI`#$5^%)Q~bA!w_Yz5185$oIrBax%7P^J5ktqAGc2qea}?yLX!;S3Gd`4sjba* z>ZqvO%Db0&u)SxYJvh%|7yQ>?_%B3yFI7h?hMveec3jY_4x-e#ij3~W_=e`0dG%#j zdF8`1Yj+w2EozCzlsHNs>##jh+;0)PhgsnMx(W6$i?N| zl7q)TkMMLPc;`N4=z&avVtTqRereSpKDC&T6^(E>QEFdCjig(kn5owh!V?XfnHUK1 zeAg;tA}Wk#9L_-9V)j@HHU&G5$eHQbmUelP7@LCKHk9Yx*ad$+WhOZB_3I_b^Lkms zx$Os;@aawghVUg@cN*Rk?80-f-x--gP6RLXZ|e^d-r3g{wPCPqyJy?DA&4gU5@pT? zU|WlNVQY!*v@e3+1h0EESN=Tx%9FG=OrM2>Xj)pcAi6wOFK=aC+qP}x(Z7Gtt*>vp zweNqv@tN`N%S!%~ZsuCBCS>b`bCNg}Sla2Q=@cHPSMo_}g`K*`CJ-3+0x2 zQrX7GwQ_=7U1c2T*#qWO4>P)>M75r?SXT`nT4Sf)LhIDB(GUB?R;?=(7A-!E43kcZ zual^v#!fUn_5G4l+GpLebX7v}`LSjMx$>Gue0!$b&qpC>t8aO7Op*z{4%v zVOE;Ep&3v>>Ptl~-m@c&^pMIMv5xWm2cPFe#5*Jk5zYjQy^ctkUTZ|yQkP2m9;DR1 z4HkJduqyiPbI{Trw!C9ZKE?Sa(FSI1eJLM$$h)6D9Wz#Y8=anm&S<5Ih0Ct3;rkPP zn-ik+%Pt{IyXM~Ao9NdrYu&u+L`Yg+4zR1$#)~=HCrWhmJAo$P z~1gVHuXe_9_h+0M)>9+7pxp4_?tmM zZzt!~T5T1u8nThNS$PVh3|d^b@J$_jNWzEcl_-k7Zck(5pg%7n{?dB~i)Dn2z!5qW zdfn800VM^Q<4ITp&jGR4iws{YZT`>smnJq)!9h>CTv7)O${NMa%pzSi}k*9F!o&-<*%Vw zS=qj|jh9@KA{7NJzLJrva>3Yh*iko})MZp$O7s1mKQF3UFWC4IJiR<Js*6tsP2zxTxgkAk4->; z_mPoHYC4vaa|vD5Wpwq>;>xg**+?0Ij=iL6_F>f7M(_H4nK#=fz6uaDUN-iXqPv&_ zsD&6U4n7T>z>Q9!FxC!@JF~a=68Z`hjECocP9AGUB^2c2uI1LLi`$65Hq(rsckx}G z>3geUqorj;&u6H;8reuYmiux1u7fJi7%F{gZQ0IFcanwPqH2uIp~xegYm8JXXffr9 z&xwENC+ZB>tj@zz2U+^6C@Q>Hu#~y$4uofneGmNSXmfmAC>o_vubN_up?PA2&{%Aq z<#Ggy{eGLB#x_mNYX`;e+PtUuekA0~JQ5`9)zwc%dU|VRnn^{gPZp4^zO^!^Bjlzd zHdksFSihRqo)A^x)w#}W66#GIq0dpq`)XD!I8{vhNyda*IJLPL*xm zA_cgwR#_%uqviWoRfhwp*F#VO6g~)|E8767BS108S`)d?^O8cba?n6pf6GI-h9W=h za9HgTbU1al^T{b;oi)p$NZw+?ikCx~?PPz-Qy?!CPh}P9vhenl6_ymFT;sjB=Hal4 zp+#n4Y<(_|;Evc_>i@GXbbU^*IC|WY22qBlV zjheaAt(IrzPrO2+E1LZ&MImVF{4u_tYlEbshJMz4 zLx@dV1cu@_*`FRJ=6Hh;&Y^f$*+A=6$<$0HX7M!>vw`m2iUDLPlZc+ooN5`pBc_x3 zJ+LoNPvUDZyMD9#_guBIhc0JKEA$UBxqCW?9&5hY!kw6X;B@LY0c@*chNPfxiT*p2 z9VoTs86#YY{o9hE!5~+|?=_)In`>1KhSak6Y5C2pWpY>ThH1^cBA^uqR+ZP`W7pH*L)P72jDWUvfTyas0Le-Y=l>N6PDVu;I z;i(?ftXM}E!NYD8H-}qqn&~w!rDLs|@6u#`a{oNpY4qr>=elCaR8RgejaEuU==6(h zO@gpT?WLN>2TgT{u1*@eBRoaLlY~-7MjFE8)^EI}G`~%*PLRa-*l;LK%cbAjb4WKg zV2stlE04bBX11Bk+U$==qN-}~xLT-6P7EazbzC>jvg%?C5vR<;pS7^q5n1@&$92`s zW4c}JNvQiqj!BS1{}kBek_L^}F4;vzRb z<6Geo*+_Yc_!)nXn6vccNrPqC+fDpt$K*t=ntLZMqQqnQShwk9e_AM0g+tGGkAjdE zIXU(yD{H%;3|#ltQ}NCo?g|M71Ltii`g*RIJrm2ZZoGQdK@n*}iW8AFI=&OB4V!JV zLS%>5cS4?eO1=%n`UCFKVs!Thk(0z3eetBD&G=2Tto!z}M1)|PQvy>R%$8{~A=Dk|wC7OeN-50r z_np5brNz=@QR+IiC7|4k57+v> MKboWObWd@IC^jc`@oB0XB`RcAt0owGGyHzJQ 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Ⓢ4rrkeR7O#t3PmIq{Q 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�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Ĩ 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 KOiV>v74bg-@Hf5y literal 0 HcmV?d00001 From 37c90ae6a59be767aaea4f4d65465c5c588cd424 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 12:54:11 +0200 Subject: [PATCH 1021/1843] Test that the community store commit is not send if community.name is not '' --- frontend/src/views/Pages/Login.spec.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index 2ffe408ad..daf32d978 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -106,12 +106,14 @@ describe('Login', () => { describe('Community Data', () => { beforeEach(() => { + jest.clearAllMocks() mocks.$store.state.community = { name: 'Gradido Entwicklung', url: 'http://localhost/vue/', registerUrl: 'http://localhost/vue/register', description: 'Die lokale Entwicklungsumgebung von Gradido.', } + wrapper = Wrapper() }) it('has a Community name', () => { @@ -123,6 +125,10 @@ describe('Login', () => { 'Die lokale Entwicklungsumgebung von Gradido.', ) }) + + it('does not update community', () => { + expect(mockStoreCommit).not.toBeCalled() + }) }) describe('links', () => { From b293abcb56259c9159d692c54b6a362c30200578 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 12:59:23 +0200 Subject: [PATCH 1022/1843] Change the description of the test. --- frontend/src/views/Pages/Login.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index daf32d978..c70403353 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -126,7 +126,7 @@ describe('Login', () => { ) }) - it('does not update community', () => { + it('does not update community data', () => { expect(mockStoreCommit).not.toBeCalled() }) }) From f53ec663604338ae95f5dcfbd742c26eef18e1db Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 13:00:18 +0200 Subject: [PATCH 1023/1843] Test that the community is working properly in register. --- frontend/src/views/Pages/Register.spec.js | 69 +++++++++++++++++++++-- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 903c5f42d..40cb9097d 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -5,6 +5,19 @@ import Register from './Register' const localVue = global.localVue +const apolloQueryMock = jest.fn().mockResolvedValue({ + data: { + getCommunityInfo: { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', + }, + }, +}) + +const toastErrorMock = jest.fn() +const mockStoreCommit = jest.fn() const registerUserMutationMock = jest.fn() const routerPushMock = jest.fn() @@ -21,20 +34,23 @@ describe('Register', () => { }, $apollo: { mutate: registerUserMutationMock, + query: apolloQueryMock, }, $store: { + commit: mockStoreCommit, state: { email: 'peter@lustig.de', language: 'en', community: { - name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', - description: 'Die lokale Entwicklungsumgebung von Gradido.', + name: '', + description: '', }, publisherId: 12345, }, }, + $toasted: { + error: toastErrorMock, + }, } const stubs = { @@ -50,6 +66,15 @@ describe('Register', () => { wrapper = Wrapper() }) + it('commits the community info to the store', () => { + expect(mockStoreCommit).toBeCalledWith('community', { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', + }) + }) + it('renders the Register form', () => { expect(wrapper.find('div#registerform').exists()).toBeTruthy() }) @@ -60,16 +85,48 @@ describe('Register', () => { }) }) + describe('communities gives back error', () => { + beforeEach(() => { + apolloQueryMock.mockRejectedValue({ + message: 'Failed to get communities', + }) + wrapper = Wrapper() + }) + + it('toasts an error message', () => { + expect(toastErrorMock).toBeCalledWith('Failed to get communities') + }) + }) + describe('Community Data', () => { - it('has a Community name?', () => { + beforeEach(() => { + jest.clearAllMocks() + mocks.$store.state.community = { + name: 'Gradido Entwicklung', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + } + wrapper = Wrapper() + }) + + it('has a Community name', () => { expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung') }) - it('has a Community description?', () => { + it('has a Community description', () => { expect(wrapper.find('.test-communitydata p').text()).toBe( 'Die lokale Entwicklungsumgebung von Gradido.', ) }) + + it('does not update community data', () => { + expect(mockStoreCommit).not.toBeCalled() + }) + + it('does not update community data', () => { + expect(mockStoreCommit).not.toBeCalled() + }) }) describe('links', () => { From fb3daf6e4c60a4e328323d1c8cfb6e75c1e98689 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 14:04:45 +0200 Subject: [PATCH 1024/1843] Change test not called commit and error toast to not call apollo query. --- frontend/src/views/Pages/Login.spec.js | 4 ++-- frontend/src/views/Pages/Register.spec.js | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index c70403353..11a4199f7 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -126,8 +126,8 @@ describe('Login', () => { ) }) - it('does not update community data', () => { - expect(mockStoreCommit).not.toBeCalled() + it('does not call community data update', () => { + expect(apolloQueryMock).not.toBeCalled() }) }) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 40cb9097d..67ebd131e 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -120,12 +120,8 @@ describe('Register', () => { ) }) - it('does not update community data', () => { - expect(mockStoreCommit).not.toBeCalled() - }) - - it('does not update community data', () => { - expect(mockStoreCommit).not.toBeCalled() + it('does not call community data update', () => { + expect(apolloQueryMock).not.toBeCalled() }) }) From c70038ec8f6f1951edd26929307db9e6e4718ac1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 14:05:19 +0200 Subject: [PATCH 1025/1843] Test that the community calls are working properly. --- .../src/views/Pages/RegisterCommunity.spec.js | 73 ++++++++++++++++--- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/views/Pages/RegisterCommunity.spec.js index 102db5891..09f1fd4e9 100644 --- a/frontend/src/views/Pages/RegisterCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterCommunity.spec.js @@ -3,6 +3,19 @@ import RegisterCommunity from './RegisterCommunity' const localVue = global.localVue +const apolloQueryMock = jest.fn().mockResolvedValue({ + data: { + getCommunityInfo: { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', + }, + }, +}) +const toastErrorMock = jest.fn() +const mockStoreCommit = jest.fn() + describe('RegisterCommunity', () => { let wrapper @@ -11,16 +24,21 @@ describe('RegisterCommunity', () => { locale: 'en', }, $t: jest.fn((t) => t), + $apollo: { + query: apolloQueryMock, + }, $store: { + commit: mockStoreCommit, state: { community: { - name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', - description: 'Die lokale Entwicklungsumgebung von Gradido.', + name: '', + description: '', }, }, }, + $toasted: { + error: toastErrorMock, + }, } const stubs = { @@ -36,23 +54,56 @@ describe('RegisterCommunity', () => { wrapper = Wrapper() }) + it('commits the community info to the store', () => { + expect(mockStoreCommit).toBeCalledWith('community', { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', + }) + }) + it('renders the Div Element "#register-community"', () => { expect(wrapper.find('div#register-community').exists()).toBeTruthy() }) - describe('Displaying the current community info', () => { - it('has a current community name', () => { - expect(wrapper.find('.header h1').text()).toBe('Gradido Entwicklung') + describe('communities gives back error', () => { + beforeEach(() => { + apolloQueryMock.mockRejectedValue({ + message: 'Failed to get communities', + }) + wrapper = Wrapper() }) - it('has a current community description', () => { - expect(wrapper.find('.header p').text()).toBe( + it('toasts an error message', () => { + expect(toastErrorMock).toBeCalledWith('Failed to get communities') + }) + }) + + describe('Community Data', () => { + beforeEach(() => { + jest.clearAllMocks() + mocks.$store.state.community = { + name: 'Gradido Entwicklung', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + } + wrapper = Wrapper() + }) + + it('has a Community name', () => { + expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung') + }) + + it('has a Community description', () => { + expect(wrapper.find('.test-communitydata p').text()).toBe( 'Die lokale Entwicklungsumgebung von Gradido.', ) }) - it('has a current community location', () => { - expect(wrapper.find('.header p.community-location').text()).toBe('http://localhost/vue/') + it('does not call community data update', () => { + expect(apolloQueryMock).not.toBeCalled() }) }) From bb122f25b953b57b26f3ec672154c9b812d854fb Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 14:09:32 +0200 Subject: [PATCH 1026/1843] Test that the community calls work properly. --- frontend/src/views/Pages/RegisterCommunity.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/views/Pages/RegisterCommunity.spec.js index 09f1fd4e9..18627821b 100644 --- a/frontend/src/views/Pages/RegisterCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterCommunity.spec.js @@ -93,11 +93,11 @@ describe('RegisterCommunity', () => { }) it('has a Community name', () => { - expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung') + expect(wrapper.find('.justify-content-center h1').text()).toBe('Gradido Entwicklung') }) it('has a Community description', () => { - expect(wrapper.find('.test-communitydata p').text()).toBe( + expect(wrapper.find('.justify-content-center p').text()).toBe( 'Die lokale Entwicklungsumgebung von Gradido.', ) }) From 3e1acb0d158f444f3fb99bfb63d8621aa2d5cd48 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 29 Oct 2021 14:47:24 +0200 Subject: [PATCH 1027/1843] Change the register select community to test the community mixin. --- .../Pages/RegisterSelectCommunity.spec.js | 118 +++++++++++++----- .../views/Pages/RegisterSelectCommunity.vue | 4 +- 2 files changed, 90 insertions(+), 32 deletions(-) diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js index dbcd950b8..008f690a6 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js @@ -1,4 +1,5 @@ import { mount, RouterLinkStub } from '@vue/test-utils' +import flushPromises from 'flush-promises' import RegisterSelectCommunity from './RegisterSelectCommunity' const localVue = global.localVue @@ -11,35 +12,48 @@ const spinnerMock = jest.fn(() => { } }) -const apolloQueryMock = jest.fn().mockResolvedValue({ - data: { - communities: [ - { - id: 1, - name: 'Gradido Entwicklung', - description: 'Die lokale Entwicklungsumgebung von Gradido.', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register-community', +const apolloQueryMock = jest + .fn() + .mockResolvedValueOnce({ + data: { + getCommunityInfo: { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', }, - { - id: 2, - name: 'Gradido Staging', - description: 'Der Testserver der Gradido-Akademie.', - url: 'https://stage1.gradido.net/vue/', - registerUrl: 'https://stage1.gradido.net/vue/register-community', - }, - { - id: 3, - name: 'Gradido-Akademie', - description: 'Freies Institut für Wirtschaftsbionik.', - url: 'https://gradido.net', - registerUrl: 'https://gdd1.gradido.com/vue/register-community', - }, - ], - }, -}) + }, + }) + .mockResolvedValue({ + data: { + communities: [ + { + id: 1, + name: 'Gradido Entwicklung', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register-community', + }, + { + id: 2, + name: 'Gradido Staging', + description: 'Der Testserver der Gradido-Akademie.', + url: 'https://stage1.gradido.net/vue/', + registerUrl: 'https://stage1.gradido.net/vue/register-community', + }, + { + id: 3, + name: 'Gradido-Akademie', + description: 'Freies Institut für Wirtschaftsbionik.', + url: 'https://gradido.net', + registerUrl: 'https://gdd1.gradido.com/vue/register-community', + }, + ], + }, + }) const toasterMock = jest.fn() +const mockStoreCommit = jest.fn() describe('RegisterSelectCommunity', () => { let wrapper @@ -50,12 +64,11 @@ describe('RegisterSelectCommunity', () => { }, $t: jest.fn((t) => t), $store: { + commit: mockStoreCommit, state: { community: { - name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', - description: 'Die lokale Entwicklungsumgebung von Gradido.', + name: '', + description: '', }, }, }, @@ -83,6 +96,15 @@ describe('RegisterSelectCommunity', () => { wrapper = Wrapper() }) + it('commits the community info to the store', () => { + expect(mockStoreCommit).toBeCalledWith('community', { + name: 'test12', + description: 'test community 12', + url: 'http://test12.test12/', + registerUrl: 'http://test12.test12/vue/register', + }) + }) + it('renders the Div Element "#register-select-community"', () => { expect(wrapper.find('div#register-select-community').exists()).toBeTruthy() }) @@ -91,6 +113,42 @@ describe('RegisterSelectCommunity', () => { expect(spinnerMock).toBeCalled() }) + describe('communities gives back error', () => { + beforeEach(() => { + apolloQueryMock.mockRejectedValue({ + message: 'Failed to get communities', + }) + wrapper = Wrapper() + }) + + it('toasts an error message', () => { + expect(toasterMock).toBeCalledWith('Failed to get communities') + }) + }) + + describe('Community Data', () => { + beforeEach(() => { + jest.clearAllMocks() + mocks.$store.state.community = { + name: 'Gradido Entwicklung', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + } + wrapper = Wrapper() + }) + + it('has a Community name', () => { + expect(wrapper.find('.card-body b').text()).toBe('Gradido Entwicklung') + }) + + it('has a Community description', () => { + expect(wrapper.find('.card-body p').text()).toBe( + 'Die lokale Entwicklungsumgebung von Gradido.', + ) + }) + }) + describe('calls the apollo query', () => { describe('server returns data', () => { it('calls the API to get the data', () => { diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.vue b/frontend/src/views/Pages/RegisterSelectCommunity.vue index 10998d404..f6914f1f2 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.vue +++ b/frontend/src/views/Pages/RegisterSelectCommunity.vue @@ -7,7 +7,7 @@ {{ $store.state.community.name }}
- {{ $store.state.community.description }} +

{{ $store.state.community.description }}


@@ -24,7 +24,7 @@ {{ community.name }}
- {{ community.description }} +

{{ community.description }}


From e375d45e022f004f959ba89d53a9e643f9529b68 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 29 Oct 2021 22:37:46 +0200 Subject: [PATCH 1028/1843] updated readme: - accurate software requirements - arch linux install instructions - service description - troubleshooting --- README.md | 66 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index fe6f2e7f3..708bd6521 100644 --- a/README.md +++ b/README.md @@ -8,33 +8,73 @@ The Gradido model can create global prosperity and peace The Corona crisis has fundamentally changed our world within a very short time. The dominant financial system threatens to fail around the globe, followed by mass insolvencies, record unemployment and abject poverty. Only with a sustainable new monetary system can humanity master these challenges of the 21st century. The Gradido Academy for Bionic Economy has developed such a system. +Find out more about the Project on its [Website](https://gradido.net/) offering vast resources about the idea. The remaining document will discuss the gradido software only. ## Software requirements -Currently we only support `docker` as environment to run all services, since many different programming languages and frameworks are used. +Currently we only support `docker` install instructions to run all services, since many different programming languages and frameworks are used. -- [docker](https://www.docker.com/) +- [docker](https://www.docker.com/) +- [docker-compose] + +### For Arch Linux +Install the required packages: +```bash +sudo pacman -S docker +sudo pacman -S docker-compose +``` + +Add group `docker` and then your user to it in oder to allow you to run docker without sudo +```bash +sudo groupadd docker # may already exist `groupadd: group 'docker' already exists` +sudo usermod -aG docker $USER +groups # verify you have the group (requires relog) +``` + +Start the docker service: +```bash +sudo systemctrl start docker +``` ## How to run? -1. Clone the repo and pull all submodules - +### 1. Clone Sources +Clone the repo and pull all submodules ```bash git clone git@github.com:gradido/gradido.git git submodule update --recursive --init ``` -2. Run docker compose - 1. Run docker compose for the debug build +### 2. Run docker-compose +Run docker-compose to bring up the development environment +```bash +docker-compose up +``` +### Additional Build options +If you want to build for production you can do this aswell: +```bash +docker-compose -f docker-compose.yml up +``` - ```bash - docker-compose up - ``` +## Services defined in this package - 2. Or run docker compose in production build +- [frontend](./frontend) Wallet frontend +- [backend](./backend) GraphQL & Business logic backend +- [mariadb](./mariadb) Database backend +- [login_server](./login_server) User credential storage & business logic backend +- [community_server](./community_server/) Business logic backend - ```bash - docker-compose -f docker-compose.yml up - ``` +We are currently restructuring the service to reduce dependencies and unify business logic into one place. Furthermore the databases defined for each service will be unified into one. + +### Open the wallet + +Once you have `docker-compose` up and running, you can open [http://localhost/vue](http://localhost/vue) and create yourself a new wallet account. + +## Troubleshooting + +| Problem | Issue | Solution | Description | +| ------- | ----- | -------- | ----------- | +| docker-compose raises database connection errors | [#1062](https://github.com/gradido/gradido/issues/1062) | End `ctrl+c` and restart the `docker-compose up` after a successful build | Several Database connection related errors occur in the docker-compose log. | +| Wallet page is empty | [#1063](https://github.com/gradido/gradido/issues/1063) | Accept Cookies and Local Storage in your Browser | The page stays empty when navigating to [http://localhost/vue](http://localhost/vue) | ## Useful Links From f3a1ebb66bcd7f846b936c3f56549cc07ca59b30 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 29 Oct 2021 22:46:16 +0200 Subject: [PATCH 1029/1843] spelling --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 708bd6521..ead54701c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The Gradido model can create global prosperity and peace The Corona crisis has fundamentally changed our world within a very short time. The dominant financial system threatens to fail around the globe, followed by mass insolvencies, record unemployment and abject poverty. Only with a sustainable new monetary system can humanity master these challenges of the 21st century. The Gradido Academy for Bionic Economy has developed such a system. -Find out more about the Project on its [Website](https://gradido.net/) offering vast resources about the idea. The remaining document will discuss the gradido software only. +Find out more about the Project on its [Website](https://gradido.net/). It is offering vast resources about the idea. The remaining document will discuss the gradido software only. ## Software requirements Currently we only support `docker` install instructions to run all services, since many different programming languages and frameworks are used. @@ -23,7 +23,7 @@ sudo pacman -S docker sudo pacman -S docker-compose ``` -Add group `docker` and then your user to it in oder to allow you to run docker without sudo +Add group `docker` and then your user to it in order to allow you to run docker without sudo ```bash sudo groupadd docker # may already exist `groupadd: group 'docker' already exists` sudo usermod -aG docker $USER From 582e5c4a4f130fd033a4f5df31f123ec15a15518 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Oct 2021 02:43:44 +0200 Subject: [PATCH 1030/1843] LoginUser Database Model --- .../0003-login_server_tables/LoginUser.ts | 56 +++++++++++++++++++ database/entity/LoginUser.ts | 1 + database/entity/index.ts | 2 + 3 files changed, 59 insertions(+) create mode 100644 database/entity/0003-login_server_tables/LoginUser.ts create mode 100644 database/entity/LoginUser.ts diff --git a/database/entity/0003-login_server_tables/LoginUser.ts b/database/entity/0003-login_server_tables/LoginUser.ts new file mode 100644 index 000000000..26614b4db --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginUser.ts @@ -0,0 +1,56 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +// Moriz: I do not like the idea of having two user tables +@Entity('login_users') +export class LoginUser extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ length: 191, unique: true }) + email: string + + @Column({ name: 'first_name', length: 150 }) + firstName: string + + @Column({ name: 'last_name', length: 255, default: '' }) + lastName: string + + @Column({ length: 255, default: '' }) + username: string + + @Column({ default: '' }) + description: string + + @Column({ type: 'bigint', default: 0, unsigned: true }) + password: string + + @Column({ name: 'pubkey', type: 'binary', length: 32, default: null, nullable: true }) + pubKey: Buffer + + @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true }) + privKey: Buffer + + @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true }) + emailHash: Buffer + + @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + createdAt: Date + + @Column({ name: 'email_checked', default: 0 }) + emailChecked: boolean + + @Column({ name: 'passphrase_shown', default: 0 }) + passphraseShown: boolean + + @Column({ length: 4, default: 'de' }) + language: string + + @Column({ default: 0 }) + disabled: boolean + + @Column({ name: 'group_id', default: 0, unsigned: true }) + groupId: number + + @Column({ name: 'publisher_id', default: 0 }) + publisherId: number +} diff --git a/database/entity/LoginUser.ts b/database/entity/LoginUser.ts new file mode 100644 index 000000000..034f791cb --- /dev/null +++ b/database/entity/LoginUser.ts @@ -0,0 +1 @@ +export { LoginUser } from './0003-login_server_tables/LoginUser' diff --git a/database/entity/index.ts b/database/entity/index.ts index e18757ab8..1881b2932 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -1,4 +1,5 @@ import { Balance } from './Balance' +import { LoginUser } from './LoginUser' import { Migration } from './Migration' import { Transaction } from './Transaction' import { TransactionCreation } from './TransactionCreation' @@ -9,6 +10,7 @@ import { UserTransaction } from './UserTransaction' export const entities = [ Balance, + LoginUser, Migration, Transaction, TransactionCreation, From af2a77c30f34e905dda579c8f8b52ba9885bdc47 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Oct 2021 02:44:22 +0200 Subject: [PATCH 1031/1843] implemented checkUsername resolver --- backend/src/graphql/resolver/UserResolver.ts | 29 ++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 33949197c..d4746589b 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -26,6 +26,7 @@ import { getCustomRepository } from 'typeorm' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' +import { LoginUser } from '@entity/LoginUser' @Resolver() export class UserResolver { @@ -276,14 +277,26 @@ export class UserResolver { } @Query(() => CheckUsernameResponse) - async checkUsername( - @Args() { username, groupId = 1 }: CheckUsernameArgs, - ): Promise { - const response = await apiGet( - CONFIG.LOGIN_API_URL + `checkUsername?username=${username}&group_id=${groupId}`, - ) - if (!response.success) throw new Error(response.data) - return new CheckUsernameResponse(response.data) + async checkUsername(@Args() { username }: CheckUsernameArgs): Promise { + // Username empty? + if (username === '') { + throw new Error('Username must be set.') + } + + // Do we fullfil the minimum character length? + const MIN_CHARACTERS_USERNAME = 2 + if (username.length < MIN_CHARACTERS_USERNAME) { + throw new Error(`Username must be at minimum ${MIN_CHARACTERS_USERNAME} characters long.`) + } + + const usersFound = await LoginUser.count({ username }) + + // Username already present? + if (usersFound !== 0) { + throw new Error(`Username "${username}" already taken.`) + } + + return new CheckUsernameResponse({ state: 'success' }) } @Query(() => CheckEmailResponse) From d1ae8a95378ed737e5703a8f55747ea03182d0c4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Oct 2021 02:44:40 +0200 Subject: [PATCH 1032/1843] cleaned graphql checkUsername Args --- backend/src/graphql/arg/CheckUsernameArgs.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/graphql/arg/CheckUsernameArgs.ts b/backend/src/graphql/arg/CheckUsernameArgs.ts index 6aaed6d0b..64265b64e 100644 --- a/backend/src/graphql/arg/CheckUsernameArgs.ts +++ b/backend/src/graphql/arg/CheckUsernameArgs.ts @@ -4,7 +4,4 @@ import { ArgsType, Field } from 'type-graphql' export default class CheckUsernameArgs { @Field(() => String) username: string - - @Field(() => Number, { nullable: true }) - groupId?: number } From 973fad7ea96054a27e92d9ccb0b3d5cef64a199a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Oct 2021 02:44:54 +0200 Subject: [PATCH 1033/1843] cleaned graphql checkUsername Response --- backend/src/graphql/model/CheckUsernameResponse.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend/src/graphql/model/CheckUsernameResponse.ts b/backend/src/graphql/model/CheckUsernameResponse.ts index b3186ffcf..fe93511bc 100644 --- a/backend/src/graphql/model/CheckUsernameResponse.ts +++ b/backend/src/graphql/model/CheckUsernameResponse.ts @@ -6,16 +6,8 @@ import { ObjectType, Field } from 'type-graphql' export class CheckUsernameResponse { constructor(json: any) { this.state = json.state - this.msg = json.msg - this.groupId = json.group_id } @Field(() => String) state: string - - @Field(() => String) - msg?: string - - @Field(() => Number) - groupId?: number } From 9540ab32086e4986da390c3bec90a9a44c8cd667 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 30 Oct 2021 04:52:01 +0200 Subject: [PATCH 1034/1843] reduced checkUsername response to a boolean --- backend/src/graphql/model/CheckUsernameResponse.ts | 13 ------------- backend/src/graphql/resolver/UserResolver.ts | 9 ++++----- frontend/src/graphql/queries.js | 4 +--- frontend/src/validation-rules.js | 2 +- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 backend/src/graphql/model/CheckUsernameResponse.ts diff --git a/backend/src/graphql/model/CheckUsernameResponse.ts b/backend/src/graphql/model/CheckUsernameResponse.ts deleted file mode 100644 index fe93511bc..000000000 --- a/backend/src/graphql/model/CheckUsernameResponse.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { ObjectType, Field } from 'type-graphql' - -@ObjectType() -export class CheckUsernameResponse { - constructor(json: any) { - this.state = json.state - } - - @Field(() => String) - state: string -} diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index d4746589b..ab49ee6bf 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,8 +3,8 @@ import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' import { from_hex as fromHex } from 'libsodium-wrappers' +import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' -import { CheckUsernameResponse } from '../model/CheckUsernameResponse' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' import { UpdateUserInfosResponse } from '../model/UpdateUserInfosResponse' @@ -22,7 +22,6 @@ import { klicktippNewsletterStateMiddleware, } from '../../middleware/klicktippMiddleware' import { CheckEmailResponse } from '../model/CheckEmailResponse' -import { getCustomRepository } from 'typeorm' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' @@ -276,8 +275,8 @@ export class UserResolver { return response } - @Query(() => CheckUsernameResponse) - async checkUsername(@Args() { username }: CheckUsernameArgs): Promise { + @Query(() => Boolean) + async checkUsername(@Args() { username }: CheckUsernameArgs): Promise { // Username empty? if (username === '') { throw new Error('Username must be set.') @@ -296,7 +295,7 @@ export class UserResolver { throw new Error(`Username "${username}" already taken.`) } - return new CheckUsernameResponse({ state: 'success' }) + return true } @Query(() => CheckEmailResponse) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 2ee381dd8..01021f601 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -75,9 +75,7 @@ export const sendResetPasswordEmail = gql` export const checkUsername = gql` query($username: String!) { - checkUsername(username: $username) { - state - } + checkUsername(username: $username) } ` diff --git a/frontend/src/validation-rules.js b/frontend/src/validation-rules.js index 5552794d1..54f4c3090 100644 --- a/frontend/src/validation-rules.js +++ b/frontend/src/validation-rules.js @@ -59,7 +59,7 @@ export const loadAllRules = (i18nCallback) => { }, }) .then((result) => { - return result.data.checkUsername.state === 'success' + return result.data.checkUsername }) .catch(() => { return false From 472391a8d2eb2a9cdb877f9b333e806e79652525 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 02:13:29 +0100 Subject: [PATCH 1035/1843] corrected typescript type (not graphql) --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ab49ee6bf..f6eccd7e8 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -276,7 +276,7 @@ export class UserResolver { } @Query(() => Boolean) - async checkUsername(@Args() { username }: CheckUsernameArgs): Promise { + async checkUsername(@Args() { username }: CheckUsernameArgs): Promise { // Username empty? if (username === '') { throw new Error('Username must be set.') From 1de1187452f9104e85d9526c4bf80a6aeebf7e27 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 04:58:21 +0100 Subject: [PATCH 1036/1843] corrected model to utilize Node10 BigInt --- database/entity/0003-login_server_tables/LoginUser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0003-login_server_tables/LoginUser.ts b/database/entity/0003-login_server_tables/LoginUser.ts index 26614b4db..1b444b0e4 100644 --- a/database/entity/0003-login_server_tables/LoginUser.ts +++ b/database/entity/0003-login_server_tables/LoginUser.ts @@ -22,7 +22,7 @@ export class LoginUser extends BaseEntity { description: string @Column({ type: 'bigint', default: 0, unsigned: true }) - password: string + password: BigInt @Column({ name: 'pubkey', type: 'binary', length: 32, default: null, nullable: true }) pubKey: Buffer From 77d89d55dbb6e7fd1011474b9e911aaca3a4311a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 04:59:07 +0100 Subject: [PATCH 1037/1843] implemented create user in apollo - Pubkey generation still missing --- backend/src/graphql/resolver/UserResolver.ts | 127 ++++++++++++++++--- 1 file changed, 108 insertions(+), 19 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index f6eccd7e8..6fbf60c7a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -27,6 +27,39 @@ import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' +// We will reuse this for changePassword +const isPassword = (password: string): boolean => { + if (!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/)) { + return false + // TODO we dont need this right, frontend does it? + /* + if(pwd.length < 8){ + throw new Error('Your password is to short!') + } + if(!pwd.match(/[a-z]/)){ + throw new Error('Your password does not contain lowercase letters!') + } + if(!pwd.match(/[A-Z]/)){ + throw new Error('Your password does not contain any capital letters!') + } + if(!pwd.match(/[0-9]/)){ + throw new Error('Your password does not contain any number!') + } + if(!pwd.match(/[^a-zA-Z0-9 \\t\\n\\r]/)){ + throw new Error('Your password does not contain special characters!') + } + */ + } + return true +} + +const LANGUAGES = ['de', 'en'] +const DEFAULT_LANGUAGE = 'de' +// very likely to be reused +const isLanguage = (language: string): boolean => { + return LANGUAGES.includes(language) +} + @Resolver() export class UserResolver { @Query(() => User) @@ -121,28 +154,84 @@ export class UserResolver { async createUser( @Args() { email, firstName, lastName, password, language, publisherId }: CreateUserArgs, ): Promise { - const payload = { - email, - first_name: firstName, - last_name: lastName, - password, - emailType: 2, - login_after_register: true, - language: language, - publisher_id: publisherId, - } - const result = await apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload) - if (!result.success) { - throw new Error(result.data) + const username = '' + + // TODO: wrong default value (should be null), how does graphql work here? Is it an required field? + // default int publisher_id = 0; + + // Validate Language (no throw) + if (!isLanguage(language)) { + language = DEFAULT_LANGUAGE } - const user = new User(result.data.user) + // Validate Password + // TODO Login Server ignored this when he got an empty password?! + if (!isPassword(password)) { + throw new Error( + 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', + ) + } + + // Validate username + // TODO: never true + if (username.length > 3 && !this.checkUsername({ username })) { + throw new Error('Username already in use') + } + + // Validate email unique + // TODO: i can register an email in upper/lower case twice + const usersFound = await LoginUser.count({ email }) + if (usersFound !== 0) { + // TODO: this is unsecure, but the current implementation of the login server. This way it can be queried if the user with given EMail is existent. + throw new Error(`User already exists.`) + } + + const loginUser = new LoginUser() + loginUser.email = email + loginUser.firstName = firstName + loginUser.lastName = lastName + loginUser.username = username + loginUser.description = '' + loginUser.password = BigInt(0) + // TODO: This was never used according to my analysis. Therefore I consider it safe to set to 0 + loginUser.emailHash = Buffer.from([0]) + loginUser.language = language + loginUser.groupId = 1 + loginUser.publisherId = publisherId + + // TODO: check if this insert method is correct, we had problems with that! + loginUser.save().catch(() => { + // TODO: this triggered an EMail send + throw new Error('insert user failed') + }) + + // TODO: pubkey + // session->generateKeys(true, true); + + // TODO: we do not login the user as before, since session management is not yet ported + // calculate encryption key, could need some time, will save encrypted privkey to db + // UniLib::controller::TaskPtr create_authenticated_encrypten_key = new AuthenticatedEncryptionCreateKeyTask(user, password); + // create_authenticated_encrypten_key->scheduleTask(create_authenticated_encrypten_key); + + // TODO: send EMail (EMAIL_OPT_IN_REGISTER) + // const emailType = 2 + // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); + // auto emailOptInModel = emailOptIn->getModel(); + // if (!emailOptInModel->insertIntoDB(false)) { + // emailOptInModel->sendErrorsAsEmail(); + // return stateError("insert emailOptIn failed"); + // } + // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); + // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); + + // ------------------------------------------------------ + const dbuser = new DbUser() - dbuser.pubkey = Buffer.from(fromHex(user.pubkey)) - dbuser.email = user.email - dbuser.firstName = user.firstName - dbuser.lastName = user.lastName - dbuser.username = user.username + dbuser.pubkey = Buffer.from(fromHex(pubkey)) + dbuser.email = email + dbuser.firstName = firstName + dbuser.lastName = lastName + dbuser.username = username dbuser.save().catch(() => { throw new Error('error saving user') From 097f1a33f9ef10e03a1c429ad7b2819cde623811 Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Sun, 31 Oct 2021 10:54:51 +0100 Subject: [PATCH 1038/1843] fix user search --- login_server/src/cpp/controller/User.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login_server/src/cpp/controller/User.cpp b/login_server/src/cpp/controller/User.cpp index 576b2b8c8..0ff299309 100644 --- a/login_server/src/cpp/controller/User.cpp +++ b/login_server/src/cpp/controller/User.cpp @@ -69,7 +69,7 @@ namespace controller { using namespace Poco::Data::Keywords; Poco::Data::Statement select(session); - select << "SELECT id, first_name, last_name, email, username, description, pubkey, created, email_checked, disabled, group_id FROM " << db->getTableName(); + select << "SELECT id, first_name, last_name, email, username, description, pubkey, created, email_checked, disabled, group_id, publisher_id FROM " << db->getTableName(); select << " where email_checked = 0 "; select, into(resultFromDB); if (searchString != "") { From 823265771877094bba4def60705baff79487cc52 Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Sun, 31 Oct 2021 11:09:31 +0100 Subject: [PATCH 1039/1843] fix defekt abort transaction button --- login_server/src/cpsp/CheckTransaction.cpsp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp index d866384b7..d303db8c3 100644 --- a/login_server/src/cpsp/CheckTransaction.cpsp +++ b/login_server/src/cpsp/CheckTransaction.cpsp @@ -74,7 +74,8 @@ enum PageState { { //mSession->finalizeTransaction(false, true); // - if(!transaction.isNull() && transaction->getModel()->getUserId() == user_model->getID()) + if(!transaction.isNull() && + (transaction_body->isCreation() || transaction->getModel()->getUserId() == user_model->getID())) { if(pt->removeTask(transaction)) { transaction->deleteFromDB(); @@ -150,7 +151,7 @@ enum PageState { transaction_body = transaction->getTransactionBody(); // user can only delete there own transactions // TODO: Auto timeout for community transactions - if(transaction->getModel()->getUserId() == user_model->getID()) { + if(transaction_body->isCreation() || transaction->getModel()->getUserId() == user_model->getID()) { transaction_removeable = true; } } @@ -354,4 +355,4 @@ enum PageState {
-<%@ include file="include/footer_chr.cpsp" %> \ No newline at end of file +<%@ include file="include/footer_chr.cpsp" %> From 5b6d73c8ee8fa7001632db276ff6be595b36f616 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 31 Oct 2021 20:45:06 +0100 Subject: [PATCH 1040/1843] hotfix --- community_server/src/Controller/ServerUsersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/community_server/src/Controller/ServerUsersController.php b/community_server/src/Controller/ServerUsersController.php index 236e35b7f..c07808641 100644 --- a/community_server/src/Controller/ServerUsersController.php +++ b/community_server/src/Controller/ServerUsersController.php @@ -15,7 +15,8 @@ class ServerUsersController extends AppController public function initialize() { parent::initialize(); - $this->Auth->allow(['add', 'edit']); + // uncomment in devmode to add new community server admin user, but don't!!! commit it + //$this->Auth->allow(['add', 'edit']); $this->Auth->deny('index'); } From ff5a7846fc595b0cc621de8f5447dce6fc4df5f5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sun, 31 Oct 2021 20:57:42 +0100 Subject: [PATCH 1041/1843] add some lines --- docu/create-coins-as-admin.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docu/create-coins-as-admin.md b/docu/create-coins-as-admin.md index e496a27f9..6942bde04 100644 --- a/docu/create-coins-as-admin.md +++ b/docu/create-coins-as-admin.md @@ -10,10 +10,20 @@ user_id has to be found in users Now when we login in on https://$community_domain/account/ we can create coins but we will be restricted cause we can't sign the creations. ### Signation account +At first we need to enable the server user account creation with uncommenting line: 19 in +community_server/src/Controller/ServerUsersController.php +```php +$this->Auth->allow(['add', 'edit']); +``` +This enable us to use this action without being logged in. To add a signation account we need to go on the following url: http://$community_domain/server-users/add ### Coin creation process The coin creation for work is done in the following url: http://$community_domain/transaction-creations/create-multi Where we can create coins for a number of as many users as we want excepted for our self. +We must than sign the transaction. Normally after klick of the left Button (Transaktion abschließen) it should be automatic +forwarding to http://$community_domain/account/checkTransactions to sign the transactions. +If not this page can also be reached by klicking on the shield-icon with the hook in it on the Dashboard. +Only shown if at least one transaction is waiting for signing. -Pending_tasks table is used to store the transactions that can't be fulfilled. \ No newline at end of file +Pending_tasks table is used to store the transactions which not signed or had errors \ No newline at end of file From 148ba6e0aee3ab6aa52169ae46e784030dc053d2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 23:54:26 +0100 Subject: [PATCH 1042/1843] LoginUserBackup typeorm entity definition --- .../0003-login_server_tables/LoginUserBackup.ts | 16 ++++++++++++++++ database/entity/LoginUserBackup.ts | 1 + database/entity/index.ts | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 database/entity/0003-login_server_tables/LoginUserBackup.ts create mode 100644 database/entity/LoginUserBackup.ts diff --git a/database/entity/0003-login_server_tables/LoginUserBackup.ts b/database/entity/0003-login_server_tables/LoginUserBackup.ts new file mode 100644 index 000000000..af152e534 --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginUserBackup.ts @@ -0,0 +1,16 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +@Entity('login_user_backups') +export class LoginUserBackup extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ name: 'user_id', nullable: false }) + userId: number + + @Column({ type: 'text', name: 'passphrase', nullable: false }) + passphrase: string + + @Column({ name: 'mnemonic_type', default: -1 }) + mnemonicType: number +} diff --git a/database/entity/LoginUserBackup.ts b/database/entity/LoginUserBackup.ts new file mode 100644 index 000000000..23d2c9271 --- /dev/null +++ b/database/entity/LoginUserBackup.ts @@ -0,0 +1 @@ +export { LoginUserBackup } from './0003-login_server_tables/LoginUserBackup' diff --git a/database/entity/index.ts b/database/entity/index.ts index 1881b2932..da6761da2 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -1,5 +1,6 @@ import { Balance } from './Balance' import { LoginUser } from './LoginUser' +import { LoginUserBackup } from './LoginUserBackup' import { Migration } from './Migration' import { Transaction } from './Transaction' import { TransactionCreation } from './TransactionCreation' @@ -11,6 +12,7 @@ import { UserTransaction } from './UserTransaction' export const entities = [ Balance, LoginUser, + LoginUserBackup, Migration, Transaction, TransactionCreation, From c48992131324c4de77bf97adcacabef62b99444f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 23:55:33 +0100 Subject: [PATCH 1043/1843] - removed libsodium-wrappers and installed sodium-native since we need the esoteric functions aswell - added conversion library from bigint to buffer --- backend/package.json | 7 ++++--- backend/yarn.lock | 48 ++++++++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/backend/package.json b/backend/package.json index 889143ac3..c3fec6983 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,6 +19,7 @@ "@types/jest": "^27.0.2", "apollo-server-express": "^2.25.2", "axios": "^0.21.1", + "bigint-conversion": "^2.2.1", "class-validator": "^0.13.1", "cors": "^2.8.5", "dotenv": "^10.0.0", @@ -26,10 +27,10 @@ "graphql": "^15.5.1", "jest": "^27.2.4", "jsonwebtoken": "^8.5.1", - "libsodium-wrappers": "^0.7.9", "module-alias": "^2.2.2", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", + "sodium-native": "^3.3.0", "ts-jest": "^27.0.5", "type-graphql": "^1.1.1", "typeorm": "^0.2.38" @@ -37,7 +38,7 @@ "devDependencies": { "@types/express": "^4.17.12", "@types/jsonwebtoken": "^8.5.2", - "@types/libsodium-wrappers": "^0.7.9", + "@types/sodium-native": "^2.3.5", "@typescript-eslint/eslint-plugin": "^4.28.0", "@typescript-eslint/parser": "^4.28.0", "eslint": "^7.29.0", @@ -53,6 +54,6 @@ "typescript": "^4.3.4" }, "_moduleAliases": { - "@entity" : "../database/build/entity" + "@entity": "../database/build/entity" } } diff --git a/backend/yarn.lock b/backend/yarn.lock index 373f623f0..92c679039 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -562,6 +562,11 @@ resolved "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz" integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== +"@juanelas/base64@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@juanelas/base64/-/base64-1.0.1.tgz#aaede00ffdca595741fc69d0008b4cfc8f08293a" + integrity sha512-ZK/wWrjMrrMcprtOV72iilC1M/HfZcF2JeUJPHOL0tMm1TZrh9UhHDQEdPny/MmmT7tO4w47ycuy0YTnBrS5fg== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" @@ -888,11 +893,6 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/libsodium-wrappers@^0.7.9": - version "0.7.9" - resolved "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz" - integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw== - "@types/long@^4.0.0": version "4.0.1" resolved "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz" @@ -951,6 +951,13 @@ "@types/mime" "^1" "@types/node" "*" +"@types/sodium-native@^2.3.5": + version "2.3.5" + resolved "https://registry.yarnpkg.com/@types/sodium-native/-/sodium-native-2.3.5.tgz#5d2681e7b6b67bcbdc63cfb133e303ec9e942e43" + integrity sha512-a3DAIpW8+36XAY8aIR36JBQQsfOabxHuJwx11DL/PTvnbwEWPAXW66b8QbMi0r2vUnkOfREsketxdvjBmQxqDQ== + dependencies: + "@types/node" "*" + "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" @@ -1512,6 +1519,13 @@ base64-js@^1.3.1: resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +bigint-conversion@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/bigint-conversion/-/bigint-conversion-2.2.1.tgz#08c9f17a826943c7e56d4bfa9f0fc7fe8050a940" + integrity sha512-9TvqpV+VZ04fPKv4KPLQRk5ZAFhgHX4F7bYQY263/BbJBFzEGbtBeTQV9oNuAGaqj88PXdov1OcSNQtq9K9MPA== + dependencies: + "@juanelas/base64" "^1.0.1" + binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" @@ -3871,18 +3885,6 @@ libphonenumber-js@^1.9.7: resolved "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.22.tgz" integrity sha512-nE0aF0wrNq09ewF36s9FVqRW73hmpw6cobVDlbexmsu1432LEfuN24BCudNuRx4t2rElSeK/N0JbedzRW/TC4A== -libsodium-wrappers@^0.7.9: - version "0.7.9" - resolved "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz" - integrity sha512-9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ== - dependencies: - libsodium "^0.7.0" - -libsodium@^0.7.0: - version "0.7.9" - resolved "https://registry.npmjs.org/libsodium/-/libsodium-0.7.9.tgz" - integrity sha512-gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A== - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" @@ -4186,6 +4188,11 @@ node-fetch@^2.6.1: resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-gyp-build@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -4910,6 +4917,13 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +sodium-native@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-3.3.0.tgz#50ee52ac843315866cce3d0c08ab03eb78f22361" + integrity sha512-rg6lCDM/qa3p07YGqaVD+ciAbUqm6SoO4xmlcfkbU5r1zIGrguXztLiEtaLYTV5U6k8KSIUFmnU3yQUSKmf6DA== + dependencies: + node-gyp-build "^4.3.0" + source-map-support@^0.5.17: version "0.5.19" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz" From a9e16708a48992f4425449cb95d2e9f7b019172a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 31 Oct 2021 23:57:11 +0100 Subject: [PATCH 1044/1843] implemented: - PassphraseGenerate - KeyPairEd25519Create - generateKeys for createUser in order to generate the privateKeys (unoptimized) --- backend/src/graphql/resolver/UserResolver.ts | 118 +++++++++++++++++-- 1 file changed, 110 insertions(+), 8 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 6fbf60c7a..8089fc677 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -1,9 +1,19 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -import { from_hex as fromHex } from 'libsodium-wrappers' -import { getCustomRepository } from 'typeorm' +import { + /* eslint-disable camelcase */ + randombytes_random, + crypto_hash_sha512_instance, + crypto_hash_sha512_BYTES, + crypto_sign_seed_keypair, + crypto_sign_PUBLICKEYBYTES, + crypto_sign_SECRETKEYBYTES, + /* eslint-enable camelcase */ +} from 'sodium-native' +import { getCustomRepository, NoNeedToReleaseEntityManagerError } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' @@ -26,6 +36,8 @@ import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepos import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' +import { LoginUserBackup } from '@entity/LoginUserBackup' +import { bigintToBuf } from 'bigint-conversion' // We will reuse this for changePassword const isPassword = (password: string): boolean => { @@ -60,6 +72,96 @@ const isLanguage = (language: string): boolean => { return LANGUAGES.includes(language) } +const PHRASE_WORD_COUNT = 24 +const WORDS = fs.readFileSync('src/config/mnemonic.english.txt').toString().split('\n') +const PassphraseGenerate = (): string[] => { + const result = [] + for (let i = 0; i < PHRASE_WORD_COUNT; i++) { + result.push(WORDS[randombytes_random() % 2048]) + } + return result +} + +const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { + if (!passphrase.length) { + throw new Error('passphrase empty') + } + + const wordIndicies = [] + for (let i = 0; i < PHRASE_WORD_COUNT; i++) { + wordIndicies.push(WORDS.indexOf(passphrase[i])) + } + + // TODO: wtf is this? + // if (!wordIndicies || (!wordIndicies[0] && !wordIndicies[1] && !wordIndicies[2] && !wordIndicies[3])) { + // return null; + // } + const clearPassphrase = passphrase.join(' ') + + // Assuming this calls `crypto_hash_sha512_init` + const hash = crypto_hash_sha512_instance() + + // **** convert word indices into uint64 **** + // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms + for (let i = 0; i < PHRASE_WORD_COUNT; i++) { + const value = BigInt(wordIndicies[i]) + hash.update(Buffer.from(bigintToBuf(value))) + } + // **** end converting into uint64 ***** + hash.update(Buffer.from(clearPassphrase)) + const outputHashBuffer = Buffer.alloc(crypto_hash_sha512_BYTES) + hash.final(outputHashBuffer) + + const pubKey = Buffer.alloc(crypto_sign_PUBLICKEYBYTES) + const privKey = Buffer.alloc(crypto_sign_SECRETKEYBYTES) + + crypto_sign_seed_keypair(pubKey, privKey, outputHashBuffer) + + return [pubKey, privKey] +} + +const generateKeys = async ( + email: string, + savePrivkey: boolean, + savePassphrase: boolean, +): Promise => { + const mNewUser = await LoginUser.findOneOrFail({ email }) + const lang = mNewUser.language + /* + if (LANG_DE == lang) { + mnemonic_type = ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER_FIXED_CASES; + } + */ + + const passphrase = PassphraseGenerate() + + if (savePassphrase) { + const loginUserBackup = new LoginUserBackup() + loginUserBackup.userId = mNewUser.id + loginUserBackup.passphrase = passphrase.join(' ') + loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; + + await loginUserBackup.save().catch(() => { + throw new Error('insert user backup failed') + }) + } + + // keys + const gradidoKeyPair = KeyPairEd25519Create(passphrase) + + mNewUser.pubKey = gradidoKeyPair[0] + + if (savePrivkey) { + mNewUser.privKey = gradidoKeyPair[1] + } + + await mNewUser.save().catch(() => { + throw new Error(`Error saving new generated pub/priv keys, email: ${email}`) + }) + + return gradidoKeyPair +} + @Resolver() export class UserResolver { @Query(() => User) @@ -95,7 +197,7 @@ export class UserResolver { userEntity.lastName = user.lastName userEntity.username = user.username userEntity.email = user.email - userEntity.pubkey = Buffer.from(fromHex(user.pubkey)) + userEntity.pubkey = Buffer.from(user.pubkey, 'hex') userEntity.save().catch(() => { throw new Error('error by save userEntity') @@ -200,13 +302,13 @@ export class UserResolver { loginUser.publisherId = publisherId // TODO: check if this insert method is correct, we had problems with that! - loginUser.save().catch(() => { + await loginUser.save().catch(() => { // TODO: this triggered an EMail send throw new Error('insert user failed') }) - // TODO: pubkey - // session->generateKeys(true, true); + const keys = await generateKeys(email, true, true) + const pubkey = keys[0] // TODO: we do not login the user as before, since session management is not yet ported // calculate encryption key, could need some time, will save encrypted privkey to db @@ -227,13 +329,13 @@ export class UserResolver { // ------------------------------------------------------ const dbuser = new DbUser() - dbuser.pubkey = Buffer.from(fromHex(pubkey)) + dbuser.pubkey = pubkey dbuser.email = email dbuser.firstName = firstName dbuser.lastName = lastName dbuser.username = username - dbuser.save().catch(() => { + await dbuser.save().catch(() => { throw new Error('error saving user') }) From 6dfb671b145b5b6888d5726b38c33c320edb4c78 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:05:51 +0100 Subject: [PATCH 1045/1843] different mnemonic word lists. It is unclear which to use for what. --- backend/src/config/mnemonic.english.txt | 2048 +++++++++++++++++ backend/src/config/mnemonic.words_ulf.txt | 2048 +++++++++++++++++ backend/src/config/mnemonic.words_ulf_org.txt | 2048 +++++++++++++++++ 3 files changed, 6144 insertions(+) create mode 100644 backend/src/config/mnemonic.english.txt create mode 100644 backend/src/config/mnemonic.words_ulf.txt create mode 100644 backend/src/config/mnemonic.words_ulf_org.txt diff --git a/backend/src/config/mnemonic.english.txt b/backend/src/config/mnemonic.english.txt new file mode 100644 index 000000000..942040ed5 --- /dev/null +++ b/backend/src/config/mnemonic.english.txt @@ -0,0 +1,2048 @@ +abandon +ability +able +about +above +absent +absorb +abstract +absurd +abuse +access +accident +account +accuse +achieve +acid +acoustic +acquire +across +act +action +actor +actress +actual +adapt +add +addict +address +adjust +admit +adult +advance +advice +aerobic +affair +afford +afraid +again +age +agent +agree +ahead +aim +air +airport +aisle +alarm +album +alcohol +alert +alien +all +alley +allow +almost +alone +alpha +already +also +alter +always +amateur +amazing +among +amount +amused +analyst +anchor +ancient +anger +angle +angry +animal +ankle +announce +annual +another +answer +antenna +antique +anxiety +any +apart +apology +appear +apple +approve +april +arch +arctic +area +arena +argue +arm +armed +armor +army +around +arrange +arrest +arrive +arrow +art +artefact +artist +artwork +ask +aspect +assault +asset +assist +assume +asthma +athlete +atom +attack +attend +attitude +attract +auction +audit +august +aunt +author +auto +autumn +average +avocado +avoid +awake +aware +away +awesome +awful +awkward +axis +baby +bachelor +bacon +badge +bag +balance +balcony +ball +bamboo +banana +banner +bar +barely +bargain +barrel +base +basic +basket +battle +beach +bean +beauty +because +become +beef +before +begin +behave +behind +believe +below +belt +bench +benefit +best +betray +better +between +beyond +bicycle +bid +bike +bind +biology +bird +birth +bitter +black +blade +blame +blanket +blast +bleak +bless +blind +blood +blossom +blouse +blue +blur +blush +board +boat +body +boil +bomb +bone +bonus +book +boost +border +boring +borrow +boss +bottom +bounce +box +boy +bracket +brain +brand +brass +brave +bread +breeze +brick +bridge +brief +bright +bring +brisk +broccoli +broken +bronze +broom +brother +brown +brush +bubble +buddy +budget +buffalo +build +bulb +bulk +bullet +bundle +bunker +burden +burger +burst +bus +business +busy +butter +buyer +buzz +cabbage +cabin +cable +cactus +cage +cake +call +calm +camera +camp +can +canal +cancel +candy +cannon +canoe +canvas +canyon +capable +capital +captain +car +carbon +card +cargo +carpet +carry +cart +case +cash +casino +castle +casual +cat +catalog +catch +category +cattle +caught +cause +caution +cave +ceiling +celery +cement +census +century +cereal +certain +chair +chalk +champion +change +chaos +chapter +charge +chase +chat +cheap +check +cheese +chef +cherry +chest +chicken +chief +child +chimney +choice +choose +chronic +chuckle +chunk +churn +cigar +cinnamon +circle +citizen +city +civil +claim +clap +clarify +claw +clay +clean +clerk +clever +click +client +cliff +climb +clinic +clip +clock +clog +close +cloth +cloud +clown +club +clump +cluster +clutch +coach +coast +coconut +code +coffee +coil +coin +collect +color +column +combine +come +comfort +comic +common +company +concert +conduct +confirm +congress +connect +consider +control +convince +cook +cool +copper +copy +coral +core +corn +correct +cost +cotton +couch +country +couple +course +cousin +cover +coyote +crack +cradle +craft +cram +crane +crash +crater +crawl +crazy +cream +credit +creek +crew +cricket +crime +crisp +critic +crop +cross +crouch +crowd +crucial +cruel +cruise +crumble +crunch +crush +cry +crystal +cube +culture +cup +cupboard +curious +current +curtain +curve +cushion +custom +cute +cycle +dad +damage +damp +dance +danger +daring +dash +daughter +dawn +day +deal +debate +debris +decade +december +decide +decline +decorate +decrease +deer +defense +define +defy +degree +delay +deliver +demand +demise +denial +dentist +deny +depart +depend +deposit +depth +deputy +derive +describe +desert +design +desk +despair +destroy +detail +detect +develop +device +devote +diagram +dial +diamond +diary +dice +diesel +diet +differ +digital +dignity +dilemma +dinner +dinosaur +direct +dirt +disagree +discover +disease +dish +dismiss +disorder +display +distance +divert +divide +divorce +dizzy +doctor +document +dog +doll +dolphin +domain +donate +donkey +donor +door +dose +double +dove +draft +dragon +drama +drastic +draw +dream +dress +drift +drill +drink +drip +drive +drop +drum +dry +duck +dumb +dune +during +dust +dutch +duty +dwarf +dynamic +eager +eagle +early +earn +earth +easily +east +easy +echo +ecology +economy +edge +edit +educate +effort +egg +eight +either +elbow +elder +electric +elegant +element +elephant +elevator +elite +else +embark +embody +embrace +emerge +emotion +employ +empower +empty +enable +enact +end +endless +endorse +enemy +energy +enforce +engage +engine +enhance +enjoy +enlist +enough +enrich +enroll +ensure +enter +entire +entry +envelope +episode +equal +equip +era +erase +erode +erosion +error +erupt +escape +essay +essence +estate +eternal +ethics +evidence +evil +evoke +evolve +exact +example +excess +exchange +excite +exclude +excuse +execute +exercise +exhaust +exhibit +exile +exist +exit +exotic +expand +expect +expire +explain +expose +express +extend +extra +eye +eyebrow +fabric +face +faculty +fade +faint +faith +fall +false +fame +family +famous +fan +fancy +fantasy +farm +fashion +fat +fatal +father +fatigue +fault +favorite +feature +february +federal +fee +feed +feel +female +fence +festival +fetch +fever +few +fiber +fiction +field +figure +file +film +filter +final +find +fine +finger +finish +fire +firm +first +fiscal +fish +fit +fitness +fix +flag +flame +flash +flat +flavor +flee +flight +flip +float +flock +floor +flower +fluid +flush +fly +foam +focus +fog +foil +fold +follow +food +foot +force +forest +forget +fork +fortune +forum +forward +fossil +foster +found +fox +fragile +frame +frequent +fresh +friend +fringe +frog +front +frost +frown +frozen +fruit +fuel +fun +funny +furnace +fury +future +gadget +gain +galaxy +gallery +game +gap +garage +garbage +garden +garlic +garment +gas +gasp +gate +gather +gauge +gaze +general +genius +genre +gentle +genuine +gesture +ghost +giant +gift +giggle +ginger +giraffe +girl +give +glad +glance +glare +glass +glide +glimpse +globe +gloom +glory +glove +glow +glue +goat +goddess +gold +good +goose +gorilla +gospel +gossip +govern +gown +grab +grace +grain +grant +grape +grass +gravity +great +green +grid +grief +grit +grocery +group +grow +grunt +guard +guess +guide +guilt +guitar +gun +gym +habit +hair +half +hammer +hamster +hand +happy +harbor +hard +harsh +harvest +hat +have +hawk +hazard +head +health +heart +heavy +hedgehog +height +hello +helmet +help +hen +hero +hidden +high +hill +hint +hip +hire +history +hobby +hockey +hold +hole +holiday +hollow +home +honey +hood +hope +horn +horror +horse +hospital +host +hotel +hour +hover +hub +huge +human +humble +humor +hundred +hungry +hunt +hurdle +hurry +hurt +husband +hybrid +ice +icon +idea +identify +idle +ignore +ill +illegal +illness +image +imitate +immense +immune +impact +impose +improve +impulse +inch +include +income +increase +index +indicate +indoor +industry +infant +inflict +inform +inhale +inherit +initial +inject +injury +inmate +inner +innocent +input +inquiry +insane +insect +inside +inspire +install +intact +interest +into +invest +invite +involve +iron +island +isolate +issue +item +ivory +jacket +jaguar +jar +jazz +jealous +jeans +jelly +jewel +job +join +joke +journey +joy +judge +juice +jump +jungle +junior +junk +just +kangaroo +keen +keep +ketchup +key +kick +kid +kidney +kind +kingdom +kiss +kit +kitchen +kite +kitten +kiwi +knee +knife +knock +know +lab +label +labor +ladder +lady +lake +lamp +language +laptop +large +later +latin +laugh +laundry +lava +law +lawn +lawsuit +layer +lazy +leader +leaf +learn +leave +lecture +left +leg +legal +legend +leisure +lemon +lend +length +lens +leopard +lesson +letter +level +liar +liberty +library +license +life +lift +light +like +limb +limit +link +lion +liquid +list +little +live +lizard +load +loan +lobster +local +lock +logic +lonely +long +loop +lottery +loud +lounge +love +loyal +lucky +luggage +lumber +lunar +lunch +luxury +lyrics +machine +mad +magic +magnet +maid +mail +main +major +make +mammal +man +manage +mandate +mango +mansion +manual +maple +marble +march +margin +marine +market +marriage +mask +mass +master +match +material +math +matrix +matter +maximum +maze +meadow +mean +measure +meat +mechanic +medal +media +melody +melt +member +memory +mention +menu +mercy +merge +merit +merry +mesh +message +metal +method +middle +midnight +milk +million +mimic +mind +minimum +minor +minute +miracle +mirror +misery +miss +mistake +mix +mixed +mixture +mobile +model +modify +mom +moment +monitor +monkey +monster +month +moon +moral +more +morning +mosquito +mother +motion +motor +mountain +mouse +move +movie +much +muffin +mule +multiply +muscle +museum +mushroom +music +must +mutual +myself +mystery +myth +naive +name +napkin +narrow +nasty +nation +nature +near +neck +need +negative +neglect +neither +nephew +nerve +nest +net +network +neutral +never +news +next +nice +night +noble +noise +nominee +noodle +normal +north +nose +notable +note +nothing +notice +novel +now +nuclear +number +nurse +nut +oak +obey +object +oblige +obscure +observe +obtain +obvious +occur +ocean +october +odor +off +offer +office +often +oil +okay +old +olive +olympic +omit +once +one +onion +online +only +open +opera +opinion +oppose +option +orange +orbit +orchard +order +ordinary +organ +orient +original +orphan +ostrich +other +outdoor +outer +output +outside +oval +oven +over +own +owner +oxygen +oyster +ozone +pact +paddle +page +pair +palace +palm +panda +panel +panic +panther +paper +parade +parent +park +parrot +party +pass +patch +path +patient +patrol +pattern +pause +pave +payment +peace +peanut +pear +peasant +pelican +pen +penalty +pencil +people +pepper +perfect +permit +person +pet +phone +photo +phrase +physical +piano +picnic +picture +piece +pig +pigeon +pill +pilot +pink +pioneer +pipe +pistol +pitch +pizza +place +planet +plastic +plate +play +please +pledge +pluck +plug +plunge +poem +poet +point +polar +pole +police +pond +pony +pool +popular +portion +position +possible +post +potato +pottery +poverty +powder +power +practice +praise +predict +prefer +prepare +present +pretty +prevent +price +pride +primary +print +priority +prison +private +prize +problem +process +produce +profit +program +project +promote +proof +property +prosper +protect +proud +provide +public +pudding +pull +pulp +pulse +pumpkin +punch +pupil +puppy +purchase +purity +purpose +purse +push +put +puzzle +pyramid +quality +quantum +quarter +question +quick +quit +quiz +quote +rabbit +raccoon +race +rack +radar +radio +rail +rain +raise +rally +ramp +ranch +random +range +rapid +rare +rate +rather +raven +raw +razor +ready +real +reason +rebel +rebuild +recall +receive +recipe +record +recycle +reduce +reflect +reform +refuse +region +regret +regular +reject +relax +release +relief +rely +remain +remember +remind +remove +render +renew +rent +reopen +repair +repeat +replace +report +require +rescue +resemble +resist +resource +response +result +retire +retreat +return +reunion +reveal +review +reward +rhythm +rib +ribbon +rice +rich +ride +ridge +rifle +right +rigid +ring +riot +ripple +risk +ritual +rival +river +road +roast +robot +robust +rocket +romance +roof +rookie +room +rose +rotate +rough +round +route +royal +rubber +rude +rug +rule +run +runway +rural +sad +saddle +sadness +safe +sail +salad +salmon +salon +salt +salute +same +sample +sand +satisfy +satoshi +sauce +sausage +save +say +scale +scan +scare +scatter +scene +scheme +school +science +scissors +scorpion +scout +scrap +screen +script +scrub +sea +search +season +seat +second +secret +section +security +seed +seek +segment +select +sell +seminar +senior +sense +sentence +series +service +session +settle +setup +seven +shadow +shaft +shallow +share +shed +shell +sheriff +shield +shift +shine +ship +shiver +shock +shoe +shoot +shop +short +shoulder +shove +shrimp +shrug +shuffle +shy +sibling +sick +side +siege +sight +sign +silent +silk +silly +silver +similar +simple +since +sing +siren +sister +situate +six +size +skate +sketch +ski +skill +skin +skirt +skull +slab +slam +sleep +slender +slice +slide +slight +slim +slogan +slot +slow +slush +small +smart +smile +smoke +smooth +snack +snake +snap +sniff +snow +soap +soccer +social +sock +soda +soft +solar +soldier +solid +solution +solve +someone +song +soon +sorry +sort +soul +sound +soup +source +south +space +spare +spatial +spawn +speak +special +speed +spell +spend +sphere +spice +spider +spike +spin +spirit +split +spoil +sponsor +spoon +sport +spot +spray +spread +spring +spy +square +squeeze +squirrel +stable +stadium +staff +stage +stairs +stamp +stand +start +state +stay +steak +steel +stem +step +stereo +stick +still +sting +stock +stomach +stone +stool +story +stove +strategy +street +strike +strong +struggle +student +stuff +stumble +style +subject +submit +subway +success +such +sudden +suffer +sugar +suggest +suit +summer +sun +sunny +sunset +super +supply +supreme +sure +surface +surge +surprise +surround +survey +suspect +sustain +swallow +swamp +swap +swarm +swear +sweet +swift +swim +swing +switch +sword +symbol +symptom +syrup +system +table +tackle +tag +tail +talent +talk +tank +tape +target +task +taste +tattoo +taxi +teach +team +tell +ten +tenant +tennis +tent +term +test +text +thank +that +theme +then +theory +there +they +thing +this +thought +three +thrive +throw +thumb +thunder +ticket +tide +tiger +tilt +timber +time +tiny +tip +tired +tissue +title +toast +tobacco +today +toddler +toe +together +toilet +token +tomato +tomorrow +tone +tongue +tonight +tool +tooth +top +topic +topple +torch +tornado +tortoise +toss +total +tourist +toward +tower +town +toy +track +trade +traffic +tragic +train +transfer +trap +trash +travel +tray +treat +tree +trend +trial +tribe +trick +trigger +trim +trip +trophy +trouble +truck +true +truly +trumpet +trust +truth +try +tube +tuition +tumble +tuna +tunnel +turkey +turn +turtle +twelve +twenty +twice +twin +twist +two +type +typical +ugly +umbrella +unable +unaware +uncle +uncover +under +undo +unfair +unfold +unhappy +uniform +unique +unit +universe +unknown +unlock +until +unusual +unveil +update +upgrade +uphold +upon +upper +upset +urban +urge +usage +use +used +useful +useless +usual +utility +vacant +vacuum +vague +valid +valley +valve +van +vanish +vapor +various +vast +vault +vehicle +velvet +vendor +venture +venue +verb +verify +version +very +vessel +veteran +viable +vibrant +vicious +victory +video +view +village +vintage +violin +virtual +virus +visa +visit +visual +vital +vivid +vocal +voice +void +volcano +volume +vote +voyage +wage +wagon +wait +walk +wall +walnut +want +warfare +warm +warrior +wash +wasp +waste +water +wave +way +wealth +weapon +wear +weasel +weather +web +wedding +weekend +weird +welcome +west +wet +whale +what +wheat +wheel +when +where +whip +whisper +wide +width +wife +wild +will +win +window +wine +wing +wink +winner +winter +wire +wisdom +wise +wish +witness +wolf +woman +wonder +wood +wool +word +work +world +worry +worth +wrap +wreck +wrestle +wrist +write +wrong +yard +year +yellow +you +young +youth +zebra +zero +zone +zoo diff --git a/backend/src/config/mnemonic.words_ulf.txt b/backend/src/config/mnemonic.words_ulf.txt new file mode 100644 index 000000000..3b44fbd12 --- /dev/null +++ b/backend/src/config/mnemonic.words_ulf.txt @@ -0,0 +1,2048 @@ +Monumental +Volksbank +Beeren +huschen +leer +Haft +saagut +Positiv +daran +solide +dauerhaft +zahlungsfähig +beinhalten +weglassen +Ausmaß +irrtümlich +Impuls +darüber +Abriss +setzten +Herkunft +manipulierbar +anfängt +anliegen +Mutter +Beobachter +Zeichner +dran +genug +Medikament +Tanten +behindern +Johannes +Rand +Illusion +anzuwenden +Fehler +erniedrigen +gehören +Güte +unangenehm +Horst +Koordination +weltweit +geprägt +unerlässlich +einig +mitbringen +Dieb +dann +Karriere +Ethik +dich +Ursachen +beglücken +Wahl +dermaßen +spritzen +erbittert +Maler +täglich +Wohlstand +hübsch +Klarheit +voneinander +berühmt +Iris +plausibel +verlagern +Lauf +Foyer +Idol +spreizen +Hölderlin +Grenze +Code +Dogma +langfristig +Urzustand +verursacht +Fasching +Finger +König +barbarisch +einbringen +Disziplin +angreifen +speichern +Urheberrecht +ermorden +Diana +Auswirkung +beginnen +kooperativ +Ahnung +allen +bisschen +durften +Prostitution +Strahlen +Umschwung +Foto +taten +Mechanismus +Urvertrauen +Chef +feminin +nirgendwo +Absatzmarkt +welches +Entwicklung +gearbeitet +erblühen +umtauschen +Aufklärung +online +produktiv +Pest +Coach +Anblick +ursprünglich +schon +solange +eventuell +Tatsache +erforderlich +Buch +derartig +werden +auseinander +halten +Maurer +Himmel +Loch +Forum +Kluft +aufbauen +bricht +permanent +saugen +exponential +Fetzen +Mord +unausweichlich +untrennbar +skeptisch +geschützt +Gebäude +Butter +bezeichnet +Daunen +Journalist +ehrgeizig +System +Zugriff +Anwalt +Krone +ankommt +zulassen +Stufenplan +Raum +Sanktion +Währung +Tradition +Money +dafür +Gruppe +solch +geben +geholfen +frei +Rahmen +Rasen +feindlich +Wirklichkeit +Unheil +luden +Ausgleich +leugnen +erklärt +Vater +Ingenieur +Erfahrung +Stil +dörren +wozu +befassen +gemäß +Apotheke +Vegan +simultan +wehen +gang +immateriell +Wilhelm +fertig +kennen +korrigieren +Jahr +Industrie +hier +Glück +Anton +Bionik +abwaschen +Hannes +Diamant +Anweisung +angleichen +Fördern +Helene +glasklar +Abgaben +beflügeln +Trennung +Ziegler +überhaupt +Guido +rotieren +treiben +sowie +Begründung +Erdöl +selig +jegliche +belastbar +ehrlich +Eier +Schulden +Brutto +Paar +Sitz +hast +annähern +Neigung +Menü +messbar +vervollständigt +Erkenntnis +pendeln +Edwin +römisch +entstehen +Gefahr +Resonanz +ungleich +Sprache +Tsunami +Bindung +Sympathie +Bomber +Schlusswort +bislang +befreien +fegen +drastisch +greift +obwohl +bewährt +Jörg +drehen +Quartett +Betätigung +Szene +Kinder +Respekt +Empathie +eher +unwichtig +besser +nein +Kredit +liegen +zulegen +Forschung +Hurrikan +wesentlich +Deutschland +eintauchen +entzünden +betteln +Islam +Rohre +Müll +Tage +sinken +Hunger +fungieren +Radio +Lohn +lenken +Container +marode +gering +Ozean +Revolution +Meter +tausend +Kalkulation +blau +Hautfarbe +Kurt +Ding +Mathematiker +jene +renovieren +Popstar +auferlegen +unübersichtlich +fantasievoll +Bedürfnisse +Maßstab +Feier +Onkel +essen +Stein +einzeln +Woche +Sekunde +Phantasie +Blockade +Chip +Moment +lüften +Jasmin +aufrecht +eisern +oder +Fachsprache +Komponist +Vermögen +allmählich +Urwissen +selbstregulierend +Brust +Leute +Gegner +Pause +unqualifiziert +August +Umdrehung +wegdenken +gucken +leihen +vordringen +Durst +Seite +fast +hinaus +Binnenland +Bund +sollt +Albert +Smartphone +Kriminalität +Protest +Fremdkosten +klingen +Chicago +Baum +sammeln +sehen +soviel +Horoskop +keiner +Pension +soweit +Quantensprung +intrinsisch +anno +Züge +Zeug +Wissenschaft +dass +loszulassen +brauchen +Lehrer +rufen +Lama +Sparen +größte +Kerl +enthalten +Flügel +Rabatt +ehrt +endlich +religiös +Orchester +braten +Feedback +exemplarisch +Zitat +Recht +toll +Zusammenfassung +hervor +Eigentum +teuer +nichtkommerziell +benachbart +leider +Fahrzeug +glauben +putzen +geübt +begünstigen +Kasten +zuspitzen +meckern +organisation +loben +Anthropologie +Seminar +moralisch +Last +merken +Samen +kassieren +Bube +Engpass +Hopfen +Hirte +Gefängnis +Gedanke +bepacken +brillant +verrichtet +drohen +Katze +reif +Fossilien +gezeigt +Packen +persönlich +denen +wegweisend +Horror +Diplomat +Japan +pflanzlich +kaltblütig +Kunde +Geruch +Patriarch +Garnele +bedingungslos +Prinzip +Vergänglichkeit +stört +hinein +Tomate +halb +geplatzt +Theologe +Vogel +September +Steak +repräsentieren +heißen +hoch +hinblick +Wunsch +frustriert +Fidel +Blödsinn +früh +Birne +Hülle +loslegen +jetzt +Biene +regnen +Celsius +hören +genommen +Fleisch +diejenigen +davon +vorrangig +sonst +herrschend +ertragen +Neuorientierung +nächsten +sozusagen +Sabbat +honorieren +verwirklichen +Mobbing +Annahme +Hügel +Bedeutung +Risiko +riskieren +ermöglichen +hemmen +Frist +Klima +böse +sofern +Paul +vertieft +missionieren +zuvor +Nagel +backen +getauft +dazu +Blech +zufolge +Koch +immerwährend +Regenwald +Finnland +altruistisch +grau +Oktober +Universität +Philosoph +Ungarn +Wirtschaft +hinlänglich +Abteil +sperrt +aggressiv +Gast +externe +Saat +Zustand +losfliegen +egal +Dubai +aktiv +flattern +zunehmend +Bauweise +erreichen +Markus +gegründet +zwölf +Rente +zwar +leicht +Fischer +Emotion +dunkel +Vision +fressen +dritter +athletisch +warum +Lage +bestimmt +Mitwirkender +Totenkopf +Qualität +hegen +Ecke +erhalten +fuhr +Sklave +getätigt +belügen +gutmachen +breit +konnten +Obst +subventionieren +Pflicht +Planet +keimen +sogar +deshalb +Milch +Gesicht +zögern +fundamental +Zwang +typisch +gefunden +offen +Publikum +wieso +strukturell +Voraussetzung +umhin +Geduld +dient +Professor +wechseln +Minute +Ärmel +Konto +waren +Information +ganz +studieren +Reihenhaus +Henry +oftmals +Apfelbaum +reißen +Labor +effektiv +Umfeld +sogenannten +Insolvenz +erzwingen +später +funktionieren +Meile +extrem +Hallo +mitdenken +Heim +Praxis +lediglich +Kohle +inmitten +berichten +Soja +Firma +rasant +relativ +doof +Belgien +Rendite +Auge +abschreiben +Direktor +unsere +Absätze +plus +suchen +inklusive +somit +Spirit +verändern +Test +Bewohner +eindeutig +Strom +leiten +Zentralbank +Austausch +pickt +weise +Tourismus +spielen +Absicht +Beachtung +Spekulation +ernst +telefonieren +Trotz +Technologie +indigene +gelöst +Thomas +Blüte +Ferienjob +geteilt +Heinrich +gelangen +Situation +Kunst +Zufall +Haufen +geworden +Wurzel +Punkt +Temperatur +zukunftsfähig +Opfer +Josef +nutzen +Kauf +annehmen +Klaus +berauben +Griff +erdacht +neulich +geändert +besitzen +liberal +kopieren +superreich +bekommen +Kolumbus +Mangel +Steffi +Hase +bahnbrechend +Norbert +Karte +kreativ +unverändert +effizient +Historiker +anschließend +Stichtag +These +nimmt +Finanzblase +wegnehmen +heutige +Hexe +Foliant +Flamme +Diktatur +klick +Mitleidenschaft +dick +vorliegend +verhindern +Klasse +uralt +Abfall +stoßen +lernen +ethnisch +Eleganz +schmackhaft +helfen +Wind +Pfarrer +neueste +anfangen +Erich +ausatmen +Präzision +Stück +aktuell +unproduktiv +dastehen +runter +Figaro +Internet +Gäste +sträflich +Angst +Bedarf +Ozonloch +Bioprodukte +mögen +Abraham +Sohn +Nebensitzer +zudem +Konzept +Russland +erzeugt +Stress +Hanau +Hugo +zehn +resultieren +Dach +junge +lehnen +Bewirtschaftung +gekommen +erproben +durch +Häuser +gigantisch +unendlich +Wegfall +Irland +Reparatur +perfekt +Pilz +Zauberwort +Dorf +darin +absolut +Anbau +Dung +müssen +betreiben +sieht +investieren +Ansatz +Vorwort +ablegen +Verantwortung +gebaut +Dreck +Feld +explizit +Harmonie +Rangordnung +maximal +meiner +vereinigt +Hamburg +clever +global +unfreiwillig +tierisch +Bayern +Importgüter +schenken +Donnerstag +Puffer +Rohstoff +britisch +Samuel +Handel +anstatt +Sprung +Dollar +Lösung +Engagement +Oberst +unmöglich +Goethe +zehren +Humorist +neuartig +plötzlich +Graf +ging +intakt +tragen +nahm +zusätzlich +Potenzial +beeinflussen +ziemlich +Beitrag +Fest +Hektik +beliebt +ergibt +ausbeuten +vorhanden +klagt +wegrationalisieren +bequem +werben +Welle +Spuren +decken +autistisch +Satz +musizieren +Umlaufbahn +nützlich +simpel +sauber +Fortschritt +losgelöst +bist +weder +ungünstig +Meer +treffen +peinlich +einnehmen +bewegte +notbedingt +benennen +Zugvogel +identisch +Infrastruktur +Blase +erfinden +modern +gähnen +Sportler +alte +aufs +Kampf +Nikolaus +fröhlich +Stockwerk +Fabel +Brasilien +passend +abgeschaut +Pädagoge +militärisch +Spaß +beugen +Einwohner +Ressourcen +Lunge +Discounter +insbesondere +lukrativ +bloß +erarbeiten +Referat +Neuseeland +Rose +Abhängigkeit +Gänse +Duft +Pilot +vernachlässigt +Lausbub +Darsteller +Bezahlung +Wörtchen +Seele +altbekannt +Seil +Lothar +irgendwann +Ironie +Titel +zumindest +Aussage +bezwingen +Errungenschaft +Medaille +Uhren +unmittelbar +treten +richtung +wahr +mitverursachen +bilden +Tennisspielerin +jenseits +Mädchen +aber +Territorium +Fenchel +Spende +Definition +draußen +parallel +annimmt +allgemein +King +verbessert +sowohl +Methode +Affe +Dank +Versorgung +Staunen +Vorteil +gegangen +ansonsten +kommt +beim +Gefrierpunkt +senkt +Elster +unter +Äther +niemand +dennoch +Zeit +Schriftsteller +klettern +boshaft +ohne +riesig +sorgfältig +Slums +Beschränkung +Gehalt +hergestellt +Urlaub +Gabe +Kapazität +werfen +suggerieren +Rolle +Guthaben +Höhle +nehmen +unfair +gemacht +Flur +kannst +Rassenkonflikte +Herbizide +Twitter +iPhone +Bausparkasse +entfalten +Vorbild +Orientale +erwidern +abrupt +mich +dein +Krieg +umkämpft +Kriterium +behaupten +Mitarbeiter +runden +Wort +hereinholen +beurteilen +Frieden +totalversagen +Africa +konfrontiert +Grün +sofort +ersten +Dotter +Facebook +gelingen +Unsinn +Arthur +umstellen +Kultur +Urmutter +Pyramide +Obsoleszenz +Biedermeier +gewehrt +heraus +ideal +ihnen +ausnahmslos +gerecht +satt +Inspiration +Sägemehl +jemanden +pflegen +Laden +optimieren +spazieren +mitnehmen +sondern +Nektar +anbringen +vorne +günstig +Vorfall +blind +widerstehen +einpendeln +einmal +Krebs +Einleitung +Institut +desto +Alibi +Besen +auftreten +zuschauen +Haar +Baukasten +ließen +polar +Umsetzung +Millionär +prima +gilt +insgesamt +Wartung +inländisch +reiten +befinden +bekannt +Niveau +Faktor +Antike +gutschreiben +antreiben +Drama +Floh +praktisch +unzählig +heikel +leiblich +Augsburg +Keller +Abendessen +anheben +retten +schnell +erhält +voriges +Wertschätzung +unnütz +neunziger +Prozess +Flutwelle +umfangreich +Geld +haben +gekauft +Öse +zukommen +Querdenker +genmanipuliert +müde +Seerose +gewaltfrei +Fiat +Negativität +faul +Datum +erfunden +gepachtet +sauer +bisher +wollen +Bonität +erbringen +restlich +oben +Fuß +Flotte +Robert +Phase +Inflation +tapfer +weinen +zeigen +hoffentlich +hingen +mutig +prüfen +lustig +gravierend +Fondue +ehemalig +mitharbeiten +Steuern +Holland +stabil +dessen +Initiative +geblieben +nachfolgen +Befehl +Nordstern +dahinter +Gott +Erbsen +Unmenschlichkeit +Reise +euch +Papa +Ersatz +Bande +womit +gerne +auskommen +nahezu +Brücke +Küche +Traum +selten +manche +häkeln +Summe +würdigen +einräumen +Lebzeiten +bitte +atmen +Licht +gekriegt +Neidisch +umso +Erde +Wolfgang +letzten +eignen +dezentral +genießen +klein +Sanft +pathologisch +anbieten +zugänglich +Flug +Bonus +regulieren +stolz +Zyklus +zerstören +fiel +Basis +delegieren +Legehenne +Leser +Fieber +wunderbar +Familie +Hippie +Gemeinschaft +Stunde +Zwergstaat +sagen +fokussieren +toxisch +psychologisch +fragen +Bach +zaudern +Lektorat +Ausland +Fackel +mehr +Datenbank +runzlig +erwähnen +Zimmerleute +Spuk +Preis +Einführung +gewidmet +talentiert +Gregor +Inhalt +Human +Südafrika +Sozialabgaben +Erfüllung +benutzt +Englisch +Nationalstaat +Krankheit +gönnen +unschätzbar +Fähigkeit +Tellerwäscher +damit +bebauen +Ehre +Software +stirbt +Honig +Altlasten +zuwider +Hobby +murmeln +beziffern +degradieren +geformt +Zufriedenheit +erlaubt +Fluss +Ratgeber +Fernseher +Hesse +jammern +verzeihen +Wagen +Mahlzeit +Abwicklung +Lizenz +Umwelt +Papst +Wolke +Fontane +Weggefährte +Fläche +ausdrücklich +stetig +dumm +Webseite +besonders +signifikant +exakt +virtuell +weichen +hilft +Topmanager +dazwischen +dringend +herzlich +kaum +Haupt +gespielt +einher +Arzt +gewöhnt +florieren +Anziehung +senden +Fichte +eingeführt +Anlass +Locke +geboren +zuerst +mahnen +evolutionär +beißen +Forelle +wenden +Umsatz +drucken +führen +Pflock +Haiti +Miesmacher +Estland +Staatseinkommen +Motte +dort +aufhören +Konsum +gutwillig +Befürworter +Ketzer +Blick +Hühner +bunkern +erinnern +Fohlen +hatten +zwitschern +Gentechnik +Berlin +foppen +Gier +Leonardo +väterlich +Hähnchen +bereits +Designer +rebellieren +Ufer +auch +Hütte +&Übel +Eden +Hermann +ungewöhnlich +Partei +gnädig +womöglich +Winter +anzetteln +vorprogrammiert +Fips +Flagge +zinslos +weil +bewahrt +Werk +Atom +Akademie +Anker +Sonne +derselbe +Sockel +Somalia +wann +erzählen +Abstand +enorm +indem +etwas +Erasmus +vorkommen +Rede +Tokio +dreifach +halfen +Zivilisation +Luftfahrt +Endverbraucher +Mama +Angebot +Vorschlag +hart +lokal +Sorte +Priorität +jedoch +genügend +dadurch +Branche +großartig +Regal +garantiert +unbewusst +Migrant +Auerhahn +David +stärken +Erbe +notfalls +hindurch +wickeln +quasi +darf +comedy +gehen +Start +verdeckt +Dosis +Brezel +Element +Kurs +Ämter +leuchten +zwischen +Beileid +weiblich +Ruder +Zoologe +aushalten +neugeboren +spüren +Ingwer +fließen +Idee +Samstag +trainieren +Flandern +Auffassung +ziehen +Masse +Nina +Arten +Gnade +Spezial +unkonventionell +Wald +Jugend +Busch +Fabian +dokumentieren +Felix +Film +belohnt +Gertrud +architektur +derzeitig +echt +Tagtraum +Margret +Objektivität +Sieger +empfinden +Beamten +akzeptieren +laut +Sternenstaub +Stadt +Aristoteles +Ferrari +finden +Google +Westen +Fratze +Bauer +Kreislauf +wovon +Jürgen +gerade +Platz +Madonna +Zahnersatz +Marianne +euer +Privat +Schatten +hundert +besucht +aufwärts +dynamisch +Sahne +viel +Teufel +Gebrauchsanweisung +Gradido +sieben +Flucht +holen +baden +ändern +jüngeren +Natur +chinesisch +Rohmaterial +Hauch +Konkurrenz +fiktiv +akkumulieren +Ball +beenden +bemüht +recyclebar +gedruckt +vegetarisch +woran +erwerben +lasst +bleiben +Radfahrer +Bücher +Klavier +genannt +Quelle +erheblich +gegenseitig +abzahlen +stagnieren +Hubert +Ende +Crash +Trinkwasser +Franz +Insekt +sensibilisieren +Erneuerung +Sehnen +Maus +Frau +betonung +stiege +Porsche +beide +absurd +dato +Österreich +beteiligen +dies +gezwungen +anvertrauen +Tilgung +Feder +logisch +konventionell +fatal +kulinarisch +Abholzung +Cicero +nostalgischen +schützen +brachte +Metzger +geehrt +Flasche +bringt +Villa +Krise +bietet +Entlastung +ausführung +Wikipedia +stellen +Park +Video +Papiergeld +voll +inzwischen +Jäger +Topf +ülzen +umgekehrt +Hanf +Februar +zirkulieren +John +heben +Novellierung +unfähig +servieren +Meier +jeweilig +Heuschrecke +daher +Alexander +Peter +erkannt +Gehirn +lateinisch +anpassbar +anderen +Artikel +Wucht +Leben +sein +exzellent +beantworten +Asche +reduzieren +Hersteller +Victor +zumal +Plage +hassen +fünf +liebevoll +für +Acker +morphogenetisch +Sachverhalt +umpolen +gibt +Busfahrer +beherzigen +weitergeben +brav +jeder +sich +Galaxis +steht +Maschine +erzielen +Sanierung +Kraft +Netto +Begabung +ersetzen +mindest +gestorben +Osten +Gebiet +Zweifel +zugleich +wild +kameradschaftlich +Farbe +Mitmensch +bevölkern +gesamt +Mittel +Reporter +Kilometer +kostenlos +mobil +wehren +herunter +Ansehen +erfrischend +Hotel +Analyse +Griechisch +Abwurf +käuflich +Bernd +entgegengesetzt +Bewusstsein +ankaufen +zurzeit +Impressum +Toast +Ladung +Verfütterung +Form +Wasser +gesund +noch +horchen +Variante +Anleitung +Pazifik +Wiederherstellung +Wandel +transformieren +Tisch +verknappt +Material +Realisierung +einer +Daimler +unvorstellbar +meldete +Strickmuster +stammen +Menge +Verifizieren +tief +Puzzle +Gepflogenheit +Ziel +dürfen +doch +Sinn +Region +fangen +zuteil +Anspruch +kehrte +Freund +Fimmel +darum +Girokonto +Zweck +Wohngemeinschaft +Projekt +schweigen +Kupfer +tauchen +holzig +Tendenz +abhalten +Nummer +bald +Töne +Salvador +Kapitel +Ibiza +Komfort +wobei +lachen +Wagnis +metaphorisch +gelb +bevor +unnatürlich +Leasing +bemerkenswert +zugute +beruhen +soeben +Kopf +wischen +appellieren +gelten +statt +Futter +Erdball +benötigt +futsch +Symbol +wofür +Glanz +beispiellos +normalen +mitfinanzieren +Frucht +italienisch +woher +allzu +beleben +weigern +Senf +Gift +atemlos +Cäsar +Begegnung +horten +sobald +Luxus +biologisch +Wettbewerb +Umkehrschluss +fallen +Darlehen +klug +anpreisen +doppelt +abwechslungsreich +Werner +nannte +Wittenberg +existenzbedrohend +deren +zynisch +Feuer +Leistung +Ideologie +Enkel +diskutiert +pervers +Brot +Ordnung +blubbern +einander +College +folgen +Anreiz +Agrarfläche +aufdecken +zerrinnen +ergründen +spalten +unehelich +Experte +viertel +gezogen +Mitspieler +geklappt +Kette +Petrus +Nahrung +Georg +Patent +Unkenntlich +Waage +ernähren +Botschafter +hell +Zelle +Silbe +pfiffig +Mystisch +Acht +ahnen +erkämpft +Team +zunächst +Benzin +falsch +erwarten +raffen +Auflage +Thema +ernten +Monat +lindern +meisten +zurückerlangen +Fenster +unabhängig +Jesus +geistig +divers +Göttingen +unruhig +Kategorie +fassen +hinzu +Wachstum +Sven +Chemie +quälen +Herde +standen +jährlich +Anhang +nötig +Hirsch +derjenige +Kurzgeschichte +ökologische +Theater +willkommen +ausüben +Kanal +nennt +Name +wussten +drücken +aufnehmen +Äste +Rücken +intuition +hätte +Zunahme +Gläubiger +abzählen +Phänomen +Ablage +spontan +spannend +Vanessa +Asien +gewusst +elektronisch +derb +getilgt +Antwort +geeignet +Bote +gequält +Anerkennung +Bilanz +natürlich +machbar +Verpackung +Blut +Eltern +Himbeere +rumfliegen +Senioren +zwingen +Spitze +Taschendiebe +steckt +Monster +Egotrip +Helmut +Bibel +geerbt +zitieren +Ameisenbau +Rekordgewinne +Hände +ergänzen +danach +orden +hinter +wenn +paddeln +gutes +Hinsicht +wegen +Teilhabe +Gesellschaft +christlich +Bezugsquelle +Igor +ausprobieren +Endpreis +links +gekürzt +einkaufen +Lied +Gerhard +gelohnt +nackt +Geburt +gelehrt +einseitig +gedeckt +hinweg +Eduard +Premiere +demografisch +ihre +höchste +wichtigsten +Aufmerksamkeit +Horde +physisch +Arbeitsklima +Brief +Notdurft +proportional +fordern +Ewig +denken +Daniel +Arabisch +edle +golden +Minimum +pure +beibringen +Boden +Anzahl +erschaffen +Energie +sehr +Gerücht +Generation +Räuber +Motivation +Chance +dabei +Programm +segensreich +April +ignorieren +Nase +epochal +Boot +faszinieren +Heilkunde +Helikopter +Computer +Kabarettist +wenig +zukünftig +sechzehn +stimmt +getragen +reagieren +Esoterik +Koralle +Dame +Katastrophe +liefern +Grund +Elend +ausreichen +Notenbank +Garten +zutiefst +Immobilien +Aspekt +naiv +besprechen +zählen +Terminologie +Amerika +Atmosphäre +Iran +debatte +Sound +Zugang +fair +unrentabel +baut +kollektiv +schief +Bank +Mann +Apropos +Ergebnis +Niederlande +Mietshaus +errichten +Ereignis +Portal +erhielten +erleben +Haus +Dschungel +Null +Pleite +Seegras +Entdeckung +also +Ebene +Anbeginn +kohärent +Autor +Mensch +hielt +Reich +Land +bekloppt +außerdem +Berg +gleich +sind +Argument +einverstanden +Euro +Sektor +dagegen +Knappheit +Armut +innerhalb +Blume +Problem +Bruder +Netzwerk +Orte +bedrängen +Aufgabe diff --git a/backend/src/config/mnemonic.words_ulf_org.txt b/backend/src/config/mnemonic.words_ulf_org.txt new file mode 100644 index 000000000..d0f96c49c --- /dev/null +++ b/backend/src/config/mnemonic.words_ulf_org.txt @@ -0,0 +1,2048 @@ +Monumental +Volksbank +Beeren +huschen +leer +Haft +saagut +Positiv +daran +solide +dauerhaft +zahlungsfähig +beinhalten +weglassen +Ausmaß +irrtümlich +Impuls +darüber +Abriss +setzten +Herkunft +manipulierbar +anfängt +anliegen +Mutter +Beobachter +Zeichner +dran +genug +Medikament +Tanten +behindern +Johannes +Rand +Illusion +anzuwenden +Fehler +erniedrigen +gehören +Güte +unangenehm +Horst +Koordination +weltweit +geprägt +unerlässlich +einig +mitbringen +Dieb +dann +Karriere +Ethik +dich +Ursachen +beglücken +Wahl +dermaßen +spritzen +erbittert +Maler +täglich +Wohlstand +hübsch +Klarheit +voneinander +berühmt +Iris +plausibel +verlagern +Lauf +Foyer +Idol +spreizen +Hölderlin +Grenze +Code +Dogma +langfristig +Urzustand +verursacht +Fasching +Finger +König +barbarisch +einbringen +Disziplin +angreifen +speichern +Urheberrecht +ermorden +Diana +Auswirkung +beginnen +kooperativ +Ahnung +allen +bisschen +durften +Prostitution +Strahlen +Umschwung +Foto +taten +Mechanismus +Urvertrauen +Chef +feminin +nirgendwo +Absatzmarkt +welches +Entwicklung +gearbeitet +erblühen +umtauschen +Aufklärung +online +produktiv +Pest +Coach +Anblick +ursprünglich +schon +solange +eventuell +Tatsache +erforderlich +Buch +derartig +werden +auseinander +halten +Maurer +Himmel +Loch +Forum +Kluft +aufbauen +bricht +permanent +saugen +exponential +Fetzen +Mord +unausweichlich +untrennbar +skeptisch +geschützt +Gebäude +Butter +bezeichnet +Daunen +Journalist +ehrgeizig +System +Zugriff +Anwalt +Krone +ankommt +zulassen +Stufenplan +Raum +Sanktion +Währung +Tradition +Money +dafür +Gruppe +solch +geben +geholfen +frei +Rahmen +Rasen +feindlich +Wirklichkeit +Unheil +luden +Ausgleich +leugnen +erklärt +Vater +Ingenieur +Erfahrung +Stil +dörren +wozu +befassen +gemäß +Apotheke +Vegan +simultan +wehen +gang +immateriell +Wilhelm +fertig +kennen +korrigieren +Jahr +Industrie +hier +Glück +Anton +Bionik +abwaschen +Hannes +Diamant +Anweisung +angleichen +Fördern +Helene +glasklar +Abgaben +beflügeln +Trennung +Ziegler +überhaupt +Guido +rotieren +treiben +sowie +Begründung +Erdöl +selig +jegliche +belastbar +ehrlich +Eier +Schulden +Brutto +Paar +Sitz +hast +annähern +Neigung +Menü +messbar +vervollständigt +Erkenntnis +pendeln +Edwin +römisch +entstehen +Gefahr +Resonanz +ungleich +Sprache +Tsunami +Bindung +Sympathie +Bomber +Schlusswort +bislang +befreien +fegen +drastisch +greift +obwohl +bewährt +Jörg +drehen +Quartett +Betätigung +Szene +Kinder +Respekt +Empathie +eher +unwichtig +besser +nein +Kredit +liegen +zulegen +Forschung +Hurrikan +wesentlich +Deutschland +eintauchen +entzünden +betteln +Islam +Rohre +Müll +Tage +sinken +Hunger +fungieren +Radio +Lohn +lenken +Container +marode +gering +Ozean +Revolution +Meter +tausend +Kalkulation +blau +Hautfarbe +Kurt +Ding +Mathematiker +jene +renovieren +Popstar +auferlegen +unübersichtlich +fantasievoll +Bedürfnisse +Maßstab +Feier +Onkel +essen +Stein +einzeln +Woche +Sekunde +Phantasie +Blockade +Chip +Moment +lüften +Jasmin +aufrecht +eisern +oder +Fachsprache +Komponist +Vermögen +allmählich +Urwissen +selbstregulierend +Brust +Leute +Gegner +Pause +unqualifiziert +August +Umdrehung +wegdenken +gucken +leihen +vordringen +Durst +Seite +fast +hinaus +Binnenland +Bund +sollt +Albert +Smartphone +Kriminalität +Protest +Fremdkosten +klingen +Chicago +Baum +sammeln +sehen +soviel +Horoskop +keiner +Pension +soweit +Quantensprung +intrinsisch +anno +Züge +Zeug +Wissenschaft +dass +loszulassen +brauchen +Lehrer +rufen +Lama +Sparen +größte +Kerl +enthalten +Flügel +Rabatt +ehrt +endlich +religiös +Orchester +braten +Feedback +exemplarisch +Zitat +Recht +toll +Zusammenfassung +hervor +Eigentum +teuer +nichtkommerziell +benachbart +leider +Fahrzeug +glauben +putzen +geübt +begünstigen +Kasten +zuspitzen +meckern +organisation +loben +Anthropologie +Seminar +moralisch +Last +merken +Samen +kassieren +Bube +Engpass +Hopfen +Hirte +Gefängnis +Gedanke +bepacken +brillant +verrichtet +drohen +Katze +reif +Fossilien +gezeigt +Packen +persönlich +denen +wegweisend +Horror +Diplomat +Japan +pflanzlich +kaltblütig +Kunde +Geruch +Patriarch +Garnele +bedingungslos +Prinzip +Vergänglichkeit +stört +hinein +Tomate +halb +geplatzt +Theologe +Vogel +September +Steak +repräsentieren +heißen +hoch +hinblick +Wunsch +frustriert +Fidel +Blödsinn +früh +Birne +Hülle +loslegen +jetzt +Biene +regnen +Celsius +hören +genommen +Fleisch +diejenigen +davon +vorrangig +sonst +herrschend +ertragen +Neuorientierung +nächsten +sozusagen +Sabbat +honorieren +verwirklichen +Mobbing +Annahme +Hügel +Bedeutung +Risiko +riskieren +ermöglichen +hemmen +Frist +Klima +böse +sofern +Paul +vertieft +missionieren +zuvor +Nagel +backen +getauft +dazu +Blech +zufolge +Koch +immerwährend +Regenwald +Finnland +altruistisch +grau +Oktober +Universität +Philosoph +Ungarn +Wirtschaft +hinlänglich +Abteil +sperrt +aggressiv +Gast +externe +Saat +Zustand +losfliegen +egal +Dubai +aktiv +flattern +zunehmend +Bauweise +erreichen +Markus +gegründet +zwölf +Rente +zwar +leicht +Fischer +Emotion +dunkel +Vision +fressen +dritter +athletisch +warum +Lage +bestimmt +Mitwirkender +Totenkopf +Qualität +hegen +Ecke +erhalten +fuhr +Sklave +getätigt +belügen +gutmachen +breit +konnten +Obst +subventionieren +Pflicht +Planet +keimen +sogar +deshalb +Milch +Gesicht +zögern +fundamental +Zwang +typisch +gefunden +offen +Publikum +wieso +strukturell +Voraussetzung +umhin +Geduld +dient +Professor +wechseln +Minute +Ärmel +Konto +waren +Information +ganz +studieren +Reihenhaus +Henry +oftmals +Apfelbaum +reißen +Labor +effektiv +Umfeld +sogenannten +Insolvenz +erzwingen +später +funktionieren +Meile +extrem +Hallo +mitdenken +Heim +Praxis +lediglich +Kohle +inmitten +berichten +Soja +Firma +rasant +relativ +doof +Belgien +Rendite +Auge +abschreiben +Direktor +unsere +Absätze +plus +suchen +inklusive +somit +Spirit +verändern +Test +Bewohner +eindeutig +Strom +leiten +Zentralbank +Austausch +pickt +weise +Tourismus +spielen +Absicht +Beachtung +Spekulation +ernst +telefonieren +Trotz +Technologie +indigene +gelöst +Thomas +Blüte +Ferienjob +geteilt +Heinrich +gelangen +Situation +Kunst +Zufall +Haufen +geworden +Wurzel +Punkt +Temperatur +zukunftsfähig +Opfer +Josef +nutzen +Kauf +annehmen +Klaus +berauben +Griff +erdacht +neulich +geändert +besitzen +liberal +kopieren +superreich +bekommen +Kolumbus +Mangel +Steffi +Hase +bahnbrechend +Norbert +Karte +kreativ +unverändert +effizient +Historiker +anschließend +Stichtag +These +nimmt +Finanzblase +wegnehmen +heutige +Hexe +Foliant +Flamme +Diktatur +klick +Mitleidenschaft +dick +vorliegend +verhindern +Klasse +uralt +Abfall +stoßen +lernen +ethnisch +Eleganz +schmackhaft +helfen +Wind +Pfarrer +neueste +anfangen +Erich +ausatmen +Präzision +Stück +aktuell +unproduktiv +dastehen +runter +Figaro +Internet +Gäste +sträflich +Angst +Bedarf +Ozonloch +Bioprodukte +mögen +Abraham +Sohn +Nebensitzer +zudem +Konzept +Russland +erzeugt +Stress +Hanau +Hugo +zehn +resultieren +Dach +junge +lehnen +Bewirtschaftung +gekommen +erproben +durch +Häuser +gigantisch +unendlich +Wegfall +Irland +Reparatur +perfekt +Pilz +Zauberwort +Dorf +darin +absolut +Anbau +Dung +müssen +betreiben +sieht +investieren +Ansatz +Vorwort +ablegen +Verantwortung +gebaut +Dreck +Feld +explizit +Harmonie +Rangordnung +maximal +meiner +vereinigt +Hamburg +clever +global +unfreiwillig +tierisch +Bayern +Importgüter +schenken +Donnerstag +Puffer +Rohstoff +britisch +Samuel +Handel +anstatt +Sprung +Dollar +Lösung +Engagement +Oberst +unmöglich +Goethe +zehren +Humorist +neuartig +plötzlich +Graf +ging +intakt +tragen +nahm +zusätzlich +Potenzial +beeinflussen +ziemlich +Beitrag +Fest +Hektik +beliebt +ergibt +ausbeuten +vorhanden +klagt +wegrationalisieren +bequem +werben +Welle +Spuren +decken +autistisch +Satz +musizieren +Umlaufbahn +nützlich +simpel +sauber +Fortschritt +losgelöst +bist +weder +ungünstig +Meer +treffen +peinlich +einnehmen +bewegte +notbedingt +benennen +Zugvogel +identisch +Infrastruktur +Blase +erfinden +modern +gähnen +Sportler +alte +aufs +Kampf +Nikolaus +fröhlich +Stockwerk +Fabel +Brasilien +passend +abgeschaut +Pädagoge +militärisch +Spaß +beugen +Einwohner +Ressourcen +Lunge +Discounter +insbesondere +lukrativ +bloß +erarbeiten +Referat +Neuseeland +Rose +Abhängigkeit +Gänse +Duft +Pilot +vernachlässigt +Lausbub +Darsteller +Bezahlung +Wörtchen +Seele +altbekannt +Seil +Lothar +irgendwann +Ironie +Titel +zumindest +Aussage +bezwingen +Errungenschaft +Medaille +Uhren +unmittelbar +treten +richtung +wahr +mitverursachen +bilden +Tennisspielerin +jenseits +Mädchen +aber +Territorium +Fenchel +Spende +Definition +draußen +parallel +annimmt +allgemein +King +verbessert +sowohl +Methode +Affe +Dank +Versorgung +Staunen +Vorteil +gegangen +ansonsten +kommt +beim +Gefrierpunkt +senkt +Elster +unter +Äther +niemand +dennoch +Zeit +Schriftsteller +klettern +boshaft +ohne +riesig +sorgfältig +Slums +Beschränkung +Gehalt +hergestellt +Urlaub +Gabe +Kapazität +werfen +suggerieren +Rolle +Guthaben +Höhle +nehmen +unfair +gemacht +Flur +kannst +Rassenkonflikte +Herbizide +Twitter +iPhone +Bausparkasse +entfalten +Vorbild +Orientale +erwidern +abrupt +mich +dein +Krieg +umkämpft +Kriterium +behaupten +Mitarbeiter +runden +Wort +hereinholen +beurteilen +Frieden +totalversagen +Africa +konfrontiert +Grün +sofort +ersten +Dotter +Facebook +gelingen +Unsinn +Arthur +umstellen +Kultur +Urmutter +Pyramide +Obsoleszenz +Biedermeier +gewehrt +heraus +ideal +ihnen +ausnahmslos +gerecht +satt +Inspiration +Sägemehl +jemanden +pflegen +Laden +optimieren +spazieren +mitnehmen +sondern +Nektar +anbringen +vorne +günstig +Vorfall +blind +widerstehen +einpendeln +einmal +Krebs +Einleitung +Institut +desto +Alibi +Besen +auftreten +zuschauen +Haar +Baukasten +ließen +polar +Umsetzung +Millionär +prima +gilt +insgesamt +Wartung +inländisch +reiten +befinden +bekannt +Niveau +Faktor +Antike +gutschreiben +antreiben +Drama +Floh +praktisch +unzählig +heikel +leiblich +Augsburg +Keller +Abendessen +anheben +retten +schnell +erhält +voriges +Wertschätzung +unnütz +neunziger +Prozess +Flutwelle +umfangreich +Geld +haben +gekauft +Öse +zukommen +Querdenker +genmanipuliert +müde +Seerose +gewaltfrei +Fiat +Negativität +faul +Datum +erfunden +gepachtet +sauer +bisher +wollen +Bonität +erbringen +restlich +oben +Fuß +Flotte +Robert +Phase +Inflation +tapfer +weinen +zeigen +hoffentlich +hingen +mutig +prüfen +lustig +gravierend +Fondue +ehemalig +mitharbeiten +Steuern +Holland +stabil +dessen +Initiative +geblieben +nachfolgen +Befehl +Nordstern +dahinter +Gott +Erbsen +Unmenschlichkeit +Reise +euch +Papa +Ersatz +Bande +womit +gerne +auskommen +nahezu +Brücke +Küche +Traum +selten +manche +häkeln +Summe +würdigen +einräumen +Lebzeiten +bitte +atmen +Licht +gekriegt +Neidisch +umso +Erde +Wolfgang +letzten +eignen +dezentral +genießen +klein +Sanft +pathologisch +anbieten +zugänglich +Flug +Bonus +regulieren +stolz +Zyklus +zerstören +fiel +Basis +delegieren +Legehenne +Leser +Fieber +wunderbar +Familie +Hippie +Gemeinschaft +Stunde +Zwergstaat +sagen +fokussieren +toxisch +psychologisch +fragen +Bach +zaudern +Lektorat +Ausland +Fackel +mehr +Datenbank +runzlig +erwähnen +Zimmerleute +Spuk +Preis +Einführung +gewidmet +talentiert +Gregor +Inhalt +Human +Südafrika +Sozialabgaben +Erfüllung +benutzt +Englisch +Nationalstaat +Krankheit +gönnen +unschätzbar +Fähigkeit +Tellerwäscher +damit +bebauen +Ehre +Software +stirbt +Honig +Altlasten +zuwider +Hobby +murmeln +beziffern +degradieren +geformt +Zufriedenheit +erlaubt +Fluss +Ratgeber +Fernseher +Hesse +jammern +verzeihen +Wagen +Mahlzeit +Abwicklung +Lizenz +Umwelt +Papst +Wolke +Fontane +Weggefährte +Fläche +ausdrücklich +stetig +dumm +Webseite +besonders +signifikant +exakt +virtuell +weichen +hilft +Topmanager +dazwischen +dringend +herzlich +kaum +Haupt +gespielt +einher +Arzt +gewöhnt +florieren +Anziehung +senden +Fichte +eingeführt +Anlass +Locke +geboren +zuerst +mahnen +evolutionär +beißen +Forelle +wenden +Umsatz +drucken +führen +Pflock +Haiti +Miesmacher +Estland +Staatseinkommen +Motte +dort +aufhören +Konsum +gutwillig +Befürworter +Ketzer +Blick +Hühner +bunkern +erinnern +Fohlen +hatten +zwitschern +Gentechnik +Berlin +foppen +Gier +Leonardo +väterlich +Hähnchen +bereits +Designer +rebellieren +Ufer +auch +Hütte +Übel +Eden +Hermann +ungewöhnlich +Partei +gnädig +womöglich +Winter +anzetteln +vorprogrammiert +Fips +Flagge +zinslos +weil +bewahrt +Werk +Atom +Akademie +Anker +Sonne +derselbe +Sockel +Somalia +wann +erzählen +Abstand +enorm +indem +etwas +Erasmus +vorkommen +Rede +Tokio +dreifach +halfen +Zivilisation +Luftfahrt +Endverbraucher +Mama +Angebot +Vorschlag +hart +lokal +Sorte +Priorität +jedoch +genügend +dadurch +Branche +großartig +Regal +garantiert +unbewusst +Migrant +Auerhahn +David +stärken +Erbe +notfalls +hindurch +wickeln +quasi +darf +comedy +gehen +Start +verdeckt +Dosis +Brezel +Element +Kurs +Ämter +leuchten +zwischen +Beileid +weiblich +Ruder +Zoologe +aushalten +neugeboren +spüren +Ingwer +fließen +Idee +Samstag +trainieren +Flandern +Auffassung +ziehen +Masse +Nina +Arten +Gnade +Spezial +unkonventionell +Wald +Jugend +Busch +Fabian +dokumentieren +Felix +Film +belohnt +Gertrud +architektur +derzeitig +echt +Tagtraum +Margret +Objektivität +Sieger +empfinden +Beamten +akzeptieren +laut +Sternenstaub +Stadt +Aristoteles +Ferrari +finden +Google +Westen +Fratze +Bauer +Kreislauf +wovon +Jürgen +gerade +Platz +Madonna +Zahnersatz +Marianne +euer +Privat +Schatten +hundert +besucht +aufwärts +dynamisch +Sahne +viel +Teufel +Gebrauchsanweisung +Gradido +sieben +Flucht +holen +baden +ändern +jüngeren +Natur +chinesisch +Rohmaterial +Hauch +Konkurrenz +fiktiv +akkumulieren +Ball +beenden +bemüht +recyclebar +gedruckt +vegetarisch +woran +erwerben +lasst +bleiben +Radfahrer +Bücher +Klavier +genannt +Quelle +erheblich +gegenseitig +abzahlen +stagnieren +Hubert +Ende +Crash +Trinkwasser +Franz +Insekt +sensibilisieren +Erneuerung +Sehnen +Maus +Frau +betonung +stiege +Porsche +beide +absurd +dato +Österreich +beteiligen +dies +gezwungen +anvertrauen +Tilgung +Feder +logisch +konventionell +fatal +kulinarisch +Abholzung +Cicero +nostalgischen +schützen +brachte +Metzger +geehrt +Flasche +bringt +Villa +Krise +bietet +Entlastung +ausführung +Wikipedia +stellen +Park +Video +Papiergeld +voll +inzwischen +Jäger +Topf +ülzen +umgekehrt +Hanf +Februar +zirkulieren +John +heben +Novellierung +unfähig +servieren +Meier +jeweilig +Heuschrecke +daher +Alexander +Peter +erkannt +Gehirn +lateinisch +anpassbar +anderen +Artikel +Wucht +Leben +sein +exzellent +beantworten +Asche +reduzieren +Hersteller +Victor +zumal +Plage +hassen +fünf +liebevoll +für +Acker +morphogenetisch +Sachverhalt +umpolen +gibt +Busfahrer +beherzigen +weitergeben +brav +jeder +sich +Galaxis +steht +Maschine +erzielen +Sanierung +Kraft +Netto +Begabung +ersetzen +mindest +gestorben +Osten +Gebiet +Zweifel +zugleich +wild +kameradschaftlich +Farbe +Mitmensch +bevölkern +gesamt +Mittel +Reporter +Kilometer +kostenlos +mobil +wehren +herunter +Ansehen +erfrischend +Hotel +Analyse +Griechisch +Abwurf +käuflich +Bernd +entgegengesetzt +Bewusstsein +ankaufen +zurzeit +Impressum +Toast +Ladung +Verfütterung +Form +Wasser +gesund +noch +horchen +Variante +Anleitung +Pazifik +Wiederherstellung +Wandel +transformieren +Tisch +verknappt +Material +Realisierung +einer +Daimler +unvorstellbar +meldete +Strickmuster +stammen +Menge +Verifizieren +tief +Puzzle +Gepflogenheit +Ziel +dürfen +doch +Sinn +Region +fangen +zuteil +Anspruch +kehrte +Freund +Fimmel +darum +Girokonto +Zweck +Wohngemeinschaft +Projekt +schweigen +Kupfer +tauchen +holzig +Tendenz +abhalten +Nummer +bald +Töne +Salvador +Kapitel +Ibiza +Komfort +wobei +lachen +Wagnis +metaphorisch +gelb +bevor +unnatürlich +Leasing +bemerkenswert +zugute +beruhen +soeben +Kopf +wischen +appellieren +gelten +statt +Futter +Erdball +benötigt +futsch +Symbol +wofür +Glanz +beispiellos +normalen +mitfinanzieren +Frucht +italienisch +woher +allzu +beleben +weigern +Senf +Gift +atemlos +Cäsar +Begegnung +horten +sobald +Luxus +biologisch +Wettbewerb +Umkehrschluss +fallen +Darlehen +klug +anpreisen +doppelt +abwechslungsreich +Werner +nannte +Wittenberg +existenzbedrohend +deren +zynisch +Feuer +Leistung +Ideologie +Enkel +diskutiert +pervers +Brot +Ordnung +blubbern +einander +College +folgen +Anreiz +Agrarfläche +aufdecken +zerrinnen +ergründen +spalten +unehelich +Experte +viertel +gezogen +Mitspieler +geklappt +Kette +Petrus +Nahrung +Georg +Patent +Unkenntlich +Waage +ernähren +Botschafter +hell +Zelle +Silbe +pfiffig +Mystisch +Acht +ahnen +erkämpft +Team +zunächst +Benzin +falsch +erwarten +raffen +Auflage +Thema +ernten +Monat +lindern +meisten +zurückerlangen +Fenster +unabhängig +Jesus +geistig +divers +Göttingen +unruhig +Kategorie +fassen +hinzu +Wachstum +Sven +Chemie +quälen +Herde +standen +jährlich +Anhang +nötig +Hirsch +derjenige +Kurzgeschichte +ökologische +Theater +willkommen +ausüben +Kanal +nennt +Name +wussten +drücken +aufnehmen +Äste +Rücken +intuition +hätte +Zunahme +Gläubiger +abzählen +Phänomen +Ablage +spontan +spannend +Vanessa +Asien +gewusst +elektronisch +derb +getilgt +Antwort +geeignet +Bote +gequält +Anerkennung +Bilanz +natürlich +machbar +Verpackung +Blut +Eltern +Himbeere +rumfliegen +Senioren +zwingen +Spitze +Taschendiebe +steckt +Monster +Egotrip +Helmut +Bibel +geerbt +zitieren +Ameisenbau +Rekordgewinne +Hände +ergänzen +danach +orden +hinter +wenn +paddeln +gutes +Hinsicht +wegen +Teilhabe +Gesellschaft +christlich +Bezugsquelle +Igor +ausprobieren +Endpreis +links +gekürzt +einkaufen +Lied +Gerhard +gelohnt +nackt +Geburt +gelehrt +einseitig +gedeckt +hinweg +Eduard +Premiere +demografisch +ihre +höchste +wichtigsten +Aufmerksamkeit +Horde +physisch +Arbeitsklima +Brief +Notdurft +proportional +fordern +Ewig +denken +Daniel +Arabisch +edle +golden +Minimum +pure +beibringen +Boden +Anzahl +erschaffen +Energie +sehr +Gerücht +Generation +Räuber +Motivation +Chance +dabei +Programm +segensreich +April +ignorieren +Nase +epochal +Boot +faszinieren +Heilkunde +Helikopter +Computer +Kabarettist +wenig +zukünftig +sechzehn +stimmt +getragen +reagieren +Esoterik +Koralle +Dame +Katastrophe +liefern +Grund +Elend +ausreichen +Notenbank +Garten +zutiefst +Immobilien +Aspekt +naiv +besprechen +zählen +Terminologie +Amerika +Atmosphäre +Iran +debatte +Sound +Zugang +fair +unrentabel +baut +kollektiv +schief +Bank +Mann +Apropos +Ergebnis +Niederlande +Mietshaus +errichten +Ereignis +Portal +erhielten +erleben +Haus +Dschungel +Null +Pleite +Seegras +Entdeckung +also +Ebene +Anbeginn +kohärent +Autor +Mensch +hielt +Reich +Land +bekloppt +außerdem +Berg +gleich +sind +Argument +einverstanden +Euro +Sektor +dagegen +Knappheit +Armut +innerhalb +Blume +Problem +Bruder +Netzwerk +Orte +bedrängen +Aufgabe From d642bff68324b836e206edef3dc18f080d83c8a4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:08:53 +0100 Subject: [PATCH 1046/1843] optimization: save private key always --- backend/src/graphql/resolver/UserResolver.ts | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8089fc677..8ca10b748 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -120,11 +120,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { return [pubKey, privKey] } -const generateKeys = async ( - email: string, - savePrivkey: boolean, - savePassphrase: boolean, -): Promise => { +const generateKeys = async (email: string, savePassphrase: boolean): Promise => { const mNewUser = await LoginUser.findOneOrFail({ email }) const lang = mNewUser.language /* @@ -150,10 +146,7 @@ const generateKeys = async ( const gradidoKeyPair = KeyPairEd25519Create(passphrase) mNewUser.pubKey = gradidoKeyPair[0] - - if (savePrivkey) { - mNewUser.privKey = gradidoKeyPair[1] - } + mNewUser.privKey = gradidoKeyPair[1] await mNewUser.save().catch(() => { throw new Error(`Error saving new generated pub/priv keys, email: ${email}`) @@ -307,7 +300,7 @@ export class UserResolver { throw new Error('insert user failed') }) - const keys = await generateKeys(email, true, true) + const keys = await generateKeys(email, true) const pubkey = keys[0] // TODO: we do not login the user as before, since session management is not yet ported From c2ffc9b5f48f4365df60d2e5ad8ec3514488da52 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:10:02 +0100 Subject: [PATCH 1047/1843] todo --- backend/src/graphql/resolver/UserResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8ca10b748..e49bc1f9a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -122,6 +122,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { const generateKeys = async (email: string, savePassphrase: boolean): Promise => { const mNewUser = await LoginUser.findOneOrFail({ email }) + // TODO figure mnemonic database const lang = mNewUser.language /* if (LANG_DE == lang) { From c4df8184565827404649279762bc82a0e52f037f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:10:39 +0100 Subject: [PATCH 1048/1843] optimization: dont assign unused variable --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index e49bc1f9a..a5b4c9968 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -123,7 +123,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { const generateKeys = async (email: string, savePassphrase: boolean): Promise => { const mNewUser = await LoginUser.findOneOrFail({ email }) // TODO figure mnemonic database - const lang = mNewUser.language + // const lang = mNewUser.language /* if (LANG_DE == lang) { mnemonic_type = ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER_FIXED_CASES; From d4dd8e5e21522c149d59f14c6fb32cc715c5a773 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:12:09 +0100 Subject: [PATCH 1049/1843] optimization: always save passphrase --- backend/src/graphql/resolver/UserResolver.ts | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index a5b4c9968..53c18f076 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -120,7 +120,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { return [pubKey, privKey] } -const generateKeys = async (email: string, savePassphrase: boolean): Promise => { +const generateKeys = async (email: string): Promise => { const mNewUser = await LoginUser.findOneOrFail({ email }) // TODO figure mnemonic database // const lang = mNewUser.language @@ -132,16 +132,14 @@ const generateKeys = async (email: string, savePassphrase: boolean): Promise { - throw new Error('insert user backup failed') - }) - } + await loginUserBackup.save().catch(() => { + throw new Error('insert user backup failed') + }) // keys const gradidoKeyPair = KeyPairEd25519Create(passphrase) @@ -301,7 +299,7 @@ export class UserResolver { throw new Error('insert user failed') }) - const keys = await generateKeys(email, true) + const keys = await generateKeys(email) const pubkey = keys[0] // TODO: we do not login the user as before, since session management is not yet ported From 2a764eef3b508dd8f31447841a32d8181c42bc04 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:16:40 +0100 Subject: [PATCH 1050/1843] optimization: additional check for passphrase to actually have enought words, various other stuff --- backend/src/graphql/resolver/UserResolver.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 53c18f076..65945d668 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -83,8 +83,8 @@ const PassphraseGenerate = (): string[] => { } const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { - if (!passphrase.length) { - throw new Error('passphrase empty') + if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { + throw new Error('passphrase empty or to short') } const wordIndicies = [] @@ -96,18 +96,15 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { // if (!wordIndicies || (!wordIndicies[0] && !wordIndicies[1] && !wordIndicies[2] && !wordIndicies[3])) { // return null; // } - const clearPassphrase = passphrase.join(' ') - // Assuming this calls `crypto_hash_sha512_init` const hash = crypto_hash_sha512_instance() - // **** convert word indices into uint64 **** // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms for (let i = 0; i < PHRASE_WORD_COUNT; i++) { const value = BigInt(wordIndicies[i]) hash.update(Buffer.from(bigintToBuf(value))) } - // **** end converting into uint64 ***** + const clearPassphrase = passphrase.join(' ') hash.update(Buffer.from(clearPassphrase)) const outputHashBuffer = Buffer.alloc(crypto_hash_sha512_BYTES) hash.final(outputHashBuffer) From 22bdcae05b15de3fc327dc12e7c41c166c5b9cf3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 00:54:12 +0100 Subject: [PATCH 1051/1843] proper encoding for the German special characters (was windows encoding, now is utf8) --- .../config/mnemonic.words_ulf.encoding.txt | 2048 +++++++++++++++++ 1 file changed, 2048 insertions(+) create mode 100644 backend/src/config/mnemonic.words_ulf.encoding.txt diff --git a/backend/src/config/mnemonic.words_ulf.encoding.txt b/backend/src/config/mnemonic.words_ulf.encoding.txt new file mode 100644 index 000000000..1be83cc2e --- /dev/null +++ b/backend/src/config/mnemonic.words_ulf.encoding.txt @@ -0,0 +1,2048 @@ +Monumental +Volksbank +Beeren +huschen +leer +Haft +saagut +Positiv +daran +solide +dauerhaft +zahlungsfähig +beinhalten +weglassen +Ausmaß +irrtümlich +Impuls +darüber +Abriss +setzten +Herkunft +manipulierbar +anfängt +anliegen +Mutter +Beobachter +Zeichner +dran +genug +Medikament +Tanten +behindern +Johannes +Rand +Illusion +anzuwenden +Fehler +erniedrigen +gehören +Güte +unangenehm +Horst +Koordination +weltweit +geprägt +unerlässlich +einig +mitbringen +Dieb +dann +Karriere +Ethik +dich +Ursachen +beglücken +Wahl +dermaßen +spritzen +erbittert +Maler +täglich +Wohlstand +hübsch +Klarheit +voneinander +berühmt +Iris +plausibel +verlagern +Lauf +Foyer +Idol +spreizen +Hölderlin +Grenze +Code +Dogma +langfristig +Urzustand +verursacht +Fasching +Finger +König +barbarisch +einbringen +Disziplin +angreifen +speichern +Urheberrecht +ermorden +Diana +Auswirkung +beginnen +kooperativ +Ahnung +allen +bisschen +durften +Prostitution +Strahlen +Umschwung +Foto +taten +Mechanismus +Urvertrauen +Chef +feminin +nirgendwo +Absatzmarkt +welches +Entwicklung +gearbeitet +erblühen +umtauschen +Aufklärung +online +produktiv +Pest +Coach +Anblick +ursprünglich +schon +solange +eventuell +Tatsache +erforderlich +Buch +derartig +werden +auseinander +halten +Maurer +Himmel +Loch +Forum +Kluft +aufbauen +bricht +permanent +saugen +exponential +Fetzen +Mord +unausweichlich +untrennbar +skeptisch +geschützt +Gebäude +Butter +bezeichnet +Daunen +Journalist +ehrgeizig +System +Zugriff +Anwalt +Krone +ankommt +zulassen +Stufenplan +Raum +Sanktion +Währung +Tradition +Money +dafür +Gruppe +solch +geben +geholfen +frei +Rahmen +Rasen +feindlich +Wirklichkeit +Unheil +luden +Ausgleich +leugnen +erklärt +Vater +Ingenieur +Erfahrung +Stil +dörren +wozu +befassen +gemäß +Apotheke +Vegan +simultan +wehen +gang +immateriell +Wilhelm +fertig +kennen +korrigieren +Jahr +Industrie +hier +Glück +Anton +Bionik +abwaschen +Hannes +Diamant +Anweisung +angleichen +Fördern +Helene +glasklar +Abgaben +beflügeln +Trennung +Ziegler +überhaupt +Guido +rotieren +treiben +sowie +Begründung +Erdöl +selig +jegliche +belastbar +ehrlich +Eier +Schulden +Brutto +Paar +Sitz +hast +annähern +Neigung +Menü +messbar +vervollständigt +Erkenntnis +pendeln +Edwin +römisch +entstehen +Gefahr +Resonanz +ungleich +Sprache +Tsunami +Bindung +Sympathie +Bomber +Schlusswort +bislang +befreien +fegen +drastisch +greift +obwohl +bewährt +Jörg +drehen +Quartett +Betätigung +Szene +Kinder +Respekt +Empathie +eher +unwichtig +besser +nein +Kredit +liegen +zulegen +Forschung +Hurrikan +wesentlich +Deutschland +eintauchen +entzünden +betteln +Islam +Rohre +Müll +Tage +sinken +Hunger +fungieren +Radio +Lohn +lenken +Container +marode +gering +Ozean +Revolution +Meter +tausend +Kalkulation +blau +Hautfarbe +Kurt +Ding +Mathematiker +jene +renovieren +Popstar +auferlegen +unübersichtlich +fantasievoll +Bedürfnisse +Maßstab +Feier +Onkel +essen +Stein +einzeln +Woche +Sekunde +Phantasie +Blockade +Chip +Moment +lüften +Jasmin +aufrecht +eisern +oder +Fachsprache +Komponist +Vermögen +allmählich +Urwissen +selbstregulierend +Brust +Leute +Gegner +Pause +unqualifiziert +August +Umdrehung +wegdenken +gucken +leihen +vordringen +Durst +Seite +fast +hinaus +Binnenland +Bund +sollt +Albert +Smartphone +Kriminalität +Protest +Fremdkosten +klingen +Chicago +Baum +sammeln +sehen +soviel +Horoskop +keiner +Pension +soweit +Quantensprung +intrinsisch +anno +Züge +Zeug +Wissenschaft +dass +loszulassen +brauchen +Lehrer +rufen +Lama +Sparen +größte +Kerl +enthalten +Flügel +Rabatt +ehrt +endlich +religiös +Orchester +braten +Feedback +exemplarisch +Zitat +Recht +toll +Zusammenfassung +hervor +Eigentum +teuer +nichtkommerziell +benachbart +leider +Fahrzeug +glauben +putzen +geübt +begünstigen +Kasten +zuspitzen +meckern +organisation +loben +Anthropologie +Seminar +moralisch +Last +merken +Samen +kassieren +Bube +Engpass +Hopfen +Hirte +Gefängnis +Gedanke +bepacken +brillant +verrichtet +drohen +Katze +reif +Fossilien +gezeigt +Packen +persönlich +denen +wegweisend +Horror +Diplomat +Japan +pflanzlich +kaltblütig +Kunde +Geruch +Patriarch +Garnele +bedingungslos +Prinzip +Vergänglichkeit +stört +hinein +Tomate +halb +geplatzt +Theologe +Vogel +September +Steak +repräsentieren +heißen +hoch +hinblick +Wunsch +frustriert +Fidel +Blödsinn +früh +Birne +Hülle +loslegen +jetzt +Biene +regnen +Celsius +hören +genommen +Fleisch +diejenigen +davon +vorrangig +sonst +herrschend +ertragen +Neuorientierung +nächsten +sozusagen +Sabbat +honorieren +verwirklichen +Mobbing +Annahme +Hügel +Bedeutung +Risiko +riskieren +ermöglichen +hemmen +Frist +Klima +böse +sofern +Paul +vertieft +missionieren +zuvor +Nagel +backen +getauft +dazu +Blech +zufolge +Koch +immerwährend +Regenwald +Finnland +altruistisch +grau +Oktober +Universität +Philosoph +Ungarn +Wirtschaft +hinlänglich +Abteil +sperrt +aggressiv +Gast +externe +Saat +Zustand +losfliegen +egal +Dubai +aktiv +flattern +zunehmend +Bauweise +erreichen +Markus +gegründet +zwölf +Rente +zwar +leicht +Fischer +Emotion +dunkel +Vision +fressen +dritter +athletisch +warum +Lage +bestimmt +Mitwirkender +Totenkopf +Qualität +hegen +Ecke +erhalten +fuhr +Sklave +getätigt +belügen +gutmachen +breit +konnten +Obst +subventionieren +Pflicht +Planet +keimen +sogar +deshalb +Milch +Gesicht +zögern +fundamental +Zwang +typisch +gefunden +offen +Publikum +wieso +strukturell +Voraussetzung +umhin +Geduld +dient +Professor +wechseln +Minute +Ärmel +Konto +waren +Information +ganz +studieren +Reihenhaus +Henry +oftmals +Apfelbaum +reißen +Labor +effektiv +Umfeld +sogenannten +Insolvenz +erzwingen +später +funktionieren +Meile +extrem +Hallo +mitdenken +Heim +Praxis +lediglich +Kohle +inmitten +berichten +Soja +Firma +rasant +relativ +doof +Belgien +Rendite +Auge +abschreiben +Direktor +unsere +Absätze +plus +suchen +inklusive +somit +Spirit +verändern +Test +Bewohner +eindeutig +Strom +leiten +Zentralbank +Austausch +pickt +weise +Tourismus +spielen +Absicht +Beachtung +Spekulation +ernst +telefonieren +Trotz +Technologie +indigene +gelöst +Thomas +Blüte +Ferienjob +geteilt +Heinrich +gelangen +Situation +Kunst +Zufall +Haufen +geworden +Wurzel +Punkt +Temperatur +zukunftsfähig +Opfer +Josef +nutzen +Kauf +annehmen +Klaus +berauben +Griff +erdacht +neulich +geändert +besitzen +liberal +kopieren +superreich +bekommen +Kolumbus +Mangel +Steffi +Hase +bahnbrechend +Norbert +Karte +kreativ +unverändert +effizient +Historiker +anschließend +Stichtag +These +nimmt +Finanzblase +wegnehmen +heutige +Hexe +Foliant +Flamme +Diktatur +klick +Mitleidenschaft +dick +vorliegend +verhindern +Klasse +uralt +Abfall +stoßen +lernen +ethnisch +Eleganz +schmackhaft +helfen +Wind +Pfarrer +neueste +anfangen +Erich +ausatmen +Präzision +Stück +aktuell +unproduktiv +dastehen +runter +Figaro +Internet +Gäste +sträflich +Angst +Bedarf +Ozonloch +Bioprodukte +mögen +Abraham +Sohn +Nebensitzer +zudem +Konzept +Russland +erzeugt +Stress +Hanau +Hugo +zehn +resultieren +Dach +junge +lehnen +Bewirtschaftung +gekommen +erproben +durch +Häuser +gigantisch +unendlich +Wegfall +Irland +Reparatur +perfekt +Pilz +Zauberwort +Dorf +darin +absolut +Anbau +Dung +müssen +betreiben +sieht +investieren +Ansatz +Vorwort +ablegen +Verantwortung +gebaut +Dreck +Feld +explizit +Harmonie +Rangordnung +maximal +meiner +vereinigt +Hamburg +clever +global +unfreiwillig +tierisch +Bayern +Importgüter +schenken +Donnerstag +Puffer +Rohstoff +britisch +Samuel +Handel +anstatt +Sprung +Dollar +Lösung +Engagement +Oberst +unmöglich +Goethe +zehren +Humorist +neuartig +plötzlich +Graf +ging +intakt +tragen +nahm +zusätzlich +Potenzial +beeinflussen +ziemlich +Beitrag +Fest +Hektik +beliebt +ergibt +ausbeuten +vorhanden +klagt +wegrationalisieren +bequem +werben +Welle +Spuren +decken +autistisch +Satz +musizieren +Umlaufbahn +nützlich +simpel +sauber +Fortschritt +losgelöst +bist +weder +ungünstig +Meer +treffen +peinlich +einnehmen +bewegte +notbedingt +benennen +Zugvogel +identisch +Infrastruktur +Blase +erfinden +modern +gähnen +Sportler +alte +aufs +Kampf +Nikolaus +fröhlich +Stockwerk +Fabel +Brasilien +passend +abgeschaut +Pädagoge +militärisch +Spaß +beugen +Einwohner +Ressourcen +Lunge +Discounter +insbesondere +lukrativ +bloß +erarbeiten +Referat +Neuseeland +Rose +Abhängigkeit +Gänse +Duft +Pilot +vernachlässigt +Lausbub +Darsteller +Bezahlung +Wörtchen +Seele +altbekannt +Seil +Lothar +irgendwann +Ironie +Titel +zumindest +Aussage +bezwingen +Errungenschaft +Medaille +Uhren +unmittelbar +treten +richtung +wahr +mitverursachen +bilden +Tennisspielerin +jenseits +Mädchen +aber +Territorium +Fenchel +Spende +Definition +draußen +parallel +annimmt +allgemein +King +verbessert +sowohl +Methode +Affe +Dank +Versorgung +Staunen +Vorteil +gegangen +ansonsten +kommt +beim +Gefrierpunkt +senkt +Elster +unter +Äther +niemand +dennoch +Zeit +Schriftsteller +klettern +boshaft +ohne +riesig +sorgfältig +Slums +Beschränkung +Gehalt +hergestellt +Urlaub +Gabe +Kapazität +werfen +suggerieren +Rolle +Guthaben +Höhle +nehmen +unfair +gemacht +Flur +kannst +Rassenkonflikte +Herbizide +Twitter +iPhone +Bausparkasse +entfalten +Vorbild +Orientale +erwidern +abrupt +mich +dein +Krieg +umkämpft +Kriterium +behaupten +Mitarbeiter +runden +Wort +hereinholen +beurteilen +Frieden +totalversagen +Africa +konfrontiert +Grün +sofort +ersten +Dotter +Facebook +gelingen +Unsinn +Arthur +umstellen +Kultur +Urmutter +Pyramide +Obsoleszenz +Biedermeier +gewehrt +heraus +ideal +ihnen +ausnahmslos +gerecht +satt +Inspiration +Sägemehl +jemanden +pflegen +Laden +optimieren +spazieren +mitnehmen +sondern +Nektar +anbringen +vorne +günstig +Vorfall +blind +widerstehen +einpendeln +einmal +Krebs +Einleitung +Institut +desto +Alibi +Besen +auftreten +zuschauen +Haar +Baukasten +ließen +polar +Umsetzung +Millionär +prima +gilt +insgesamt +Wartung +inländisch +reiten +befinden +bekannt +Niveau +Faktor +Antike +gutschreiben +antreiben +Drama +Floh +praktisch +unzählig +heikel +leiblich +Augsburg +Keller +Abendessen +anheben +retten +schnell +erhält +voriges +Wertschätzung +unnütz +neunziger +Prozess +Flutwelle +umfangreich +Geld +haben +gekauft +Öse +zukommen +Querdenker +genmanipuliert +müde +Seerose +gewaltfrei +Fiat +Negativität +faul +Datum +erfunden +gepachtet +sauer +bisher +wollen +Bonität +erbringen +restlich +oben +Fuß +Flotte +Robert +Phase +Inflation +tapfer +weinen +zeigen +hoffentlich +hingen +mutig +prüfen +lustig +gravierend +Fondue +ehemalig +mitharbeiten +Steuern +Holland +stabil +dessen +Initiative +geblieben +nachfolgen +Befehl +Nordstern +dahinter +Gott +Erbsen +Unmenschlichkeit +Reise +euch +Papa +Ersatz +Bande +womit +gerne +auskommen +nahezu +Brücke +Küche +Traum +selten +manche +häkeln +Summe +würdigen +einräumen +Lebzeiten +bitte +atmen +Licht +gekriegt +Neidisch +umso +Erde +Wolfgang +letzten +eignen +dezentral +genießen +klein +Sanft +pathologisch +anbieten +zugänglich +Flug +Bonus +regulieren +stolz +Zyklus +zerstören +fiel +Basis +delegieren +Legehenne +Leser +Fieber +wunderbar +Familie +Hippie +Gemeinschaft +Stunde +Zwergstaat +sagen +fokussieren +toxisch +psychologisch +fragen +Bach +zaudern +Lektorat +Ausland +Fackel +mehr +Datenbank +runzlig +erwähnen +Zimmerleute +Spuk +Preis +Einführung +gewidmet +talentiert +Gregor +Inhalt +Human +Südafrika +Sozialabgaben +Erfüllung +benutzt +Englisch +Nationalstaat +Krankheit +gönnen +unschätzbar +Fähigkeit +Tellerwäscher +damit +bebauen +Ehre +Software +stirbt +Honig +Altlasten +zuwider +Hobby +murmeln +beziffern +degradieren +geformt +Zufriedenheit +erlaubt +Fluss +Ratgeber +Fernseher +Hesse +jammern +verzeihen +Wagen +Mahlzeit +Abwicklung +Lizenz +Umwelt +Papst +Wolke +Fontane +Weggefährte +Fläche +ausdrücklich +stetig +dumm +Webseite +besonders +signifikant +exakt +virtuell +weichen +hilft +Topmanager +dazwischen +dringend +herzlich +kaum +Haupt +gespielt +einher +Arzt +gewöhnt +florieren +Anziehung +senden +Fichte +eingeführt +Anlass +Locke +geboren +zuerst +mahnen +evolutionär +beißen +Forelle +wenden +Umsatz +drucken +führen +Pflock +Haiti +Miesmacher +Estland +Staatseinkommen +Motte +dort +aufhören +Konsum +gutwillig +Befürworter +Ketzer +Blick +Hühner +bunkern +erinnern +Fohlen +hatten +zwitschern +Gentechnik +Berlin +foppen +Gier +Leonardo +väterlich +Hähnchen +bereits +Designer +rebellieren +Ufer +auch +Hütte +&Ãœbel +Eden +Hermann +ungewöhnlich +Partei +gnädig +womöglich +Winter +anzetteln +vorprogrammiert +Fips +Flagge +zinslos +weil +bewahrt +Werk +Atom +Akademie +Anker +Sonne +derselbe +Sockel +Somalia +wann +erzählen +Abstand +enorm +indem +etwas +Erasmus +vorkommen +Rede +Tokio +dreifach +halfen +Zivilisation +Luftfahrt +Endverbraucher +Mama +Angebot +Vorschlag +hart +lokal +Sorte +Priorität +jedoch +genügend +dadurch +Branche +großartig +Regal +garantiert +unbewusst +Migrant +Auerhahn +David +stärken +Erbe +notfalls +hindurch +wickeln +quasi +darf +comedy +gehen +Start +verdeckt +Dosis +Brezel +Element +Kurs +Ämter +leuchten +zwischen +Beileid +weiblich +Ruder +Zoologe +aushalten +neugeboren +spüren +Ingwer +fließen +Idee +Samstag +trainieren +Flandern +Auffassung +ziehen +Masse +Nina +Arten +Gnade +Spezial +unkonventionell +Wald +Jugend +Busch +Fabian +dokumentieren +Felix +Film +belohnt +Gertrud +architektur +derzeitig +echt +Tagtraum +Margret +Objektivität +Sieger +empfinden +Beamten +akzeptieren +laut +Sternenstaub +Stadt +Aristoteles +Ferrari +finden +Google +Westen +Fratze +Bauer +Kreislauf +wovon +Jürgen +gerade +Platz +Madonna +Zahnersatz +Marianne +euer +Privat +Schatten +hundert +besucht +aufwärts +dynamisch +Sahne +viel +Teufel +Gebrauchsanweisung +Gradido +sieben +Flucht +holen +baden +ändern +jüngeren +Natur +chinesisch +Rohmaterial +Hauch +Konkurrenz +fiktiv +akkumulieren +Ball +beenden +bemüht +recyclebar +gedruckt +vegetarisch +woran +erwerben +lasst +bleiben +Radfahrer +Bücher +Klavier +genannt +Quelle +erheblich +gegenseitig +abzahlen +stagnieren +Hubert +Ende +Crash +Trinkwasser +Franz +Insekt +sensibilisieren +Erneuerung +Sehnen +Maus +Frau +betonung +stiege +Porsche +beide +absurd +dato +Österreich +beteiligen +dies +gezwungen +anvertrauen +Tilgung +Feder +logisch +konventionell +fatal +kulinarisch +Abholzung +Cicero +nostalgischen +schützen +brachte +Metzger +geehrt +Flasche +bringt +Villa +Krise +bietet +Entlastung +ausführung +Wikipedia +stellen +Park +Video +Papiergeld +voll +inzwischen +Jäger +Topf +ülzen +umgekehrt +Hanf +Februar +zirkulieren +John +heben +Novellierung +unfähig +servieren +Meier +jeweilig +Heuschrecke +daher +Alexander +Peter +erkannt +Gehirn +lateinisch +anpassbar +anderen +Artikel +Wucht +Leben +sein +exzellent +beantworten +Asche +reduzieren +Hersteller +Victor +zumal +Plage +hassen +fünf +liebevoll +für +Acker +morphogenetisch +Sachverhalt +umpolen +gibt +Busfahrer +beherzigen +weitergeben +brav +jeder +sich +Galaxis +steht +Maschine +erzielen +Sanierung +Kraft +Netto +Begabung +ersetzen +mindest +gestorben +Osten +Gebiet +Zweifel +zugleich +wild +kameradschaftlich +Farbe +Mitmensch +bevölkern +gesamt +Mittel +Reporter +Kilometer +kostenlos +mobil +wehren +herunter +Ansehen +erfrischend +Hotel +Analyse +Griechisch +Abwurf +käuflich +Bernd +entgegengesetzt +Bewusstsein +ankaufen +zurzeit +Impressum +Toast +Ladung +Verfütterung +Form +Wasser +gesund +noch +horchen +Variante +Anleitung +Pazifik +Wiederherstellung +Wandel +transformieren +Tisch +verknappt +Material +Realisierung +einer +Daimler +unvorstellbar +meldete +Strickmuster +stammen +Menge +Verifizieren +tief +Puzzle +Gepflogenheit +Ziel +dürfen +doch +Sinn +Region +fangen +zuteil +Anspruch +kehrte +Freund +Fimmel +darum +Girokonto +Zweck +Wohngemeinschaft +Projekt +schweigen +Kupfer +tauchen +holzig +Tendenz +abhalten +Nummer +bald +Töne +Salvador +Kapitel +Ibiza +Komfort +wobei +lachen +Wagnis +metaphorisch +gelb +bevor +unnatürlich +Leasing +bemerkenswert +zugute +beruhen +soeben +Kopf +wischen +appellieren +gelten +statt +Futter +Erdball +benötigt +futsch +Symbol +wofür +Glanz +beispiellos +normalen +mitfinanzieren +Frucht +italienisch +woher +allzu +beleben +weigern +Senf +Gift +atemlos +Cäsar +Begegnung +horten +sobald +Luxus +biologisch +Wettbewerb +Umkehrschluss +fallen +Darlehen +klug +anpreisen +doppelt +abwechslungsreich +Werner +nannte +Wittenberg +existenzbedrohend +deren +zynisch +Feuer +Leistung +Ideologie +Enkel +diskutiert +pervers +Brot +Ordnung +blubbern +einander +College +folgen +Anreiz +Agrarfläche +aufdecken +zerrinnen +ergründen +spalten +unehelich +Experte +viertel +gezogen +Mitspieler +geklappt +Kette +Petrus +Nahrung +Georg +Patent +Unkenntlich +Waage +ernähren +Botschafter +hell +Zelle +Silbe +pfiffig +Mystisch +Acht +ahnen +erkämpft +Team +zunächst +Benzin +falsch +erwarten +raffen +Auflage +Thema +ernten +Monat +lindern +meisten +zurückerlangen +Fenster +unabhängig +Jesus +geistig +divers +Göttingen +unruhig +Kategorie +fassen +hinzu +Wachstum +Sven +Chemie +quälen +Herde +standen +jährlich +Anhang +nötig +Hirsch +derjenige +Kurzgeschichte +ökologische +Theater +willkommen +ausüben +Kanal +nennt +Name +wussten +drücken +aufnehmen +Äste +Rücken +intuition +hätte +Zunahme +Gläubiger +abzählen +Phänomen +Ablage +spontan +spannend +Vanessa +Asien +gewusst +elektronisch +derb +getilgt +Antwort +geeignet +Bote +gequält +Anerkennung +Bilanz +natürlich +machbar +Verpackung +Blut +Eltern +Himbeere +rumfliegen +Senioren +zwingen +Spitze +Taschendiebe +steckt +Monster +Egotrip +Helmut +Bibel +geerbt +zitieren +Ameisenbau +Rekordgewinne +Hände +ergänzen +danach +orden +hinter +wenn +paddeln +gutes +Hinsicht +wegen +Teilhabe +Gesellschaft +christlich +Bezugsquelle +Igor +ausprobieren +Endpreis +links +gekürzt +einkaufen +Lied +Gerhard +gelohnt +nackt +Geburt +gelehrt +einseitig +gedeckt +hinweg +Eduard +Premiere +demografisch +ihre +höchste +wichtigsten +Aufmerksamkeit +Horde +physisch +Arbeitsklima +Brief +Notdurft +proportional +fordern +Ewig +denken +Daniel +Arabisch +edle +golden +Minimum +pure +beibringen +Boden +Anzahl +erschaffen +Energie +sehr +Gerücht +Generation +Räuber +Motivation +Chance +dabei +Programm +segensreich +April +ignorieren +Nase +epochal +Boot +faszinieren +Heilkunde +Helikopter +Computer +Kabarettist +wenig +zukünftig +sechzehn +stimmt +getragen +reagieren +Esoterik +Koralle +Dame +Katastrophe +liefern +Grund +Elend +ausreichen +Notenbank +Garten +zutiefst +Immobilien +Aspekt +naiv +besprechen +zählen +Terminologie +Amerika +Atmosphäre +Iran +debatte +Sound +Zugang +fair +unrentabel +baut +kollektiv +schief +Bank +Mann +Apropos +Ergebnis +Niederlande +Mietshaus +errichten +Ereignis +Portal +erhielten +erleben +Haus +Dschungel +Null +Pleite +Seegras +Entdeckung +also +Ebene +Anbeginn +kohärent +Autor +Mensch +hielt +Reich +Land +bekloppt +außerdem +Berg +gleich +sind +Argument +einverstanden +Euro +Sektor +dagegen +Knappheit +Armut +innerhalb +Blume +Problem +Bruder +Netzwerk +Orte +bedrängen +Aufgabe From 41137626bea484b89467d5c9d6a989751401f116 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 1 Nov 2021 03:45:46 +0100 Subject: [PATCH 1052/1843] suggest some extensions --- .vscode/extensions.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..a6dc06683 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "streetsidesoftware.code-spell-checker", + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file From e1d9454645cb958c665d9fcb6756c1d34f947c72 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 1 Nov 2021 10:25:31 +0100 Subject: [PATCH 1053/1843] Update docu/create-coins-as-admin.md Co-authored-by: Ulf Gebhardt --- docu/create-coins-as-admin.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docu/create-coins-as-admin.md b/docu/create-coins-as-admin.md index 6942bde04..6a95df119 100644 --- a/docu/create-coins-as-admin.md +++ b/docu/create-coins-as-admin.md @@ -21,9 +21,7 @@ To add a signation account we need to go on the following url: http://$community ### Coin creation process The coin creation for work is done in the following url: http://$community_domain/transaction-creations/create-multi Where we can create coins for a number of as many users as we want excepted for our self. -We must than sign the transaction. Normally after klick of the left Button (Transaktion abschließen) it should be automatic -forwarding to http://$community_domain/account/checkTransactions to sign the transactions. -If not this page can also be reached by klicking on the shield-icon with the hook in it on the Dashboard. -Only shown if at least one transaction is waiting for signing. +Furthermore we must sign the transactions we created. Normally after clicking on the left button (Transaktion abschließen) we should be automatically forwarded to http://$community_domain/account/checkTransactions where we can do this. +If not this page can also be reached by clicking on the shield-icon with the hook in it on the Dashboard, which is only shown if at least one transaction is waiting for signing. -Pending_tasks table is used to store the transactions which not signed or had errors \ No newline at end of file +For debug purposes you can check the `pending_tasks` table, which is used to store the transactions which are not signed yet or had errors. \ No newline at end of file From 20c440c2580e6085967a35491fff9d138234dc53 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 2 Nov 2021 17:21:57 +0100 Subject: [PATCH 1054/1843] Changed the save methods used on entities to repository save entity methods. --- backend/src/graphql/resolver/UserResolver.ts | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 65945d668..769da6bdf 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -35,6 +35,8 @@ import { CheckEmailResponse } from '../model/CheckEmailResponse' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' +import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { LoginUserBackupRepository } from '../../typeorm/repository/LoginUserBackup' import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' import { bigintToBuf } from 'bigint-conversion' @@ -118,7 +120,8 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { } const generateKeys = async (email: string): Promise => { - const mNewUser = await LoginUser.findOneOrFail({ email }) + const loginUserRepository = getCustomRepository(LoginUserRepository) + const mNewUser = await loginUserRepository.findOneOrFail({ email }) // TODO figure mnemonic database // const lang = mNewUser.language /* @@ -134,7 +137,8 @@ const generateKeys = async (email: string): Promise => { loginUserBackup.passphrase = passphrase.join(' ') loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - await loginUserBackup.save().catch(() => { + const loginUserBackupRepository = getCustomRepository(LoginUserBackupRepository) + await loginUserBackupRepository.save(loginUserBackup).catch(() => { throw new Error('insert user backup failed') }) @@ -144,7 +148,7 @@ const generateKeys = async (email: string): Promise => { mNewUser.pubKey = gradidoKeyPair[0] mNewUser.privKey = gradidoKeyPair[1] - await mNewUser.save().catch(() => { + await loginUserRepository.save(mNewUser).catch(() => { throw new Error(`Error saving new generated pub/priv keys, email: ${email}`) }) @@ -188,7 +192,7 @@ export class UserResolver { userEntity.email = user.email userEntity.pubkey = Buffer.from(user.pubkey, 'hex') - userEntity.save().catch(() => { + userRepository.save(userEntity).catch(() => { throw new Error('error by save userEntity') }) }) @@ -271,7 +275,8 @@ export class UserResolver { // Validate email unique // TODO: i can register an email in upper/lower case twice - const usersFound = await LoginUser.count({ email }) + const userRepository = getCustomRepository(UserRepository) + const usersFound = await userRepository.count({ email }) if (usersFound !== 0) { // TODO: this is unsecure, but the current implementation of the login server. This way it can be queried if the user with given EMail is existent. throw new Error(`User already exists.`) @@ -291,8 +296,10 @@ export class UserResolver { loginUser.publisherId = publisherId // TODO: check if this insert method is correct, we had problems with that! - await loginUser.save().catch(() => { + const loginUserRepository = getCustomRepository(LoginUserRepository) + await loginUserRepository.save(loginUser).catch((error) => { // TODO: this triggered an EMail send + console.log('insert user failed', error) throw new Error('insert user failed') }) @@ -324,7 +331,7 @@ export class UserResolver { dbuser.lastName = lastName dbuser.username = username - await dbuser.save().catch(() => { + await userRepository.save(dbuser).catch(() => { throw new Error('error saving user') }) @@ -426,7 +433,7 @@ export class UserResolver { userEntityChanged = true } if (userEntityChanged) { - userEntity.save().catch((error) => { + userRepository.save(userEntity).catch((error) => { throw new Error(error) }) } From d286d687309f9b4046a083b7de0a6be222862679 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 2 Nov 2021 17:24:45 +0100 Subject: [PATCH 1055/1843] Create the LoginUserRepository. --- backend/src/typeorm/repository/LoginUser.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 backend/src/typeorm/repository/LoginUser.ts diff --git a/backend/src/typeorm/repository/LoginUser.ts b/backend/src/typeorm/repository/LoginUser.ts new file mode 100644 index 000000000..e69de29bb From 5220874a0795e14b9ef2e12a7e80fffed6761ee2 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 2 Nov 2021 17:27:09 +0100 Subject: [PATCH 1056/1843] Setup LoginUserBackupRepository. --- backend/src/typeorm/repository/LoginUser.ts | 5 +++++ backend/src/typeorm/repository/LoginUserBackup.ts | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 backend/src/typeorm/repository/LoginUserBackup.ts diff --git a/backend/src/typeorm/repository/LoginUser.ts b/backend/src/typeorm/repository/LoginUser.ts index e69de29bb..d0db007d0 100644 --- a/backend/src/typeorm/repository/LoginUser.ts +++ b/backend/src/typeorm/repository/LoginUser.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { LoginUser } from '@entity/LoginUser' + +@EntityRepository(LoginUser) +export class LoginUserRepository extends Repository {} diff --git a/backend/src/typeorm/repository/LoginUserBackup.ts b/backend/src/typeorm/repository/LoginUserBackup.ts new file mode 100644 index 000000000..8c729139a --- /dev/null +++ b/backend/src/typeorm/repository/LoginUserBackup.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { LoginUserBackup } from '@entity/LoginUserBackup' + +@EntityRepository(LoginUserBackup) +export class LoginUserBackupRepository extends Repository {} From 7a36d97835b83c023e1a6b7833a7eea82427eede Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 2 Nov 2021 21:17:00 +0100 Subject: [PATCH 1057/1843] lint fixes, disabled console lint, removed email todo since its logged - should be adequat --- backend/src/graphql/resolver/UserResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 769da6bdf..c883cbb39 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -13,7 +13,7 @@ import { crypto_sign_SECRETKEYBYTES, /* eslint-enable camelcase */ } from 'sodium-native' -import { getCustomRepository, NoNeedToReleaseEntityManagerError } from 'typeorm' +import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' @@ -298,7 +298,7 @@ export class UserResolver { // TODO: check if this insert method is correct, we had problems with that! const loginUserRepository = getCustomRepository(LoginUserRepository) await loginUserRepository.save(loginUser).catch((error) => { - // TODO: this triggered an EMail send + // eslint-disable-next-line no-console console.log('insert user failed', error) throw new Error('insert user failed') }) From c6af40d1bd90ce30abf523a8cf591ebd2c7d79e2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 00:51:26 +0100 Subject: [PATCH 1058/1843] we connot use those types, they are wrong --- backend/package.json | 1 - backend/yarn.lock | 7 ------- 2 files changed, 8 deletions(-) diff --git a/backend/package.json b/backend/package.json index c3fec6983..b80120cb0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -38,7 +38,6 @@ "devDependencies": { "@types/express": "^4.17.12", "@types/jsonwebtoken": "^8.5.2", - "@types/sodium-native": "^2.3.5", "@typescript-eslint/eslint-plugin": "^4.28.0", "@typescript-eslint/parser": "^4.28.0", "eslint": "^7.29.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 92c679039..da6a37950 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -951,13 +951,6 @@ "@types/mime" "^1" "@types/node" "*" -"@types/sodium-native@^2.3.5": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@types/sodium-native/-/sodium-native-2.3.5.tgz#5d2681e7b6b67bcbdc63cfb133e303ec9e942e43" - integrity sha512-a3DAIpW8+36XAY8aIR36JBQQsfOabxHuJwx11DL/PTvnbwEWPAXW66b8QbMi0r2vUnkOfREsketxdvjBmQxqDQ== - dependencies: - "@types/node" "*" - "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" From 2473f450c34ce6dc49ce8a3248f62bbf2e8bc532 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 00:51:55 +0100 Subject: [PATCH 1059/1843] - require sodium because else problems occur - fix key generation --- backend/src/graphql/resolver/UserResolver.ts | 79 +++++++++++++++----- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index c883cbb39..1ff60d769 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,16 +3,17 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -import { - /* eslint-disable camelcase */ - randombytes_random, - crypto_hash_sha512_instance, - crypto_hash_sha512_BYTES, - crypto_sign_seed_keypair, - crypto_sign_PUBLICKEYBYTES, - crypto_sign_SECRETKEYBYTES, - /* eslint-enable camelcase */ -} from 'sodium-native' +// import { +// /* eslint-disable camelcase */ +// randombytes_random, +// crypto_hash_sha512_instance, +// crypto_hash_sha512_BYTES, +// crypto_sign_seed_keypair, +// crypto_sign_PUBLICKEYBYTES, +// crypto_sign_SECRETKEYBYTES, +// /* eslint-enable camelcase */ +// } from 'sodium-native' + import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' @@ -41,6 +42,9 @@ import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' import { bigintToBuf } from 'bigint-conversion' +// eslint-disable-next-line @typescript-eslint/no-var-requires +const sodium = require('sodium-native') + // We will reuse this for changePassword const isPassword = (password: string): boolean => { if (!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/)) { @@ -79,11 +83,42 @@ const WORDS = fs.readFileSync('src/config/mnemonic.english.txt').toString().spli const PassphraseGenerate = (): string[] => { const result = [] for (let i = 0; i < PHRASE_WORD_COUNT; i++) { - result.push(WORDS[randombytes_random() % 2048]) + result.push(WORDS[sodium.randombytes_random() % 2048]) } return result } +/* + return [ + 'avoid', + 'security', + 'heavy', + 'mercy', + 'exit', + 'avocado', + 'actress', + 'apple', + 'crowd', + 'drop', + 'rib', + 'photo', + 'valley', + 'test', + 'board', + 'evidence', + 'blast', + 'pencil', + 'frost', + 'frame', + 'come', + 'vanish', + 'very', + 'inner', + ] +*/ +// pub: 0xdd1b7bb +// priv: 0xbcadd66 + const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { throw new Error('passphrase empty or to short') @@ -98,23 +133,29 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { // if (!wordIndicies || (!wordIndicies[0] && !wordIndicies[1] && !wordIndicies[2] && !wordIndicies[3])) { // return null; // } + const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) - const hash = crypto_hash_sha512_instance() + // sodium.crypto_hash_sha256_init(state /* , [key], outlen */) + sodium.crypto_hash_sha512_init(state) // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms for (let i = 0; i < PHRASE_WORD_COUNT; i++) { const value = BigInt(wordIndicies[i]) - hash.update(Buffer.from(bigintToBuf(value))) + sodium.crypto_hash_sha512_update(state, Buffer.from(bigintToBuf(value))) // hash.update(Buffer.from(bigintToBuf(value))) } const clearPassphrase = passphrase.join(' ') - hash.update(Buffer.from(clearPassphrase)) - const outputHashBuffer = Buffer.alloc(crypto_hash_sha512_BYTES) - hash.final(outputHashBuffer) + sodium.crypto_hash_sha512_update(state, Buffer.from(clearPassphrase)) // hash.update(Buffer.from(clearPassphrase)) + const outputHashBuffer = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) + sodium.crypto_hash_sha512_final(state, outputHashBuffer) // hash.final(outputHashBuffer) - const pubKey = Buffer.alloc(crypto_sign_PUBLICKEYBYTES) - const privKey = Buffer.alloc(crypto_sign_SECRETKEYBYTES) + const pubKey = Buffer.alloc(sodium.crypto_sign_PUBLICKEYBYTES) + const privKey = Buffer.alloc(sodium.crypto_sign_SECRETKEYBYTES) - crypto_sign_seed_keypair(pubKey, privKey, outputHashBuffer) + sodium.crypto_sign_seed_keypair( + pubKey, + privKey, + outputHashBuffer.slice(sodium.crypto_sign_SEEDBYTES), + ) return [pubKey, privKey] } From 5736d3ba0b7c90b2ec4d871e4ad365a31dd558a0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 02:08:10 +0100 Subject: [PATCH 1060/1843] removed bigint-conversion, fixed keygeneration to be aligned 100% with login_server trailing space on passphrase bigint to hash conversion --- backend/package.json | 1 - backend/src/graphql/resolver/UserResolver.ts | 23 +++++++++++--------- backend/yarn.lock | 12 ---------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/backend/package.json b/backend/package.json index b80120cb0..ee7365b72 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,7 +19,6 @@ "@types/jest": "^27.0.2", "apollo-server-express": "^2.25.2", "axios": "^0.21.1", - "bigint-conversion": "^2.2.1", "class-validator": "^0.13.1", "cors": "^2.8.5", "dotenv": "^10.0.0", diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 1ff60d769..2f4fe93cf 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -40,8 +40,8 @@ import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { LoginUserBackupRepository } from '../../typeorm/repository/LoginUserBackup' import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' -import { bigintToBuf } from 'bigint-conversion' +// TODO apparently the types are cannot be loaded correctly? IDK whats wrong and we have to use require // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') @@ -117,7 +117,7 @@ const PassphraseGenerate = (): string[] => { ] */ // pub: 0xdd1b7bb -// priv: 0xbcadd66 +// priv: 0xbcadd66 (wrong?) const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { @@ -129,24 +129,27 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { wordIndicies.push(WORDS.indexOf(passphrase[i])) } + // eslint-disable-next-line no-console + console.log(wordIndicies) // TODO: wtf is this? // if (!wordIndicies || (!wordIndicies[0] && !wordIndicies[1] && !wordIndicies[2] && !wordIndicies[3])) { // return null; // } - const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) - // sodium.crypto_hash_sha256_init(state /* , [key], outlen */) + const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) sodium.crypto_hash_sha512_init(state) // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms for (let i = 0; i < PHRASE_WORD_COUNT; i++) { - const value = BigInt(wordIndicies[i]) - sodium.crypto_hash_sha512_update(state, Buffer.from(bigintToBuf(value))) // hash.update(Buffer.from(bigintToBuf(value))) + const value = Buffer.alloc(8) + value.writeBigInt64LE(BigInt(wordIndicies[i])) + sodium.crypto_hash_sha512_update(state, value) } - const clearPassphrase = passphrase.join(' ') - sodium.crypto_hash_sha512_update(state, Buffer.from(clearPassphrase)) // hash.update(Buffer.from(clearPassphrase)) + // TODO trailing space in login_server + const clearPassphrase = passphrase.join(' ') + ' ' + sodium.crypto_hash_sha512_update(state, Buffer.from(clearPassphrase)) const outputHashBuffer = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) - sodium.crypto_hash_sha512_final(state, outputHashBuffer) // hash.final(outputHashBuffer) + sodium.crypto_hash_sha512_final(state, outputHashBuffer) const pubKey = Buffer.alloc(sodium.crypto_sign_PUBLICKEYBYTES) const privKey = Buffer.alloc(sodium.crypto_sign_SECRETKEYBYTES) @@ -154,7 +157,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { sodium.crypto_sign_seed_keypair( pubKey, privKey, - outputHashBuffer.slice(sodium.crypto_sign_SEEDBYTES), + outputHashBuffer.slice(0, sodium.crypto_sign_SEEDBYTES), ) return [pubKey, privKey] diff --git a/backend/yarn.lock b/backend/yarn.lock index da6a37950..7cd146647 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -562,11 +562,6 @@ resolved "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz" integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg== -"@juanelas/base64@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@juanelas/base64/-/base64-1.0.1.tgz#aaede00ffdca595741fc69d0008b4cfc8f08293a" - integrity sha512-ZK/wWrjMrrMcprtOV72iilC1M/HfZcF2JeUJPHOL0tMm1TZrh9UhHDQEdPny/MmmT7tO4w47ycuy0YTnBrS5fg== - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" @@ -1512,13 +1507,6 @@ base64-js@^1.3.1: resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bigint-conversion@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/bigint-conversion/-/bigint-conversion-2.2.1.tgz#08c9f17a826943c7e56d4bfa9f0fc7fe8050a940" - integrity sha512-9TvqpV+VZ04fPKv4KPLQRk5ZAFhgHX4F7bYQY263/BbJBFzEGbtBeTQV9oNuAGaqj88PXdov1OcSNQtq9K9MPA== - dependencies: - "@juanelas/base64" "^1.0.1" - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" From d4e0815d0068d817c9261b34992bfaf9b404c0f6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 02:51:34 +0100 Subject: [PATCH 1061/1843] cleaned the whole thing --- backend/src/graphql/resolver/UserResolver.ts | 135 ++++++------------- 1 file changed, 44 insertions(+), 91 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 2f4fe93cf..61951cec1 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,17 +3,6 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -// import { -// /* eslint-disable camelcase */ -// randombytes_random, -// crypto_hash_sha512_instance, -// crypto_hash_sha512_BYTES, -// crypto_sign_seed_keypair, -// crypto_sign_PUBLICKEYBYTES, -// crypto_sign_SECRETKEYBYTES, -// /* eslint-enable camelcase */ -// } from 'sodium-native' - import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' @@ -42,38 +31,26 @@ import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' // TODO apparently the types are cannot be loaded correctly? IDK whats wrong and we have to use require +// import { +// /* eslint-disable camelcase */ +// randombytes_random, +// crypto_hash_sha512_instance, +// crypto_hash_sha512_BYTES, +// crypto_sign_seed_keypair, +// crypto_sign_PUBLICKEYBYTES, +// crypto_sign_SECRETKEYBYTES, +// /* eslint-enable camelcase */ +// } from 'sodium-native' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') // We will reuse this for changePassword const isPassword = (password: string): boolean => { - if (!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/)) { - return false - // TODO we dont need this right, frontend does it? - /* - if(pwd.length < 8){ - throw new Error('Your password is to short!') - } - if(!pwd.match(/[a-z]/)){ - throw new Error('Your password does not contain lowercase letters!') - } - if(!pwd.match(/[A-Z]/)){ - throw new Error('Your password does not contain any capital letters!') - } - if(!pwd.match(/[0-9]/)){ - throw new Error('Your password does not contain any number!') - } - if(!pwd.match(/[^a-zA-Z0-9 \\t\\n\\r]/)){ - throw new Error('Your password does not contain special characters!') - } - */ - } - return true + return !!password.match(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^a-zA-Z0-9 \\t\\n\\r]).{8,}$/) } const LANGUAGES = ['de', 'en'] const DEFAULT_LANGUAGE = 'de' -// very likely to be reused const isLanguage = (language: string): boolean => { return LANGUAGES.includes(language) } @@ -131,10 +108,6 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { // eslint-disable-next-line no-console console.log(wordIndicies) - // TODO: wtf is this? - // if (!wordIndicies || (!wordIndicies[0] && !wordIndicies[1] && !wordIndicies[2] && !wordIndicies[3])) { - // return null; - // } const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) sodium.crypto_hash_sha512_init(state) @@ -163,42 +136,6 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { return [pubKey, privKey] } -const generateKeys = async (email: string): Promise => { - const loginUserRepository = getCustomRepository(LoginUserRepository) - const mNewUser = await loginUserRepository.findOneOrFail({ email }) - // TODO figure mnemonic database - // const lang = mNewUser.language - /* - if (LANG_DE == lang) { - mnemonic_type = ServerConfig::MNEMONIC_GRADIDO_BOOK_GERMAN_RANDOM_ORDER_FIXED_CASES; - } - */ - - const passphrase = PassphraseGenerate() - - const loginUserBackup = new LoginUserBackup() - loginUserBackup.userId = mNewUser.id - loginUserBackup.passphrase = passphrase.join(' ') - loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - - const loginUserBackupRepository = getCustomRepository(LoginUserBackupRepository) - await loginUserBackupRepository.save(loginUserBackup).catch(() => { - throw new Error('insert user backup failed') - }) - - // keys - const gradidoKeyPair = KeyPairEd25519Create(passphrase) - - mNewUser.pubKey = gradidoKeyPair[0] - mNewUser.privKey = gradidoKeyPair[1] - - await loginUserRepository.save(mNewUser).catch(() => { - throw new Error(`Error saving new generated pub/priv keys, email: ${email}`) - }) - - return gradidoKeyPair -} - @Resolver() export class UserResolver { @Query(() => User) @@ -326,30 +263,59 @@ export class UserResolver { throw new Error(`User already exists.`) } + const passphrase = PassphraseGenerate() + const keyPair = KeyPairEd25519Create(passphrase) + + // Table: login_users const loginUser = new LoginUser() loginUser.email = email loginUser.firstName = firstName loginUser.lastName = lastName loginUser.username = username loginUser.description = '' + // TODO password? loginUser.password = BigInt(0) // TODO: This was never used according to my analysis. Therefore I consider it safe to set to 0 loginUser.emailHash = Buffer.from([0]) loginUser.language = language loginUser.groupId = 1 loginUser.publisherId = publisherId + loginUser.pubKey = keyPair[0] + loginUser.privKey = keyPair[1] - // TODO: check if this insert method is correct, we had problems with that! + // TODO transaction const loginUserRepository = getCustomRepository(LoginUserRepository) - await loginUserRepository.save(loginUser).catch((error) => { + const { id: loginUserId } = await loginUserRepository.save(loginUser).catch((error) => { // eslint-disable-next-line no-console console.log('insert user failed', error) throw new Error('insert user failed') }) - const keys = await generateKeys(email) - const pubkey = keys[0] + // Table: login_user_backups + const loginUserBackup = new LoginUserBackup() + loginUserBackup.userId = loginUserId + loginUserBackup.passphrase = passphrase.join(' ') + loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; + // TODO transaction + const loginUserBackupRepository = getCustomRepository(LoginUserBackupRepository) + await loginUserBackupRepository.save(loginUserBackup).catch(() => { + throw new Error('insert user backup failed') + }) + + // Table: state_users + const dbuser = new DbUser() + dbuser.pubkey = keyPair[0] + dbuser.email = email + dbuser.firstName = firstName + dbuser.lastName = lastName + dbuser.username = username + + await userRepository.save(dbuser).catch(() => { + throw new Error('error saving user') + }) + + // TODO this is the password encryption // TODO: we do not login the user as before, since session management is not yet ported // calculate encryption key, could need some time, will save encrypted privkey to db // UniLib::controller::TaskPtr create_authenticated_encrypten_key = new AuthenticatedEncryptionCreateKeyTask(user, password); @@ -366,19 +332,6 @@ export class UserResolver { // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); - // ------------------------------------------------------ - - const dbuser = new DbUser() - dbuser.pubkey = pubkey - dbuser.email = email - dbuser.firstName = firstName - dbuser.lastName = lastName - dbuser.username = username - - await userRepository.save(dbuser).catch(() => { - throw new Error('error saving user') - }) - return 'success' } From ff0388c82c05d944823dc25e385009c40ecf32bf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 02:57:25 +0100 Subject: [PATCH 1062/1843] typo --- backend/src/graphql/resolver/UserResolver.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 61951cec1..32272fbda 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -304,14 +304,14 @@ export class UserResolver { }) // Table: state_users - const dbuser = new DbUser() - dbuser.pubkey = keyPair[0] - dbuser.email = email - dbuser.firstName = firstName - dbuser.lastName = lastName - dbuser.username = username + const dbUser = new DbUser() + dbUser.pubkey = keyPair[0] + dbUser.email = email + dbUser.firstName = firstName + dbUser.lastName = lastName + dbUser.username = username - await userRepository.save(dbuser).catch(() => { + await userRepository.save(dbUser).catch(() => { throw new Error('error saving user') }) From 30455fd22077d84c2e0822f38207494720d4e0cc Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 03:08:53 +0100 Subject: [PATCH 1063/1843] missing todo --- backend/src/graphql/resolver/UserResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 32272fbda..a07c944ae 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -311,6 +311,7 @@ export class UserResolver { dbUser.lastName = lastName dbUser.username = username + // TDOO transaction await userRepository.save(dbUser).catch(() => { throw new Error('error saving user') }) From 2381c3dd7a705c202984261c450f7039a2c33ac9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 04:39:57 +0100 Subject: [PATCH 1064/1843] generate password hash --- backend/src/graphql/resolver/UserResolver.ts | 50 ++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index a07c944ae..f525e233a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -136,6 +136,42 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { return [pubKey, privKey] } +const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[] => { + // TODO: put that in the actual config + const configCryptoAppSecret = Buffer.from('21ffbbc616fe', 'hex') + const configCryptoServerKey = Buffer.from('a51ef8ac7ef1abf162fb7a65261acd7a', 'hex') + if (configCryptoServerKey.length !== sodium.crypto_shorthash_KEYBYTES) { + throw new Error( + `ServerKey has an invalid size. The size must be ${sodium.crypto_shorthash_KEYBYTES} bytes.`, + ) + } + + const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) + sodium.crypto_hash_sha512_init(state) + sodium.crypto_hash_sha512_update(state, Buffer.from(salt)) + sodium.crypto_hash_sha512_update(state, Buffer.from(configCryptoAppSecret)) + const hash = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) + sodium.crypto_hash_sha512_final(state, hash) + + const encryptionKey = Buffer.alloc(sodium.crypto_box_SEEDBYTES) + const opsLimit = 10 + const memLimit = 33554432 + const algo = 2 + sodium.crypto_pwhash( + encryptionKey, + Buffer.from(password), + hash.slice(0, sodium.crypto_pwhash_SALTBYTES), + opsLimit, + memLimit, + algo, + ) + + const encryptionKeyHash = Buffer.alloc(sodium.crypto_shorthash_BYTES) + sodium.crypto_shorthash(encryptionKeyHash, encryptionKey, configCryptoServerKey) + + return [encryptionKeyHash, encryptionKey] +} + @Resolver() export class UserResolver { @Query(() => User) @@ -265,6 +301,7 @@ export class UserResolver { const passphrase = PassphraseGenerate() const keyPair = KeyPairEd25519Create(passphrase) + const passwordHash = SecretKeyCryptographyCreateKey(email, password) // Table: login_users const loginUser = new LoginUser() @@ -273,9 +310,10 @@ export class UserResolver { loginUser.lastName = lastName loginUser.username = username loginUser.description = '' - // TODO password? - loginUser.password = BigInt(0) - // TODO: This was never used according to my analysis. Therefore I consider it safe to set to 0 + loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash + // TODO: This was never used according to my analysis. Therefore I consider it + // safe to set to 0, since we can generate it whenever we need it, assuming + // that its actually the email hash and the password is not involved loginUser.emailHash = Buffer.from([0]) loginUser.language = language loginUser.groupId = 1 @@ -316,12 +354,6 @@ export class UserResolver { throw new Error('error saving user') }) - // TODO this is the password encryption - // TODO: we do not login the user as before, since session management is not yet ported - // calculate encryption key, could need some time, will save encrypted privkey to db - // UniLib::controller::TaskPtr create_authenticated_encrypten_key = new AuthenticatedEncryptionCreateKeyTask(user, password); - // create_authenticated_encrypten_key->scheduleTask(create_authenticated_encrypten_key); - // TODO: send EMail (EMAIL_OPT_IN_REGISTER) // const emailType = 2 // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); From 8ed4ade3fe97efcf7ddd1b62a79c9303521fb3c0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 04:44:42 +0100 Subject: [PATCH 1065/1843] finished todo --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index f525e233a..8aabf0cc3 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -118,7 +118,7 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { value.writeBigInt64LE(BigInt(wordIndicies[i])) sodium.crypto_hash_sha512_update(state, value) } - // TODO trailing space in login_server + // trailing space is part of the login_server implementation const clearPassphrase = passphrase.join(' ') + ' ' sodium.crypto_hash_sha512_update(state, Buffer.from(clearPassphrase)) const outputHashBuffer = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) From 86fbe1d11c15d1606d0e0cb2a2a64e18084bbfdb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 04:59:25 +0100 Subject: [PATCH 1066/1843] generate email hash --- backend/src/graphql/resolver/UserResolver.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8aabf0cc3..7688f3766 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -172,6 +172,13 @@ const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[ return [encryptionKeyHash, encryptionKey] } +const getEmailHash = (email:string):Buffer => +{ + const emailHash = Buffer.alloc(sodium.crypto_generichash_BYTES) + sodium.crypto_generichash(emailHash,Buffer.from(email)); + return emailHash +} + @Resolver() export class UserResolver { @Query(() => User) @@ -302,6 +309,7 @@ export class UserResolver { const passphrase = PassphraseGenerate() const keyPair = KeyPairEd25519Create(passphrase) const passwordHash = SecretKeyCryptographyCreateKey(email, password) + const emailHash = getEmailHash(email) // Table: login_users const loginUser = new LoginUser() @@ -311,10 +319,7 @@ export class UserResolver { loginUser.username = username loginUser.description = '' loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash - // TODO: This was never used according to my analysis. Therefore I consider it - // safe to set to 0, since we can generate it whenever we need it, assuming - // that its actually the email hash and the password is not involved - loginUser.emailHash = Buffer.from([0]) + loginUser.emailHash = emailHash loginUser.language = language loginUser.groupId = 1 loginUser.publisherId = publisherId From 02ce432dc5cb6d72642d40ef862896de3fb64e8a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 05:08:05 +0100 Subject: [PATCH 1067/1843] lint, removed console, removed todo --- backend/src/graphql/resolver/UserResolver.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 7688f3766..b80b202a1 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -106,9 +106,6 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { wordIndicies.push(WORDS.indexOf(passphrase[i])) } - // eslint-disable-next-line no-console - console.log(wordIndicies) - const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) sodium.crypto_hash_sha512_init(state) @@ -172,10 +169,9 @@ const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[ return [encryptionKeyHash, encryptionKey] } -const getEmailHash = (email:string):Buffer => -{ +const getEmailHash = (email: string): Buffer => { const emailHash = Buffer.alloc(sodium.crypto_generichash_BYTES) - sodium.crypto_generichash(emailHash,Buffer.from(email)); + sodium.crypto_generichash(emailHash, Buffer.from(email)) return emailHash } @@ -284,7 +280,6 @@ export class UserResolver { } // Validate Password - // TODO Login Server ignored this when he got an empty password?! if (!isPassword(password)) { throw new Error( 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', From f7f0d9821928114bdc5db6b494096e6594dac7c0 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 3 Nov 2021 09:41:57 +0100 Subject: [PATCH 1068/1843] Optimise code, withdrew loop and integrated the logic in the second loop. --- backend/src/graphql/resolver/UserResolver.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index b80b202a1..b80e69c8e 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -101,18 +101,14 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { throw new Error('passphrase empty or to short') } - const wordIndicies = [] - for (let i = 0; i < PHRASE_WORD_COUNT; i++) { - wordIndicies.push(WORDS.indexOf(passphrase[i])) - } - const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) sodium.crypto_hash_sha512_init(state) // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms for (let i = 0; i < PHRASE_WORD_COUNT; i++) { const value = Buffer.alloc(8) - value.writeBigInt64LE(BigInt(wordIndicies[i])) + const wordIndex = WORDS.indexOf(passphrase[i]) + value.writeBigInt64LE(BigInt(wordIndex)) sodium.crypto_hash_sha512_update(state, value) } // trailing space is part of the login_server implementation @@ -350,7 +346,9 @@ export class UserResolver { dbUser.username = username // TDOO transaction - await userRepository.save(dbUser).catch(() => { + await userRepository.save(dbUser).catch((er) => { + // eslint-disable-next-line no-console + console.log('Error while saving dbUser', er) throw new Error('error saving user') }) From 5bf98f20eb691d30c706281b63e11c359268c3ef Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Wed, 3 Nov 2021 09:57:48 +0100 Subject: [PATCH 1069/1843] move skip button before abort button --- login_server/src/cpsp/CheckTransaction.cpsp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/login_server/src/cpsp/CheckTransaction.cpsp b/login_server/src/cpsp/CheckTransaction.cpsp index d303db8c3..f0c56c100 100644 --- a/login_server/src/cpsp/CheckTransaction.cpsp +++ b/login_server/src/cpsp/CheckTransaction.cpsp @@ -339,16 +339,15 @@ enum PageState { <%= gettext("Transaktion unterzeichnen") %> <% } %> + <% if(transaction_removeable) { %> - <% } else { %> - <% } %> <% } %> From 3fcedaec4182d5e0ddc1bb402fd3e8e5cd005383 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 20:52:30 +0100 Subject: [PATCH 1070/1843] encrypt private key --- backend/src/graphql/resolver/UserResolver.ts | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index b80e69c8e..dbe1aa6fa 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -63,9 +63,7 @@ const PassphraseGenerate = (): string[] => { result.push(WORDS[sodium.randombytes_random() % 2048]) } return result -} - -/* + /* return [ 'avoid', 'security', @@ -92,9 +90,8 @@ const PassphraseGenerate = (): string[] => { 'very', 'inner', ] -*/ -// pub: 0xdd1b7bb -// priv: 0xbcadd66 (wrong?) + */ +} const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { @@ -171,6 +168,15 @@ const getEmailHash = (email: string): Buffer => { return emailHash } +const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): Buffer => { + const encrypted = Buffer.alloc(sodium.crypto_secretbox_MACBYTES + message.length) + const nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES) + nonce.fill(31) // static nonce + + sodium.crypto_secretbox_easy(encrypted, message, nonce, encryptionKey) + return encrypted +} + @Resolver() export class UserResolver { @Query(() => User) @@ -298,9 +304,10 @@ export class UserResolver { } const passphrase = PassphraseGenerate() - const keyPair = KeyPairEd25519Create(passphrase) - const passwordHash = SecretKeyCryptographyCreateKey(email, password) + const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key + const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash const emailHash = getEmailHash(email) + const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) // Table: login_users const loginUser = new LoginUser() @@ -315,7 +322,7 @@ export class UserResolver { loginUser.groupId = 1 loginUser.publisherId = publisherId loginUser.pubKey = keyPair[0] - loginUser.privKey = keyPair[1] + loginUser.privKey = encryptedPrivkey // TODO transaction const loginUserRepository = getCustomRepository(LoginUserRepository) @@ -328,7 +335,7 @@ export class UserResolver { // Table: login_user_backups const loginUserBackup = new LoginUserBackup() loginUserBackup.userId = loginUserId - loginUserBackup.passphrase = passphrase.join(' ') + loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; // TODO transaction From ab6418527575e54ce3e47e9cc0c73f56fa21bd3e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 21:36:47 +0100 Subject: [PATCH 1071/1843] test results --- backend/src/graphql/resolver/UserResolver.ts | 60 ++++++++++++-------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index dbe1aa6fa..7e0db4791 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -65,34 +65,48 @@ const PassphraseGenerate = (): string[] => { return result /* return [ - 'avoid', - 'security', - 'heavy', - 'mercy', - 'exit', - 'avocado', - 'actress', - 'apple', - 'crowd', - 'drop', - 'rib', - 'photo', - 'valley', - 'test', - 'board', - 'evidence', - 'blast', - 'pencil', + 'behind', + 'salmon', + 'fluid', + 'orphan', 'frost', - 'frame', - 'come', - 'vanish', - 'very', - 'inner', + 'elder', + 'amateur', + 'always', + 'panel', + 'palm', + 'leopard', + 'essay', + 'punch', + 'title', + 'fun', + 'annual', + 'page', + 'hundred', + 'journey', + 'select', + 'figure', + 'tunnel', + 'casual', + 'bar', ] */ } +/* +Test results: +INSERT INTO `login_users` (`id`, `email`, `first_name`, `last_name`, `username`, `description`, `password`, `pubkey`, `privkey`, `email_hash`, `created`, `email_checked`, `passphrase_shown`, `language`, `disabled`, `group_id`, `publisher_id`) VALUES +// old +(1, 'peter@lustig.de', 'peter', 'lustig', '', '', 4747956395458240931, 0x8c75edd507f470e5378f927489374694d68f3d155523f1c4402c36affd35a7ed, 0xb0e310655726b088631ccfd31ad6470ee50115c161dde8559572fa90657270ff13dc1200b2d3ea90dfbe92f3a4475ee4d9cee4989e39736a0870c33284bc73a8ae690e6da89f241a121eb3b500c22885, 0x9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036, '2021-11-03 20:05:04', 0, 0, 'de', 0, 1, 0); +// new +(2, 'peter@lustig.de', 'peter', 'lustig', '', '', 4747956395458240931, 0x8c75edd507f470e5378f927489374694d68f3d155523f1c4402c36affd35a7ed, 0xb0e310655726b088631ccfd31ad6470ee50115c161dde8559572fa90657270ff13dc1200b2d3ea90dfbe92f3a4475ee4d9cee4989e39736a0870c33284bc73a8ae690e6da89f241a121eb3b500c22885, 0x9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036, '2021-11-03 20:22:15', 0, 0, 'de', 0, 1, 0); +INSERT INTO `login_user_backups` (`id`, `user_id`, `passphrase`, `mnemonic_type`) VALUES +// old +(1, 1, 'behind salmon fluid orphan frost elder amateur always panel palm leopard essay punch title fun annual page hundred journey select figure tunnel casual bar ', 2); +// new +(2, 2, 'behind salmon fluid orphan frost elder amateur always panel palm leopard essay punch title fun annual page hundred journey select figure tunnel casual bar ', 2); +*/ + const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { throw new Error('passphrase empty or to short') From 4f99a111f20ee154cc374f1b7d0bb3cfc27ad7a3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 20 Oct 2021 20:25:16 +0200 Subject: [PATCH 1072/1843] module alias in create server --- backend/src/server/createServer.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 6c5149ce6..4644d982e 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import 'reflect-metadata' +import 'module-alias/register' import { ApolloServer } from 'apollo-server-express' import express from 'express' From 114cbb30701e712ab9c58d61974c8c58e75da011 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 21:03:10 +0200 Subject: [PATCH 1073/1843] try not to start backend but execute it directly later on --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 209e39af8..9f86d17d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -381,7 +381,7 @@ jobs: # UNIT TESTS BACKEND ##################################################### ########################################################################## - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test run: docker-compose exec -T backend yarn test ########################################################################## From fbc8b9c7ebd7766c2eabc31d5d0821ff503d0482 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 21:23:36 +0200 Subject: [PATCH 1074/1843] use the same compose files for docker-exec --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9f86d17d4..c06b5ccdd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,7 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test - run: docker-compose exec -T backend yarn test + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# ########################################################################## From 29b9936fc782dc84b26490688be35dc02a800217 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 21:39:04 +0200 Subject: [PATCH 1075/1843] try with a shellmask --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c06b5ccdd..90aed8b57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,8 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test + shell: 'script -q -e -c "bash {0}"' + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# ########################################################################## From ddc16876996624914984db5e430ef7b99c3a893f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 21:46:17 +0200 Subject: [PATCH 1076/1843] without shell mask or tty mask --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90aed8b57..e0e3ba381 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,6 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test - shell: 'script -q -e -c "bash {0}"' run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# From 5fcca07836481a58b3b7f166bc5e41f9ffd40909 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 21:52:41 +0200 Subject: [PATCH 1077/1843] also start backend with docker-compose --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0e3ba381..94dcdee22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -381,7 +381,7 @@ jobs: # UNIT TESTS BACKEND ##################################################### ########################################################################## - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec backend yarn test ########################################################################## From 6504e54db123500baa48bfc0d905a475241ec5de Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 22:31:21 +0200 Subject: [PATCH 1078/1843] tty disabled --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94dcdee22..0c5335dbc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,7 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec backend yarn test + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# ########################################################################## From eff239eeee471b5bd1523927a52f1f741d70602a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 22:38:56 +0200 Subject: [PATCH 1079/1843] check if we can avoid memory limit without coverage report --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 7b08be989..193a46f31 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", - "test": "jest --coverage" + "test": "jest" }, "dependencies": { "@types/jest": "^27.0.2", From 9f264f7ad35a39aef9e0f7e50a8b318c7097362e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 22:45:45 +0200 Subject: [PATCH 1080/1843] jest coverage again --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 193a46f31..7b08be989 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", - "test": "jest" + "test": "jest --coverage" }, "dependencies": { "@types/jest": "^27.0.2", From e1d1a05be50cd76614e3a22ad24f5d6be64cf139 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 22:49:32 +0200 Subject: [PATCH 1081/1843] try to split command --- .github/workflows/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c5335dbc..7575154f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -380,8 +380,12 @@ jobs: ########################################################################## # UNIT TESTS BACKEND ##################################################### ########################################################################## - - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend + - name: backend | docker-compose mariadb database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database + - name: backend | docker-compose stop database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml stop database + - name: backend | docker-compose backend + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend - name: backend Unit tests | test run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## From a8b74073ceae94ff86669588247e898cad712ada Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 21 Oct 2021 23:00:29 +0200 Subject: [PATCH 1082/1843] revert stuff --- .github/workflows/test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7575154f7..0c5335dbc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -380,12 +380,8 @@ jobs: ########################################################################## # UNIT TESTS BACKEND ##################################################### ########################################################################## - - name: backend | docker-compose mariadb database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - - name: backend | docker-compose stop database - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml stop database - - name: backend | docker-compose backend - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend + - name: backend | docker-compose + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## From 18b52663897a374713f4695a1bc3bbeb32466353 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 23:25:49 +0100 Subject: [PATCH 1083/1843] adjuested database version accoridng to master --- backend/src/server/createServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4644d982e..4350483ff 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -25,7 +25,7 @@ import schema from '../graphql/schema' // TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; -const DB_VERSION = '0002-add_settings' +const DB_VERSION = '0004-login_server_data' const createServer = async (context: any = serverContext): Promise => { // open mysql connection From f2b5155f1cd1ba82d2e42847fb09223cef8fc6cb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 23:31:41 +0100 Subject: [PATCH 1084/1843] merge error --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c5335dbc..b3d9d997b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,7 +47,7 @@ jobs: ########################################################################## - name: Backend | Build `test` image run: | - docker build -f ./backend/Dockerfile --target test -t "gradido/backend:test" backend/ + docker build -f ./backend/Dockerfile --target test -t "gradido/backend:test" . docker save "gradido/backend:test" > /tmp/backend.tar - name: Upload Artifact uses: actions/upload-artifact@v2 From 153264b1ef45f895d8a4e2d72a4055e28beedf2d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 3 Nov 2021 23:44:27 +0100 Subject: [PATCH 1085/1843] do not start the backend --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3d9d997b..b4ec548a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -381,7 +381,7 @@ jobs: # UNIT TESTS BACKEND ##################################################### ########################################################################## - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## From 9aecae227fa56ede80056e419f79a44c51ba9637 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:10:37 +0100 Subject: [PATCH 1086/1843] run tests in band --- .github/workflows/test.yml | 2 +- backend/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4ec548a9..b3d9d997b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -381,7 +381,7 @@ jobs: # UNIT TESTS BACKEND ##################################################### ########################################################################## - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## diff --git a/backend/package.json b/backend/package.json index 7b08be989..c253f4178 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", - "test": "jest --coverage" + "test": "jest --coverage --runInBand" }, "dependencies": { "@types/jest": "^27.0.2", From 33bbf4688a7c52146f534ee06414290bbd874f3b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:16:44 +0100 Subject: [PATCH 1087/1843] without coverage --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index c253f4178..f60706996 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", - "test": "jest --coverage --runInBand" + "test": "jest --runInBand" }, "dependencies": { "@types/jest": "^27.0.2", From 03d198183dcc87d13f45dcefa2c033105c6c73e5 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:32:46 +0100 Subject: [PATCH 1088/1843] coverage again --- .github/workflows/test.yml | 3 ++- backend/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3d9d997b..e1d5426e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,8 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test + run: cd backend && yarn && yarn test + # run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# ########################################################################## diff --git a/backend/package.json b/backend/package.json index f60706996..dda91d754 100644 --- a/backend/package.json +++ b/backend/package.json @@ -13,7 +13,7 @@ "start": "node build/index.js", "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts", "lint": "eslint . --ext .js,.ts", - "test": "jest --runInBand" + "test": "jest --runInBand --coverage " }, "dependencies": { "@types/jest": "^27.0.2", From 8b047dfffe4064182b80f369bc27af8b99e760f3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:40:46 +0100 Subject: [PATCH 1089/1843] checkout database project aswell --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1d5426e0..b00926dc8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,7 +383,7 @@ jobs: - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend - name: backend Unit tests | test - run: cd backend && yarn && yarn test + run: cd database && yarn && cd ../backend && yarn && yarn test # run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test ########################################################################## # COVERAGE CHECK BACKEND ################################################# From 574ea377dbfda53f91b40ded3f4d6a20459138b9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:41:18 +0100 Subject: [PATCH 1090/1843] do not start the backend --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b00926dc8..68414b022 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -381,7 +381,7 @@ jobs: # UNIT TESTS BACKEND ##################################################### ########################################################################## - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database backend + run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb database - name: backend Unit tests | test run: cd database && yarn && cd ../backend && yarn && yarn test # run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test From 1f4058e5e556c41094fcb32e686e174ce0335921 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 00:51:39 +0100 Subject: [PATCH 1091/1843] expose mariadb to external-net in test environment --- docker-compose.test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index b6ad3eb1f..9fc5eede8 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -29,6 +29,7 @@ services: - MARIADB_USER=root networks: - internal-net + - external-net ports: - 3306:3306 volumes: From aa40d4efbfa32e3cde5666e591930c3ac87d604a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 01:08:39 +0100 Subject: [PATCH 1092/1843] restart database project --- docker-compose.test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 9fc5eede8..740f62958 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -33,7 +33,8 @@ services: ports: - 3306:3306 volumes: - - db_test_vol:/var/lib/mysql + - db_test_vol:/var/lib/mysql + restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run ######################################################### ## LOGIN SERVER ######################################### From d700c30dd1c8bd476069445e499900ecab1b2b28 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 01:19:46 +0100 Subject: [PATCH 1093/1843] restart database not mariadb --- docker-compose.test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 740f62958..e7b0e9849 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -16,6 +16,12 @@ services: - NODE_ENV="test" - DB_HOST=mariadb + ######################################################## + # DATABASE ############################################# + ######################################################## + database: + restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run + ######################################################### ## MARIADB ############################################## ######################################################### @@ -34,7 +40,6 @@ services: - 3306:3306 volumes: - db_test_vol:/var/lib/mysql - restart: always # this is very dangerous, but worth a test for the delayed mariadb startup at first run ######################################################### ## LOGIN SERVER ######################################### From 2b99e1668142d96b417a0bb1cd86e93bd44f8b09 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 01:30:39 +0100 Subject: [PATCH 1094/1843] correct coverage path --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68414b022..75fd46a08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -393,7 +393,7 @@ jobs: with: report_name: Coverage Backend type: lcov - result_path: ./coverage/lcov.info + result_path: ./backend/coverage/lcov.info min_coverage: 45 token: ${{ github.token }} From 2bd63985b221e9ee0a03c9c6dd51f97828b35dc9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 02:18:19 +0100 Subject: [PATCH 1095/1843] externalize login server secrets, now configurable --- backend/.env.dist | 4 +++- backend/src/config/index.ts | 7 ++++++- backend/src/graphql/resolver/UserResolver.ts | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index 3ac50ac9b..98cf23263 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -18,4 +18,6 @@ DB_DATABASE=gradido_community COMMUNITY_NAME= COMMUNITY_URL= COMMUNITY_REGISTER_URL= -COMMUNITY_DESCRIPTION= \ No newline at end of file +COMMUNITY_DESCRIPTION= +LOGIN_APP_SECRET=21ffbbc616fe +LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a \ No newline at end of file diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 7de498f85..a5413b741 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -39,9 +39,14 @@ const community = { process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.', } +const loginServer = { + LOGIN_APP_SECRET: process.env.LOGIN_APP_SECRET || '21ffbbc616fe', + LOGIN_SERVER_KEY: process.env.LOGIN_SERVER_KEY || 'a51ef8ac7ef1abf162fb7a65261acd7a', +} + // This is needed by graphql-directive-auth process.env.APP_SECRET = server.JWT_SECRET -const CONFIG = { ...server, ...database, ...klicktipp, ...community } +const CONFIG = { ...server, ...database, ...klicktipp, ...community, ...loginServer } export default CONFIG diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 7e0db4791..1cabc49bd 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -142,9 +142,9 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[] => { // TODO: put that in the actual config - const configCryptoAppSecret = Buffer.from('21ffbbc616fe', 'hex') - const configCryptoServerKey = Buffer.from('a51ef8ac7ef1abf162fb7a65261acd7a', 'hex') - if (configCryptoServerKey.length !== sodium.crypto_shorthash_KEYBYTES) { + const configLoginAppSecret = Buffer.from(CONFIG.LOGIN_APP_SECRET, 'hex') + const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex') + if (configLoginServerKey.length !== sodium.crypto_shorthash_KEYBYTES) { throw new Error( `ServerKey has an invalid size. The size must be ${sodium.crypto_shorthash_KEYBYTES} bytes.`, ) @@ -153,7 +153,7 @@ const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[ const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) sodium.crypto_hash_sha512_init(state) sodium.crypto_hash_sha512_update(state, Buffer.from(salt)) - sodium.crypto_hash_sha512_update(state, Buffer.from(configCryptoAppSecret)) + sodium.crypto_hash_sha512_update(state, configLoginAppSecret) const hash = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) sodium.crypto_hash_sha512_final(state, hash) @@ -171,7 +171,7 @@ const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[ ) const encryptionKeyHash = Buffer.alloc(sodium.crypto_shorthash_BYTES) - sodium.crypto_shorthash(encryptionKeyHash, encryptionKey, configCryptoServerKey) + sodium.crypto_shorthash(encryptionKeyHash, encryptionKey, configLoginServerKey) return [encryptionKeyHash, encryptionKey] } From f2d2ed970172e39c5bf919bfc8fc3a669638404a Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 09:24:06 +0100 Subject: [PATCH 1096/1843] Changed all entity.save methods to respository.save(entity) --- backend/src/graphql/resolver/UserResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 68a61cbeb..09e8d1079 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -64,7 +64,7 @@ export class UserResolver { userEntity.email = user.email userEntity.pubkey = Buffer.from(fromHex(user.pubkey)) - userEntity.save().catch(() => { + userRepository.save(userEntity).catch(() => { throw new Error('error by save userEntity') }) }) @@ -247,7 +247,7 @@ export class UserResolver { userEntityChanged = true } if (userEntityChanged) { - userEntity.save().catch((error) => { + userRepository.save(userEntity).catch((error) => { throw new Error(error) }) } From 83b2684908533d00c558a0e9f6a2b1dcd0c0d7fc Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 09:40:05 +0100 Subject: [PATCH 1097/1843] Changed the Db... back to db... so that this change is not done in this branch. --- .../graphql/resolver/TransactionResolver.ts | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 5ca46985a..6ce033f44 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -1,3 +1,4 @@ +/* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ @@ -21,10 +22,10 @@ import { UserTransactionRepository } from '../../typeorm/repository/UserTransact import { TransactionRepository } from '../../typeorm/repository/Transaction' import { User as dbUser } from '@entity/User' -import { UserTransaction as DbUserTransaction } from '@entity/UserTransaction' -import { Transaction as DbTransaction } from '@entity/Transaction' -import { TransactionSendCoin as DbTransactionSendCoin } from '@entity/TransactionSendCoin' -import { Balance as DbBalance } from '@entity/Balance' +import { UserTransaction as dbUserTransaction } from '@entity/UserTransaction' +import { Transaction as dbTransaction } from '@entity/Transaction' +import { TransactionSendCoin as dbTransactionSendCoin } from '@entity/TransactionSendCoin' +import { Balance as dbBalance } from '@entity/Balance' import { apiPost } from '../../apis/HttpRequest' import { roundFloorFrom4, roundCeilFrom4 } from '../../util/round' @@ -36,7 +37,7 @@ import { from_hex as fromHex } from 'libsodium-wrappers' // Helper function async function calculateAndAddDecayTransactions( - userTransactions: DbUserTransaction[], + userTransactions: dbUserTransaction[], user: dbUser, decay: boolean, skipFirstTransaction: boolean, @@ -45,15 +46,15 @@ async function calculateAndAddDecayTransactions( const transactionIds: number[] = [] const involvedUserIds: number[] = [] - userTransactions.forEach((userTransaction: DbUserTransaction) => { + userTransactions.forEach((userTransaction: dbUserTransaction) => { transactionIds.push(userTransaction.transactionId) }) const transactionRepository = getCustomRepository(TransactionRepository) const transactions = await transactionRepository.joinFullTransactionsByIds(transactionIds) - const transactionIndiced: DbTransaction[] = [] - transactions.forEach((transaction: DbTransaction) => { + const transactionIndiced: dbTransaction[] = [] + transactions.forEach((transaction: dbTransaction) => { transactionIndiced[transaction.id] = transaction if (transaction.transactionTypeId === TransactionTypeId.SEND) { involvedUserIds.push(transaction.transactionSendCoin.userId) @@ -221,11 +222,11 @@ async function updateStateBalance( centAmount: number, received: Date, queryRunner: QueryRunner, -): Promise { +): Promise { const balanceRepository = getCustomRepository(BalanceRepository) let balance = await balanceRepository.findByUser(user.id) if (!balance) { - balance = new DbBalance() + balance = new dbBalance() balance.userId = user.id balance.amount = centAmount balance.modified = received @@ -250,10 +251,10 @@ async function updateStateBalance( // helper helper function async function addUserTransaction( user: dbUser, - transaction: DbTransaction, + transaction: dbTransaction, centAmount: number, queryRunner: QueryRunner, -): Promise { +): Promise { let newBalance = centAmount const userTransactionRepository = getCustomRepository(UserTransactionRepository) const lastUserTransaction = await userTransactionRepository.findLastForUser(user.id) @@ -273,7 +274,7 @@ async function addUserTransaction( throw new Error('error new balance <= 0') } - const newUserTransaction = new DbUserTransaction() + const newUserTransaction = new dbUserTransaction() newUserTransaction.userId = user.id newUserTransaction.transactionId = transaction.id newUserTransaction.transactionTypeId = transaction.transactionTypeId @@ -331,12 +332,12 @@ async function sendCoins( await queryRunner.startTransaction('READ UNCOMMITTED') try { // transaction - let transaction = new DbTransaction() + let transaction = new dbTransaction() transaction.transactionTypeId = TransactionTypeId.SEND transaction.memo = memo - const insertResult = await queryRunner.manager.insert(DbTransaction, transaction) + const insertResult = await queryRunner.manager.insert(dbTransaction, transaction) transaction = await queryRunner.manager - .findOneOrFail(DbTransaction, insertResult.generatedMaps[0].id) + .findOneOrFail(dbTransaction, insertResult.generatedMaps[0].id) .catch((error) => { throw new Error('error loading saved transaction: ' + error) }) @@ -381,7 +382,7 @@ async function sendCoins( } // transactionSendCoin - const transactionSendCoin = new DbTransactionSendCoin() + const transactionSendCoin = new dbTransactionSendCoin() transactionSendCoin.transactionId = transaction.id transactionSendCoin.userId = senderUser.id transactionSendCoin.senderPublic = senderUser.pubkey @@ -404,7 +405,7 @@ async function sendCoins( // console.log("start time: %o, transaction log: %o", startTime.getTime(), result) } catch (e) { await queryRunner.rollbackTransaction() - const count = await queryRunner.manager.count(DbTransaction) + const count = await queryRunner.manager.count(dbTransaction) // fix autoincrement value which seems not effected from rollback await queryRunner .query('ALTER TABLE `transactions` auto_increment = ?', [count]) From 1142f7359a4d0b60419efeb1a666c5fea0e175a9 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 10:50:47 +0100 Subject: [PATCH 1098/1843] Change the commit strategy so that the query runner store the commits and roll them back if their is an error. --- backend/src/graphql/resolver/UserResolver.ts | 100 +++++++++++-------- 1 file changed, 57 insertions(+), 43 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 1cabc49bd..8a3dfb6cd 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,7 +3,7 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -import { getCustomRepository } from 'typeorm' +import { getConnection, getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' @@ -324,7 +324,7 @@ export class UserResolver { const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) // Table: login_users - const loginUser = new LoginUser() + let loginUser = new LoginUser() loginUser.email = email loginUser.firstName = firstName loginUser.lastName = lastName @@ -339,52 +339,66 @@ export class UserResolver { loginUser.privKey = encryptedPrivkey // TODO transaction - const loginUserRepository = getCustomRepository(LoginUserRepository) - const { id: loginUserId } = await loginUserRepository.save(loginUser).catch((error) => { - // eslint-disable-next-line no-console - console.log('insert user failed', error) - throw new Error('insert user failed') - }) + const queryRunner = getConnection().createQueryRunner() + // belong to debugging mysql query / typeorm line + // const startTime = new Date() + await queryRunner.connect() + await queryRunner.startTransaction('READ UNCOMMITTED') + try { + const { id: loginUserId } = await queryRunner.manager.save(loginUser).catch((error) => { + // eslint-disable-next-line no-console + console.log('insert LoginUser failed', error) + throw new Error('insert user failed') + }) - // Table: login_user_backups - const loginUserBackup = new LoginUserBackup() - loginUserBackup.userId = loginUserId - loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space - loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; + // Table: login_user_backups + const loginUserBackup = new LoginUserBackup() + loginUserBackup.userId = loginUserId + loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space + loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - // TODO transaction - const loginUserBackupRepository = getCustomRepository(LoginUserBackupRepository) - await loginUserBackupRepository.save(loginUserBackup).catch(() => { - throw new Error('insert user backup failed') - }) + // TODO transaction + await queryRunner.manager.save(loginUserBackup).catch((error) => { + // eslint-disable-next-line no-console + console.log('insert LoginUserBackup failed', error) + throw new Error('insert user backup failed') + }) - // Table: state_users - const dbUser = new DbUser() - dbUser.pubkey = keyPair[0] - dbUser.email = email - dbUser.firstName = firstName - dbUser.lastName = lastName - dbUser.username = username + // Table: state_users + const dbUser = new DbUser() + dbUser.pubkey = keyPair[0] + dbUser.email = email + dbUser.firstName = firstName + dbUser.lastName = lastName + dbUser.username = username - // TDOO transaction - await userRepository.save(dbUser).catch((er) => { - // eslint-disable-next-line no-console - console.log('Error while saving dbUser', er) - throw new Error('error saving user') - }) + // TDOO transaction + await queryRunner.manager.save(dbUser).catch((er) => { + // eslint-disable-next-line no-console + console.log('Error while saving dbUser', er) + throw new Error('error saving user') + }) - // TODO: send EMail (EMAIL_OPT_IN_REGISTER) - // const emailType = 2 - // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); - // auto emailOptInModel = emailOptIn->getModel(); - // if (!emailOptInModel->insertIntoDB(false)) { - // emailOptInModel->sendErrorsAsEmail(); - // return stateError("insert emailOptIn failed"); - // } - // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); - // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); - - return 'success' + // TODO: send EMail (EMAIL_OPT_IN_REGISTER) + // const emailType = 2 + // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); + // auto code = createEmailVerificationCode(); + // auto db = new model::table::EmailOptIn(code, userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); + // auto emailOptInModel = emailOptIn->getModel(); + // if (!emailOptInModel->insertIntoDB(false)) { + // emailOptInModel->sendErrorsAsEmail(); + // return stateError("insert emailOptIn failed"); + // } + // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); + // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); + await queryRunner.commitTransaction() + return 'success' + } catch (e) { + await queryRunner.rollbackTransaction() + throw e + } finally { + await queryRunner.release() + } } @Query(() => SendPasswordResetEmailResponse) From fc0dafeeb81661a83ee55447ab09206d179a62c9 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 4 Nov 2021 11:45:34 +0100 Subject: [PATCH 1099/1843] test dashboard plugin to increase coverage --- .github/workflows/test.yml | 2 +- frontend/jest.config.js | 3 ++- frontend/src/assets/mocks/styleMock.js | 1 + frontend/src/plugins/dashboard-plugin.test.js | 25 +++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 frontend/src/assets/mocks/styleMock.js create mode 100644 frontend/src/plugins/dashboard-plugin.test.js diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75fd46a08..1e8d53acc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -344,7 +344,7 @@ jobs: report_name: Coverage Frontend type: lcov result_path: ./coverage/lcov.info - min_coverage: 83 + min_coverage: 85 token: ${{ github.token }} ############################################################################## diff --git a/frontend/jest.config.js b/frontend/jest.config.js index dc44ca43e..774aa6bf9 100644 --- a/frontend/jest.config.js +++ b/frontend/jest.config.js @@ -9,8 +9,9 @@ module.exports = { ], // coverageReporters: ['lcov', 'text'], moduleNameMapper: { - '^@/(.*)$': '/src/$1', '\\.(css|less)$': 'identity-obj-proxy', + '\\.(scss)$': '/src/assets/mocks/styleMock.js', + '^@/(.*)$': '/src/$1', }, transform: { '^.+\\.vue$': 'vue-jest', diff --git a/frontend/src/assets/mocks/styleMock.js b/frontend/src/assets/mocks/styleMock.js new file mode 100644 index 000000000..4ba52ba2c --- /dev/null +++ b/frontend/src/assets/mocks/styleMock.js @@ -0,0 +1 @@ +module.exports = {} diff --git a/frontend/src/plugins/dashboard-plugin.test.js b/frontend/src/plugins/dashboard-plugin.test.js new file mode 100644 index 000000000..3792ad2c4 --- /dev/null +++ b/frontend/src/plugins/dashboard-plugin.test.js @@ -0,0 +1,25 @@ +import dashboardPlugin from './dashboard-plugin.js' +import Vue from 'vue' + +import GlobalComponents from './globalComponents' +import GlobalDirectives from './globalDirectives' + +jest.mock('./globalComponents') +jest.mock('./globalDirectives') + +jest.mock('vue') + +const vueUseMock = jest.fn() +Vue.use = vueUseMock + +describe('dashboard plugin', () => { + dashboardPlugin.install(Vue) + + it('installs the global components', () => { + expect(vueUseMock).toBeCalledWith(GlobalComponents) + }) + + it('installs the global directives', () => { + expect(vueUseMock).toBeCalledWith(GlobalDirectives) + }) +}) From dcdcb1c977c02a5c34e386083a82ab73f8053e81 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 12:17:30 +0100 Subject: [PATCH 1100/1843] Added rollback of auto increment index for state_users, login_users & login_user_backups --- backend/src/graphql/resolver/UserResolver.ts | 28 +++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8a3dfb6cd..fc57e793d 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,7 +3,7 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -import { getConnection, getCustomRepository } from 'typeorm' +import { BaseEntity, getConnection, getCustomRepository, QueryRunner } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' @@ -324,7 +324,7 @@ export class UserResolver { const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) // Table: login_users - let loginUser = new LoginUser() + const loginUser = new LoginUser() loginUser.email = email loginUser.firstName = firstName loginUser.lastName = lastName @@ -338,10 +338,7 @@ export class UserResolver { loginUser.pubKey = keyPair[0] loginUser.privKey = encryptedPrivkey - // TODO transaction const queryRunner = getConnection().createQueryRunner() - // belong to debugging mysql query / typeorm line - // const startTime = new Date() await queryRunner.connect() await queryRunner.startTransaction('READ UNCOMMITTED') try { @@ -357,7 +354,6 @@ export class UserResolver { loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - // TODO transaction await queryRunner.manager.save(loginUserBackup).catch((error) => { // eslint-disable-next-line no-console console.log('insert LoginUserBackup failed', error) @@ -372,7 +368,6 @@ export class UserResolver { dbUser.lastName = lastName dbUser.username = username - // TDOO transaction await queryRunner.manager.save(dbUser).catch((er) => { // eslint-disable-next-line no-console console.log('Error while saving dbUser', er) @@ -395,6 +390,9 @@ export class UserResolver { return 'success' } catch (e) { await queryRunner.rollbackTransaction() + await rollbackAutoIncrement(queryRunner, LoginUser, `login_users`) + await rollbackAutoIncrement(queryRunner, LoginUserBackup, `login_user_backups`) + await rollbackAutoIncrement(queryRunner, DbUser, `state_users`) throw e } finally { await queryRunner.release() @@ -569,3 +567,19 @@ export class UserResolver { return result.data.hasElopage } } + +const rollbackAutoIncrement = async ( + queryRunner: QueryRunner, + entity: typeof BaseEntity, + entityName: string, +) => { + const count = await queryRunner.manager.count(entity) + const queryString = 'ALTER TABLE `' + entityName + '` auto_increment = ' + count + // eslint-disable-next-line no-console + console.log('Database AlterTable Query: ', queryString) + await queryRunner.query(queryString).catch((error) => { + // eslint-disable-next-line no-console + console.log('problems with reset auto increment: %o', error) + throw new Error('Problems with reset auto increment: ' + error) + }) +} From 137d68335187dbf319db42c3a38a3831c62985da Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 12:20:09 +0100 Subject: [PATCH 1101/1843] Update and adding some packages.updated: typeorm, imported: sodium-native, node-gyp-build & module-alias. --- backend/package-lock.json | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 448700c9f..b998613b5 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.4.0", + "version": "1.5.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5069,6 +5069,11 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, + "module-alias": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", + "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -5156,6 +5161,11 @@ "whatwg-url": "^5.0.0" } }, + "node-gyp-build": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", + "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==" + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -6109,6 +6119,14 @@ "is-fullwidth-code-point": "^3.0.0" } }, + "sodium-native": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-3.3.0.tgz", + "integrity": "sha512-rg6lCDM/qa3p07YGqaVD+ciAbUqm6SoO4xmlcfkbU5r1zIGrguXztLiEtaLYTV5U6k8KSIUFmnU3yQUSKmf6DA==", + "requires": { + "node-gyp-build": "^4.3.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -6603,9 +6621,9 @@ } }, "typeorm": { - "version": "0.2.37", - "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.37.tgz", - "integrity": "sha512-7rkW0yCgFC24I5T0f3S/twmLSuccPh1SQmxET/oDWn2sSDVzbyWdnItSdKy27CdJGTlKHYtUVeOcMYw5LRsXVw==", + "version": "0.2.38", + "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.38.tgz", + "integrity": "sha512-M6Y3KQcAREQcphOVJciywf4mv6+A0I/SeR+lWNjKsjnQ+a3XcMwGYMGL0Jonsx3H0Cqlf/3yYqVki1jIXSK/xg==", "requires": { "@sqltools/formatter": "^1.2.2", "app-root-path": "^3.0.0", From d097e5cd76f065eabae8abb0ccdb200545c5cddd Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 12:55:04 +0100 Subject: [PATCH 1102/1843] Created the LoginEmailOptIn table entity. --- .../LoginEmailOptIn.ts | 26 +++++++++++++++++++ database/entity/LoginEmailOptIn.ts | 1 + 2 files changed, 27 insertions(+) create mode 100644 database/entity/0003-login_server_tables/LoginEmailOptIn.ts create mode 100644 database/entity/LoginEmailOptIn.ts diff --git a/database/entity/0003-login_server_tables/LoginEmailOptIn.ts b/database/entity/0003-login_server_tables/LoginEmailOptIn.ts new file mode 100644 index 000000000..e07411dfb --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginEmailOptIn.ts @@ -0,0 +1,26 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +// Moriz: I do not like the idea of having two user tables +@Entity('login_email_opt_in') +export class LoginEmailOptIn extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column() + userId: number + + @Column({ name: 'verification_code', type: 'bigint', unsigned: true }) + verificationCode: BigInt + + @Column({ name: 'email_opt_in_type_id' }) + emailOptInTypeId: number + + @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + createdAt: Date + + @Column({ name: 'resend_count', default: 0 }) + resendCount: number + + @Column({ name: 'updated', default: () => 'CURRENT_TIMESTAMP' }) + updatedAt: Date +} diff --git a/database/entity/LoginEmailOptIn.ts b/database/entity/LoginEmailOptIn.ts new file mode 100644 index 000000000..fa8717ed3 --- /dev/null +++ b/database/entity/LoginEmailOptIn.ts @@ -0,0 +1 @@ +export { LoginEmailOptIn } from './0003-login_server_tables/LoginEmailOptIn' From 8bfc5388246f57ef0ac1fe5e13faef2691d1bb8f Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 12:57:28 +0100 Subject: [PATCH 1103/1843] Added random-bigint library for verificationCode, store EmailOptIn data in DB. --- backend/package-lock.json | 5 ++++ backend/package.json | 1 + backend/src/graphql/resolver/UserResolver.ts | 30 +++++++++++++------- backend/yarn.lock | 5 ++++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index b998613b5..a174865aa 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -5697,6 +5697,11 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, + "random-bigint": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/random-bigint/-/random-bigint-0.0.1.tgz", + "integrity": "sha512-X+NTsf5Hzl/tRNLiNTD3N1LRU0eKdIE0+plNlV1CmXLTlnAxj6HipcTnOhWvFRoSytCz6l1f4KYFf/iH8NNSLw==" + }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", diff --git a/backend/package.json b/backend/package.json index ee7365b72..9da51cb7f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -28,6 +28,7 @@ "jsonwebtoken": "^8.5.1", "module-alias": "^2.2.2", "mysql2": "^2.3.0", + "random-bigint": "^0.0.1", "reflect-metadata": "^0.1.13", "sodium-native": "^3.3.0", "ts-jest": "^27.0.5", diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index fc57e793d..6c140bc62 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -29,6 +29,7 @@ import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { LoginUserBackupRepository } from '../../typeorm/repository/LoginUserBackup' import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' +import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' // TODO apparently the types are cannot be loaded correctly? IDK whats wrong and we have to use require // import { @@ -43,6 +44,8 @@ import { LoginUserBackup } from '@entity/LoginUserBackup' // } from 'sodium-native' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') +// eslint-disable-next-line @typescript-eslint/no-var-requires +const random = require('random-bigint') // We will reuse this for changePassword const isPassword = (password: string): boolean => { @@ -374,16 +377,23 @@ export class UserResolver { throw new Error('error saving user') }) - // TODO: send EMail (EMAIL_OPT_IN_REGISTER) - // const emailType = 2 - // auto emailOptIn = controller::EmailVerificationCode::create(userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); - // auto code = createEmailVerificationCode(); - // auto db = new model::table::EmailOptIn(code, userModel->getID(), model::table::EMAIL_OPT_IN_REGISTER); - // auto emailOptInModel = emailOptIn->getModel(); - // if (!emailOptInModel->insertIntoDB(false)) { - // emailOptInModel->sendErrorsAsEmail(); - // return stateError("insert emailOptIn failed"); - // } + // Store EmailOptIn in DB + const emailOptIn = new LoginEmailOptIn() + emailOptIn.userId = loginUserId + emailOptIn.verificationCode = random(64) // TODO generate verificationCode + emailOptIn.emailOptInTypeId = 2 + + await queryRunner.manager.save(emailOptIn).catch((error) => { + // TODO: Send error email instead of throw error + // if (!emailOptInModel->insertIntoDB(false)) { + // emailOptInModel->sendErrorsAsEmail(); + // return stateError("insert emailOptIn failed"); + // } + // eslint-disable-next-line no-console + console.log('Error while saving emailOptIn', error) + throw new Error('error saving email opt in') + }) + // TODO: Send EmailOptIn to user.email // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); await queryRunner.commitTransaction() diff --git a/backend/yarn.lock b/backend/yarn.lock index 7cd146647..75b998c17 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4615,6 +4615,11 @@ queue-microtask@^1.2.2: resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +random-bigint@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/random-bigint/-/random-bigint-0.0.1.tgz#684de0a93784ab7448a441393916f0e632c95df9" + integrity sha512-X+NTsf5Hzl/tRNLiNTD3N1LRU0eKdIE0+plNlV1CmXLTlnAxj6HipcTnOhWvFRoSytCz6l1f4KYFf/iH8NNSLw== + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz" From c7f0e2440bdf44db6d1dce0d06ce3b0e8c395dbf Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 4 Nov 2021 13:50:09 +0100 Subject: [PATCH 1104/1843] Change so that the new entity is recognized by the queryRunner. --- backend/src/typeorm/repository/LoginEmailOptIn.ts | 5 +++++ database/entity/0003-login_server_tables/LoginEmailOptIn.ts | 4 ++-- database/entity/index.ts | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 backend/src/typeorm/repository/LoginEmailOptIn.ts diff --git a/backend/src/typeorm/repository/LoginEmailOptIn.ts b/backend/src/typeorm/repository/LoginEmailOptIn.ts new file mode 100644 index 000000000..cb486d922 --- /dev/null +++ b/backend/src/typeorm/repository/LoginEmailOptIn.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' + +@EntityRepository(LoginEmailOptIn) +export class LoginEmailOptInRepository extends Repository {} diff --git a/database/entity/0003-login_server_tables/LoginEmailOptIn.ts b/database/entity/0003-login_server_tables/LoginEmailOptIn.ts index e07411dfb..2ec62927f 100644 --- a/database/entity/0003-login_server_tables/LoginEmailOptIn.ts +++ b/database/entity/0003-login_server_tables/LoginEmailOptIn.ts @@ -6,10 +6,10 @@ export class LoginEmailOptIn extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column() + @Column({ name: 'user_id' }) userId: number - @Column({ name: 'verification_code', type: 'bigint', unsigned: true }) + @Column({ name: 'verification_code', type: 'bigint', unsigned: true, unique: true }) verificationCode: BigInt @Column({ name: 'email_opt_in_type_id' }) diff --git a/database/entity/index.ts b/database/entity/index.ts index da6761da2..ff1d34d9e 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -1,4 +1,5 @@ import { Balance } from './Balance' +import { LoginEmailOptIn } from './LoginEmailOptIn' import { LoginUser } from './LoginUser' import { LoginUserBackup } from './LoginUserBackup' import { Migration } from './Migration' @@ -13,6 +14,7 @@ export const entities = [ Balance, LoginUser, LoginUserBackup, + LoginEmailOptIn, Migration, Transaction, TransactionCreation, From 95d6884b0b2f2f80e3787d5c183103171de05d7c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 23:56:52 +0100 Subject: [PATCH 1105/1843] cleanup --- .../graphql/resolver/TransactionResolver.ts | 302 +++++++----------- 1 file changed, 121 insertions(+), 181 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 6ce033f44..7327f4925 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -35,6 +35,29 @@ import { TransactionType } from '../enum/TransactionType' import { hasUserAmount, isHexPublicKey } from '../../util/validate' import { from_hex as fromHex } from 'libsodium-wrappers' +const sendEMail = async (emailDef: any): Promise => { + if (!CONFIG.EMAIL) { + // eslint-disable-next-line no-console + console.log('Emails are disabled via config') + return false + } + const transporter = createTransport({ + host: CONFIG.EMAIL_SMTP_URL, + port: Number(CONFIG.EMAIL_SMTP_PORT), + secure: false, // true for 465, false for other ports + requireTLS: true, + auth: { + user: CONFIG.EMAIL_USERNAME, + pass: CONFIG.EMAIL_PASSWORD, + }, + }) + const info = await transporter.sendMail(emailDef) + if (!info.messageId) { + throw new Error('error sending notification email, but transaction succeed') + } + return true +} + // Helper function async function calculateAndAddDecayTransactions( userTransactions: dbUserTransaction[], @@ -286,48 +309,93 @@ async function addUserTransaction( }) } -// helper function -/** - * - * @param senderPublicKey as hex string - * @param recipiantPublicKey as hex string - * @param amount as float - * @param memo - * @param groupId - */ -async function sendCoins( - senderUser: dbUser, - recipiantPublicKey: string, - amount: number, - memo: string, - groupId = 0, -): Promise { - if (senderUser.pubkey.length !== 32) { - throw new Error('invalid sender public key') +async function getPublicKey(email: string, sessionId: number): Promise { + const result = await apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', { + session_id: sessionId, + email, + ask: ['user.pubkeyhex'], + }) + if (result.success) { + return result.data.userData.pubkeyhex } - if (!isHexPublicKey(recipiantPublicKey)) { - throw new Error('invalid recipiant public key') - } - if (amount <= 0) { - throw new Error('invalid amount') - } - if (!hasUserAmount(senderUser, amount)) { - throw new Error("user hasn't enough GDD") +} + +@Resolver() +export class TransactionResolver { + @Authorized() + @Query(() => TransactionList) + async transactionList( + @Args() { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated, + @Ctx() context: any, + ): Promise { + // load user + const userRepository = getCustomRepository(UserRepository) + const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + + const transactions = await listTransactions(currentPage, pageSize, order, userEntity) + + // get gdt sum + const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, { + email: userEntity.email, + }) + if (!resultGDTSum.success) throw new Error(resultGDTSum.data) + transactions.gdtSum = resultGDTSum.data.sum || 0 + + // get balance + const balanceRepository = getCustomRepository(BalanceRepository) + const balanceEntity = await balanceRepository.findByUser(userEntity.id) + if (balanceEntity) { + const now = new Date() + transactions.balance = roundFloorFrom4(balanceEntity.amount) + transactions.decay = roundFloorFrom4( + await calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now), + ) + transactions.decayDate = now.toString() + } + + return transactions } - const userRepository = getCustomRepository(UserRepository) - const recipiantUser = await userRepository.findByPubkeyHex(recipiantPublicKey) - if (recipiantUser && recipiantUser.disabled) { - throw new Error('recipiant user account is disabled') - } + @Authorized() + @Mutation(() => String) + async sendCoins( + @Args() { email, amount, memo }: TransactionSendArgs, + @Ctx() context: any, + ): Promise { + // validate sender user (logged in) + const userRepository = getCustomRepository(UserRepository) + const senderUser = await userRepository.findByPubkeyHex(context.pubKey) + if (senderUser.pubkey.length !== 32) { + throw new Error('invalid sender public key') + } + if (!hasUserAmount(senderUser, amount)) { + throw new Error("user hasn't enough GDD") + } - const centAmount = Math.trunc(amount * 10000) + // validate recipient user + // TODO: the detour over the public key is unnecessary + const recipiantPublicKey = await getPublicKey(email, context.sessionId) + if (!recipiantPublicKey) { + throw new Error('recipiant not known') + } + if (!isHexPublicKey(recipiantPublicKey)) { + throw new Error('invalid recipiant public key') + } + const recipiantUser = await userRepository.findByPubkeyHex(recipiantPublicKey) + if (!recipiantUser) { + throw new Error('Cannot find recipiant user by local send coins transaction') + } else if (recipiantUser.disabled) { + throw new Error('recipiant user account is disabled') + } + + // validate amount + if (amount <= 0) { + throw new Error('invalid amount') + } + + const centAmount = Math.trunc(amount * 10000) - // no group id is given so we assume it is a local transfer - if (!groupId) { const queryRunner = getConnection().createQueryRunner() - // belong to debugging mysql query / typeorm line - // const startTime = new Date() await queryRunner.connect() await queryRunner.startTransaction('READ UNCOMMITTED') try { @@ -335,6 +403,8 @@ async function sendCoins( let transaction = new dbTransaction() transaction.transactionTypeId = TransactionTypeId.SEND transaction.memo = memo + + // TODO: NO! this is problematic in its construction const insertResult = await queryRunner.manager.insert(dbTransaction, transaction) transaction = await queryRunner.manager .findOneOrFail(dbTransaction, insertResult.generatedMaps[0].id) @@ -342,10 +412,6 @@ async function sendCoins( throw new Error('error loading saved transaction: ' + error) }) - if (!recipiantUser) { - throw new Error('Cannot find recipiant user by local send coins transaction') - } - // update state balance const senderStateBalance = await updateStateBalance( senderUser, @@ -399,156 +465,30 @@ async function sendCoins( }) await queryRunner.commitTransaction() - - // great way de debug mysql querys / typeorm - // const result = await queryRunner.query("SELECT * FROM mysql.general_log WHERE thread_id IN (SELECT ID FROM information_schema.processlist WHERE DB = 'gradido_community') AND event_time > ?; ", [startTime]) - // console.log("start time: %o, transaction log: %o", startTime.getTime(), result) } catch (e) { await queryRunner.rollbackTransaction() - const count = await queryRunner.manager.count(dbTransaction) - // fix autoincrement value which seems not effected from rollback - await queryRunner - .query('ALTER TABLE `transactions` auto_increment = ?', [count]) - .catch((error) => { - // eslint-disable-next-line no-console - console.log('problems with reset auto increment: %o', error) - }) - throw e } finally { - // you need to release query runner which is manually created: await queryRunner.release() } // send notification email - if (CONFIG.EMAIL) { - const transporter = createTransport({ - host: CONFIG.EMAIL_SMTP_URL, - port: Number(CONFIG.EMAIL_SMTP_PORT), - secure: false, // true for 465, false for other ports - requireTLS: true, - auth: { - user: CONFIG.EMAIL_USERNAME, - pass: CONFIG.EMAIL_PASSWORD, - }, - }) - - // send mail with defined transport object - // TODO: translate - const info = await transporter.sendMail({ - from: 'Gradido (nicht antworten) <' + CONFIG.EMAIL_SENDER + '>', // sender address - to: - recipiantUser.firstName + ' ' + recipiantUser.lastName + ' <' + recipiantUser.email + '>', // list of receivers - subject: 'Gradido Ãœberweisung', // Subject line - text: - 'Hallo ' + - recipiantUser.firstName + - ' ' + - recipiantUser.lastName + - ',\n\n' + - 'Du hast soeben ' + - amount + - ' GDD von ' + - senderUser.firstName + - ' ' + - senderUser.lastName + - ' erhalten.\n' + - senderUser.firstName + - ' ' + - senderUser.lastName + - ' schreibt: \n\n' + - memo + - '\n\n' + - 'Bitte antworte nicht auf diese E-Mail!\n\n' + - 'Mit freundlichen Grüßenņ Gradido Community Server', // plain text body - }) - if (!info.messageId) { - throw new Error('error sending notification email, but transaction succeed') - } - } - } - return true -} - -// helper function -// target can be email, username or public_key -// groupId if not null and another community, try to get public key from there -async function getPublicKey(target: string, sessionId: number): Promise { - // if it is already a public key, return it - if (isHexPublicKey(target)) { - return target - } - - // assume it is a email address if it's contain a @ - if (/@/i.test(target)) { - const result = await apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', { - session_id: sessionId, - email: target, - ask: ['user.pubkeyhex'], + // TODO: translate + await sendEMail({ + from: 'Gradido (nicht antworten) <' + CONFIG.EMAIL_SENDER + '>', + to: recipiantUser.firstName + ' ' + recipiantUser.lastName + ' <' + recipiantUser.email + '>', + subject: 'Gradido Ãœberweisung', + text: `Hallo ${recipiantUser.firstName} ${recipiantUser.lastName} + + Du hast soeben ${amount} GDD von ${senderUser.firstName} ${senderUser.lastName} erhalten. + ${senderUser.firstName} ${senderUser.lastName} schreibt: + + ${memo} + + Bitte antworte nicht auf diese E-Mail! + + Mit freundlichen Grüßen Gradido Community Server`, }) - if (result.success) { - return result.data.userData.pubkeyhex - } - } - // if username is used add code here - - // if we have multiple communities add code here - - return undefined -} - -@Resolver() -export class TransactionResolver { - @Authorized() - @Query(() => TransactionList) - async transactionList( - @Args() { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated, - @Ctx() context: any, - ): Promise { - // load user - const userRepository = getCustomRepository(UserRepository) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) - - const transactions = await listTransactions(currentPage, pageSize, order, userEntity) - - // get gdt sum - const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, { - email: userEntity.email, - }) - if (!resultGDTSum.success) throw new Error(resultGDTSum.data) - transactions.gdtSum = resultGDTSum.data.sum || 0 - - // get balance - const balanceRepository = getCustomRepository(BalanceRepository) - const balanceEntity = await balanceRepository.findByUser(userEntity.id) - if (balanceEntity) { - const now = new Date() - transactions.balance = roundFloorFrom4(balanceEntity.amount) - transactions.decay = roundFloorFrom4( - await calculateDecay(balanceEntity.amount, balanceEntity.recordDate, now), - ) - transactions.decayDate = now.toString() - } - - return transactions - } - - @Authorized() - @Mutation(() => String) - async sendCoins( - @Args() { email, amount, memo }: TransactionSendArgs, - @Ctx() context: any, - ): Promise { - const recipiantPublicKey = await getPublicKey(email, context.sessionId) - if (!recipiantPublicKey) { - throw new Error('recipiant not known') - } - - // load logged in user - const userRepository = getCustomRepository(UserRepository) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) - - await sendCoins(userEntity, recipiantPublicKey, amount, memo) return 'success' } } From 8f2506eeca8ed92373396e6b1b6ecb7b5b0d5ba3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 00:08:15 +0100 Subject: [PATCH 1106/1843] ordered transaction commit --- .../graphql/resolver/TransactionResolver.ts | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 7327f4925..78ab728e8 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -412,27 +412,14 @@ export class TransactionResolver { throw new Error('error loading saved transaction: ' + error) }) - // update state balance - const senderStateBalance = await updateStateBalance( - senderUser, - -centAmount, - transaction.received, - queryRunner, - ) - const recipiantStateBalance = await updateStateBalance( - recipiantUser, - centAmount, - transaction.received, - queryRunner, - ) - - // update user transactions + // Insert Transaction: sender - amount const senderUserTransactionBalance = await addUserTransaction( senderUser, transaction, -centAmount, queryRunner, ) + // Insert Transaction: recipient + amount const recipiantUserTransactionBalance = await addUserTransaction( recipiantUser, transaction, @@ -440,6 +427,21 @@ export class TransactionResolver { queryRunner, ) + // Update Balance: sender - amount + const senderStateBalance = await updateStateBalance( + senderUser, + -centAmount, + transaction.received, + queryRunner, + ) + // Update Balance: recipiant + amount + const recipiantStateBalance = await updateStateBalance( + recipiantUser, + centAmount, + transaction.received, + queryRunner, + ) + if (senderStateBalance.amount !== senderUserTransactionBalance.balance) { throw new Error('db data corrupted, sender') } From 9de2c9eab657961554302f27135d6fbd08f68536 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 00:26:41 +0100 Subject: [PATCH 1107/1843] make login server reachable from outside in test environment --- docker-compose.override.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 5783b9fe7..d8d02fa71 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -72,6 +72,9 @@ services: login-server: build: dockerfile: Dockerfiles/ubuntu/Dockerfile.debug + networks: + - external-net + - internal-net security_opt: - seccomp:unconfined cap_add: From e68227f8e11d0c28ac23a8e52c242710d0d68c6c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 02:11:14 +0100 Subject: [PATCH 1108/1843] test protocol --- .../graphql/resolver/TransactionResolver.ts | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 78ab728e8..51ad2c427 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -35,6 +35,81 @@ import { TransactionType } from '../enum/TransactionType' import { hasUserAmount, isHexPublicKey } from '../../util/validate' import { from_hex as fromHex } from 'libsodium-wrappers' +/* +# Test + +## Prepare +> sudo systemctl start docker +> docker-compose up mariadb +> DROP all databases +> docker-compose down +> docker compose up mariadb database +> verify there is exactly one database `gradido_community` + +TODO: +INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `description`) VALUES + (1, 'docker', 'docker gradido group', 'localhost', 'nginx', '/', 'gradido test group for docker and stage2 with blockchain db'); + +>> Database is cool + + + +### Start login server +> docker-compose up login-server community-server nginx +>> Login & community servers and nginx proxy are up and running + +## Build database +> cd database +> yarn +> yarn build +> cd .. +>> Database has been built successful + +### Start backend (no docker for debugging) +> cd backend +> yarn +> yarn dev +>> Backend is up and running + +### Create users +> chromium http://localhost:4000/graphql +> mutation{createUser(email: "receiver@user.net", firstName: "Receiver", lastName: "user", password: "123!AAAb", language: "de")} +> mutation{createUser(email: "sender@user.net", firstName: "Sender", lastName: "user", password: "123!AAAb", language: "de")} +> mutation{createUser(email: "creator@user.net", firstName: "Creator", lastName: "user", password: "123!AAAb", language: "de")} +>> Verify you have 3 entries in `login_users`, `login_user_backups` and `state_users` + +### make creator an admin +> INSERT INTO login_user_roles (id, user_id, role_id) VALUES (NULL, '4', '1'); +> UPDATE login_users SET email_checked = 1 WHERE id = 4; +> uncomment line: 19 in community_server/src/Controller/ServerUsersController.php +> chromium http://localhost/server-users/add +> create user `creator` `123` `creator@different.net` +>> verify you have 1 entry in `server_users` +> login with user on http://localhost/server-users +> activate server user by changing the corespondign flag in the interface +> navigate to http://localhost/transaction-creations/create-multi +> create 1000GDD for user sender@user.net +> navigate to http://localhost +> login with `creator@user.net` `123!AAAb` +> confirm transaction (top right corner - click the thingy, click the green button `Transaktion abschließen`) + +### the test: +> chromium http://localhost:4000/graphql +> query{login(email: "sender@user.net", password: "123!AAAb"){pubkey}} +>> copy token from network tab (inspect) +> mutation{sendCoins(email: "receiver@user.net", amount: 10.0, memo: "Hier!")} +> Headers: {"Authorization": "Bearer ${token}"} +>> Verify via Database that stuff is as it should see `state_balance` & `transaction_send_coins` + +### create decay block +> chromium http://localhost/transactions/add +> login with `creator` `123` +> select `decay start` +> press submit +> wait for at least 0.02 display of decay on user sender@user.net on old frontend + +*/ + const sendEMail = async (emailDef: any): Promise => { if (!CONFIG.EMAIL) { // eslint-disable-next-line no-console @@ -362,6 +437,7 @@ export class TransactionResolver { @Args() { email, amount, memo }: TransactionSendArgs, @Ctx() context: any, ): Promise { + // TODO this is subject to replay attacks // validate sender user (logged in) const userRepository = getCustomRepository(UserRepository) const senderUser = await userRepository.findByPubkeyHex(context.pubKey) From 6bc0915a9a101fb1d72eee7e39cfc73c679fffab Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 02:23:52 +0100 Subject: [PATCH 1109/1843] finish test --- backend/src/graphql/resolver/TransactionResolver.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 51ad2c427..40ac1c7a9 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -86,7 +86,7 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr > create user `creator` `123` `creator@different.net` >> verify you have 1 entry in `server_users` > login with user on http://localhost/server-users -> activate server user by changing the corespondign flag in the interface +> activate server user by changing the corresponding flag in the interface > navigate to http://localhost/transaction-creations/create-multi > create 1000GDD for user sender@user.net > navigate to http://localhost @@ -106,7 +106,16 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr > login with `creator` `123` > select `decay start` > press submit -> wait for at least 0.02 display of decay on user sender@user.net on old frontend +> wait for at least 0.02 display of decay on user sender@user.net on old frontend, this should be aprox 10min +> chromium http://localhost:4000/graphql +> query{login(email: "sender@user.net", password: "123!AAAb"){pubkey}} +>> copy token from network tab (inspect) +> mutation{sendCoins(email: "receiver@user.net", amount: 10.0, memo: "Hier!")} +>> verify in `transaction_send_coins` that a decay was taken into account +>> same in `state_balances` +>> now check the old frontend +>>> sender@user.net should have a decay of 0.02 +>>> while receiver@user.net should have zero decay on anything (old frontend) */ From 88f0a14b61483dacc4e4ba89bbb74ff2e837f590 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 02:39:17 +0100 Subject: [PATCH 1110/1843] more test instructions --- backend/src/graphql/resolver/TransactionResolver.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 40ac1c7a9..97d3ac150 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -52,8 +52,6 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr >> Database is cool - - ### Start login server > docker-compose up login-server community-server nginx >> Login & community servers and nginx proxy are up and running @@ -98,6 +96,7 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr > query{login(email: "sender@user.net", password: "123!AAAb"){pubkey}} >> copy token from network tab (inspect) > mutation{sendCoins(email: "receiver@user.net", amount: 10.0, memo: "Hier!")} +> mutation{sendCoins(email: "receiver@user.net", amount: 10.0, memo: "Hier!")} > Headers: {"Authorization": "Bearer ${token}"} >> Verify via Database that stuff is as it should see `state_balance` & `transaction_send_coins` @@ -117,6 +116,14 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr >>> sender@user.net should have a decay of 0.02 >>> while receiver@user.net should have zero decay on anything (old frontend) +### Export data +> docker-compose up phpmyadmin +> chromium http://localhost:8074/ +> select gradido_community +> export +> select custom +> untick structure +> ok */ const sendEMail = async (emailDef: any): Promise => { From 1f978ce4e89dd3e2cbec86033375db6f3c3acb5d Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 5 Nov 2021 11:33:50 +0100 Subject: [PATCH 1111/1843] Since the mixin gets communityInfo needed to change the tests so that they check it out. --- .../Pages/RegisterSelectCommunity.spec.js | 67 ++++++++++++++++++- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js index 008f690a6..8f334364a 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js @@ -1,5 +1,4 @@ import { mount, RouterLinkStub } from '@vue/test-utils' -import flushPromises from 'flush-promises' import RegisterSelectCommunity from './RegisterSelectCommunity' const localVue = global.localVue @@ -96,6 +95,7 @@ describe('RegisterSelectCommunity', () => { wrapper = Wrapper() }) + // TODO: Tests so that resolved value order is followed it('commits the community info to the store', () => { expect(mockStoreCommit).toBeCalledWith('community', { name: 'test12', @@ -131,10 +131,48 @@ describe('RegisterSelectCommunity', () => { jest.clearAllMocks() mocks.$store.state.community = { name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', description: 'Die lokale Entwicklungsumgebung von Gradido.', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register-community', } + apolloQueryMock + .mockResolvedValueOnce({ + data: { + getCommunityInfo: { + name: 'Gradido Entwicklung', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + }, + }, + }) + .mockResolvedValue({ + data: { + communities: [ + { + id: 1, + name: 'Gradido Entwicklung', + description: 'Die lokale Entwicklungsumgebung von Gradido.', + url: 'http://localhost/vue/', + registerUrl: 'http://localhost/vue/register-community', + }, + { + id: 2, + name: 'Gradido Staging', + description: 'Der Testserver der Gradido-Akademie.', + url: 'https://stage1.gradido.net/vue/', + registerUrl: 'https://stage1.gradido.net/vue/register-community', + }, + { + id: 3, + name: 'Gradido-Akademie', + description: 'Freies Institut für Wirtschaftsbionik.', + url: 'https://gradido.net', + registerUrl: 'https://gdd1.gradido.com/vue/register-community', + }, + ], + }, + }) wrapper = Wrapper() }) @@ -151,6 +189,28 @@ describe('RegisterSelectCommunity', () => { describe('calls the apollo query', () => { describe('server returns data', () => { + beforeEach(async () => { + wrapper = Wrapper() + await wrapper.setProps({ + communities: [ + { + id: 2, + name: 'Gradido Staging', + description: 'Der Testserver der Gradido-Akademie.', + url: 'https://stage1.gradido.net/vue/', + registerUrl: 'https://stage1.gradido.net/vue/register-community', + }, + { + id: 3, + name: 'Gradido-Akademie', + description: 'Freies Institut für Wirtschaftsbionik.', + url: 'https://gradido.net', + registerUrl: 'https://gdd1.gradido.com/vue/register-community', + }, + ], + }) + }) + it('calls the API to get the data', () => { expect(apolloQueryMock).toBeCalled() }) @@ -166,6 +226,7 @@ describe('RegisterSelectCommunity', () => { describe('server response is error', () => { beforeEach(() => { + jest.clearAllMocks() apolloQueryMock.mockRejectedValue({ message: 'Wrong thing', }) From 3d3a77a0eaedeb3fc25033f4ea5546269da69b5b Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 5 Nov 2021 12:32:45 +0100 Subject: [PATCH 1112/1843] Changed the logic so that we check if the queries have been send but does not check the result. --- .../Pages/RegisterSelectCommunity.spec.js | 66 ++++++------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js index 8f334364a..0dc6be55a 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js @@ -1,4 +1,5 @@ import { mount, RouterLinkStub } from '@vue/test-utils' +import { communities, communityInfo } from '../../graphql/queries' import RegisterSelectCommunity from './RegisterSelectCommunity' const localVue = global.localVue @@ -92,16 +93,20 @@ describe('RegisterSelectCommunity', () => { describe('mount', () => { beforeEach(() => { + jest.clearAllMocks() wrapper = Wrapper() }) - // TODO: Tests so that resolved value order is followed - it('commits the community info to the store', () => { - expect(mockStoreCommit).toBeCalledWith('community', { - name: 'test12', - description: 'test community 12', - url: 'http://test12.test12/', - registerUrl: 'http://test12.test12/vue/register', + it('calls the API to get the community info data', () => { + expect(apolloQueryMock).toBeCalledWith({ + query: communityInfo, + }) + }) + + it('calls the API to get the communities data', () => { + expect(apolloQueryMock).toBeCalledWith({ + query: communities, + fetchPolicy: 'network-only', }) }) @@ -135,47 +140,15 @@ describe('RegisterSelectCommunity', () => { url: 'http://localhost/vue/', registerUrl: 'http://localhost/vue/register-community', } - apolloQueryMock - .mockResolvedValueOnce({ - data: { - getCommunityInfo: { - name: 'Gradido Entwicklung', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register', - description: 'Die lokale Entwicklungsumgebung von Gradido.', - }, - }, - }) - .mockResolvedValue({ - data: { - communities: [ - { - id: 1, - name: 'Gradido Entwicklung', - description: 'Die lokale Entwicklungsumgebung von Gradido.', - url: 'http://localhost/vue/', - registerUrl: 'http://localhost/vue/register-community', - }, - { - id: 2, - name: 'Gradido Staging', - description: 'Der Testserver der Gradido-Akademie.', - url: 'https://stage1.gradido.net/vue/', - registerUrl: 'https://stage1.gradido.net/vue/register-community', - }, - { - id: 3, - name: 'Gradido-Akademie', - description: 'Freies Institut für Wirtschaftsbionik.', - url: 'https://gradido.net', - registerUrl: 'https://gdd1.gradido.com/vue/register-community', - }, - ], - }, - }) wrapper = Wrapper() }) + it('does not call community info data when already filled', () => { + expect(apolloQueryMock).not.toBeCalledWith({ + query: communityInfo, + }) + }) + it('has a Community name', () => { expect(wrapper.find('.card-body b').text()).toBe('Gradido Entwicklung') }) @@ -191,7 +164,7 @@ describe('RegisterSelectCommunity', () => { describe('server returns data', () => { beforeEach(async () => { wrapper = Wrapper() - await wrapper.setProps({ + await wrapper.setData({ communities: [ { id: 2, @@ -226,7 +199,6 @@ describe('RegisterSelectCommunity', () => { describe('server response is error', () => { beforeEach(() => { - jest.clearAllMocks() apolloQueryMock.mockRejectedValue({ message: 'Wrong thing', }) From 4483e69d0d0bcb6eda63d82858475dfead894201 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 5 Nov 2021 12:33:29 +0100 Subject: [PATCH 1113/1843] Update frontend/src/views/Pages/Login.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/Login.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js index 11a4199f7..53bb9446f 100644 --- a/frontend/src/views/Pages/Login.spec.js +++ b/frontend/src/views/Pages/Login.spec.js @@ -104,7 +104,7 @@ describe('Login', () => { }) }) - describe('Community Data', () => { + describe('Community data already loaded', () => { beforeEach(() => { jest.clearAllMocks() mocks.$store.state.community = { From 2b64cb939760b324881d7e311c658b1cd4bf8dd3 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 5 Nov 2021 12:33:39 +0100 Subject: [PATCH 1114/1843] Update frontend/src/views/Pages/Register.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/Register.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 67ebd131e..c63de66cf 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -98,7 +98,7 @@ describe('Register', () => { }) }) - describe('Community Data', () => { + describe('Community data already loaded', () => { beforeEach(() => { jest.clearAllMocks() mocks.$store.state.community = { From c8570218c1eb1a52abdec1c8e2d8d65f936fb07c Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 5 Nov 2021 12:33:50 +0100 Subject: [PATCH 1115/1843] Update frontend/src/views/Pages/RegisterCommunity.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/RegisterCommunity.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/views/Pages/RegisterCommunity.spec.js index 18627821b..63fd63276 100644 --- a/frontend/src/views/Pages/RegisterCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterCommunity.spec.js @@ -80,7 +80,7 @@ describe('RegisterCommunity', () => { }) }) - describe('Community Data', () => { + describe('Community data already loaded', () => { beforeEach(() => { jest.clearAllMocks() mocks.$store.state.community = { From 8d2274406a08b664ce6b64fcb874979b181eb5e1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 5 Nov 2021 12:34:01 +0100 Subject: [PATCH 1116/1843] Update frontend/src/views/Pages/RegisterSelectCommunity.spec.js Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/RegisterSelectCommunity.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js index 0dc6be55a..eba23cea4 100644 --- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js +++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js @@ -131,7 +131,7 @@ describe('RegisterSelectCommunity', () => { }) }) - describe('Community Data', () => { + describe('Community data already loaded', () => { beforeEach(() => { jest.clearAllMocks() mocks.$store.state.community = { From 2573ee8c9b1f1a1630d7e319ee2c8270db631973 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 12:48:33 +0100 Subject: [PATCH 1117/1843] reintroduce autoincrement fix for transactions --- backend/src/graphql/resolver/TransactionResolver.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 97d3ac150..efd8f5588 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -564,6 +564,17 @@ export class TransactionResolver { throw e } finally { await queryRunner.release() + // TODO: This is broken code - we should never correct an autoincrement index in production + // according to dario it is required tho to properly work. The index of the table is used as + // index for the transaction which requires a chain without gaps + const count = await queryRunner.manager.count(dbTransaction) + // fix autoincrement value which seems not effected from rollback + await queryRunner + .query('ALTER TABLE `transactions` auto_increment = ?', [count]) + .catch((error) => { + // eslint-disable-next-line no-console + console.log('problems with reset auto increment: %o', error) + }) } // send notification email // TODO: translate From 5cf2b61388c2390753d64dc1e64993113d887efe Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 5 Nov 2021 13:50:09 +0100 Subject: [PATCH 1118/1843] fix: Await Resolved Promises in Backend Unit Tests --- backend/src/graphql/resolver/CommunityResolver.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index 20a06c2b8..afc6decec 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -48,7 +48,7 @@ describe('CommunityResolver', () => { describe('getCommunityInfo', () => { it('returns the default values', async () => { - expect(query({ query: getCommunityInfoQuery })).resolves.toMatchObject({ + await expect(query({ query: getCommunityInfoQuery })).resolves.toMatchObject({ data: { getCommunityInfo: { name: 'Gradido Entwicklung', @@ -68,7 +68,7 @@ describe('CommunityResolver', () => { }) it('returns three communities', async () => { - expect(query({ query: communities })).resolves.toMatchObject({ + await expect(query({ query: communities })).resolves.toMatchObject({ data: { communities: [ { @@ -104,7 +104,7 @@ describe('CommunityResolver', () => { }) it('returns one community', async () => { - expect(query({ query: communities })).resolves.toMatchObject({ + await expect(query({ query: communities })).resolves.toMatchObject({ data: { communities: [ { From 489743b6d6750b8e23fe063f39a863fcf7a4975b Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 5 Nov 2021 13:50:10 +0100 Subject: [PATCH 1119/1843] add navbar and routes --- admin/src/App.vue | 9 ++++++++- admin/src/components/NavBar.vue | 19 +++++++++++++++++++ admin/src/components/UserTable.vue | 24 ++++++++++++++++++++++++ admin/src/main.js | 2 ++ admin/src/router/routes.js | 29 ++++++++++++++++++++++++++--- admin/src/views/Creation.vue | 9 +++++++++ admin/src/views/Overview.vue | 21 +++++++++++++++++++++ admin/src/views/UserSearch.vue | 9 +++++++++ 8 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 admin/src/components/NavBar.vue create mode 100644 admin/src/components/UserTable.vue create mode 100644 admin/src/views/Creation.vue create mode 100644 admin/src/views/Overview.vue create mode 100644 admin/src/views/UserSearch.vue diff --git a/admin/src/App.vue b/admin/src/App.vue index 9267cc82b..1a15d5d7c 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,9 +1,16 @@ diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue new file mode 100644 index 000000000..42bc2161c --- /dev/null +++ b/admin/src/components/NavBar.vue @@ -0,0 +1,19 @@ + diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue new file mode 100644 index 000000000..55e9b5b3c --- /dev/null +++ b/admin/src/components/UserTable.vue @@ -0,0 +1,24 @@ + + + diff --git a/admin/src/main.js b/admin/src/main.js index 61f65129e..089e02352 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -14,6 +14,8 @@ import VueApollo from 'vue-apollo' import CONFIG from './config' import { BootstrapVue } from 'bootstrap-vue' +import 'bootstrap-vue/dist/bootstrap-vue.css' +import 'bootstrap/dist/css/bootstrap.css' const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js index 40f3ce325..71500eece 100644 --- a/admin/src/router/routes.js +++ b/admin/src/router/routes.js @@ -1,13 +1,36 @@ -import NotFound from '@/components/NotFoundPage.vue' - const routes = [ { path: '/', + component: () => import('@/views/Overview.vue'), meta: { requiresAuth: true, }, }, - { path: '*', component: NotFound }, + { + path: '/overview', + component: () => import('@/views/Overview.vue'), + meta: { + requiresAuth: true, + }, + }, + { + path: '/user', + component: () => import('@/views/UserSearch.vue'), + meta: { + requiresAuth: true, + }, + }, + { + path: '/creation', + component: () => import('@/views/Creation.vue'), + meta: { + requiresAuth: true, + }, + }, + { + path: '*', + component: () => import('@/components/NotFoundPage.vue'), + }, ] export default routes diff --git a/admin/src/views/Creation.vue b/admin/src/views/Creation.vue new file mode 100644 index 000000000..794218163 --- /dev/null +++ b/admin/src/views/Creation.vue @@ -0,0 +1,9 @@ + diff --git a/admin/src/views/Overview.vue b/admin/src/views/Overview.vue new file mode 100644 index 000000000..0cb8a106d --- /dev/null +++ b/admin/src/views/Overview.vue @@ -0,0 +1,21 @@ + + diff --git a/admin/src/views/UserSearch.vue b/admin/src/views/UserSearch.vue new file mode 100644 index 000000000..be6ce38c9 --- /dev/null +++ b/admin/src/views/UserSearch.vue @@ -0,0 +1,9 @@ + From e12438586fefc2fed7f275b1d0317fbda18d9566 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 5 Nov 2021 16:24:17 +0100 Subject: [PATCH 1120/1843] reduce coverage backend --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e8d53acc..a9f730d47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -394,7 +394,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 45 + min_coverage: 44 token: ${{ github.token }} ############################################################################## From 2e88e8f3a7f97863f4831e796ae83c1927eced91 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 23:36:20 +0100 Subject: [PATCH 1121/1843] reduce backend coverage to 41 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e8d53acc..08e63e6bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -394,7 +394,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 45 + min_coverage: 41 token: ${{ github.token }} ############################################################################## From 5791124c287b30a3ac480e4f129e8c60bf228ca2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 5 Nov 2021 23:36:43 +0100 Subject: [PATCH 1122/1843] - test results - minor fixes for test instructions --- .../graphql/resolver/TransactionResolver.ts | 79 ++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index efd8f5588..70dfdc505 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -77,8 +77,8 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr >> Verify you have 3 entries in `login_users`, `login_user_backups` and `state_users` ### make creator an admin -> INSERT INTO login_user_roles (id, user_id, role_id) VALUES (NULL, '4', '1'); -> UPDATE login_users SET email_checked = 1 WHERE id = 4; +> INSERT INTO login_user_roles (id, user_id, role_id) VALUES (NULL, '3', '1'); +> UPDATE login_users SET email_checked = 1 WHERE id = 3; > uncomment line: 19 in community_server/src/Controller/ServerUsersController.php > chromium http://localhost/server-users/add > create user `creator` `123` `creator@different.net` @@ -124,6 +124,81 @@ INSERT INTO `login_groups` (`id`, `alias`, `name`, `url`, `host`, `home`, `descr > select custom > untick structure > ok + +## Results +NOTE: We decided not to write the `transaction_signatures` since its unused. This is the main difference. +NOTE: We fixed a bug in the `state_user_transactions code` with the new implementation of apollo + + +Master: + +-- +-- Dumping data for table `state_user_transactions` +-- + +INSERT INTO `state_user_transactions` (`id`, `state_user_id`, `transaction_id`, `transaction_type_id`, `balance`, `balance_date`) VALUES +(1, 2, 1, 1, 10000000, '2021-11-05 12:45:18'), +(2, 2, 2, 2, 9900000, '2021-11-05 12:48:35'), +(3, 1, 2, 2, 100000, '2021-11-05 12:48:35'), +(4, 2, 3, 2, 9800000, '2021-11-05 12:49:07'), +(5, 1, 3, 2, 200000, '2021-11-05 12:49:07'), +(6, 2, 5, 2, 9699845, '2021-11-05 13:03:50'), +(7, 1, 5, 2, 99996, '2021-11-05 13:03:50'); + +-- +-- Dumping data for table `transactions` +-- + +INSERT INTO `transactions` (`id`, `state_group_id`, `transaction_type_id`, `tx_hash`, `memo`, `received`, `blockchain_type_id`) VALUES +(1, NULL, 1, 0x9ccdcd01ccb6320c09c2d1da2f0bf735a95ece0e7c1df6bbff51918fbaec061700000000000000000000000000000000, '', '2021-11-05 12:45:18', 1), +(2, NULL, 2, 0x58d7706a67fa4ff4b8038168c6be39a2963d7e28e9d3872759ad09c519fe093700000000000000000000000000000000, 'Hier!', '2021-11-05 12:48:35', 1), +(3, NULL, 2, 0x427cd214f92ef35af671129d50edc5a478c53d1e464f285b7615d9794a69f69b00000000000000000000000000000000, 'Hier!', '2021-11-05 12:49:07', 1), +(4, NULL, 9, 0x32807368f0906a21b94c072599795bc9eeab88fb565df82e85cc62a4fdcde48500000000000000000000000000000000, '', '2021-11-05 12:51:51', 1), +(5, NULL, 2, 0x75eb729e0f60a1c8cead1342955853d2440d7a2ea57dfef6d4a18bff0d94491e00000000000000000000000000000000, 'Hier!', '2021-11-05 13:03:50', 1); + +-- +-- Dumping data for table `transaction_signatures` +-- + +INSERT INTO `transaction_signatures` (`id`, `transaction_id`, `signature`, `pubkey`) VALUES +(1, 1, 0x5888edcdcf77aaadad6d321882903bc831d7416f17213fd5020a764365b5fcb336e4c7917385a1278ea44ccdb31eac4a09e448053b5e3f8f1fe5da3baf53c008, 0xd5b20f8dee415038bfa2b6b0e1b40ff54850351109444863b04d6d28825b7b7d), +(2, 2, 0xf6fef428f8f22faf7090f7d740e6088d1d90c58ae92d757117d7d91d799e659f3a3a0c65a3fd97cbde798e761f9d23eff13e8810779a184c97c411f28e7c4608, 0xdc74a589004377ab14836dce68ce2ca34e5b17147cd78ad4b3afe8137524ae8a), +(3, 3, 0x8ebe9730c6cf61f56ef401d6f2bd229f3c298ca3c2791ee9137e4827b7af6c6d6566fca616eb1fe7adc2e4d56b5c7350ae3990c9905580630fa75ecffca8e001, 0xdc74a589004377ab14836dce68ce2ca34e5b17147cd78ad4b3afe8137524ae8a), +(4, 5, 0x50cf418f7e217391e89ab9c2879ae68d7c7c597d846b4fe1c082b5b16e5d0c85c328fbf48ad3490bcfe94f446700ae0a4b0190e76d26cc752abced58f480c80f, 0xdc74a589004377ab14836dce68ce2ca34e5b17147cd78ad4b3afe8137524ae8a); + +This Feature Branch: + + +-- +-- Dumping data for table `state_user_transactions` +-- + +INSERT INTO `state_user_transactions` (`id`, `state_user_id`, `transaction_id`, `transaction_type_id`, `balance`, `balance_date`) VALUES +(1, 2, 1, 1, 10000000, '2021-11-05 00:25:46'), +(12, 2, 7, 2, 9900000, '2021-11-05 00:55:37'), +(13, 1, 7, 2, 100000, '2021-11-05 00:55:37'), +(14, 2, 8, 2, 9800000, '2021-11-05 01:00:04'), +(15, 1, 8, 2, 200000, '2021-11-05 01:00:04'), +(16, 2, 10, 2, 9699772, '2021-11-05 01:17:41'), +(17, 1, 10, 2, 299995, '2021-11-05 01:17:41'); + +-- +-- Dumping data for table `transactions` +-- + +INSERT INTO `transactions` (`id`, `state_group_id`, `transaction_type_id`, `tx_hash`, `memo`, `received`, `blockchain_type_id`) VALUES +(1, NULL, 1, 0xdd030d475479877587d927ed9024784ba62266cf1f3d87862fc98ad68f7b26e400000000000000000000000000000000, '', '2021-11-05 00:25:46', 1), +(7, NULL, 2, NULL, 'Hier!', '2021-11-05 00:55:37', 1), +(8, NULL, 2, NULL, 'Hier!', '2021-11-05 01:00:04', 1), +(9, NULL, 9, 0xb1cbedbf126aa35f5edbf06e181c415361d05228ab4da9d19a4595285a673dfa00000000000000000000000000000000, '', '2021-11-05 01:05:34', 1), +(10, NULL, 2, NULL, 'Hier!', '2021-11-05 01:17:41', 1); + +-- +-- Dumping data for table `transaction_signatures` +-- + +INSERT INTO `transaction_signatures` (`id`, `transaction_id`, `signature`, `pubkey`) VALUES +(1, 1, 0x60d632479707e5d01cdc32c3326b5a5bae11173a0c06b719ee7b552f9fd644de1a0cd4afc207253329081d39dac1a63421f51571d836995c649fc39afac7480a, 0x48c45cb4fea925e83850f68f2fa8f27a1a4ed1bcba68cdb59fcd86adef3f52ee); */ const sendEMail = async (emailDef: any): Promise => { From d15b9a7e3ce7c529cfd0dd6e3c292dbfce41f0b5 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 18:04:06 +0100 Subject: [PATCH 1123/1843] - do not send error email - return after finally block due to unknown behaviour?! --- backend/src/graphql/resolver/UserResolver.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 6c140bc62..ae8d0f8b1 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -384,11 +384,6 @@ export class UserResolver { emailOptIn.emailOptInTypeId = 2 await queryRunner.manager.save(emailOptIn).catch((error) => { - // TODO: Send error email instead of throw error - // if (!emailOptInModel->insertIntoDB(false)) { - // emailOptInModel->sendErrorsAsEmail(); - // return stateError("insert emailOptIn failed"); - // } // eslint-disable-next-line no-console console.log('Error while saving emailOptIn', error) throw new Error('error saving email opt in') @@ -397,7 +392,6 @@ export class UserResolver { // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); await queryRunner.commitTransaction() - return 'success' } catch (e) { await queryRunner.rollbackTransaction() await rollbackAutoIncrement(queryRunner, LoginUser, `login_users`) @@ -407,6 +401,7 @@ export class UserResolver { } finally { await queryRunner.release() } + return 'success' } @Query(() => SendPasswordResetEmailResponse) From 854ce12d620ea125d696b27daf248995a55f060d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 Nov 2021 18:08:59 +0100 Subject: [PATCH 1124/1843] removed dangerous code --- backend/src/graphql/resolver/UserResolver.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ae8d0f8b1..55cf5b81f 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -394,9 +394,11 @@ export class UserResolver { await queryRunner.commitTransaction() } catch (e) { await queryRunner.rollbackTransaction() - await rollbackAutoIncrement(queryRunner, LoginUser, `login_users`) - await rollbackAutoIncrement(queryRunner, LoginUserBackup, `login_user_backups`) - await rollbackAutoIncrement(queryRunner, DbUser, `state_users`) + // TODO: Lets not do this?! What if state_users were never updated? + // We would still roll back the autoincrement which would produce duplicate entries?! + // await rollbackAutoIncrement(queryRunner, LoginUser, `login_users`) + // await rollbackAutoIncrement(queryRunner, LoginUserBackup, `login_user_backups`) + // await rollbackAutoIncrement(queryRunner, DbUser, `state_users`) throw e } finally { await queryRunner.release() @@ -573,6 +575,7 @@ export class UserResolver { } } +/* const rollbackAutoIncrement = async ( queryRunner: QueryRunner, entity: typeof BaseEntity, @@ -588,3 +591,4 @@ const rollbackAutoIncrement = async ( throw new Error('Problems with reset auto increment: ' + error) }) } +*/ From f915bd40131cdd5a355f1a04847b39d9ba03718e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 00:45:36 +0100 Subject: [PATCH 1125/1843] removed unused includes --- backend/src/graphql/resolver/UserResolver.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 55cf5b81f..c3c8e0f14 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,7 +3,7 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' -import { BaseEntity, getConnection, getCustomRepository, QueryRunner } from 'typeorm' +import { getConnection, getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' @@ -25,8 +25,6 @@ import { CheckEmailResponse } from '../model/CheckEmailResponse' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' -import { LoginUserRepository } from '../../typeorm/repository/LoginUser' -import { LoginUserBackupRepository } from '../../typeorm/repository/LoginUserBackup' import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' From 95265fe9898bcf59f5da4c4b96598110ef9414e7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 00:55:27 +0100 Subject: [PATCH 1126/1843] removed @types/libsodium-wrapper package --- backend/package.json | 1 - backend/yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index e47939b41..bc098958f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -40,7 +40,6 @@ "devDependencies": { "@types/express": "^4.17.12", "@types/jsonwebtoken": "^8.5.2", - "@types/libsodium-wrappers": "^0.7.9", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", "@typescript-eslint/eslint-plugin": "^4.28.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 915766619..b411bcf60 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -918,11 +918,6 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/libsodium-wrappers@^0.7.9": - version "0.7.9" - resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#89c3ad2156d5143e64bce86cfeb0045a983aeccc" - integrity sha512-LisgKLlYQk19baQwjkBZZXdJL0KbeTpdEnrAfz5hQACbklCY0gVFnsKUyjfNWF1UQsCSjw93Sj5jSbiO8RPfdw== - "@types/long@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" From 4e118b65ee8389bca6083f19c2109d3eea414c1f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 00:57:05 +0100 Subject: [PATCH 1127/1843] - make sendEMails external (utils) - replace fromHex from libsodium-wrapper --- .../graphql/resolver/TransactionResolver.ts | 28 ++----------------- backend/src/util/sendEMail.ts | 26 +++++++++++++++++ 2 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 backend/src/util/sendEMail.ts diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 70dfdc505..afdd87156 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -4,9 +4,9 @@ import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { getCustomRepository, getConnection, QueryRunner } from 'typeorm' -import { createTransport } from 'nodemailer' import CONFIG from '../../config' +import { sendEMail } from '../../util/sendEMail' import { Transaction } from '../model/Transaction' import { TransactionList } from '../model/TransactionList' @@ -33,7 +33,6 @@ import { calculateDecay, calculateDecayWithInterval } from '../../util/decay' import { TransactionTypeId } from '../enum/TransactionTypeId' import { TransactionType } from '../enum/TransactionType' import { hasUserAmount, isHexPublicKey } from '../../util/validate' -import { from_hex as fromHex } from 'libsodium-wrappers' /* # Test @@ -201,29 +200,6 @@ INSERT INTO `transaction_signatures` (`id`, `transaction_id`, `signature`, `pubk (1, 1, 0x60d632479707e5d01cdc32c3326b5a5bae11173a0c06b719ee7b552f9fd644de1a0cd4afc207253329081d39dac1a63421f51571d836995c649fc39afac7480a, 0x48c45cb4fea925e83850f68f2fa8f27a1a4ed1bcba68cdb59fcd86adef3f52ee); */ -const sendEMail = async (emailDef: any): Promise => { - if (!CONFIG.EMAIL) { - // eslint-disable-next-line no-console - console.log('Emails are disabled via config') - return false - } - const transporter = createTransport({ - host: CONFIG.EMAIL_SMTP_URL, - port: Number(CONFIG.EMAIL_SMTP_PORT), - secure: false, // true for 465, false for other ports - requireTLS: true, - auth: { - user: CONFIG.EMAIL_USERNAME, - pass: CONFIG.EMAIL_PASSWORD, - }, - }) - const info = await transporter.sendMail(emailDef) - if (!info.messageId) { - throw new Error('error sending notification email, but transaction succeed') - } - return true -} - // Helper function async function calculateAndAddDecayTransactions( userTransactions: dbUserTransaction[], @@ -622,7 +598,7 @@ export class TransactionResolver { transactionSendCoin.userId = senderUser.id transactionSendCoin.senderPublic = senderUser.pubkey transactionSendCoin.recipiantUserId = recipiantUser.id - transactionSendCoin.recipiantPublic = Buffer.from(fromHex(recipiantPublicKey)) + transactionSendCoin.recipiantPublic = Buffer.from(recipiantPublicKey, 'hex') transactionSendCoin.amount = centAmount transactionSendCoin.senderFinalBalance = senderStateBalance.amount await queryRunner.manager.save(transactionSendCoin).catch((error) => { diff --git a/backend/src/util/sendEMail.ts b/backend/src/util/sendEMail.ts new file mode 100644 index 000000000..e34597419 --- /dev/null +++ b/backend/src/util/sendEMail.ts @@ -0,0 +1,26 @@ +import { createTransport } from 'nodemailer' + +import CONFIG from '../config' + +export const sendEMail = async (emailDef: any): Promise => { + if (!CONFIG.EMAIL) { + // eslint-disable-next-line no-console + console.log('Emails are disabled via config') + return false + } + const transporter = createTransport({ + host: CONFIG.EMAIL_SMTP_URL, + port: Number(CONFIG.EMAIL_SMTP_PORT), + secure: false, // true for 465, false for other ports + requireTLS: true, + auth: { + user: CONFIG.EMAIL_USERNAME, + pass: CONFIG.EMAIL_PASSWORD, + }, + }) + const info = await transporter.sendMail(emailDef) + if (!info.messageId) { + throw new Error('error sending notification email, but transaction succeed') + } + return true +} From 9894b4a91ffd1d064029aa735ff70533b0f3b09e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 01:56:30 +0100 Subject: [PATCH 1128/1843] fixed email for transactions --- backend/src/graphql/resolver/TransactionResolver.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index afdd87156..755955a7f 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -630,8 +630,8 @@ export class TransactionResolver { // send notification email // TODO: translate await sendEMail({ - from: 'Gradido (nicht antworten) <' + CONFIG.EMAIL_SENDER + '>', - to: recipiantUser.firstName + ' ' + recipiantUser.lastName + ' <' + recipiantUser.email + '>', + from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`, + to: `${recipiantUser.firstName} ${recipiantUser.lastName} <${recipiantUser.email}>`, subject: 'Gradido Ãœberweisung', text: `Hallo ${recipiantUser.firstName} ${recipiantUser.lastName} @@ -642,7 +642,8 @@ export class TransactionResolver { Bitte antworte nicht auf diese E-Mail! - Mit freundlichen Grüßen Gradido Community Server`, + Mit freundlichen Grüßen, + dein Gradido-Team`, }) return 'success' From 0f89cf1c9688fe4caa51cec12b78a3628332942a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 01:56:47 +0100 Subject: [PATCH 1129/1843] send emails to activate account --- backend/.env.dist | 2 ++ backend/src/config/index.ts | 3 ++ backend/src/graphql/resolver/UserResolver.ts | 33 +++++++++++++++++--- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index 30c0da2db..b4a91026a 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -18,6 +18,8 @@ DB_DATABASE=gradido_community #EMAIL_SMTP_URL= #EMAIL_SMTP_PORT=587 +#EMAIL_LINK_VERIFICATION=http://localhost/vue/checkEmail/$1 + #KLICKTIPP_USER= #KLICKTIPP_PASSWORD= #KLICKTIPP_APIKEY_DE= diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 7e2059eac..f21082d1d 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -51,6 +51,9 @@ const email = { EMAIL_PASSWORD: process.env.EMAIL_PASSWORD || 'xxx', EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'gmail.com', EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587', + + EMAIL_LINK_VERIFICATION: + process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1', } // This is needed by graphql-directive-auth diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index c3c8e0f14..6a8eed67f 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -28,6 +28,7 @@ import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' +import { sendEMail } from '../../util/sendEMail' // TODO apparently the types are cannot be loaded correctly? IDK whats wrong and we have to use require // import { @@ -378,7 +379,7 @@ export class UserResolver { // Store EmailOptIn in DB const emailOptIn = new LoginEmailOptIn() emailOptIn.userId = loginUserId - emailOptIn.verificationCode = random(64) // TODO generate verificationCode + emailOptIn.verificationCode = random(64) emailOptIn.emailOptInTypeId = 2 await queryRunner.manager.save(emailOptIn).catch((error) => { @@ -386,9 +387,33 @@ export class UserResolver { console.log('Error while saving emailOptIn', error) throw new Error('error saving email opt in') }) - // TODO: Send EmailOptIn to user.email - // emailOptIn->setBaseUrl(user->getGroupBaseUrl() + ServerConfig::g_frontend_checkEmailPath); - // em->addEmail(new model::Email(emailOptIn, user, model::Email::convertTypeFromInt(emailType))); + + // Send EMail to user + const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace( + /\$1/g, + emailOptIn.verificationCode.toString(), + ) + const emailSent = await sendEMail({ + from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`, + to: `${firstName} ${lastName} <${email}>`, + subject: 'Gradido: E-Mail Ãœberprüfung', + text: `Hallo ${firstName} ${lastName}, + + Deine EMail wurde soeben bei Gradido registriert. + + Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren: + ${activationLink} + oder kopiere den obigen Link in dein Browserfenster. + + Mit freundlichen Grüßen, + dein Gradido-Team`, + }) + + // In case EMails are disabled log the activation link for the user + if (!emailSent) { + // eslint-disable-next-line no-console + console.log(`Account confirmation link: ${activationLink}`) + } await queryRunner.commitTransaction() } catch (e) { await queryRunner.rollbackTransaction() From fe9a8e1a7501ce18aa3b2a64a2920d25b40ed96b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 02:05:21 +0100 Subject: [PATCH 1130/1843] reduced coverage to 39 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 08e63e6bb..9b10b7250 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -394,7 +394,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 41 + min_coverage: 39 token: ${{ github.token }} ############################################################################## From 70fa4f49d0a7832ddf6e70f3367fa8689e81f116 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 02:10:35 +0100 Subject: [PATCH 1131/1843] cleanup --- backend/src/graphql/resolver/UserResolver.ts | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 6a8eed67f..f332a56bf 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -30,17 +30,6 @@ import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { sendEMail } from '../../util/sendEMail' -// TODO apparently the types are cannot be loaded correctly? IDK whats wrong and we have to use require -// import { -// /* eslint-disable camelcase */ -// randombytes_random, -// crypto_hash_sha512_instance, -// crypto_hash_sha512_BYTES, -// crypto_sign_seed_keypair, -// crypto_sign_PUBLICKEYBYTES, -// crypto_sign_SECRETKEYBYTES, -// /* eslint-enable camelcase */ -// } from 'sodium-native' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -143,7 +132,6 @@ const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { } const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[] => { - // TODO: put that in the actual config const configLoginAppSecret = Buffer.from(CONFIG.LOGIN_APP_SECRET, 'hex') const configLoginServerKey = Buffer.from(CONFIG.LOGIN_SERVER_KEY, 'hex') if (configLoginServerKey.length !== sodium.crypto_shorthash_KEYBYTES) { @@ -287,8 +275,6 @@ export class UserResolver { async createUser( @Args() { email, firstName, lastName, password, language, publisherId }: CreateUserArgs, ): Promise { - const username = '' - // TODO: wrong default value (should be null), how does graphql work here? Is it an required field? // default int publisher_id = 0; @@ -306,6 +292,7 @@ export class UserResolver { // Validate username // TODO: never true + const username = '' if (username.length > 3 && !this.checkUsername({ username })) { throw new Error('Username already in use') } From d73728bf8695d4bb42b3791764be9ef07f8b272c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 18:55:04 +0100 Subject: [PATCH 1132/1843] Update backend/src/graphql/resolver/UserResolver.ts Co-authored-by: Hannes Heine --- backend/src/graphql/resolver/UserResolver.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index f332a56bf..c0ec4b932 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -584,21 +584,3 @@ export class UserResolver { return result.data.hasElopage } } - -/* -const rollbackAutoIncrement = async ( - queryRunner: QueryRunner, - entity: typeof BaseEntity, - entityName: string, -) => { - const count = await queryRunner.manager.count(entity) - const queryString = 'ALTER TABLE `' + entityName + '` auto_increment = ' + count - // eslint-disable-next-line no-console - console.log('Database AlterTable Query: ', queryString) - await queryRunner.query(queryString).catch((error) => { - // eslint-disable-next-line no-console - console.log('problems with reset auto increment: %o', error) - throw new Error('Problems with reset auto increment: ' + error) - }) -} -*/ From 348075ab386b858cd8a3634f95bc067d464279e5 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 18:55:16 +0100 Subject: [PATCH 1133/1843] Update backend/src/graphql/resolver/UserResolver.ts Co-authored-by: Hannes Heine --- backend/src/graphql/resolver/UserResolver.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index c0ec4b932..7cc8cbf6d 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -404,11 +404,6 @@ export class UserResolver { await queryRunner.commitTransaction() } catch (e) { await queryRunner.rollbackTransaction() - // TODO: Lets not do this?! What if state_users were never updated? - // We would still roll back the autoincrement which would produce duplicate entries?! - // await rollbackAutoIncrement(queryRunner, LoginUser, `login_users`) - // await rollbackAutoIncrement(queryRunner, LoginUserBackup, `login_user_backups`) - // await rollbackAutoIncrement(queryRunner, DbUser, `state_users`) throw e } finally { await queryRunner.release() From 01707674d2cc7e765edae5adcab7eb4507b32533 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 8 Nov 2021 13:27:03 +0100 Subject: [PATCH 1134/1843] Added LoginUserRepository to get login_users. --- backend/src/typeorm/repository/LoginUser.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 backend/src/typeorm/repository/LoginUser.ts diff --git a/backend/src/typeorm/repository/LoginUser.ts b/backend/src/typeorm/repository/LoginUser.ts new file mode 100644 index 000000000..65ac6f67b --- /dev/null +++ b/backend/src/typeorm/repository/LoginUser.ts @@ -0,0 +1,11 @@ +import { EntityRepository, Repository } from 'typeorm' +import { LoginUser } from '@entity/LoginUser' + +@EntityRepository(LoginUser) +export class LoginUserRepository extends Repository { + async findByEmail(email: string): Promise { + return this.createQueryBuilder('loginUser') + .where('loginUser.email = :email', { email }) + .getOneOrFail() + } +} From a375e6ecc9d9982ad7ea569b3f186a562107df30 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 8 Nov 2021 13:27:32 +0100 Subject: [PATCH 1135/1843] WIP: Change the login so that the unsecureLogin logic is implemented. --- backend/src/graphql/resolver/UserResolver.ts | 41 +++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index d05640e5e..bfb8b41b4 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -26,9 +26,13 @@ import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepos import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' +import { LoginUserRepository } from '../../typeorm/repository/LoginUser' @Resolver() export class UserResolver { + private userRepository = getCustomRepository(UserRepository) + private userSettingRepository = getCustomRepository(UserSettingRepository) + @Query(() => User) @UseMiddleware(klicktippNewsletterStateMiddleware) async login( @@ -36,27 +40,34 @@ export class UserResolver { @Ctx() context: any, ): Promise { email = email.trim().toLowerCase() - const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) - - // if there is no user, throw an authentication error - if (!result.success) { - throw new Error(result.data) + // const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) + // UnsecureLogin + const userCount = await LoginUser.count({ email }) + if (userCount === 0) { + throw new Error('No user with this credentials') } + if (!isPassword(password)) { + throw new Error('No user with this credentials') + } + + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findByEmail(email) + if (loginUser.password) context.setHeaders.push({ key: 'token', value: encode(result.data.session_id, result.data.user.public_hex), }) - const user = new User(result.data.user) + // const user = new User(result.data.user) // Hack: Database Field is not validated properly and not nullable if (user.publisherId === 0) { user.publisherId = undefined } user.hasElopage = result.data.hasElopage // read additional settings from settings table - const userRepository = getCustomRepository(UserRepository) + // const userRepository = getCustomRepository(UserRepository) let userEntity: void | DbUser - userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { + userEntity = await this.userRepository.findByPubkeyHex(user.pubkey).catch(() => { userEntity = new DbUser() userEntity.firstName = user.firstName userEntity.lastName = user.lastName @@ -64,7 +75,7 @@ export class UserResolver { userEntity.email = user.email userEntity.pubkey = Buffer.from(fromHex(user.pubkey)) - userRepository.save(userEntity).catch(() => { + this.userRepository.save(userEntity).catch(() => { throw new Error('error by save userEntity') }) }) @@ -216,7 +227,7 @@ export class UserResolver { }, } let response: UpdateUserInfosResponse | undefined - const userRepository = getCustomRepository(UserRepository) + // const userRepository = getCustomRepository(UserRepository) if ( firstName || @@ -232,7 +243,7 @@ export class UserResolver { if (!result.success) throw new Error(result.data) response = new UpdateUserInfosResponse(result.data) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const userEntity = await this.userRepository.findByPubkeyHex(context.pubKey) let userEntityChanged = false if (firstName) { userEntity.firstName = firstName @@ -247,7 +258,7 @@ export class UserResolver { userEntityChanged = true } if (userEntityChanged) { - userRepository.save(userEntity).catch((error) => { + this.userRepository.save(userEntity).catch((error) => { throw new Error(error) }) } @@ -255,10 +266,10 @@ export class UserResolver { if (coinanimation !== undefined) { // load user and balance - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const userEntity = await this.userRepository.findByPubkeyHex(context.pubKey) - const userSettingRepository = getCustomRepository(UserSettingRepository) - userSettingRepository + // const userSettingRepository = getCustomRepository(UserSettingRepository) + this.userSettingRepository .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) .catch((error) => { throw new Error(error) From f2d8d400ac39c48c8534b6a1d5d4702f83920b87 Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 8 Nov 2021 14:26:32 +0100 Subject: [PATCH 1136/1843] Add libsodium. --- backend/package-lock.json | 19 ++++++++++++++++--- backend/package.json | 1 + backend/yarn.lock | 12 ++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index bb0d16316..f18213264 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -4903,6 +4903,19 @@ "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.34.tgz", "integrity": "sha512-gHTNU9xTtVgSp30IDX/57W4pETMXDIYXFfwEOJVXiYosiY7Hc7ogJwlBjOqlCcU04X0aA8DT57hdwUC1sJBJnA==" }, + "libsodium": { + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.9.tgz", + "integrity": "sha512-gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A==" + }, + "libsodium-wrappers": { + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz", + "integrity": "sha512-9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ==", + "requires": { + "libsodium": "^0.7.0" + } + }, "load-json-file": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", @@ -6934,9 +6947,9 @@ } }, "validator": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-13.6.0.tgz", - "integrity": "sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==" + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz", + "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==" }, "vary": { "version": "1.1.2", diff --git a/backend/package.json b/backend/package.json index e47939b41..c0d244ecd 100644 --- a/backend/package.json +++ b/backend/package.json @@ -27,6 +27,7 @@ "graphql": "^15.5.1", "jest": "^27.2.4", "jsonwebtoken": "^8.5.1", + "libsodium-wrappers": "^0.7.9", "module-alias": "^2.2.2", "mysql2": "^2.3.0", "nodemailer": "^6.6.5", diff --git a/backend/yarn.lock b/backend/yarn.lock index 915766619..3cb8e9b43 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3918,6 +3918,18 @@ libphonenumber-js@^1.9.7: resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.9.37.tgz#944f59a3618a8f85d9b619767a0b6fb87523f285" integrity sha512-RnUR4XwiVhMLnT7uFSdnmLeprspquuDtaShAgKTA+g/ms9/S4hQU3/QpFdh3iXPHtxD52QscXLm2W2+QBmvYAg== +libsodium-wrappers@^0.7.9: + version "0.7.9" + resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz#4ffc2b69b8f7c7c7c5594a93a4803f80f6d0f346" + integrity sha512-9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ== + dependencies: + libsodium "^0.7.0" + +libsodium@^0.7.0: + version "0.7.9" + resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.9.tgz#4bb7bcbf662ddd920d8795c227ae25bbbfa3821b" + integrity sha512-gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A== + load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" From 5400967142619d975ff74efb0aa802b1f7e6ce1f Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 8 Nov 2021 14:27:07 +0100 Subject: [PATCH 1137/1843] Get LoginUser from the DB, checkPassword. --- backend/src/graphql/resolver/UserResolver.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index be1e06305..4768b4659 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -196,9 +196,6 @@ const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): B @Resolver() export class UserResolver { - - private userSettingRepository = getCustomRepository(UserSettingRepository) - @Query(() => User) @UseMiddleware(klicktippNewsletterStateMiddleware) async login( @@ -208,19 +205,18 @@ export class UserResolver { email = email.trim().toLowerCase() // const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) // UnsecureLogin - const userCount = await LoginUser.count({ email }) - if (userCount === 0) { + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findByEmail(email) + if (!loginUser) { throw new Error('No user with this credentials') } if (!isPassword(password)) { throw new Error('No user with this credentials') } - const loginUserRepository = getCustomRepository(LoginUserRepository) - const loginUser = await loginUserRepository.findByEmail(email) const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash - // loginUser.password = passwordHash[0].readBigUInt64LE() - if (loginUser.password !== passwordHash[0].readBigUInt64LE()) { + const loginUserPassword = BigInt(loginUser.password.toString()) + if (loginUserPassword !== passwordHash[0].readBigUInt64LE()) { throw new Error('No user with this credentials') } From 8a61f73c56ecf122f74978dc87545841c94f307e Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 06:01:25 +0100 Subject: [PATCH 1138/1843] Added the load or store of the state_users. --- backend/src/graphql/resolver/UserResolver.ts | 42 +++++++++++--------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 4768b4659..50f2cfe48 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -224,6 +224,29 @@ export class UserResolver { key: 'token', value: encode(loginUser.pubKey), }) + + const userRepository = getCustomRepository(UserRepository) + let userEntity: void | DbUser + userEntity = await userRepository + .findByPubkeyHex(loginUser.pubKey.toString('utf8')) + .catch(() => { + // User not stored in state_users + userEntity = new DbUser() + userEntity.firstName = loginUser.firstName + userEntity.lastName = loginUser.lastName + userEntity.username = loginUser.username + userEntity.email = loginUser.email + userEntity.pubkey = Buffer.from(loginUser.pubKey.toString('utf8'), 'hex') + + userRepository.save(userEntity).catch(() => { + throw new Error('error by save userEntity') + }) + }) + if (!userEntity) { + throw new Error('error with cannot happen') + } + // TODO: Check and/or store hasElopage + // TODO: If user has no pubKey Create it again and update user. throw new Error('WIP') // const user = new User(result.data.user) // Hack: Database Field is not validated properly and not nullable @@ -232,25 +255,8 @@ export class UserResolver { // } // user.hasElopage = result.data.hasElopage // // read additional settings from settings table - // const userRepository = getCustomRepository(UserRepository) - // let userEntity: void | DbUser - // userEntity = await userRepository.findByPubkeyHex(user.pubkey).catch(() => { - // userEntity = new DbUser() - // userEntity.firstName = user.firstName - // userEntity.lastName = user.lastName - // userEntity.username = user.username - // userEntity.email = user.email - // userEntity.pubkey = Buffer.from(user.pubkey, 'hex') - // userRepository.save(userEntity).catch(() => { - // throw new Error('error by save userEntity') - // }) - // }) - // if (!userEntity) { - // throw new Error('error with cannot happen') - // } - - // // Save publisherId if Elopage is not yet registered + // Save publisherId if Elopage is not yet registered // if (!user.hasElopage && publisherId) { // user.publisherId = publisherId // await this.updateUserInfos( From e8b9765a34c588c909eb4581e4f96c35dec61cf4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 06:13:29 +0100 Subject: [PATCH 1139/1843] Withdrew the check on the sessionId when is authorized is called. --- backend/src/graphql/directive/isAuthorized.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index c553539bc..23971162d 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -14,13 +14,13 @@ const isAuthorized: AuthChecker = async ( if (context.token) { const decoded = decode(context.token) // if (decoded.sessionId && decoded.sessionId !== 0) { - // const result = await apiGet( - // `${CONFIG.LOGIN_API_URL}checkSessionState?session_id=${decoded.sessionId}`, - // ) - // context.sessionId = decoded.sessionId - context.pubKey = decoded.pubKey - context.setHeaders.push({ key: 'token', value: encode(decoded.pubKey) }) - return true + // const result = await apiGet( + // `${CONFIG.LOGIN_API_URL}checkSessionState?session_id=${decoded.sessionId}`, + // ) + // context.sessionId = decoded.sessionId + context.pubKey = decoded.pubKey + context.setHeaders.push({ key: 'token', value: encode(decoded.pubKey) }) + return true // } } throw new Error('401 Unauthorized') From 8730bc898c86f0300f3a589783e9b1f3b728e864 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 06:14:02 +0100 Subject: [PATCH 1140/1843] We don't use the login_server to fill this model anymore. --- backend/src/graphql/model/User.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index 08651ae17..5b7682e01 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -10,15 +10,17 @@ export class User { @PrimaryGeneratedColumn() id: number */ - constructor(json: any) { - this.email = json.email - this.firstName = json.first_name - this.lastName = json.last_name - this.username = json.username - this.description = json.description - this.pubkey = json.public_hex - this.language = json.language - this.publisherId = json.publisher_id + constructor(json?: any) { + if (json) { + this.email = json.email + this.firstName = json.first_name + this.lastName = json.last_name + this.username = json.username + this.description = json.description + this.pubkey = json.public_hex + this.language = json.language + this.publisherId = json.publisher_id + } } @Field(() => String) From 4af3c6ed8c1e422991ad73d7e24b6abc18b46b78 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 06:14:38 +0100 Subject: [PATCH 1141/1843] Filling the returned model so that we get the same result as before. --- backend/src/graphql/resolver/UserResolver.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 50f2cfe48..b37c568a4 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -219,6 +219,7 @@ export class UserResolver { if (loginUserPassword !== passwordHash[0].readBigUInt64LE()) { throw new Error('No user with this credentials') } + // TODO: If user has no pubKey Create it again and update user. context.setHeaders.push({ key: 'token', @@ -245,8 +246,22 @@ export class UserResolver { if (!userEntity) { throw new Error('error with cannot happen') } - // TODO: Check and/or store hasElopage - // TODO: If user has no pubKey Create it again and update user. + + const user = new User() + user.email = email + user.firstName = loginUser.firstName + user.lastName = loginUser.lastName + user.username = loginUser.username + user.description = loginUser.description + user.pubkey = loginUser.pubKey.toString('utf8') + user.language = loginUser.language + // TODO: hasElopage + // auto elopage_buy = Poco::AutoPtr(new model::table::ElopageBuy); + // mHasElopage = elopage_buy->isExistInDB("payer_email", mEmail); + // else undefined + + // TODO: coinAnimation + return user throw new Error('WIP') // const user = new User(result.data.user) // Hack: Database Field is not validated properly and not nullable From 75d7ff3905f38b39777ce1934cc8f029255032a1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 06:15:58 +0100 Subject: [PATCH 1142/1843] Withdrew the comments. --- backend/src/graphql/directive/isAuthorized.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 23971162d..079e8e88c 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -2,9 +2,6 @@ import { AuthChecker } from 'type-graphql' -import CONFIG from '../../config' -import { apiGet } from '../../apis/HttpRequest' - import decode from '../../jwt/decode' import encode from '../../jwt/encode' @@ -13,15 +10,9 @@ const isAuthorized: AuthChecker = async ( ) => { if (context.token) { const decoded = decode(context.token) - // if (decoded.sessionId && decoded.sessionId !== 0) { - // const result = await apiGet( - // `${CONFIG.LOGIN_API_URL}checkSessionState?session_id=${decoded.sessionId}`, - // ) - // context.sessionId = decoded.sessionId context.pubKey = decoded.pubKey context.setHeaders.push({ key: 'token', value: encode(decoded.pubKey) }) return true - // } } throw new Error('401 Unauthorized') } From 30ef78dddea4214c5d65fc11dca19b5ce7d7e4d8 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 10:25:41 +0100 Subject: [PATCH 1143/1843] Withdrew sessionId from the jwt token. --- backend/src/jwt/decode.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/backend/src/jwt/decode.ts b/backend/src/jwt/decode.ts index 34b3ed836..6f09276b0 100644 --- a/backend/src/jwt/decode.ts +++ b/backend/src/jwt/decode.ts @@ -2,27 +2,22 @@ import jwt, { JwtPayload } from 'jsonwebtoken' import CONFIG from '../config/' interface CustomJwtPayload extends JwtPayload { - sessionId: number pubKey: Buffer } type DecodedJwt = { token: string - sessionId: number pubKey: Buffer } export default (token: string): DecodedJwt => { if (!token) throw new Error('401 Unauthorized') - let sessionId = null let pubKey = null try { const decoded = jwt.verify(token, CONFIG.JWT_SECRET) - sessionId = decoded.sessionId pubKey = decoded.pubKey return { token, - sessionId, pubKey, } } catch (err) { From 74cc9522c21e53eb57f2a18347d01247eaedb637 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 10:27:05 +0100 Subject: [PATCH 1144/1843] Added method to find User with their email & find User with a PubKey Buffer. --- backend/src/typeorm/repository/User.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index 441c1b2c8..e127c179c 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -9,6 +9,15 @@ export class UserRepository extends Repository { .getOneOrFail() } + async findByPubkeyHexBuffer(pubkeyHexBuffer: Buffer): Promise { + const pubKeyString = pubkeyHexBuffer.toString('hex') + return await this.findByPubkeyHex(pubKeyString) + } + + async findByEmail(email: string): Promise { + return this.createQueryBuilder('user').where('user.email = :email', { email }).getOneOrFail() + } + async getUsersIndiced(userIds: number[]): Promise { if (!userIds.length) return [] const users = await this.createQueryBuilder('user') From a16b7ad47a7ff176760b808a4b3c297f148c486f Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 10:28:31 +0100 Subject: [PATCH 1145/1843] Changed the decode of context.pubKey so that it is stored in a buffer and transformed after in a Hex string. --- backend/src/graphql/resolver/BalanceResolver.ts | 3 ++- backend/src/graphql/resolver/GdtResolver.ts | 3 ++- backend/src/graphql/resolver/TransactionResolver.ts | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index e067b4d68..902e50b8b 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -18,7 +18,8 @@ export class BalanceResolver { const balanceRepository = getCustomRepository(BalanceRepository) const userRepository = getCustomRepository(UserRepository) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const userEntity = await userRepository.findByPubkeyHex(pubKeyString) const balanceEntity = await balanceRepository.findByUser(userEntity.id) const now = new Date() diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index b4f9a512b..ba10d45bf 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -22,7 +22,8 @@ export class GdtResolver { ): Promise { // load user const userRepository = getCustomRepository(UserRepository) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const userEntity = await userRepository.findByPubkeyHex(pubKeyString) const resultGDT = await apiGet( `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 70dfdc505..b804c1af9 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -496,7 +496,8 @@ export class TransactionResolver { ): Promise { // load user const userRepository = getCustomRepository(UserRepository) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const userEntity = await userRepository.findByPubkeyHex(pubKeyString) const transactions = await listTransactions(currentPage, pageSize, order, userEntity) @@ -531,7 +532,8 @@ export class TransactionResolver { // TODO this is subject to replay attacks // validate sender user (logged in) const userRepository = getCustomRepository(UserRepository) - const senderUser = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const senderUser = await userRepository.findByPubkeyHex(pubKeyString) if (senderUser.pubkey.length !== 32) { throw new Error('invalid sender public key') } From 6a85017406a315c86f8d84215ed5c524c639adfc Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 10:30:35 +0100 Subject: [PATCH 1146/1843] PubKey decoded has to be cast to buffer and back to hex string, changed the coinanimation. --- backend/src/graphql/resolver/UserResolver.ts | 63 ++++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index b37c568a4..a2d4ee0e8 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -228,21 +228,21 @@ export class UserResolver { const userRepository = getCustomRepository(UserRepository) let userEntity: void | DbUser - userEntity = await userRepository - .findByPubkeyHex(loginUser.pubKey.toString('utf8')) - .catch(() => { - // User not stored in state_users - userEntity = new DbUser() - userEntity.firstName = loginUser.firstName - userEntity.lastName = loginUser.lastName - userEntity.username = loginUser.username - userEntity.email = loginUser.email - userEntity.pubkey = Buffer.from(loginUser.pubKey.toString('utf8'), 'hex') + const loginUserPubKey = loginUser.pubKey + const loginUserPubKeyString = loginUserPubKey.toString('hex') + userEntity = await userRepository.findByPubkeyHex(loginUserPubKeyString).catch(() => { + // User not stored in state_users + userEntity = new DbUser() + userEntity.firstName = loginUser.firstName + userEntity.lastName = loginUser.lastName + userEntity.username = loginUser.username + userEntity.email = loginUser.email + userEntity.pubkey = loginUser.pubKey - userRepository.save(userEntity).catch(() => { - throw new Error('error by save userEntity') - }) + userRepository.save(userEntity).catch(() => { + throw new Error('error by save userEntity') }) + }) if (!userEntity) { throw new Error('error with cannot happen') } @@ -253,24 +253,19 @@ export class UserResolver { user.lastName = loginUser.lastName user.username = loginUser.username user.description = loginUser.description - user.pubkey = loginUser.pubKey.toString('utf8') + user.pubkey = loginUserPubKeyString user.language = loginUser.language - // TODO: hasElopage + // TODO: Get Method from PR (hasElopage) // auto elopage_buy = Poco::AutoPtr(new model::table::ElopageBuy); // mHasElopage = elopage_buy->isExistInDB("payer_email", mEmail); // else undefined + // user.hasElopage = result.data.hasElopage - // TODO: coinAnimation - return user - throw new Error('WIP') - // const user = new User(result.data.user) + // TODO: Get Method from PR (publisherId) // Hack: Database Field is not validated properly and not nullable // if (user.publisherId === 0) { // user.publisherId = undefined // } - // user.hasElopage = result.data.hasElopage - // // read additional settings from settings table - // Save publisherId if Elopage is not yet registered // if (!user.hasElopage && publisherId) { // user.publisherId = publisherId @@ -280,14 +275,15 @@ export class UserResolver { // ) // } - // const userSettingRepository = getCustomRepository(UserSettingRepository) - // const coinanimation = await userSettingRepository - // .readBoolean(userEntity.id, Setting.COIN_ANIMATION) - // .catch((error) => { - // throw new Error(error) - // }) - // user.coinanimation = coinanimation - // return user + // coinAnimation + const userSettingRepository = getCustomRepository(UserSettingRepository) + const coinanimation = await userSettingRepository + .readBoolean(userEntity.id, Setting.COIN_ANIMATION) + .catch((error) => { + throw new Error(error) + }) + user.coinanimation = coinanimation + return user } @Query(() => LoginViaVerificationCode) @@ -521,7 +517,8 @@ export class UserResolver { if (!result.success) throw new Error(result.data) response = new UpdateUserInfosResponse(result.data) - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const userEntity = await userRepository.findByPubkeyHex(pubKeyString) let userEntityChanged = false if (firstName) { userEntity.firstName = firstName @@ -543,8 +540,8 @@ export class UserResolver { } if (coinanimation !== undefined) { // load user and balance - - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const pubKeyString = Buffer.from(context.pubKey).toString('hex') + const userEntity = await userRepository.findByPubkeyHex(pubKeyString) const userSettingRepository = getCustomRepository(UserSettingRepository) userSettingRepository From 5d886a93607a2af03b3c0d4cea51e9daf66e210e Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 10 Nov 2021 11:28:35 +0100 Subject: [PATCH 1147/1843] LoginUserRepository import has droped out put it in again. --- backend/src/graphql/resolver/UserResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ec28f964e..3aa7e7fd5 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -23,6 +23,7 @@ import { } from '../../middleware/klicktippMiddleware' import { CheckEmailResponse } from '../model/CheckEmailResponse' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' +import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' From 5d7241da14dd7d074084ab1b7abaffaf51f003d1 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 19:29:15 +0100 Subject: [PATCH 1148/1843] LoginElopageBuys Entity model --- .../LoginElopageBuys.ts | 52 +++++++++++++++++++ database/entity/LoginElopageBuys.ts | 1 + database/entity/index.ts | 4 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 database/entity/0003-login_server_tables/LoginElopageBuys.ts create mode 100644 database/entity/LoginElopageBuys.ts diff --git a/database/entity/0003-login_server_tables/LoginElopageBuys.ts b/database/entity/0003-login_server_tables/LoginElopageBuys.ts new file mode 100644 index 000000000..fc0d6c355 --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginElopageBuys.ts @@ -0,0 +1,52 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +@Entity('login_elopage_buys') +export class LoginElopageBuys extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ name: 'elopage_user_id', nullable: false }) + elopageUserId: number + + @Column({ name: 'affiliate_program_id', nullable: false }) + affiliateProgramId: number + + @Column({ name: 'publisher_id', nullable: false }) + publisherId: number + + @Column({ name: 'order_id', nullable: false }) + orderId: number + + @Column({ name: 'product_id', nullable: false }) + productId: number + + @Column({ name: 'product_price', nullable: false }) + productPrice: number + + @Column({ + name: 'payer_email', + length: 255, + nullable: false, + charset: 'utf8', + collation: 'utf8_bin', + }) + payerEmail: string + + @Column({ + name: 'publisher_email', + length: 255, + nullable: false, + charset: 'utf8', + collation: 'utf8_bin', + }) + publisherEmail: string + + @Column({ nullable: false }) + payed: boolean + + @Column({ name: 'success_date', nullable: false }) + successDate: Date + + @Column({ length: 255, nullable: false }) + event: string +} diff --git a/database/entity/LoginElopageBuys.ts b/database/entity/LoginElopageBuys.ts new file mode 100644 index 000000000..6a1f3230b --- /dev/null +++ b/database/entity/LoginElopageBuys.ts @@ -0,0 +1 @@ +export { LoginElopageBuys } from './0003-login_server_tables/LoginElopageBuys' diff --git a/database/entity/index.ts b/database/entity/index.ts index ff1d34d9e..5e4e98118 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -1,4 +1,5 @@ import { Balance } from './Balance' +import { LoginElopageBuys } from './LoginElopageBuys' import { LoginEmailOptIn } from './LoginEmailOptIn' import { LoginUser } from './LoginUser' import { LoginUserBackup } from './LoginUserBackup' @@ -12,9 +13,10 @@ import { UserTransaction } from './UserTransaction' export const entities = [ Balance, + LoginElopageBuys, + LoginEmailOptIn, LoginUser, LoginUserBackup, - LoginEmailOptIn, Migration, Transaction, TransactionCreation, From 248622f3bed68d4ecc7c315ec3578cf14968fd9b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 6 Nov 2021 19:30:03 +0100 Subject: [PATCH 1149/1843] hasElopage is now implemented on apollo - requires authorization now --- backend/src/graphql/resolver/UserResolver.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 7cc8cbf6d..879d5a183 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -26,6 +26,7 @@ import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepos import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' import { LoginUser } from '@entity/LoginUser' +import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { sendEMail } from '../../util/sendEMail' @@ -570,12 +571,19 @@ export class UserResolver { return new CheckEmailResponse(result.data) } + @Authorized() @Query(() => Boolean) async hasElopage(@Ctx() context: any): Promise { - const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId) - if (!result.success) { - throw new Error(result.data) + // const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId) + const userRepository = getCustomRepository(UserRepository) + const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() + + if (!userEntity) { + return false } - return result.data.hasElopage + + const elopageBuyCount = await LoginElopageBuys.count({ payerEmail: userEntity.email }) + + return elopageBuyCount > 0 } } From 1865e42f8357a688f2c11cd6420d645e7509cbc2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 7 Nov 2021 08:45:34 +0100 Subject: [PATCH 1150/1843] just some cleanups, mostly to trigger another build --- backend/src/graphql/resolver/UserResolver.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 879d5a183..2ecd523e9 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -577,13 +577,11 @@ export class UserResolver { // const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId) const userRepository = getCustomRepository(UserRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() - if (!userEntity) { return false } const elopageBuyCount = await LoginElopageBuys.count({ payerEmail: userEntity.email }) - return elopageBuyCount > 0 } } From fe7d7dc5f82c08308409153f8c9fc510b418af63 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 7 Nov 2021 06:18:39 +0100 Subject: [PATCH 1151/1843] implemented most of updateUserInfos on Apollo also removed publisherId from updateUserInfos since this is now part of the login call. --- .../src/graphql/arg/UpdateUserInfosArgs.ts | 3 - .../graphql/model/UpdateUserInfosResponse.ts | 13 -- backend/src/graphql/resolver/UserResolver.ts | 178 +++++++++++------- frontend/src/graphql/mutations.js | 4 +- 4 files changed, 107 insertions(+), 91 deletions(-) delete mode 100644 backend/src/graphql/model/UpdateUserInfosResponse.ts diff --git a/backend/src/graphql/arg/UpdateUserInfosArgs.ts b/backend/src/graphql/arg/UpdateUserInfosArgs.ts index dca9ec4ab..0aee1f6f6 100644 --- a/backend/src/graphql/arg/UpdateUserInfosArgs.ts +++ b/backend/src/graphql/arg/UpdateUserInfosArgs.ts @@ -17,9 +17,6 @@ export default class UpdateUserInfosArgs { @Field({ nullable: true }) language?: string - @Field({ nullable: true }) - publisherId?: number - @Field({ nullable: true }) password?: string diff --git a/backend/src/graphql/model/UpdateUserInfosResponse.ts b/backend/src/graphql/model/UpdateUserInfosResponse.ts deleted file mode 100644 index 0e41f21cb..000000000 --- a/backend/src/graphql/model/UpdateUserInfosResponse.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { ObjectType, Field } from 'type-graphql' - -@ObjectType() -export class UpdateUserInfosResponse { - constructor(json: any) { - this.validValues = json.valid_values - } - - @Field(() => Number) - validValues: number -} diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 2ecd523e9..ef0347dec 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -7,7 +7,6 @@ import { getConnection, getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' -import { UpdateUserInfosResponse } from '../model/UpdateUserInfosResponse' import { User } from '../model/User' import { User as DbUser } from '@entity/User' import encode from '../../jwt/encode' @@ -230,10 +229,10 @@ export class UserResolver { // Save publisherId if Elopage is not yet registered if (!user.hasElopage && publisherId) { user.publisherId = publisherId - await this.updateUserInfos( - { publisherId }, - { sessionId: result.data.session_id, pubKey: result.data.user.public_hex }, - ) + + const loginUser = await LoginUser.findOneOrFail({ email: userEntity.email }) + loginUser.publisherId = publisherId + loginUser.save() } const userSettingRepository = getCustomRepository(UserSettingRepository) @@ -446,7 +445,7 @@ export class UserResolver { } @Authorized() - @Mutation(() => UpdateUserInfosResponse) + @Mutation(() => Boolean) async updateUserInfos( @Args() { @@ -455,85 +454,120 @@ export class UserResolver { description, username, language, - publisherId, password, passwordNew, coinanimation, }: UpdateUserInfosArgs, @Ctx() context: any, - ): Promise { - const payload = { - session_id: context.sessionId, - update: { - 'User.first_name': firstName || undefined, - 'User.last_name': lastName || undefined, - 'User.description': description || undefined, - 'User.username': username || undefined, - 'User.language': language || undefined, - 'User.publisher_id': publisherId || undefined, - 'User.password': passwordNew || undefined, - 'User.password_old': password || undefined, - }, - } - let response: UpdateUserInfosResponse | undefined + ): Promise { const userRepository = getCustomRepository(UserRepository) + const userSettingRepository = getCustomRepository(UserSettingRepository) + const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const loginUser = await LoginUser.findOneOrFail({ email: userEntity.email }) - if ( - firstName || - lastName || - description || - username || - language || - publisherId || - passwordNew || - password - ) { - const result = await apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload) - if (!result.success) throw new Error(result.data) - response = new UpdateUserInfosResponse(result.data) - - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) - let userEntityChanged = false - if (firstName) { - userEntity.firstName = firstName - userEntityChanged = true - } - if (lastName) { - userEntity.lastName = lastName - userEntityChanged = true - } - if (username) { - userEntity.username = username - userEntityChanged = true - } - if (userEntityChanged) { - userRepository.save(userEntity).catch((error) => { - throw new Error(error) - }) - } + if (username) { + throw new Error('change username currently not supported!') + // TODO: this error was thrown on login_server whenever you tried to change the username + // to anything except "" which is an exception to the rules below. Those were defined + // aswell, even tho never used. + // ^[a-zA-Z][a-zA-Z0-9_-]*$ + // username must start with [a-z] or [A-Z] and than can contain also [0-9], - and _ + // username already used + // userEntity.username = username } - if (coinanimation !== undefined) { - // load user and balance - const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + if (firstName) { + loginUser.firstName = firstName + userEntity.firstName = firstName + } - const userSettingRepository = getCustomRepository(UserSettingRepository) - userSettingRepository - .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) - .catch((error) => { - throw new Error(error) - }) + if (lastName) { + loginUser.lastName = lastName + userEntity.lastName = lastName + } - if (!response) { - response = new UpdateUserInfosResponse({ valid_values: 1 }) - } else { - response.validValues++ + if (description) { + loginUser.description = description + } + + // TODO: `disabled` can be set via this interface, the login_server allowed this. + // this means a user could disable his own account - sense? + + // TODO this requires language validation from createUser PR + // "User.language isn't a valid language" + if (language) { + loginUser.language = language + } + + if (password && passwordNew) { + throw new Error('Not implemented') + // CARE: password = password_old, passwordNew = password + // verify password + /* + if (isOldPasswordValid(updates, jsonErrorsArray)) + { + NotificationList errors; + if (!sm->checkPwdValidation(value.toString(), &errors, LanguageManager::getInstance()->getFreeCatalog(LANG_EN))) { + jsonErrorsArray.add("User.password isn't valid"); + jsonErrorsArray.add(errors.getErrorsArray()); + } + else + { + auto result_new_password = user->setNewPassword(value.toString()); + + switch (result_new_password) { + // 0 = new and current passwords are the same + // 1 = password changed, private key re-encrypted and saved into db + case 1: + extractet_values++; + password_changed = true; + break; + // 2 = password changed, only hash stored in db, couldn't load private key for re-encryption + case 2: + jsonErrorsArray.add("password changed, couldn't load private key for re-encryption"); + extractet_values++; + password_changed = true; + break; + // -1 = stored pubkey and private key didn't match + case -1: jsonErrorsArray.add("stored pubkey and private key didn't match"); break; + } + + } + } + */ + } + + const queryRunner = getConnection().createQueryRunner() + await queryRunner.connect() + await queryRunner.startTransaction('READ UNCOMMITTED') + + try { + if (coinanimation) { + // TODO transaction + userSettingRepository + .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) + .catch((error) => { + throw new Error(error) + }) } + + await queryRunner.manager.save(loginUser).catch((error) => { + throw new Error('error saving loginUser: ' + error) + }) + + await queryRunner.manager.save(userEntity).catch((error) => { + throw new Error('error saving user: ' + error) + }) + + await queryRunner.commitTransaction() + } catch (e) { + await queryRunner.rollbackTransaction() + throw e + } finally { + await queryRunner.release() } - if (!response) { - throw new Error('no valid response') - } - return response + + return true } @Query(() => Boolean) diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index a20367aa8..d1d3d583c 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -38,9 +38,7 @@ export const updateUserInfos = gql` passwordNew: $passwordNew language: $locale coinanimation: $coinanimation - ) { - validValues - } + ) } ` From 4ffa2b4ee1774904e22cc8981e521b544ce3ae7e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 7 Nov 2021 06:19:42 +0100 Subject: [PATCH 1152/1843] we will not implement disable here - it does not make sense that an user disables himself --- backend/src/graphql/resolver/UserResolver.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ef0347dec..dc3e02d52 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -490,9 +490,6 @@ export class UserResolver { loginUser.description = description } - // TODO: `disabled` can be set via this interface, the login_server allowed this. - // this means a user could disable his own account - sense? - // TODO this requires language validation from createUser PR // "User.language isn't a valid language" if (language) { From f797017c9a156b781211e8ca09d5514dda489492 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 10 Nov 2021 20:23:47 +0100 Subject: [PATCH 1153/1843] have language check for changing language --- backend/src/graphql/resolver/UserResolver.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index dc3e02d52..37da362ae 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -490,9 +490,10 @@ export class UserResolver { loginUser.description = description } - // TODO this requires language validation from createUser PR - // "User.language isn't a valid language" if (language) { + if (!isLanguage(language)) { + throw new Error(`"${language}" isn't a valid language`) + } loginUser.language = language } From 7205eb2fae6f45601c283e24fd02439bb937a720 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 10 Nov 2021 20:34:14 +0100 Subject: [PATCH 1154/1843] transaction for coinanimation --- backend/src/graphql/resolver/UserResolver.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 37da362ae..174ecb4f9 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -541,11 +541,11 @@ export class UserResolver { try { if (coinanimation) { - // TODO transaction - userSettingRepository + queryRunner.manager + .getCustomRepository(UserSettingRepository) .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) .catch((error) => { - throw new Error(error) + throw new Error('error saving coinanimation: ' + error) }) } From 8b0c1feb3ec495206b66f558aa36583c173d495f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 10 Nov 2021 23:47:37 +0100 Subject: [PATCH 1155/1843] change password and reencrypt private key when doing so. --- backend/src/graphql/resolver/UserResolver.ts | 61 ++++++++------------ 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 174ecb4f9..15720fd3f 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -173,7 +173,7 @@ const getEmailHash = (email: string): Buffer => { } const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): Buffer => { - const encrypted = Buffer.alloc(sodium.crypto_secretbox_MACBYTES + message.length) + const encrypted = Buffer.alloc(message.length + sodium.crypto_secretbox_MACBYTES) const nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES) nonce.fill(31) // static nonce @@ -181,6 +181,16 @@ const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): B return encrypted } +const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: Buffer): Buffer => { + const message = Buffer.alloc(encryptedMessage.length - sodium.crypto_secretbox_MACBYTES) + const nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES) + nonce.fill(31) // static nonce + + sodium.crypto_secretbox_open_easy(message, encryptedMessage, nonce, encryptionKey) + + return message +} + @Resolver() export class UserResolver { @Query(() => User) @@ -498,41 +508,20 @@ export class UserResolver { } if (password && passwordNew) { - throw new Error('Not implemented') - // CARE: password = password_old, passwordNew = password - // verify password - /* - if (isOldPasswordValid(updates, jsonErrorsArray)) - { - NotificationList errors; - if (!sm->checkPwdValidation(value.toString(), &errors, LanguageManager::getInstance()->getFreeCatalog(LANG_EN))) { - jsonErrorsArray.add("User.password isn't valid"); - jsonErrorsArray.add(errors.getErrorsArray()); - } - else - { - auto result_new_password = user->setNewPassword(value.toString()); - - switch (result_new_password) { - // 0 = new and current passwords are the same - // 1 = password changed, private key re-encrypted and saved into db - case 1: - extractet_values++; - password_changed = true; - break; - // 2 = password changed, only hash stored in db, couldn't load private key for re-encryption - case 2: - jsonErrorsArray.add("password changed, couldn't load private key for re-encryption"); - extractet_values++; - password_changed = true; - break; - // -1 = stored pubkey and private key didn't match - case -1: jsonErrorsArray.add("stored pubkey and private key didn't match"); break; - } - - } - } - */ + // TODO: This had some error cases defined - like missing private key. This is no longer checked. + const oldPasswordHash = SecretKeyCryptographyCreateKey(loginUser.email, password) + if (loginUser.password !== oldPasswordHash[0].readBigUInt64LE()) { + throw new Error(`Old password is invalid`) + } + + const privKey = SecretKeyCryptographyDecrypt(loginUser.privKey, oldPasswordHash[1]) + + const newPasswordHash = SecretKeyCryptographyCreateKey(loginUser.email, passwordNew) // return short and long hash + const encryptedPrivkey = SecretKeyCryptographyEncrypt(privKey, newPasswordHash[1]) + + // Save new password hash and newly encrypted private key + loginUser.password = newPasswordHash[0].readBigInt64LE() + loginUser.privKey = encryptedPrivkey } const queryRunner = getConnection().createQueryRunner() From dc8091b60bfbd9086e84d95f2a30cf423de31d4b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 10 Nov 2021 23:50:58 +0100 Subject: [PATCH 1156/1843] lint fix --- backend/src/graphql/resolver/UserResolver.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 15720fd3f..4c9ec65e5 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -471,7 +471,6 @@ export class UserResolver { @Ctx() context: any, ): Promise { const userRepository = getCustomRepository(UserRepository) - const userSettingRepository = getCustomRepository(UserSettingRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey) const loginUser = await LoginUser.findOneOrFail({ email: userEntity.email }) From 61786d9e5d0f1d0ad7a9d1eff47b7361fec71138 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 10 Nov 2021 23:52:44 +0100 Subject: [PATCH 1157/1843] another (unrelated) lint fix --- backend/src/util/sendEMail.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/util/sendEMail.ts b/backend/src/util/sendEMail.ts index e34597419..4c239980d 100644 --- a/backend/src/util/sendEMail.ts +++ b/backend/src/util/sendEMail.ts @@ -2,7 +2,12 @@ import { createTransport } from 'nodemailer' import CONFIG from '../config' -export const sendEMail = async (emailDef: any): Promise => { +export const sendEMail = async (emailDef: { + from: string + to: string + subject: string + text: string +}): Promise => { if (!CONFIG.EMAIL) { // eslint-disable-next-line no-console console.log('Emails are disabled via config') From d8835e37da7a916207172495cb3d57b440b116ad Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 11 Nov 2021 00:01:40 +0100 Subject: [PATCH 1158/1843] removed coverage --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b10b7250..e09bdf8b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -394,7 +394,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 39 + min_coverage: 38 token: ${{ github.token }} ############################################################################## From e896759e1e5cf87c9a499d7477cdfabb85d07752 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 11 Nov 2021 00:14:03 +0100 Subject: [PATCH 1159/1843] "implemented" logout call --- backend/src/graphql/resolver/UserResolver.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 2ecd523e9..ebb5000c9 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -263,13 +263,13 @@ export class UserResolver { @Authorized() @Query(() => String) - async logout(@Ctx() context: any): Promise { - const payload = { session_id: context.sessionId } - const result = await apiPost(CONFIG.LOGIN_API_URL + 'logout', payload) - if (!result.success) { - throw new Error(result.data) - } - return 'success' + async logout(@Ctx() context: any): Promise { + // TODO: We dont need this anymore, but might need this in the future in oder to invalidate a valid JWT-Token. + // Furthermore this hook can be useful for tracking user behaviour (did he logout or not? Flag him if he didn't on next login) + // The functionality is fully client side - the client just needs to delete his token with the current implementation. + // we could try to force this by sending `token: null` or `token: ''` with this call. But since it bares no real security + // we should just return true for now. + return true } @Mutation(() => String) From d7c515491245a3ff576315c0e85165c38f889d8b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 11 Nov 2021 00:30:00 +0100 Subject: [PATCH 1160/1843] removed unused context corrected comment removed unused code-comment --- backend/src/graphql/resolver/UserResolver.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ebb5000c9..888a1aa00 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -263,9 +263,9 @@ export class UserResolver { @Authorized() @Query(() => String) - async logout(@Ctx() context: any): Promise { + async logout(): Promise { // TODO: We dont need this anymore, but might need this in the future in oder to invalidate a valid JWT-Token. - // Furthermore this hook can be useful for tracking user behaviour (did he logout or not? Flag him if he didn't on next login) + // Furthermore this hook can be useful for tracking user behaviour (did he logout or not? Warn him if he didn't on next login) // The functionality is fully client side - the client just needs to delete his token with the current implementation. // we could try to force this by sending `token: null` or `token: ''` with this call. But since it bares no real security // we should just return true for now. @@ -574,7 +574,6 @@ export class UserResolver { @Authorized() @Query(() => Boolean) async hasElopage(@Ctx() context: any): Promise { - // const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId) const userRepository = getCustomRepository(UserRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() if (!userEntity) { From 7655a647fe30e3ce7c129cfc1533419e372285ef Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 11 Nov 2021 06:15:21 +0100 Subject: [PATCH 1161/1843] Implementation of the LoginElopageBuys repository. --- backend/src/typeorm/repository/LoginElopageBuys.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 backend/src/typeorm/repository/LoginElopageBuys.ts diff --git a/backend/src/typeorm/repository/LoginElopageBuys.ts b/backend/src/typeorm/repository/LoginElopageBuys.ts new file mode 100644 index 000000000..15f2a8492 --- /dev/null +++ b/backend/src/typeorm/repository/LoginElopageBuys.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { LoginElopageBuys } from '@entity/LoginElopageBuys' + +@EntityRepository(LoginElopageBuys) +export class LoginElopageBuysRepository extends Repository {} From 1baf756c08953784111e28cd29e9a72f95e9e42a Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 11 Nov 2021 06:31:00 +0100 Subject: [PATCH 1162/1843] HasElopage has been called, search loginUser catch instead of if no user, context get's the pubKey at the end of the login call instead of the start. --- backend/src/graphql/resolver/UserResolver.ts | 27 ++++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 437d7072e..bee35d676 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -31,6 +31,7 @@ import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { sendEMail } from '../../util/sendEMail' +import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') @@ -195,14 +196,9 @@ export class UserResolver { // const result = await apiPost(CONFIG.LOGIN_API_URL + 'unsecureLogin', { email, password }) // UnsecureLogin const loginUserRepository = getCustomRepository(LoginUserRepository) - const loginUser = await loginUserRepository.findByEmail(email) - if (!loginUser) { + const loginUser = await loginUserRepository.findByEmail(email).catch(() => { throw new Error('No user with this credentials') - } - if (!isPassword(password)) { - throw new Error('No user with this credentials') - } - + }) const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash const loginUserPassword = BigInt(loginUser.password.toString()) if (loginUserPassword !== passwordHash[0].readBigUInt64LE()) { @@ -210,11 +206,6 @@ export class UserResolver { } // TODO: If user has no pubKey Create it again and update user. - context.setHeaders.push({ - key: 'token', - value: encode(loginUser.pubKey), - }) - const userRepository = getCustomRepository(UserRepository) let userEntity: void | DbUser const loginUserPubKey = loginUser.pubKey @@ -244,11 +235,7 @@ export class UserResolver { user.description = loginUser.description user.pubkey = loginUserPubKeyString user.language = loginUser.language - // TODO: Get Method from PR (hasElopage) - // auto elopage_buy = Poco::AutoPtr(new model::table::ElopageBuy); - // mHasElopage = elopage_buy->isExistInDB("payer_email", mEmail); - // else undefined - // user.hasElopage = result.data.hasElopage + user.hasElopage = await this.hasElopage({ pubkey: loginUser.pubKey }) // TODO: Get Method from PR (publisherId) // Hack: Database Field is not validated properly and not nullable @@ -272,6 +259,12 @@ export class UserResolver { throw new Error(error) }) user.coinanimation = coinanimation + + context.setHeaders.push({ + key: 'token', + value: encode(loginUser.pubKey), + }) + return user } From e976c6854d88d2b4586eb6959c5af77df308cd93 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 11 Nov 2021 06:41:56 +0100 Subject: [PATCH 1163/1843] Adding hasElopage and publisherId logic, hasElopage is called and checks if in ElopageBuys their is a user with this email, if hasElopage and publisherId is filled store it in the user table. --- backend/src/graphql/resolver/UserResolver.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index bee35d676..8462df819 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -236,7 +236,10 @@ export class UserResolver { user.pubkey = loginUserPubKeyString user.language = loginUser.language user.hasElopage = await this.hasElopage({ pubkey: loginUser.pubKey }) - + if (!user.hasElopage && publisherId) { + user.publisherId = publisherId + await this.updateUserInfos({ publisherId }, { pubKey: loginUser.pubKey }) + } // TODO: Get Method from PR (publisherId) // Hack: Database Field is not validated properly and not nullable // if (user.publisherId === 0) { From e97798d73c780f6a7c16870e1f04b64f20c255e4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 11 Nov 2021 06:42:27 +0100 Subject: [PATCH 1164/1843] Withdrew comments. --- backend/src/graphql/resolver/UserResolver.ts | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8462df819..ee44346e7 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -31,7 +31,6 @@ import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { sendEMail } from '../../util/sendEMail' -import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') @@ -235,24 +234,13 @@ export class UserResolver { user.description = loginUser.description user.pubkey = loginUserPubKeyString user.language = loginUser.language + + // Elopage Status & Stored PublisherId user.hasElopage = await this.hasElopage({ pubkey: loginUser.pubKey }) if (!user.hasElopage && publisherId) { user.publisherId = publisherId await this.updateUserInfos({ publisherId }, { pubKey: loginUser.pubKey }) } - // TODO: Get Method from PR (publisherId) - // Hack: Database Field is not validated properly and not nullable - // if (user.publisherId === 0) { - // user.publisherId = undefined - // } - // Save publisherId if Elopage is not yet registered - // if (!user.hasElopage && publisherId) { - // user.publisherId = publisherId - // await this.updateUserInfos( - // { publisherId }, - // { sessionId: result.data.session_id, pubKey: result.data.user.public_hex }, - // ) - // } // coinAnimation const userSettingRepository = getCustomRepository(UserSettingRepository) @@ -600,7 +588,6 @@ export class UserResolver { @Authorized() @Query(() => Boolean) async hasElopage(@Ctx() context: any): Promise { - // const result = await apiGet(CONFIG.LOGIN_API_URL + 'hasElopage?session_id=' + context.sessionId) const userRepository = getCustomRepository(UserRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch() if (!userEntity) { From 4cb7abdc9bfca2d601a66b417ef301c531d4cb59 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 11 Nov 2021 06:51:21 +0100 Subject: [PATCH 1165/1843] add momentjs, add component CreateFormular.vue formular for creating gdd --- admin/package.json | 2 + admin/src/components/CreateFormular.vue | 66 +++++++++++++++++++++ admin/src/components/UserTable.vue | 78 ++++++++++++++++++++++--- admin/src/locales/en.json | 17 +++++- admin/src/main.js | 4 ++ admin/src/views/Overview.vue | 7 ++- admin/yarn.lock | 12 ++++ 7 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 admin/src/components/CreateFormular.vue diff --git a/admin/package.json b/admin/package.json index 2b4e33c91..5dff9145e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -33,11 +33,13 @@ "dotenv-webpack": "^7.0.3", "graphql": "^15.6.1", "jest": "26.6.3", + "moment": "^2.29.1", "stats-webpack-plugin": "^0.7.0", "vue": "^2.6.11", "vue-apollo": "^3.0.8", "vue-i18n": "^8.26.5", "vue-jest": "^3.0.7", + "vue-moment": "^4.1.0", "vue-router": "^3.5.3", "vuex": "^3.6.2" }, diff --git a/admin/src/components/CreateFormular.vue b/admin/src/components/CreateFormular.vue new file mode 100644 index 000000000..5dd07a4c1 --- /dev/null +++ b/admin/src/components/CreateFormular.vue @@ -0,0 +1,66 @@ + + diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 55e9b5b3c..2e92c9a7f 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -1,22 +1,86 @@ + diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 3f5c840d4..4ef7f7fb6 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -103,11 +103,13 @@ export default { loader.hide() }) .catch((error) => { + if (!error.message.includes('user email not validated')) { + this.$toasted.error(this.$t('error.no-account')) + } else { + // : this.$t('error.no-email-verify') + this.$router.push('/thx/login') + } loader.hide() - const toastedError = !error.message.includes('user email not validated') - ? this.$t('error.no-account') - : this.$t('error.no-email-verify') - this.$toasted.error(toastedError) }) }, async onCreated() { diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue index 9d9143456..5dc2bda19 100644 --- a/frontend/src/views/Pages/thx.vue +++ b/frontend/src/views/Pages/thx.vue @@ -36,6 +36,16 @@ const textFields = { button: 'login', linkTo: '/login', }, + login: { + subtitle: 'site.thx.activateEmail', + button: 'Send Activation Link', + linkTo: '/activateEmail', + }, + activateEmail: { + subtitle: 'site.thx.emailActivated', + button: 'login', + linkTo: '/login', + }, } export default { From 1bf8e8451da37e91db7233e45c83134430f47953 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 12 Nov 2021 10:06:51 +0100 Subject: [PATCH 1174/1843] Textes for the new pages added. --- frontend/src/locales/de.json | 6 ++++++ frontend/src/locales/en.json | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1c298b416..97f49b5e8 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -153,6 +153,10 @@ "ooops": "Ooops!", "text": "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden" }, + "activateEmail": { + "headline": "", + "subtitle": "" + }, "checkEmail": { "errorText": "Email konnte nicht verifiziert werden.", "title": "Email wird verifiziert" @@ -179,8 +183,10 @@ "uppercase": "Ein Großbuchstabe erforderlich." }, "thx": { + "activateEmail": "Deine Email wurde noch nicht aktiviert, email erneut senden?", "checkEmail": "Deine Email würde erfolgreich verifiziert.", "email": "Wir haben dir eine eMail gesendet.", + "emailActivated": "Danke dass Du deine Email bestätigt hast.", "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.", "reset": "Dein Passwort wurde geändert.", "title": "Danke!" diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index fd57798c4..236d607cf 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -153,6 +153,10 @@ "ooops": "Ooops!", "text": "Page not found. Do not worry though, we have plenty of other pages to explore" }, + "activateEmail": { + "headline": "", + "subtitle": "" + }, "checkEmail": { "errorText": "Could not verify the email.", "title": "Verifing email" @@ -179,8 +183,10 @@ "uppercase": "One uppercase letter required." }, "thx": { + "activateEmail": "Your email has not been activated yet, send again the activation email?", "checkEmail": "Your email has been successfully verified.", "email": "We have sent you an email.", + "emailActivated": "Thank you your email has been activated.", "register": "You are registered now, please check your emails and click the activation link.", "reset": "Your password has been changed.", "title": "Thank you!" From 9a75604a7a6f00c0e7350963ba5e01afec450601 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 12 Nov 2021 10:55:43 +0100 Subject: [PATCH 1175/1843] Change prozess so that a user that has not activate his account gets a warning that he needs to click the activation link in the email. Withdrew sendActivationMail again. --- frontend/src/locales/de.json | 3 +- frontend/src/locales/en.json | 3 +- frontend/src/routes/routes.js | 6 +- frontend/src/views/Pages/ActivateEmail.vue | 76 ---------------------- frontend/src/views/Pages/thx.vue | 17 ++--- 5 files changed, 14 insertions(+), 91 deletions(-) delete mode 100644 frontend/src/views/Pages/ActivateEmail.vue diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 97f49b5e8..95504407d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -183,10 +183,11 @@ "uppercase": "Ein Großbuchstabe erforderlich." }, "thx": { - "activateEmail": "Deine Email wurde noch nicht aktiviert, email erneut senden?", + "activateEmail": "Deine Email wurde noch nicht aktiviert, bitte überprüfe deine Email und Klicke den Aktivierungslink!", "checkEmail": "Deine Email würde erfolgreich verifiziert.", "email": "Wir haben dir eine eMail gesendet.", "emailActivated": "Danke dass Du deine Email bestätigt hast.", + "errorTitle": "Achtung!", "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.", "reset": "Dein Passwort wurde geändert.", "title": "Danke!" diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 236d607cf..ac00b0d20 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -183,10 +183,11 @@ "uppercase": "One uppercase letter required." }, "thx": { - "activateEmail": "Your email has not been activated yet, send again the activation email?", + "activateEmail": "Your email has not been activated yet, please check your emails and click the activation link!", "checkEmail": "Your email has been successfully verified.", "email": "We have sent you an email.", "emailActivated": "Thank you your email has been activated.", + "errorTitle": "Attention!", "register": "You are registered now, please check your emails and click the activation link.", "reset": "Your password has been changed.", "title": "Thank you!" diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 3d16ef45e..9c51bc688 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -40,7 +40,7 @@ const routes = [ path: '/thx/:comingFrom', component: () => import('../views/Pages/thx.vue'), beforeEnter: (to, from, next) => { - const validFrom = ['password', 'reset', 'register', 'login', 'activateEmail'] + const validFrom = ['password', 'reset', 'register', 'login'] if (!validFrom.includes(from.path.split('/')[1])) { next({ path: '/login' }) } else { @@ -68,10 +68,6 @@ const routes = [ path: '/checkEmail/:optin', component: () => import('../views/Pages/CheckEmail.vue'), }, - { - path: '/activateEmail', - component: () => import('../views/Pages/ActivateEmail.vue'), - }, { path: '*', component: NotFound }, ] diff --git a/frontend/src/views/Pages/ActivateEmail.vue b/frontend/src/views/Pages/ActivateEmail.vue deleted file mode 100644 index 203065b3c..000000000 --- a/frontend/src/views/Pages/ActivateEmail.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue index 5dc2bda19..d28b129e1 100644 --- a/frontend/src/views/Pages/thx.vue +++ b/frontend/src/views/Pages/thx.vue @@ -4,10 +4,12 @@
-

{{ $t('site.thx.title') }}

+

{{ $t(displaySetup.headline) }}

{{ $t(displaySetup.subtitle) }}

- {{ $t(displaySetup.button) }} + + {{ $t(displaySetup.button) }} +
@@ -17,34 +19,33 @@ From 259a663f05ad698014079b9e5686a7c3bf5913da Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 16 Nov 2021 13:27:52 +0100 Subject: [PATCH 1177/1843] test global components --- frontend/src/plugins/globalComponents.test.js | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 frontend/src/plugins/globalComponents.test.js diff --git a/frontend/src/plugins/globalComponents.test.js b/frontend/src/plugins/globalComponents.test.js new file mode 100644 index 000000000..294c5d616 --- /dev/null +++ b/frontend/src/plugins/globalComponents.test.js @@ -0,0 +1,29 @@ +import GlobalComponents from './globalComponents.js' +import Vue from 'vue' +import 'vee-validate' + +jest.mock('vue') +jest.mock('vee-validate', () => { + const originalModule = jest.requireActual('vee-validate') + return { + __esModule: true, + ...originalModule, + ValidationProvider: 'mocked validation provider', + ValidationObserver: 'mocked validation observer', + } +}) + +const vueComponentMock = jest.fn() +Vue.component = vueComponentMock + +describe('global Components', () => { + GlobalComponents.install(Vue) + + it('installs the validation provider', () => { + expect(vueComponentMock).toBeCalledWith('validation-provider', 'mocked validation provider') + }) + + it('installs the validation observer', () => { + expect(vueComponentMock).toBeCalledWith('validation-observer', 'mocked validation observer') + }) +}) From eb06b9a528f5fd777cc1096bde674603ba8734cf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 00:09:30 +0100 Subject: [PATCH 1178/1843] Update backend/src/graphql/resolver/UserResolver.ts Co-authored-by: Hannes Heine --- backend/src/graphql/resolver/UserResolver.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 4c9ec65e5..58d38d0c5 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -240,9 +240,10 @@ export class UserResolver { if (!user.hasElopage && publisherId) { user.publisherId = publisherId - const loginUser = await LoginUser.findOneOrFail({ email: userEntity.email }) + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findOneOrFail({ email: userEntity.email }) loginUser.publisherId = publisherId - loginUser.save() + loginUserRepository.save(loginUser) } const userSettingRepository = getCustomRepository(UserSettingRepository) From c9f167d07bf709046f2710e03dcb9d733d145acf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 00:10:16 +0100 Subject: [PATCH 1179/1843] Update backend/src/graphql/resolver/UserResolver.ts Co-authored-by: Hannes Heine --- backend/src/graphql/resolver/UserResolver.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 58d38d0c5..baf39c562 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -473,7 +473,8 @@ export class UserResolver { ): Promise { const userRepository = getCustomRepository(UserRepository) const userEntity = await userRepository.findByPubkeyHex(context.pubKey) - const loginUser = await LoginUser.findOneOrFail({ email: userEntity.email }) + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findOneOrFail({ email: userEntity.email }) if (username) { throw new Error('change username currently not supported!') From 4fccc19b684e5aad9bc9f781ed50519d0cdb20c0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 00:13:44 +0100 Subject: [PATCH 1180/1843] missing import --- backend/src/graphql/resolver/UserResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 489fc28d2..87f556264 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -29,6 +29,7 @@ import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { LoginUserBackup } from '@entity/LoginUserBackup' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { sendEMail } from '../../util/sendEMail' +import { LoginUserRepository } from '../../typeorm/repository/LoginUser' // eslint-disable-next-line @typescript-eslint/no-var-requires const sodium = require('sodium-native') From 540cbd0e1f3a598abca66af3ccdbeb1dbfc56c78 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 00:20:43 +0100 Subject: [PATCH 1181/1843] reimplement publisherId on updateUserInfos --- backend/src/graphql/arg/UpdateUserInfosArgs.ts | 3 +++ backend/src/graphql/resolver/UserResolver.ts | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/backend/src/graphql/arg/UpdateUserInfosArgs.ts b/backend/src/graphql/arg/UpdateUserInfosArgs.ts index 0aee1f6f6..dca9ec4ab 100644 --- a/backend/src/graphql/arg/UpdateUserInfosArgs.ts +++ b/backend/src/graphql/arg/UpdateUserInfosArgs.ts @@ -17,6 +17,9 @@ export default class UpdateUserInfosArgs { @Field({ nullable: true }) language?: string + @Field({ nullable: true }) + publisherId?: number + @Field({ nullable: true }) password?: string diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 87f556264..5c4625938 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -466,6 +466,7 @@ export class UserResolver { description, username, language, + publisherId, password, passwordNew, coinanimation, @@ -526,6 +527,11 @@ export class UserResolver { loginUser.privKey = encryptedPrivkey } + // Save publisherId only if Elopage is not yet registered + if (publisherId && !(await this.hasElopage(context))) { + loginUser.publisherId = publisherId + } + const queryRunner = getConnection().createQueryRunner() await queryRunner.connect() await queryRunner.startTransaction('READ UNCOMMITTED') From f09c3b4964605ae4e66a6149a79e58a909efdf44 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 00:40:16 +0100 Subject: [PATCH 1182/1843] replace implementation of `getPublicKey` to no longer require the sessionId. Furthermore the call now no longer calls `getUserInfos` on the `login_server` but just queries the database itself --- .../graphql/resolver/TransactionResolver.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 755955a7f..968ce9d4c 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -33,6 +33,7 @@ import { calculateDecay, calculateDecayWithInterval } from '../../util/decay' import { TransactionTypeId } from '../enum/TransactionTypeId' import { TransactionType } from '../enum/TransactionType' import { hasUserAmount, isHexPublicKey } from '../../util/validate' +import { LoginUserRepository } from '../../typeorm/repository/LoginUser' /* # Test @@ -451,15 +452,15 @@ async function addUserTransaction( }) } -async function getPublicKey(email: string, sessionId: number): Promise { - const result = await apiPost(CONFIG.LOGIN_API_URL + 'getUserInfos', { - session_id: sessionId, - email, - ask: ['user.pubkeyhex'], - }) - if (result.success) { - return result.data.userData.pubkeyhex +async function getPublicKey(email: string): Promise { + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findOne({ email: email }) + // User not found + if (!loginUser) { + return null } + + return loginUser.pubKey.toString('hex') } @Resolver() @@ -517,7 +518,7 @@ export class TransactionResolver { // validate recipient user // TODO: the detour over the public key is unnecessary - const recipiantPublicKey = await getPublicKey(email, context.sessionId) + const recipiantPublicKey = await getPublicKey(email) if (!recipiantPublicKey) { throw new Error('recipiant not known') } From fd994936d5df18f109d1e8e15d24b7c330692124 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 17 Nov 2021 12:58:18 +0100 Subject: [PATCH 1183/1843] Update frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue Co-authored-by: Ulf Gebhardt --- frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue b/frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue index 3927cdb72..0146621ed 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue @@ -57,7 +57,7 @@ export default { this.scan = false }, async onDetect() { - // what is this for? I added the detect data to test that the method is called + // TODO: what is this for? I added the detect data to test that the method is called this.detect = !this.detect }, }, From a3e8ca49e59a3e0dd674a47ebc778142a9ff1fcf Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 17 Nov 2021 13:26:18 +0100 Subject: [PATCH 1184/1843] diable authentication --- admin/src/App.vue | 10 ---------- admin/src/main.js | 2 +- admin/src/router/routes.js | 2 ++ admin/src/store/store.js | 2 +- docker-compose.override.yml | 4 ---- docker-compose.yml | 2 ++ 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/admin/src/App.vue b/admin/src/App.vue index bcc6fadec..9267cc82b 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -5,15 +5,5 @@ diff --git a/admin/src/main.js b/admin/src/main.js index f5ec929f2..7375393d9 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -21,7 +21,7 @@ import { BootstrapVue } from 'bootstrap-vue' const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) const authLink = new ApolloLink((operation, forward) => { - const token = '' // store.state.token + const token = store.state.token operation.setContext({ headers: { Authorization: token && token.length > 0 ? `Bearer ${token}` : '', diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js index 40f3ce325..604b03bee 100644 --- a/admin/src/router/routes.js +++ b/admin/src/router/routes.js @@ -3,9 +3,11 @@ import NotFound from '@/components/NotFoundPage.vue' const routes = [ { path: '/', + /* meta: { requiresAuth: true, }, + */ }, { path: '*', component: NotFound }, ] diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 92fb37835..709ac52d0 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -12,7 +12,7 @@ export const mutations = { const store = new Vuex.Store({ mutations, state: { - token: null, + token: 'some-token', }, }) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index bd23b43b3..83f38a95f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -8,8 +8,6 @@ services: image: gradido/frontend:development build: target: development - networks: - - external-net environment: - NODE_ENV="development" # - DEBUG=true @@ -27,8 +25,6 @@ services: image: gradido/admin:development build: target: development - networks: - - external-net environment: - NODE_ENV="development" # - DEBUG=true diff --git a/docker-compose.yml b/docker-compose.yml index b212c6f21..9352fd162 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,7 @@ services: context: ./frontend target: production networks: + - external-net - internal-net ports: - 3000:3000 @@ -39,6 +40,7 @@ services: context: ./admin target: production networks: + - external-net - internal-net ports: - 8080:8080 From 7cc4d8e5e2ebb01a1e01afc5683f1ee81c00acb6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 17 Nov 2021 16:21:23 +0100 Subject: [PATCH 1185/1843] =?UTF-8?q?adminbereich,=20=C3=BCbersicht,=20use?= =?UTF-8?q?rsuche,=20sch=C3=B6pfen,=20sch=C3=B6pfung=20best=C3=A4tigen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/components/CreateFormular.vue | 66 ------- admin/src/components/CreationFormular.spec.js | 22 +++ admin/src/components/CreationFormular.vue | 114 ++++++++++++ admin/src/components/NavBar.spec.js | 22 +++ admin/src/components/NavBar.vue | 27 ++- admin/src/components/UserTable.spec.js | 22 +++ admin/src/components/UserTable.vue | 133 ++++++++------ admin/src/locales/en.json | 17 +- admin/src/main.js | 6 +- admin/src/main.test.js | 25 +++ admin/src/router/routes.js | 7 + admin/src/views/Creation.vue | 171 +++++++++++++++++- admin/src/views/CreationConfirm.vue | 108 +++++++++++ admin/src/views/Overview.vue | 73 ++++++-- admin/src/views/UserSearch.vue | 74 +++++++- 15 files changed, 710 insertions(+), 177 deletions(-) delete mode 100644 admin/src/components/CreateFormular.vue create mode 100644 admin/src/components/CreationFormular.spec.js create mode 100644 admin/src/components/CreationFormular.vue create mode 100644 admin/src/components/NavBar.spec.js create mode 100644 admin/src/components/UserTable.spec.js create mode 100644 admin/src/views/CreationConfirm.vue diff --git a/admin/src/components/CreateFormular.vue b/admin/src/components/CreateFormular.vue deleted file mode 100644 index 5dd07a4c1..000000000 --- a/admin/src/components/CreateFormular.vue +++ /dev/null @@ -1,66 +0,0 @@ - - diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js new file mode 100644 index 000000000..c2098768c --- /dev/null +++ b/admin/src/components/CreationFormular.spec.js @@ -0,0 +1,22 @@ +import { mount } from '@vue/test-utils' +import CreationFormular from './CreationFormular.vue' + +const localVue = global.localVue + +describe('CreationFormular', () => { + let wrapper + + const Wrapper = () => { + return mount(CreationFormular, { localVue }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('have a DIV element with the class.componente-creation-formular', () => { + expect(wrapper.find('.componente-creation-formular').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue new file mode 100644 index 000000000..dbc40c13c --- /dev/null +++ b/admin/src/components/CreationFormular.vue @@ -0,0 +1,114 @@ + + diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js new file mode 100644 index 000000000..ab9be26e5 --- /dev/null +++ b/admin/src/components/NavBar.spec.js @@ -0,0 +1,22 @@ +import { mount } from '@vue/test-utils' +import NavBar from './NavBar.vue' + +const localVue = global.localVue + +describe('NavBar', () => { + let wrapper + + const Wrapper = () => { + return mount(NavBar, { localVue }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('have a DIV element with the class.componente-nabvar', () => { + expect(wrapper.find('.componente-nabvar').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 42bc2161c..1efdffc04 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -1,19 +1,18 @@ diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js new file mode 100644 index 000000000..935bd177c --- /dev/null +++ b/admin/src/components/UserTable.spec.js @@ -0,0 +1,22 @@ +import { mount } from '@vue/test-utils' +import UserTable from './UserTable.vue' + +const localVue = global.localVue + +describe('UserTable', () => { + let wrapper + + const Wrapper = () => { + return mount(UserTable, { localVue }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('have a DIV element with the class.componente-user-table', () => { + expect(wrapper.find('.componente-user-table').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 2e92c9a7f..a376e0f67 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -1,24 +1,8 @@ diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index ac7159ece..0967ef424 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,16 +1 @@ -{ - "monthNames": { - "January": "", - "February": "", - "March": "", - "April": "", - "May": "", - "June": "", - "July": "", - "August": "", - "September": "", - "October": "", - "November": "", - "December": "" - } -} +{} diff --git a/admin/src/main.js b/admin/src/main.js index 197b82888..b3925c9fe 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -13,9 +13,9 @@ import VueApollo from 'vue-apollo' import CONFIG from './config' -import { BootstrapVue } from 'bootstrap-vue' -import 'bootstrap-vue/dist/bootstrap-vue.css' +import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' import 'bootstrap/dist/css/bootstrap.css' +import 'bootstrap-vue/dist/bootstrap-vue.css' import moment from 'vue-moment' @@ -52,6 +52,8 @@ const apolloProvider = new VueApollo({ }) Vue.use(BootstrapVue) +Vue.use(IconsPlugin) + Vue.use(moment) addNavigationGuards(router, store) diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 27c8898ab..b2d7fadc8 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -5,10 +5,13 @@ import CONFIG from './config' import Vue from 'vue' import Vuex from 'vuex' import VueI18n from 'vue-i18n' +import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' +import moment from 'vue-moment' jest.mock('vue') jest.mock('vuex') jest.mock('vue-i18n') +jest.mock('moment') const storeMock = jest.fn() Vuex.Store = storeMock @@ -25,6 +28,16 @@ jest.mock('apollo-boost', () => { } }) +jest.mock('bootstrap-vue', () => { + return { + __esModule: true, + BootstrapVue: jest.fn(), + IconsPlugin: jest.fn(() => { + return { concat: jest.fn() } + }), + } +}) + describe('main', () => { it('calls the HttpLink', () => { expect(HttpLink).toBeCalledWith({ uri: CONFIG.GRAPHQL_URI }) @@ -50,6 +63,18 @@ describe('main', () => { expect(VueI18n).toBeCalled() }) + it('calls BootstrapVue', () => { + expect(BootstrapVue).toBeCalled() + }) + + it('calls IconsPlugin', () => { + expect(IconsPlugin).toBeCalled() + }) + + it('calls Moment', () => { + expect(moment).toBeCalled() + }) + it.skip('creates a store', () => { expect(storeMock).toBeCalled() }) diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js index 71500eece..a13463e08 100644 --- a/admin/src/router/routes.js +++ b/admin/src/router/routes.js @@ -27,6 +27,13 @@ const routes = [ requiresAuth: true, }, }, + { + path: '/creation-confirm', + component: () => import('@/views/CreationConfirm.vue'), + meta: { + requiresAuth: true, + }, + }, { path: '*', component: () => import('@/components/NotFoundPage.vue'), diff --git a/admin/src/views/Creation.vue b/admin/src/views/Creation.vue index 794218163..02a060f74 100644 --- a/admin/src/views/Creation.vue +++ b/admin/src/views/Creation.vue @@ -1,9 +1,178 @@ + diff --git a/admin/src/views/CreationConfirm.vue b/admin/src/views/CreationConfirm.vue new file mode 100644 index 000000000..2d416e08f --- /dev/null +++ b/admin/src/views/CreationConfirm.vue @@ -0,0 +1,108 @@ + + diff --git a/admin/src/views/Overview.vue b/admin/src/views/Overview.vue index 55eca4aea..d529701e2 100644 --- a/admin/src/views/Overview.vue +++ b/admin/src/views/Overview.vue @@ -1,26 +1,71 @@ diff --git a/admin/src/views/UserSearch.vue b/admin/src/views/UserSearch.vue index be6ce38c9..c7ed5ffef 100644 --- a/admin/src/views/UserSearch.vue +++ b/admin/src/views/UserSearch.vue @@ -1,9 +1,73 @@ + From f362032b388373d372bf71102632fc66e5c1d0b3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 16:56:13 +0100 Subject: [PATCH 1186/1843] add body parser --- backend/package.json | 1 + backend/yarn.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index bc098958f..375046363 100644 --- a/backend/package.json +++ b/backend/package.json @@ -20,6 +20,7 @@ "apollo-server-express": "^2.25.2", "apollo-server-testing": "^2.25.2", "axios": "^0.21.1", + "body-parser": "^1.19.0", "class-validator": "^0.13.1", "cors": "^2.8.5", "dotenv": "^10.0.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index b411bcf60..5b74ba7c3 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -1552,7 +1552,7 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.19.0, body-parser@^1.18.3: +body-parser@1.19.0, body-parser@^1.18.3, body-parser@^1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== From 33670f1575565f37dcf2f980257dfd1a900ee670 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 16:56:32 +0100 Subject: [PATCH 1187/1843] WEBHOOK_ELOPAGE_SECRET --- backend/src/config/index.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index f21082d1d..22e37eeb9 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -56,9 +56,21 @@ const email = { process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1', } +const webhook = { + WEBHOOK_ELOPAGE_SECRET: process.env.WEBHOOK_ELOPAGE_SECRET || 'secret', +} + // This is needed by graphql-directive-auth process.env.APP_SECRET = server.JWT_SECRET -const CONFIG = { ...server, ...database, ...klicktipp, ...community, ...email, ...loginServer } +const CONFIG = { + ...server, + ...database, + ...klicktipp, + ...community, + ...email, + ...loginServer, + ...webhook, +} export default CONFIG From e68f22ade02861cb5fdb83921de910374e6cec8a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 16:57:04 +0100 Subject: [PATCH 1188/1843] implement the webhook --- backend/src/server/createServer.ts | 10 + backend/src/webhook/elopage.ts | 365 +++++++++++++++++++++++++++++ 2 files changed, 375 insertions(+) create mode 100644 backend/src/webhook/elopage.ts diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4350483ff..28e0e1ce4 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -6,6 +6,7 @@ import 'module-alias/register' import { ApolloServer } from 'apollo-server-express' import express from 'express' +import bodyParser from 'body-parser' // database import connection from '../typeorm/connection' @@ -22,6 +23,9 @@ import CONFIG from '../config' // graphql import schema from '../graphql/schema' +// webhooks +import { elopageWebhook } from '../webhook/elopage' + // TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; @@ -50,6 +54,12 @@ const createServer = async (context: any = serverContext): Promise => { // cors app.use(cors) + // bodyparser + app.use(bodyParser.json()) + + // Elopage Webhook + app.post('/hook/elopage/' + CONFIG.WEBHOOK_ELOPAGE_SECRET, elopageWebhook) + // Apollo Server const apollo = new ApolloServer({ schema: await schema(), diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts new file mode 100644 index 000000000..0db26bf9c --- /dev/null +++ b/backend/src/webhook/elopage.ts @@ -0,0 +1,365 @@ +/* + Elopage Webhook + + Those are all available infos: + HandleElopageRequestTask: order_id 849951 + + Es gibt 5 elopage request mit dieser order_id + Alle von der gleichen Person, aber unterschiedliche Events: + 2019-12-03: chargeback.successful + 29.10.2019: order.subscription.paused + 2019-12-06: payment.successful + 29.10.2019: order.subscription.paying + 2091-12-07: payment.pending + + + order_id=849951&order_token=y22MJxHr9XzzPiaaH9GU&payment_session_id=849951&payment_session_token=y22MJxHr9XzzPiaaH9GU&action=payment_processed&initiator&payer[email]=theodora.mis%40gmx.ch&payer[first_name]=Theodora&payer[last_name]=Mis&payer[country]=Schweiz&payer[country_code]=CH&payer[city]=St.+Gallen&payer[street]=Vonwilstrasse+23&payer[street_number]&payer[zip]=9000&payer[company]&payer[vat_no]&payer[phone]&gift_receiver&publisher[id]=691&publisher[email]=joytopia%40gmail.com&publisher[first_name]=Bernd&publisher[last_name]=H%C3%BCckst%C3%A4dt&publisher[street]=Pfarrweg+2&publisher[zip]=74653&publisher[city]=K%C3%BCnzelsau&publisher[country]=Deutschland&publisher[phone]=%2B4979405460810&team_members&product_id=43944&product[id]=43944&product[slug]=gold-de&product[name]=Gold-Mitgliedschaft&product[type]=membership&product[price]=40.0&product[affiliate_program_id]=111&upsell&membership[id]=43944&membership[name]=Gold-Mitgliedschaft&membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29&membership[membership_product_1_id]=44982&membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin&membership[membership_product_2_id]=43970&membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_3_id]=43969&membership[membership_product_4]=Potential-Entfaltungs-Techniken&membership[membership_product_4_id]=43954&membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_5_id]=43896&membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt&membership[membership_product_6_id]=14590&membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido&membership[membership_product_7_id]=43951&membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile&membership[membership_product_8_id]=7312&membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21&membership[membership_product_9_id]=43744&membership[membership_product_10]=Basis-Informationen+zu+Gradido&membership[membership_product_10_id]=42600&membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_11_id]=43882&membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22&membership[membership_product_12_id]=43886&membership[membership_product_13]=Premium+Community+%26+Markt&membership[membership_product_13_id]=43885&membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen&membership[membership_product_14_id]=43887&membership[membership_product_15]=Online-Konferenzen&membership[membership_product_15_id]=43919&membership[membership_product_16]=Gradido+H%C3%B6rbuch&membership[membership_product_16_id]=43920&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&pricing_plan[name]=Monatlich&add_id_1&add_id_2&campaign_id¤cy=EUR&coupon_code&recurring=yes&recurring_form=subscription&payment_state=payment_paused&payment_method=sepa&opt_ins&payments_schedule[][rate]=1&payments_schedule[][state]=debt&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2019&payments_schedule[][rate]=2&payments_schedule[][state]=pending&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.11.2019&payments_schedule[][rate]=3&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.12.2019&payments_schedule[][rate]=4&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.01.2020&payments_schedule[][rate]=5&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.02.2020&payments_schedule[][rate]=6&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.03.2020&payments_schedule[][rate]=7&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.04.2020&payments_schedule[][rate]=8&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.05.2020&payments_schedule[][rate]=9&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.06.2020&payments_schedule[][rate]=10&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.07.2020&payments_schedule[][rate]=11&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.08.2020&payments_schedule[][rate]=12&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.09.2020&payments_schedule[][rate]=13&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2020&payments_schedule[][rate]=14&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.11.2020&payments_count=0&payments_count_expected&with_test_period=false&with_custom_start=false&created=29.10.2019+13%3A17&id=58268076&invoice_number&revenue=-40.0&amount=-23.72&fee=-16.28&vat_rate=0.0&vat_amount=0.0&state=successful&refunded_transfer_id=52876337&invoice_link&credit_memo_link=http%3A%2F%2Felopage.com%2Fcommon%2Fcredit_memos%2F12410%3Ftoken%3D6dyBsddt6gsJpX8Fq-M2&success_link=http%3A%2F%2Felopage.com%2Fs%2Fgradido%2Fpayment%2Fy22MJxHr9XzzPiaaH9GU&error_msg&created_date=2019-12-03T22%3A15Z&success_date=2019-12-03T22%3A15Z&success_date_short=2019-12-03&created_date_utc=03.12.2019+22%3A15&success_date_utc=03.12.2019+22%3A15&team_member_commissions&event=chargeback.successful + order_id=849951&order_token=y22MJxHr9XzzPiaaH9GU&payment_session_id=849951&payment_session_token=y22MJxHr9XzzPiaaH9GU&action=subscription_state_changed&initiator&payer[email]=theodora.mis%40gmx.ch&payer[first_name]=Theodora&payer[last_name]=Mis&payer[country]=Schweiz&payer[country_code]=CH&payer[city]=St.+Gallen&payer[street]=Vonwilstrasse+23&payer[street_number]&payer[zip]=9000&payer[company]&payer[vat_no]&payer[phone]&gift_receiver&publisher[id]=691&publisher[email]=joytopia%40gmail.com&publisher[first_name]=Bernd&publisher[last_name]=H%C3%BCckst%C3%A4dt&publisher[street]=Pfarrweg+2&publisher[zip]=74653&publisher[city]=K%C3%BCnzelsau&publisher[country]=Deutschland&publisher[phone]=%2B4979405460810&team_members&product_id=43944&product[id]=43944&product[slug]=gold-de&product[name]=Gold-Mitgliedschaft&product[type]=membership&product[price]=40.0&product[affiliate_program_id]=111&upsell&membership[id]=43944&membership[name]=Gold-Mitgliedschaft&membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29&membership[membership_product_1_id]=44982&membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin&membership[membership_product_2_id]=43970&membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_3_id]=43969&membership[membership_product_4]=Potential-Entfaltungs-Techniken&membership[membership_product_4_id]=43954&membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_5_id]=43896&membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt&membership[membership_product_6_id]=14590&membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido&membership[membership_product_7_id]=43951&membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile&membership[membership_product_8_id]=7312&membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21&membership[membership_product_9_id]=43744&membership[membership_product_10]=Basis-Informationen+zu+Gradido&membership[membership_product_10_id]=42600&membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_11_id]=43882&membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22&membership[membership_product_12_id]=43886&membership[membership_product_13]=Premium+Community+%26+Markt&membership[membership_product_13_id]=43885&membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen&membership[membership_product_14_id]=43887&membership[membership_product_15]=Online-Konferenzen&membership[membership_product_15_id]=43919&membership[membership_product_16]=Gradido+H%C3%B6rbuch&membership[membership_product_16_id]=43920&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&pricing_plan[name]=Monatlich&add_id_1&add_id_2&campaign_id¤cy=EUR&coupon_code&recurring=yes&recurring_form=subscription&payment_state=payment_paused&payment_method=sepa&opt_ins&payments_schedule[][rate]=1&payments_schedule[][state]=debt&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2019&payments_schedule[][rate]=2&payments_schedule[][state]=pending&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.11.2019&payments_schedule[][rate]=3&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.12.2019&payments_schedule[][rate]=4&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.01.2020&payments_schedule[][rate]=5&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.02.2020&payments_schedule[][rate]=6&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.03.2020&payments_schedule[][rate]=7&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.04.2020&payments_schedule[][rate]=8&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.05.2020&payments_schedule[][rate]=9&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.06.2020&payments_schedule[][rate]=10&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.07.2020&payments_schedule[][rate]=11&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.08.2020&payments_schedule[][rate]=12&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.09.2020&payments_schedule[][rate]=13&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2020&payments_schedule[][rate]=14&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.11.2020&payments_count=0&payments_count_expected&with_test_period=false&with_custom_start=false&created=29.10.2019+13%3A17&event=order.subscription.paused + order_id=849951&order_token=y22MJxHr9XzzPiaaH9GU&payment_session_id=849951&payment_session_token=y22MJxHr9XzzPiaaH9GU&action=payment_processed&initiator&payer[email]=theodora.mis%40gmx.ch&payer[first_name]=Theodora&payer[last_name]=Mis&payer[country]=Schweiz&payer[country_code]=CH&payer[city]=St.+Gallen&payer[street]=Vonwilstrasse+23&payer[street_number]&payer[zip]=9000&payer[company]&payer[vat_no]&payer[phone]&gift_receiver&publisher[id]=691&publisher[email]=joytopia%40gmail.com&publisher[first_name]=Bernd&publisher[last_name]=H%C3%BCckst%C3%A4dt&publisher[street]=Pfarrweg+2&publisher[zip]=74653&publisher[city]=K%C3%BCnzelsau&publisher[country]=Deutschland&publisher[phone]=%2B4979405460810&team_members&product_id=43944&product[id]=43944&product[slug]=gold-de&product[name]=Gold-Mitgliedschaft&product[type]=membership&product[price]=40.0&product[affiliate_program_id]=111&upsell&membership[id]=43944&membership[name]=Gold-Mitgliedschaft&membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29&membership[membership_product_1_id]=44982&membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin&membership[membership_product_2_id]=43970&membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_3_id]=43969&membership[membership_product_4]=Potential-Entfaltungs-Techniken&membership[membership_product_4_id]=43954&membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_5_id]=43896&membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt&membership[membership_product_6_id]=14590&membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido&membership[membership_product_7_id]=43951&membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile&membership[membership_product_8_id]=7312&membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21&membership[membership_product_9_id]=43744&membership[membership_product_10]=Basis-Informationen+zu+Gradido&membership[membership_product_10_id]=42600&membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_11_id]=43882&membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22&membership[membership_product_12_id]=43886&membership[membership_product_13]=Premium+Community+%26+Markt&membership[membership_product_13_id]=43885&membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen&membership[membership_product_14_id]=43887&membership[membership_product_15]=Online-Konferenzen&membership[membership_product_15_id]=43919&membership[membership_product_16]=Gradido+H%C3%B6rbuch&membership[membership_product_16_id]=43920&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&pricing_plan[name]=Monatlich&add_id_1&add_id_2&campaign_id¤cy=EUR&coupon_code&recurring=yes&recurring_form=subscription&payment_state=active_subscription&payment_method=sepa&opt_ins&payments_schedule[][rate]=1&payments_schedule[][state]=debt&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2019&payments_schedule[][rate]=2&payments_schedule[][state]=paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.11.2019&payments_schedule[][rate]=3&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.12.2019&payments_schedule[][rate]=4&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.01.2020&payments_schedule[][rate]=5&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.02.2020&payments_schedule[][rate]=6&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.03.2020&payments_schedule[][rate]=7&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.04.2020&payments_schedule[][rate]=8&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.05.2020&payments_schedule[][rate]=9&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.06.2020&payments_schedule[][rate]=10&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.07.2020&payments_schedule[][rate]=11&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.08.2020&payments_schedule[][rate]=12&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.09.2020&payments_schedule[][rate]=13&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2020&payments_schedule[][rate]=14&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.11.2020&payments_schedule[][rate]=15&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.12.2020&payments_count=1&payments_count_expected&with_test_period=false&with_custom_start=false&created=29.10.2019+13%3A17&id=57354055&invoice_number=111-1839-000000677&revenue=40.0&amount=23.72&fee=16.28&vat_rate=0.0&vat_amount=0.0&state=successful&refunded_transfer_id&invoice_link=http%3A%2F%2Felopage.com%2Fcommon%2Finvoices%2F450856%2Fdownload.pdf%3Ftoken%3DGR7bG7zcbgCzNJEPLDss&credit_memo_link&success_link=http%3A%2F%2Felopage.com%2Fs%2Fgradido%2Fpayment%2Fy22MJxHr9XzzPiaaH9GU&error_msg&created_date=2019-11-29T07%3A19Z&success_date=2019-12-06T13%3A12Z&success_date_short=2019-12-06&created_date_utc=29.11.2019+07%3A19&success_date_utc=06.12.2019+13%3A12&team_member_commissions&event=payment.successful + order_id=849951&order_token=y22MJxHr9XzzPiaaH9GU&payment_session_id=849951&payment_session_token=y22MJxHr9XzzPiaaH9GU&action=subscription_state_changed&initiator&payer[email]=theodora.mis%40gmx.ch&payer[first_name]=Theodora&payer[last_name]=Mis&payer[country]=Schweiz&payer[country_code]=CH&payer[city]=St.+Gallen&payer[street]=Vonwilstrasse+23&payer[street_number]&payer[zip]=9000&payer[company]&payer[vat_no]&payer[phone]&gift_receiver&publisher[id]=691&publisher[email]=joytopia%40gmail.com&publisher[first_name]=Bernd&publisher[last_name]=H%C3%BCckst%C3%A4dt&publisher[street]=Pfarrweg+2&publisher[zip]=74653&publisher[city]=K%C3%BCnzelsau&publisher[country]=Deutschland&publisher[phone]=%2B4979405460810&team_members&product_id=43944&product[id]=43944&product[slug]=gold-de&product[name]=Gold-Mitgliedschaft&product[type]=membership&product[price]=40.0&product[affiliate_program_id]=111&upsell&membership[id]=43944&membership[name]=Gold-Mitgliedschaft&membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29&membership[membership_product_1_id]=44982&membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin&membership[membership_product_2_id]=43970&membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_3_id]=43969&membership[membership_product_4]=Potential-Entfaltungs-Techniken&membership[membership_product_4_id]=43954&membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_5_id]=43896&membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt&membership[membership_product_6_id]=14590&membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido&membership[membership_product_7_id]=43951&membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile&membership[membership_product_8_id]=7312&membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21&membership[membership_product_9_id]=43744&membership[membership_product_10]=Basis-Informationen+zu+Gradido&membership[membership_product_10_id]=42600&membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_11_id]=43882&membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22&membership[membership_product_12_id]=43886&membership[membership_product_13]=Premium+Community+%26+Markt&membership[membership_product_13_id]=43885&membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen&membership[membership_product_14_id]=43887&membership[membership_product_15]=Online-Konferenzen&membership[membership_product_15_id]=43919&membership[membership_product_16]=Gradido+H%C3%B6rbuch&membership[membership_product_16_id]=43920&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&pricing_plan[name]=Monatlich&add_id_1&add_id_2&campaign_id¤cy=EUR&coupon_code&recurring=yes&recurring_form=subscription&payment_state=active_subscription&payment_method=sepa&opt_ins&payments_schedule[][rate]=1&payments_schedule[][state]=debt&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2019&payments_schedule[][rate]=2&payments_schedule[][state]=paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.11.2019&payments_schedule[][rate]=3&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.12.2019&payments_schedule[][rate]=4&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.01.2020&payments_schedule[][rate]=5&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.02.2020&payments_schedule[][rate]=6&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.03.2020&payments_schedule[][rate]=7&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.04.2020&payments_schedule[][rate]=8&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.05.2020&payments_schedule[][rate]=9&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.06.2020&payments_schedule[][rate]=10&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.07.2020&payments_schedule[][rate]=11&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.08.2020&payments_schedule[][rate]=12&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.09.2020&payments_schedule[][rate]=13&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2020&payments_schedule[][rate]=14&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.11.2020&payments_schedule[][rate]=15&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.12.2020&payments_count=1&payments_count_expected&with_test_period=false&with_custom_start=false&created=29.10.2019+13%3A17&event=order.subscription.paying + order_id=849951&order_token=y22MJxHr9XzzPiaaH9GU&payment_session_id=849951&payment_session_token=y22MJxHr9XzzPiaaH9GU&action=payment_processed&initiator&payer[email]=theodora.mis%40gmx.ch&payer[first_name]=Theodora&payer[last_name]=Mis&payer[country]=Schweiz&payer[country_code]=CH&payer[city]=St.+Gallen&payer[street]=Vonwilstrasse+23&payer[street_number]&payer[zip]=9000&payer[company]&payer[vat_no]&payer[phone]&gift_receiver&publisher[id]=691&publisher[email]=joytopia%40gmail.com&publisher[first_name]=Bernd&publisher[last_name]=H%C3%BCckst%C3%A4dt&publisher[street]=Pfarrweg+2&publisher[zip]=74653&publisher[city]=K%C3%BCnzelsau&publisher[country]=Deutschland&publisher[phone]=%2B4979405460810&team_members&product_id=43944&product[id]=43944&product[slug]=gold-de&product[name]=Gold-Mitgliedschaft&product[type]=membership&product[price]=40.0&product[affiliate_program_id]=111&upsell&membership[id]=43944&membership[name]=Gold-Mitgliedschaft&membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29&membership[membership_product_1_id]=44982&membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin&membership[membership_product_2_id]=43970&membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_3_id]=43969&membership[membership_product_4]=Potential-Entfaltungs-Techniken&membership[membership_product_4_id]=43954&membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_5_id]=43896&membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt&membership[membership_product_6_id]=14590&membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido&membership[membership_product_7_id]=43951&membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile&membership[membership_product_8_id]=7312&membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21&membership[membership_product_9_id]=43744&membership[membership_product_10]=Basis-Informationen+zu+Gradido&membership[membership_product_10_id]=42600&membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens&membership[membership_product_11_id]=43882&membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22&membership[membership_product_12_id]=43886&membership[membership_product_13]=Premium+Community+%26+Markt&membership[membership_product_13_id]=43885&membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen&membership[membership_product_14_id]=43887&membership[membership_product_15]=Online-Konferenzen&membership[membership_product_15_id]=43919&membership[membership_product_16]=Gradido+H%C3%B6rbuch&membership[membership_product_16_id]=43920&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&events[]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&tickets[][codes]&tickets[][ticket_attendees]&pricing_plan[name]=Monatlich&add_id_1&add_id_2&campaign_id¤cy=EUR&coupon_code&recurring=yes&recurring_form=subscription&payment_state=active_subscription&payment_method=sepa&opt_ins&payments_schedule[][rate]=1&payments_schedule[][state]=pending&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2019&payments_schedule[][rate]=2&payments_schedule[][state]=paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.11.2019&payments_schedule[][rate]=3&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.12.2019&payments_schedule[][rate]=4&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.01.2020&payments_schedule[][rate]=5&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.02.2020&payments_schedule[][rate]=6&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.03.2020&payments_schedule[][rate]=7&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.04.2020&payments_schedule[][rate]=8&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.05.2020&payments_schedule[][rate]=9&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.06.2020&payments_schedule[][rate]=10&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.07.2020&payments_schedule[][rate]=11&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.08.2020&payments_schedule[][rate]=12&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.09.2020&payments_schedule[][rate]=13&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=40.0&payments_schedule[][date]=29.10.2020&payments_schedule[][rate]=14&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.11.2020&payments_schedule[][rate]=15&payments_schedule[][state]=to_be_paid&payments_schedule[][amount]=0.0&payments_schedule[][date]=29.12.2020&payments_count=1&payments_count_expected&with_test_period=false&with_custom_start=false&created=29.10.2019+13%3A17&id=58838098&invoice_number=111-1839-000000689&revenue=40.0&amount=23.72&fee=16.28&vat_rate=0.0&vat_amount=0.0&state=pending&refunded_transfer_id&invoice_link=http%3A%2F%2Felopage.com%2Fcommon%2Finvoices%2F470009%2Fdownload.pdf%3Ftoken%3DZ_gogUf8tpKxcHhB-7Cz&credit_memo_link&success_link=http%3A%2F%2Felopage.com%2Fs%2Fgradido%2Fpayment%2Fy22MJxHr9XzzPiaaH9GU&error_msg&created_date=2019-12-07T07%3A19Z&success_date&success_date_short&created_date_utc=07.12.2019+07%3A19&success_date_utc&team_member_commissions&event=payment.pending + + Additional we have the Elopage API docu: + https://apidoc.elopage.com/#webhooks + + I assume that the webhook arrives via POST and transmits a string as shown above +*/ + +import { LoginElopageBuys } from '@entity/LoginElopageBuys' +import { LoginUser } from '@entity/LoginUser' +import { randomBytes } from 'crypto' +import { UserResolver } from '../graphql/resolver/UserResolver' + +export const elopageWebhook = async (req: any, res: any): Promise => { + res.status(200).end() // Responding is important + + const loginElopgaeBuy = new LoginElopageBuys() + let firstName = '' + let lastName = '' + const entries = req.body.split('&') + entries.map((entry: string) => { + const keyVal = entry.split('=') + if (keyVal.length !== 2) { + throw new Error(`Error parsing entry '${entry}'`) + } + const key = keyVal[0] + const val = decodeURIComponent(keyVal[1]).replace('+', ' ').trim() + switch (key) { + case 'product[affiliate_program_id]': + loginElopgaeBuy.affiliateProgramId = parseInt(val) + break + case 'publisher[id]': + loginElopgaeBuy.publisherId = parseInt(val) + break + case 'order_id': + loginElopgaeBuy.orderId = parseInt(val) + break + case 'product_id': + loginElopgaeBuy.productId = parseInt(val) + break + case 'product[price]': + // TODO: static_cast(round(stof(temp) * 100.0f)); + loginElopgaeBuy.productPrice = parseFloat(val) + break + case 'payer[email]': + loginElopgaeBuy.payerEmail = val + break + case 'publisher[email]': + loginElopgaeBuy.publisherEmail = val + break + case 'payment_state': + loginElopgaeBuy.payed = val === 'paid' + break + case 'success_date': + loginElopgaeBuy.successDate = new Date(val) + break + case 'event': + loginElopgaeBuy.event = val + break + case 'membership[id]': + // TODO this was never set on login_server - its unclear if this is the correct value + loginElopgaeBuy.elopageUserId = parseInt(val) + break + case 'payer[first_name]': + firstName = val + break + case 'payer[last_name]': + lastName = val + break + default: + // eslint-disable-next-line no-console + console.log(`Unknown Elopage Value '${entry}'`) + } + return null // we write things into the loginElopgaeBuy object, no return value needed + }) + + // Do not process certain events + if (['lesson.viewed', 'lesson.completed', 'lesson.commented'].includes(loginElopgaeBuy.event)) { + // eslint-disable-next-line no-console + console.log('User viewed, completed or commented - not saving hook') + return + } + + // Save the hook data + await loginElopgaeBuy.save() + + // create user for certain products + /* + Registrierung - Schritt 1 von 3, 36001 + Gradido-Basis, 43741 + Premium-Mitgliedschaft, 43870 + Gold-Mitgliedschaft, 43944 + Business-Mitgliedschaft, 43960 + Förderbeitrag: 49106 + */ + if ([36001, 43741, 43870, 43944, 43960, 49106].includes(loginElopgaeBuy.productId)) { + const email = loginElopgaeBuy.payerEmail + + const VALIDATE_EMAIL = /^[a-zA-Z0-9.!#$%&?*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/ + const VALIDATE_NAME = /^<>&;]{2,}$/ + + // Validate inputs + if ( + email === '' || + !email.match(VALIDATE_EMAIL) || + firstName === '' || + firstName.match(VALIDATE_NAME) || + lastName === '' || + lastName.match(VALIDATE_NAME) + ) { + // eslint-disable-next-line no-console + console.log(`Could not create User ${firstName} ${lastName} with email: ${email}`) + return + } + + // Do we already have such a user? + if ((await LoginUser.count({ email })) !== 0) { + // eslint-disable-next-line no-console + console.log(`Did not create User - already exists with email: ${email}`) + return + } + + // generate a random password - 8 random bytes, the email, special char, capital & small letter, number and another set of 8 random bytes + // TODO: The user will be forced to reset his password - how was this done before? + const password = + randomBytes(8).toString('hex') + email + '!aA1' + randomBytes(8).toString('hex') + + const userResolver = new UserResolver() + userResolver.createUser({ + email, + firstName, + lastName, + password, + language: 'default', + publisherId: loginElopgaeBuy.publisherId, + }) + } +} + +/* +Known unused fields: + + order_token=y22MJxHr9XzzPiaaH9GU + payment_session_id=849951 + payment_session_token=y22MJxHr9XzzPiaaH9GU + action=payment_processed + initiator + payer[first_name]=Theodora + payer[last_name]=Mis + payer[country]=Schweiz + payer[country_code]=CH + payer[city]=St.+Gallen + payer[street]=Vonwilstrasse+23 + payer[street_number] + payer[zip]=9000 + payer[company] + payer[vat_no] + payer[phone] + gift_receiver + publisher[first_name]=Bernd + publisher[last_name]=H%C3%BCckst%C3%A4dt + publisher[street]=Pfarrweg+2 + publisher[zip]=74653 + publisher[city]=K%C3%BCnzelsau + publisher[country]=Deutschland + publisher[phone]=%2B4979405460810 + team_members + product[id]=43944 + product[slug]=gold-de + product[name]=Gold-Mitgliedschaft + product[type]=membership + upsell + membership[name]=Gold-Mitgliedschaft + membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29 + membership[membership_product_1_id]=44982 + membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin + membership[membership_product_2_id]=43970 + membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens + membership[membership_product_3_id]=43969 + membership[membership_product_4]=Potential-Entfaltungs-Techniken + membership[membership_product_4_id]=43954 + membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens + membership[membership_product_5_id]=43896 + membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt + membership[membership_product_6_id]=14590 + membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido + membership[membership_product_7_id]=43951 + membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile + membership[membership_product_8_id]=7312 + membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21 + membership[membership_product_9_id]=43744 + membership[membership_product_10]=Basis-Informationen+zu+Gradido + membership[membership_product_10_id]=42600 + membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens + membership[membership_product_11_id]=43882 + membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22 + membership[membership_product_12_id]=43886 + membership[membership_product_13]=Premium+Community+%26+Markt + membership[membership_product_13_id]=43885 + membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen + membership[membership_product_14_id]=43887 + membership[membership_product_15]=Online-Konferenzen + membership[membership_product_15_id]=43919 + membership[membership_product_16]=Gradido+H%C3%B6rbuch + membership[membership_product_16_id]=43920 + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + events[] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + tickets[][codes] + tickets[][ticket_attendees] + pricing_plan[name]=Monatlich + add_id_1 + add_id_2 + campaign_id + currency=EUR + coupon_code + recurring=yes + recurring_form=subscription + payment_method=sepa + opt_ins + payments_schedule[][rate]=1 + payments_schedule[][state]=debt + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.10.2019 + payments_schedule[][rate]=2 + payments_schedule[][state]=paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.11.2019 + payments_schedule[][rate]=3 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.12.2019 + payments_schedule[][rate]=4 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.01.2020 + payments_schedule[][rate]=5 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.02.2020 + payments_schedule[][rate]=6 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.03.2020 + payments_schedule[][rate]=7 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.04.2020 + payments_schedule[][rate]=8 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.05.2020 + payments_schedule[][rate]=9 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.06.2020 + payments_schedule[][rate]=10 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.07.2020 + payments_schedule[][rate]=11 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.08.2020 + payments_schedule[][rate]=12 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.09.2020 + payments_schedule[][rate]=13 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=40.0 + payments_schedule[][date]=29.10.2020 + payments_schedule[][rate]=14 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=0.0 + payments_schedule[][date]=29.11.2020 + payments_schedule[][rate]=15 + payments_schedule[][state]=to_be_paid + payments_schedule[][amount]=0.0 + payments_schedule[][date]=29.12.2020 + payments_count=1&payments_count_expected + with_test_period=false + with_custom_start=false + created=29.10.2019+13%3A17 + id=57354055 + invoice_number=111-1839-000000677 + revenue=40.0 + amount=23.72 + fee=16.28 + vat_rate=0.0 + vat_amount=0.0 + state=successful + refunded_transfer_id + invoice_link=http%3A%2F%2Felopage.com%2Fcommon%2Finvoices%2F450856%2Fdownload.pdf%3Ftoken%3DGR7bG7zcbgCzNJEPLDss + credit_memo_link + success_link=http%3A%2F%2Felopage.com%2Fs%2Fgradido%2Fpayment%2Fy22MJxHr9XzzPiaaH9GU + error_msg + created_date=2019-11-29T07%3A19Z + success_date_short=2019-12-06 + created_date_utc=29.11.2019+07%3A19 + success_date_utc=06.12.2019+13%3A12 + team_member_commissions +*/ From 52b6026ed836ce3f07599399d4798315f166c09c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 16:58:04 +0100 Subject: [PATCH 1189/1843] missing .env.dist value --- backend/.env.dist | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/.env.dist b/backend/.env.dist index b4a91026a..1b485b8e4 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -30,4 +30,6 @@ COMMUNITY_URL= COMMUNITY_REGISTER_URL= COMMUNITY_DESCRIPTION= LOGIN_APP_SECRET=21ffbbc616fe -LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a \ No newline at end of file +LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a + +WEBHOOK_ELOPAGE_SECRET=secret \ No newline at end of file From c2a3866ae53c034e171406945dd0edfd26ba8f34 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 19:32:11 +0100 Subject: [PATCH 1190/1843] reduce coverage --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0e89057cf..f4d48c5c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -394,7 +394,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 39 + min_coverage: 38 token: ${{ github.token }} ############################################################################## From 5335d128021d54eb4a90efd0bd90d425d5487ae7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 17 Nov 2021 19:37:35 +0100 Subject: [PATCH 1191/1843] catch error on createUser and log them --- backend/src/webhook/elopage.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 0db26bf9c..945a2a24c 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -145,14 +145,19 @@ export const elopageWebhook = async (req: any, res: any): Promise => { randomBytes(8).toString('hex') + email + '!aA1' + randomBytes(8).toString('hex') const userResolver = new UserResolver() - userResolver.createUser({ - email, - firstName, - lastName, - password, - language: 'default', - publisherId: loginElopgaeBuy.publisherId, - }) + try { + await userResolver.createUser({ + email, + firstName, + lastName, + password, + language: 'default', + publisherId: loginElopgaeBuy.publisherId, + }) + } catch (error) { + // eslint-disable-next-line no-console + console.log(`Could not create User for ${email}. Following Error occured:`, error) + } } } From 1cb8b185ac8786f4386305af61d756eb6a8e4427 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 18 Nov 2021 09:14:02 +0100 Subject: [PATCH 1192/1843] Create tables on an already exsting table breaks the script, so fix with a create table if not exists. Insert statement breaks if their is a duplicate key that is imported change so that it does not break. --- database/migrations/0002-add_settings.ts | 2 +- .../migrations/0003-login_server_tables.ts | 20 +++++++++---------- database/migrations/0004-login_server_data.ts | 20 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts index d26a2b4cc..4c5300e49 100644 --- a/database/migrations/0002-add_settings.ts +++ b/database/migrations/0002-add_settings.ts @@ -11,7 +11,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` - CREATE TABLE \`user_setting\` ( + CREATE TABLE IF NOT EXISTS \`user_setting\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`userId\` int(11) NOT NULL, \`key\` varchar(255) NOT NULL, diff --git a/database/migrations/0003-login_server_tables.ts b/database/migrations/0003-login_server_tables.ts index dacc211ac..ee8a4cfe2 100644 --- a/database/migrations/0003-login_server_tables.ts +++ b/database/migrations/0003-login_server_tables.ts @@ -11,7 +11,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` - CREATE TABLE \`login_app_access_tokens\` ( + CREATE TABLE IF NOT EXISTS \`login_app_access_tokens\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`user_id\` int NOT NULL, \`access_code\` bigint unsigned NOT NULL, @@ -22,7 +22,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_elopage_buys\` ( + CREATE TABLE IF NOT EXISTS \`login_elopage_buys\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`elopage_user_id\` int DEFAULT NULL, \`affiliate_program_id\` int NOT NULL, @@ -39,7 +39,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_email_opt_in_types\` ( + CREATE TABLE IF NOT EXISTS \`login_email_opt_in_types\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`name\` varchar(255) NOT NULL, \`description\` varchar(255) NOT NULL, @@ -47,7 +47,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_email_opt_in\` ( + CREATE TABLE IF NOT EXISTS \`login_email_opt_in\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`user_id\` int NOT NULL, \`verification_code\` bigint unsigned NOT NULL, @@ -60,7 +60,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_groups\` ( + CREATE TABLE IF NOT EXISTS \`login_groups\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`alias\` varchar(190) NOT NULL, \`name\` varchar(255) NOT NULL, @@ -73,7 +73,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_pending_tasks\` ( + CREATE TABLE IF NOT EXISTS \`login_pending_tasks\` ( \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT, \`user_id\` int UNSIGNED DEFAULT 0, \`request\` varbinary(2048) NOT NULL, @@ -88,7 +88,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_roles\` ( + CREATE TABLE IF NOT EXISTS \`login_roles\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`name\` varchar(255) NOT NULL, \`description\` varchar(255) NOT NULL, @@ -97,7 +97,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_user_backups\` ( + CREATE TABLE IF NOT EXISTS \`login_user_backups\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`user_id\` int NOT NULL, \`passphrase\` text NOT NULL, @@ -106,7 +106,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_user_roles\` ( + CREATE TABLE IF NOT EXISTS \`login_user_roles\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`user_id\` int NOT NULL, \`role_id\` int NOT NULL, @@ -114,7 +114,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; `) await queryFn(` - CREATE TABLE \`login_users\` ( + CREATE TABLE IF NOT EXISTS \`login_users\` ( \`id\` int unsigned NOT NULL AUTO_INCREMENT, \`email\` varchar(191) NOT NULL, \`first_name\` varchar(150) NOT NULL, diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts index dad7d1e34..bd4cf2d18 100644 --- a/database/migrations/0004-login_server_data.ts +++ b/database/migrations/0004-login_server_data.ts @@ -22,34 +22,34 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis } await queryFn(` - INSERT INTO \`login_app_access_tokens\` SELECT * FROM ${LOGIN_SERVER_DB}.\`app_access_tokens\`; + INSERT IGNORE INTO \`login_app_access_tokens\` SELECT * FROM ${LOGIN_SERVER_DB}.\`app_access_tokens\`; `) await queryFn(` - INSERT INTO \`login_elopage_buys\` SELECT * FROM ${LOGIN_SERVER_DB}.\`elopage_buys\`; + INSERT IGNORE INTO \`login_elopage_buys\` SELECT * FROM ${LOGIN_SERVER_DB}.\`elopage_buys\`; `) await queryFn(` - INSERT INTO \`login_email_opt_in_types\` SELECT * FROM ${LOGIN_SERVER_DB}.\`email_opt_in_types\`; + INSERT IGNORE INTO \`login_email_opt_in_types\` SELECT * FROM ${LOGIN_SERVER_DB}.\`email_opt_in_types\`; `) await queryFn(` - INSERT INTO \`login_email_opt_in\` SELECT * FROM ${LOGIN_SERVER_DB}.\`email_opt_in\`; + INSERT IGNORE INTO \`login_email_opt_in\` SELECT * FROM ${LOGIN_SERVER_DB}.\`email_opt_in\`; `) await queryFn(` - INSERT INTO \`login_groups\` SELECT * FROM ${LOGIN_SERVER_DB}.\`groups\`; + INSERT IGNORE INTO \`login_groups\` SELECT * FROM ${LOGIN_SERVER_DB}.\`groups\`; `) await queryFn(` - INSERT INTO \`login_pending_tasks\` SELECT * FROM ${LOGIN_SERVER_DB}.\`pending_tasks\`; + INSERT IGNORE INTO \`login_pending_tasks\` SELECT * FROM ${LOGIN_SERVER_DB}.\`pending_tasks\`; `) await queryFn(` - INSERT INTO \`login_roles\` SELECT * FROM ${LOGIN_SERVER_DB}.\`roles\`; + INSERT IGNORE INTO \`login_roles\` SELECT * FROM ${LOGIN_SERVER_DB}.\`roles\`; `) await queryFn(` - INSERT INTO \`login_user_backups\` SELECT * FROM ${LOGIN_SERVER_DB}.\`user_backups\`; + INSERT IGNORE INTO \`login_user_backups\` SELECT * FROM ${LOGIN_SERVER_DB}.\`user_backups\`; `) await queryFn(` - INSERT INTO \`login_user_roles\` SELECT * FROM ${LOGIN_SERVER_DB}.\`user_roles\`; + INSERT IGNORE INTO \`login_user_roles\` SELECT * FROM ${LOGIN_SERVER_DB}.\`user_roles\`; `) await queryFn(` - INSERT INTO \`login_users\` SELECT * FROM ${LOGIN_SERVER_DB}.\`users\`; + INSERT IGNORE INTO \`login_users\` SELECT * FROM ${LOGIN_SERVER_DB}.\`users\`; `) // TODO clarify if we need this on non docker environment? From f0696061c43686c33c269254f21f11356d61aa85 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 09:32:17 +0100 Subject: [PATCH 1193/1843] feat: Setup Data Seeding --- database/package.json | 4 +- database/yarn.lock | 231 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 230 insertions(+), 5 deletions(-) diff --git a/database/package.json b/database/package.json index c01c75f2b..d69926340 100644 --- a/database/package.json +++ b/database/package.json @@ -19,6 +19,7 @@ "lint": "eslint . --ext .js,.ts" }, "devDependencies": { + "@types/faker": "^5.5.9", "@types/node": "^16.10.3", "@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/parser": "^4.29.2", @@ -39,6 +40,7 @@ "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "ts-mysql-migrate": "^1.0.2", - "typeorm": "^0.2.38" + "typeorm": "^0.2.38", + "typeorm-seeding": "^1.6.1" } } diff --git a/database/yarn.lock b/database/yarn.lock index 1afbc7f09..7ea8914c1 100644 --- a/database/yarn.lock +++ b/database/yarn.lock @@ -122,6 +122,11 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== +"@types/faker@^5.5.9": + version "5.5.9" + resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c" + integrity sha512-uCx6mP3UY5SIO14XlspxsGjgaemrxpssJI0Ol+GfhxtcKpv9pgRZYsS4eeKeHVLje6Qtc8lGszuBI461+gVZBA== + "@types/json-schema@^7.0.7": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -457,7 +462,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase@^5.3.1: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -473,7 +478,7 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0: +chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -523,6 +528,13 @@ cli-boxes@^2.2.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + cli-highlight@^2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" @@ -535,6 +547,20 @@ cli-highlight@^2.1.11: parse5-htmlparser2-tree-adapter "^6.0.0" yargs "^16.0.0" +cli-spinners@^2.2.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -551,6 +577,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -637,6 +668,11 @@ debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: dependencies: ms "2.1.2" +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -654,6 +690,13 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" @@ -1002,6 +1045,11 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +faker@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f" + integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8= + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -1066,6 +1114,14 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1106,7 +1162,7 @@ generate-function@^2.3.1: dependencies: is-property "^1.0.2" -get-caller-file@^2.0.5: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -1141,6 +1197,18 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.1.3: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" @@ -1434,6 +1502,11 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" @@ -1605,6 +1678,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -1620,6 +1700,13 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== + dependencies: + chalk "^2.4.2" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -1675,6 +1762,11 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -1712,6 +1804,11 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + mysql2@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079" @@ -1841,6 +1938,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + optionator@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" @@ -1853,6 +1957,20 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +ora@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05" + integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg== + dependencies: + chalk "^3.0.0" + cli-cursor "^3.1.0" + cli-spinners "^2.2.0" + is-interactive "^1.0.0" + log-symbols "^3.0.0" + mute-stream "0.0.8" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -1865,6 +1983,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -1872,11 +1997,23 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -1929,6 +2066,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -2094,7 +2236,7 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -reflect-metadata@^0.1.13: +reflect-metadata@0.1.13, reflect-metadata@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== @@ -2128,6 +2270,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -2148,6 +2295,14 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -2216,6 +2371,11 @@ seq-queue@^0.0.5: resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + sha.js@^2.4.11: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -2532,6 +2692,18 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeorm-seeding@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/typeorm-seeding/-/typeorm-seeding-1.6.1.tgz#4fe3a1aec9a611007d1135419cde286cced8defd" + integrity sha512-xJIW1pp72hv6npPqbQ7xDvawcDmS60EDUjK++UCfiqT0WE4xTzCn+QK1ZijLkD3GYCqFPuFt4nmeyRJn6VO2Vw== + dependencies: + chalk "^4.0.0" + faker "4.1.0" + glob "7.1.6" + ora "4.0.3" + reflect-metadata "0.1.13" + yargs "15.3.1" + typeorm@^0.2.38: version "0.2.38" resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.38.tgz#2af08079919f6ab04cd17017f9faa2c8d5cd566f" @@ -2635,6 +2807,13 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + dependencies: + defaults "^1.0.3" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -2646,6 +2825,11 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -2665,6 +2849,15 @@ word-wrap@^1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2707,6 +2900,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -2731,11 +2929,36 @@ yargonaut@^1.1.4: figlet "^1.1.1" parent-require "^1.0.0" +yargs-parser@^18.1.1: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs@15.3.1: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.1" + yargs@^16.0.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" From 15d1e6545b67cd4ca97e2d6d633260918966b217 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 10:19:13 +0100 Subject: [PATCH 1194/1843] user factory and seed --- database/package.json | 2 ++ database/src/factories/user.factory.ts | 26 ++++++++++++++++++++++++++ database/src/seeds/create-user.seed.ts | 8 ++++++++ database/yarn.lock | 10 ++++++++++ 4 files changed, 46 insertions(+) create mode 100644 database/src/factories/user.factory.ts create mode 100644 database/src/seeds/create-user.seed.ts diff --git a/database/package.json b/database/package.json index d69926340..ff238ee13 100644 --- a/database/package.json +++ b/database/package.json @@ -36,7 +36,9 @@ "typescript": "^4.3.5" }, "dependencies": { + "crypto": "^1.0.1", "dotenv": "^10.0.0", + "faker": "^5.5.3", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "ts-mysql-migrate": "^1.0.2", diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts new file mode 100644 index 000000000..7fbccbdb3 --- /dev/null +++ b/database/src/factories/user.factory.ts @@ -0,0 +1,26 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { User } from '../../entity/User' +import { randomBytes } from 'crypto' + +interface UserContext { + pubkey?: Buffer + email?: string + firstName?: string + lastName?: string + username?: string + disabled?: boolean +} + +define(User, (faker: typeof Faker, context: UserContext) => { + const user = new User() + + user.pubkey = context.pubkey ? context.pubkey : randomBytes(32) + user.email = context.email ? context.email : faker.internet.email() + user.firstName = context.firstName ? context.firstName : faker.name.firstName() + user.lastName = context.lastName ? context.lastName : faker.name.lastName() + user.username = context.username ? context.username : faker.internet.userName() + user.disabled = context.disabled ? context.disabled : false + + return user +}) diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts new file mode 100644 index 000000000..b95d1bbe3 --- /dev/null +++ b/database/src/seeds/create-user.seed.ts @@ -0,0 +1,8 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { User } from '../../entity/User' + +export class CreateUser implements Seeder { + public async run(factory: Factory): Promise { + await factory(User)().create() + } +} diff --git a/database/yarn.lock b/database/yarn.lock index 7ea8914c1..25b236371 100644 --- a/database/yarn.lock +++ b/database/yarn.lock @@ -647,6 +647,11 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== +crypto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037" + integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig== + debug@^2.2.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1050,6 +1055,11 @@ faker@4.1.0: resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f" integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8= +faker@^5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" + integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" From d8def24e0c2f87a6973e3298a184a9b8e7c82867 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 18 Nov 2021 10:28:54 +0100 Subject: [PATCH 1195/1843] Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined. --- backend/src/graphql/resolver/UserResolver.ts | 2 +- backend/src/typeorm/repository/UserSettingRepository.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 5c4625938..b10876d46 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -537,7 +537,7 @@ export class UserResolver { await queryRunner.startTransaction('READ UNCOMMITTED') try { - if (coinanimation) { + if (coinanimation !== undefined) { queryRunner.manager .getCustomRepository(UserSettingRepository) .setOrUpdate(userEntity.id, Setting.COIN_ANIMATION, coinanimation.toString()) diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index 80c44802b..7ec7ed3dd 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -18,7 +18,7 @@ export class UserSettingRepository extends Repository { let entity = await this.findOne({ userId: userId, key: key }) if (!entity) { - entity = new UserSetting() + entity = this.create() entity.userId = userId entity.key = key } From 0b3ead83691c3454dc684239b946469ae1f2deef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 19:17:51 +0100 Subject: [PATCH 1196/1843] simple seed is working --- database/.env.dist | 4 +++- database/ormconfig.js | 15 +++++++++++++++ database/package.json | 4 +++- database/src/factories/user.factory.ts | 5 +++-- database/src/index.ts | 9 +++++++++ database/src/seeds/create-user.seed.ts | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 database/ormconfig.js diff --git a/database/.env.dist b/database/.env.dist index 8488fb1bf..644dcaaf4 100644 --- a/database/.env.dist +++ b/database/.env.dist @@ -4,4 +4,6 @@ DB_USER=root DB_PASSWORD= DB_DATABASE=gradido_community MIGRATIONS_TABLE=migrations -MIGRATIONS_DIRECTORY=./migrations/ \ No newline at end of file +MIGRATIONS_DIRECTORY=./migrations/ + +TYPEORM_SEEDING_FACTORIES=src/factories/**/*{.ts,.js} diff --git a/database/ormconfig.js b/database/ormconfig.js new file mode 100644 index 000000000..71e444061 --- /dev/null +++ b/database/ormconfig.js @@ -0,0 +1,15 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ + +const CONFIG = require('./src/config') + +module.export = { + name: 'default', + type: 'mysql', + host: CONFIG.DB_HOST, + port: CONFIG.DB_PORT, + username: CONFIG.DB_USER, + password: CONFIG.DB_PASSWORD, + database: CONFIG.DB_DATABASE, + seeds: ['src/seeds/**/*{.ts,.js}'], + factories: ['src/factories/**/*{.ts,.js}'], +} diff --git a/database/package.json b/database/package.json index ff238ee13..a84026e6a 100644 --- a/database/package.json +++ b/database/package.json @@ -16,7 +16,9 @@ "dev_up": "nodemon -w ./ --ext ts --exec ts-node src/index.ts up", "dev_down": "nodemon -w ./ --ext ts --exec ts-node src/index.ts down", "dev_reset": "nodemon -w ./ --ext ts --exec ts-node src/index.ts reset", - "lint": "eslint . --ext .js,.ts" + "lint": "eslint . --ext .js,.ts", + "seed:config": "ts-node ./node_modules/typeorm-seeding/dist/cli.js config", + "seed": "nodemon -w ./ --ext ts --exec ts-node src/index.ts seed" }, "devDependencies": { "@types/faker": "^5.5.9", diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts index 7fbccbdb3..5f9bb420b 100644 --- a/database/src/factories/user.factory.ts +++ b/database/src/factories/user.factory.ts @@ -12,9 +12,10 @@ interface UserContext { disabled?: boolean } -define(User, (faker: typeof Faker, context: UserContext) => { - const user = new User() +define(User, (faker: typeof Faker, context?: UserContext) => { + if (!context) context = {} + const user = new User() user.pubkey = context.pubkey ? context.pubkey : randomBytes(32) user.email = context.email ? context.email : faker.internet.email() user.firstName = context.firstName ? context.firstName : faker.name.firstName() diff --git a/database/src/index.ts b/database/src/index.ts index 2492a1306..9341b3d45 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -4,6 +4,8 @@ import { Migration } from 'ts-mysql-migrate' import CONFIG from './config' import prepare from './prepare' import connection from './typeorm/connection' +import { useSeeding, runSeeder } from 'typeorm-seeding' +import { CreateUserSeed } from './seeds/create-user.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -47,6 +49,13 @@ const run = async (command: string) => { case 'reset': await migration.reset() // use for resetting database break + case 'seed': + await useSeeding({ + root: process.cwd(), + configName: 'ormconfig.js', + }) + await runSeeder(CreateUserSeed) + break default: throw new Error(`Unsupported command ${command}`) } diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts index b95d1bbe3..a6de48a0c 100644 --- a/database/src/seeds/create-user.seed.ts +++ b/database/src/seeds/create-user.seed.ts @@ -1,7 +1,7 @@ import { Factory, Seeder } from 'typeorm-seeding' import { User } from '../../entity/User' -export class CreateUser implements Seeder { +export class CreateUserSeed implements Seeder { public async run(factory: Factory): Promise { await factory(User)().create() } From 2aba37e60c5a76d749a66bd62e94f2d2aa630b8a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 01:00:55 +0100 Subject: [PATCH 1197/1843] replace map with foreach since we don't need a return - thanks moriz --- backend/src/webhook/elopage.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 945a2a24c..10dc35b61 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -37,7 +37,7 @@ export const elopageWebhook = async (req: any, res: any): Promise => { let firstName = '' let lastName = '' const entries = req.body.split('&') - entries.map((entry: string) => { + entries.foreach((entry: string) => { const keyVal = entry.split('=') if (keyVal.length !== 2) { throw new Error(`Error parsing entry '${entry}'`) @@ -90,7 +90,6 @@ export const elopageWebhook = async (req: any, res: any): Promise => { // eslint-disable-next-line no-console console.log(`Unknown Elopage Value '${entry}'`) } - return null // we write things into the loginElopgaeBuy object, no return value needed }) // Do not process certain events From a44a3ee6d06df5bf6dc465680791e71a0d2df553 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 01:08:53 +0100 Subject: [PATCH 1198/1843] make language an optional parameter for createUser and do not set it on the elopage webhook --- backend/src/graphql/arg/CreateUserArgs.ts | 2 +- backend/src/graphql/resolver/UserResolver.ts | 2 +- backend/src/webhook/elopage.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/arg/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts index 3d09e56eb..906e14aed 100644 --- a/backend/src/graphql/arg/CreateUserArgs.ts +++ b/backend/src/graphql/arg/CreateUserArgs.ts @@ -15,7 +15,7 @@ export default class CreateUserArgs { password: string @Field(() => String) - language: string + language?: string @Field(() => Int, { nullable: true }) publisherId: number diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 888a1aa00..ba71fef7a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -280,7 +280,7 @@ export class UserResolver { // default int publisher_id = 0; // Validate Language (no throw) - if (!isLanguage(language)) { + if (!language || !isLanguage(language)) { language = DEFAULT_LANGUAGE } diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 10dc35b61..fb25e9068 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -150,7 +150,6 @@ export const elopageWebhook = async (req: any, res: any): Promise => { firstName, lastName, password, - language: 'default', publisherId: loginElopgaeBuy.publisherId, }) } catch (error) { From ad82cda48933929c7b13188ac998acbe6cd1cbf6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 01:12:01 +0100 Subject: [PATCH 1199/1843] remove unused fields comments to reduce file lengrh --- backend/src/webhook/elopage.ts | 208 --------------------------------- 1 file changed, 208 deletions(-) diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index fb25e9068..62af89f2f 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -158,211 +158,3 @@ export const elopageWebhook = async (req: any, res: any): Promise => { } } } - -/* -Known unused fields: - - order_token=y22MJxHr9XzzPiaaH9GU - payment_session_id=849951 - payment_session_token=y22MJxHr9XzzPiaaH9GU - action=payment_processed - initiator - payer[first_name]=Theodora - payer[last_name]=Mis - payer[country]=Schweiz - payer[country_code]=CH - payer[city]=St.+Gallen - payer[street]=Vonwilstrasse+23 - payer[street_number] - payer[zip]=9000 - payer[company] - payer[vat_no] - payer[phone] - gift_receiver - publisher[first_name]=Bernd - publisher[last_name]=H%C3%BCckst%C3%A4dt - publisher[street]=Pfarrweg+2 - publisher[zip]=74653 - publisher[city]=K%C3%BCnzelsau - publisher[country]=Deutschland - publisher[phone]=%2B4979405460810 - team_members - product[id]=43944 - product[slug]=gold-de - product[name]=Gold-Mitgliedschaft - product[type]=membership - upsell - membership[name]=Gold-Mitgliedschaft - membership[membership_product_1]=Werkzeuge+%26+Ressourcen+%28Gold%29 - membership[membership_product_1_id]=44982 - membership[membership_product_2]=Zertifizierung+zum%2Fr+Gradido-Botschafter%2Fin - membership[membership_product_2_id]=43970 - membership[membership_product_3]=Seminar+3+Nat%C3%BCrliche+%C3%96konomie+des+Lebens - membership[membership_product_3_id]=43969 - membership[membership_product_4]=Potential-Entfaltungs-Techniken - membership[membership_product_4_id]=43954 - membership[membership_product_5]=Seminar+2+Nat%C3%BCrliche+%C3%96konomie+des+Lebens - membership[membership_product_5_id]=43896 - membership[membership_product_6]=Kongresspaket%3A+Gesundes+Geld+f%C3%BCr+eine+gesunde+Welt - membership[membership_product_6_id]=14590 - membership[membership_product_7]=Deine+Gold-Mitgliedschaft+bei+Gradido - membership[membership_product_7_id]=43951 - membership[membership_product_8]=Gradido+E-Book%2C+H%C3%B6rspiel+%22Joytopia%22++%E2%80%93+und+100+Vorteile - membership[membership_product_8_id]=7312 - membership[membership_product_9]=Danke%2C+dass+Du+hilfst+Gradido+in+die+Welt+zu+bringen%21 - membership[membership_product_9_id]=43744 - membership[membership_product_10]=Basis-Informationen+zu+Gradido - membership[membership_product_10_id]=42600 - membership[membership_product_11]=Seminar+1+Nat%C3%BCrliche+%C3%96konomie+des+Lebens - membership[membership_product_11_id]=43882 - membership[membership_product_12]=Musical+%22Gradido+%E2%80%93+gemeinsam+retten+wir+die+Welt%22 - membership[membership_product_12_id]=43886 - membership[membership_product_13]=Premium+Community+%26+Markt - membership[membership_product_13_id]=43885 - membership[membership_product_14]=Gradido+Buch+ungek%C3%BCrzte+Version+%26+%C3%9Cbersetzungen - membership[membership_product_14_id]=43887 - membership[membership_product_15]=Online-Konferenzen - membership[membership_product_15_id]=43919 - membership[membership_product_16]=Gradido+H%C3%B6rbuch - membership[membership_product_16_id]=43920 - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - events[] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - tickets[][codes] - tickets[][ticket_attendees] - pricing_plan[name]=Monatlich - add_id_1 - add_id_2 - campaign_id - currency=EUR - coupon_code - recurring=yes - recurring_form=subscription - payment_method=sepa - opt_ins - payments_schedule[][rate]=1 - payments_schedule[][state]=debt - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.10.2019 - payments_schedule[][rate]=2 - payments_schedule[][state]=paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.11.2019 - payments_schedule[][rate]=3 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.12.2019 - payments_schedule[][rate]=4 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.01.2020 - payments_schedule[][rate]=5 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.02.2020 - payments_schedule[][rate]=6 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.03.2020 - payments_schedule[][rate]=7 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.04.2020 - payments_schedule[][rate]=8 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.05.2020 - payments_schedule[][rate]=9 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.06.2020 - payments_schedule[][rate]=10 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.07.2020 - payments_schedule[][rate]=11 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.08.2020 - payments_schedule[][rate]=12 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.09.2020 - payments_schedule[][rate]=13 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=40.0 - payments_schedule[][date]=29.10.2020 - payments_schedule[][rate]=14 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=0.0 - payments_schedule[][date]=29.11.2020 - payments_schedule[][rate]=15 - payments_schedule[][state]=to_be_paid - payments_schedule[][amount]=0.0 - payments_schedule[][date]=29.12.2020 - payments_count=1&payments_count_expected - with_test_period=false - with_custom_start=false - created=29.10.2019+13%3A17 - id=57354055 - invoice_number=111-1839-000000677 - revenue=40.0 - amount=23.72 - fee=16.28 - vat_rate=0.0 - vat_amount=0.0 - state=successful - refunded_transfer_id - invoice_link=http%3A%2F%2Felopage.com%2Fcommon%2Finvoices%2F450856%2Fdownload.pdf%3Ftoken%3DGR7bG7zcbgCzNJEPLDss - credit_memo_link - success_link=http%3A%2F%2Felopage.com%2Fs%2Fgradido%2Fpayment%2Fy22MJxHr9XzzPiaaH9GU - error_msg - created_date=2019-11-29T07%3A19Z - success_date_short=2019-12-06 - created_date_utc=29.11.2019+07%3A19 - success_date_utc=06.12.2019+13%3A12 - team_member_commissions -*/ From f6f6314eb170358c23b2a6f41bf5239c19edb062 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 01:22:24 +0100 Subject: [PATCH 1200/1843] save price as integer --- backend/src/webhook/elopage.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 62af89f2f..da9d1a171 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -58,8 +58,8 @@ export const elopageWebhook = async (req: any, res: any): Promise => { loginElopgaeBuy.productId = parseInt(val) break case 'product[price]': - // TODO: static_cast(round(stof(temp) * 100.0f)); - loginElopgaeBuy.productPrice = parseFloat(val) + // TODO: WHAT THE ACTUAL FUK? Please save this as float in the future directly in the database + loginElopgaeBuy.productPrice = Math.trunc(parseFloat(val) * 100) break case 'payer[email]': loginElopgaeBuy.payerEmail = val From a6e4e84c9bc484bccc3dbc2fcfcb0310a3da1aab Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 01:51:13 +0100 Subject: [PATCH 1201/1843] do not generate a password for a user, but change the process to set the password later. --- backend/src/graphql/arg/CreateUserArgs.ts | 5 +- backend/src/graphql/resolver/UserResolver.ts | 54 +++++++++++--------- backend/src/webhook/elopage.ts | 6 --- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/backend/src/graphql/arg/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts index 906e14aed..0d63e76bb 100644 --- a/backend/src/graphql/arg/CreateUserArgs.ts +++ b/backend/src/graphql/arg/CreateUserArgs.ts @@ -12,10 +12,7 @@ export default class CreateUserArgs { lastName: string @Field(() => String) - password: string - - @Field(() => String) - language?: string + language?: string // Will default to DEFAULT_LANGUAGE @Field(() => Int, { nullable: true }) publisherId: number diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ba71fef7a..471ca7384 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -274,7 +274,7 @@ export class UserResolver { @Mutation(() => String) async createUser( - @Args() { email, firstName, lastName, password, language, publisherId }: CreateUserArgs, + @Args() { email, firstName, lastName, language, publisherId }: CreateUserArgs, ): Promise { // TODO: wrong default value (should be null), how does graphql work here? Is it an required field? // default int publisher_id = 0; @@ -284,12 +284,13 @@ export class UserResolver { language = DEFAULT_LANGUAGE } + // TODO: Register process // Validate Password - if (!isPassword(password)) { - throw new Error( - 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', - ) - } + // if (!isPassword(password)) { + // throw new Error( + // 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', + // ) + // } // Validate username // TODO: never true @@ -307,11 +308,13 @@ export class UserResolver { throw new Error(`User already exists.`) } - const passphrase = PassphraseGenerate() - const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key - const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash + // TODO: Register process + // const passphrase = PassphraseGenerate() + // const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key + // const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash + // const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) + const emailHash = getEmailHash(email) - const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) // Table: login_users const loginUser = new LoginUser() @@ -320,13 +323,15 @@ export class UserResolver { loginUser.lastName = lastName loginUser.username = username loginUser.description = '' - loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash + // TODO: Register process + // loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash loginUser.emailHash = emailHash loginUser.language = language loginUser.groupId = 1 loginUser.publisherId = publisherId - loginUser.pubKey = keyPair[0] - loginUser.privKey = encryptedPrivkey + // TODO: Register process + // loginUser.pubKey = keyPair[0] + // loginUser.privKey = encryptedPrivkey const queryRunner = getConnection().createQueryRunner() await queryRunner.connect() @@ -338,21 +343,24 @@ export class UserResolver { throw new Error('insert user failed') }) + // TODO: Register process // Table: login_user_backups - const loginUserBackup = new LoginUserBackup() - loginUserBackup.userId = loginUserId - loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space - loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; + // const loginUserBackup = new LoginUserBackup() + // loginUserBackup.userId = loginUserId + // loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space + // loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - await queryRunner.manager.save(loginUserBackup).catch((error) => { - // eslint-disable-next-line no-console - console.log('insert LoginUserBackup failed', error) - throw new Error('insert user backup failed') - }) + // TODO: Register process + // await queryRunner.manager.save(loginUserBackup).catch((error) => { + // // eslint-disable-next-line no-console + // console.log('insert LoginUserBackup failed', error) + // throw new Error('insert user backup failed') + // }) // Table: state_users const dbUser = new DbUser() - dbUser.pubkey = keyPair[0] + // TODO: Register process + // dbUser.pubkey = keyPair[0] dbUser.email = email dbUser.firstName = firstName dbUser.lastName = lastName diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index da9d1a171..90cdb159f 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -138,18 +138,12 @@ export const elopageWebhook = async (req: any, res: any): Promise => { return } - // generate a random password - 8 random bytes, the email, special char, capital & small letter, number and another set of 8 random bytes - // TODO: The user will be forced to reset his password - how was this done before? - const password = - randomBytes(8).toString('hex') + email + '!aA1' + randomBytes(8).toString('hex') - const userResolver = new UserResolver() try { await userResolver.createUser({ email, firstName, lastName, - password, publisherId: loginElopgaeBuy.publisherId, }) } catch (error) { From 686f9bfd4e6aeaaad9be451ddcdcf04f54e3cbe5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 19 Nov 2021 11:14:16 +0100 Subject: [PATCH 1202/1843] admin area extended according to concept and functions added and improved. workflow stands for the mass creation and for the confirmation of creations. all changes made which were indicated by moritz. all translations will be done in one step at a later date. --- admin/package.json | 3 +- admin/src/App.vue | 3 + admin/src/components/CreationFormular.spec.js | 8 +- admin/src/components/CreationFormular.vue | 201 +++++++++++++---- admin/src/components/Footer.vue | 10 + admin/src/components/NavBar.spec.js | 4 +- admin/src/components/NavBar.vue | 18 +- admin/src/components/UserTable.spec.js | 4 +- admin/src/components/UserTable.vue | 208 ++++++++++++++---- admin/src/store/store.js | 22 ++ admin/src/views/Creation.vue | 109 ++++----- admin/src/views/CreationConfirm.vue | 48 ++-- admin/src/views/Overview.vue | 31 ++- admin/yarn.lock | 13 ++ 14 files changed, 497 insertions(+), 185 deletions(-) create mode 100644 admin/src/components/Footer.vue diff --git a/admin/package.json b/admin/package.json index 5dff9145e..f3ba786bc 100644 --- a/admin/package.json +++ b/admin/package.json @@ -41,7 +41,8 @@ "vue-jest": "^3.0.7", "vue-moment": "^4.1.0", "vue-router": "^3.5.3", - "vuex": "^3.6.2" + "vuex": "^3.6.2", + "vuex-persistedstate": "^4.1.0" }, "devDependencies": { "@babel/eslint-parser": "^7.15.8", diff --git a/admin/src/App.vue b/admin/src/App.vue index 1a15d5d7c..70bc2978a 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -2,15 +2,18 @@
+
diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index c2098768c..9f4fc3f1b 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -3,11 +3,13 @@ import CreationFormular from './CreationFormular.vue' const localVue = global.localVue +const mocks = { $moment: jest.fn() } + describe('CreationFormular', () => { let wrapper const Wrapper = () => { - return mount(CreationFormular, { localVue }) + return mount(CreationFormular, { localVue, mocks }) } describe('mount', () => { @@ -15,8 +17,8 @@ describe('CreationFormular', () => { wrapper = Wrapper() }) - it('have a DIV element with the class.componente-creation-formular', () => { - expect(wrapper.find('.componente-creation-formular').exists()).toBeTruthy() + it('has a DIV element with the class.component-creation-formular', () => { + expect(wrapper.find('.component-creation-formular').exists()).toBeTruthy() }) }) }) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index dbc40c13c..995640c72 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -1,72 +1,108 @@ From 03e5df5ece7dd4984b062644f59e853621d876bf Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 19 Nov 2021 21:26:12 +0100 Subject: [PATCH 1283/1843] convenience mode to disable the auth mode for development --- admin/.env.dist | 3 ++- admin/src/App.vue | 8 +++++++- admin/src/config/index.js | 5 +++++ admin/src/router/guards.js | 14 +++++++++----- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/admin/.env.dist b/admin/.env.dist index a056837ab..6d78e6782 100644 --- a/admin/.env.dist +++ b/admin/.env.dist @@ -1,2 +1,3 @@ GRAPHQL_URI=http://localhost:4000/graphql -WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1 \ No newline at end of file +WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1 +DEBUG_DISABLE_AUTH=false \ No newline at end of file diff --git a/admin/src/App.vue b/admin/src/App.vue index 40460eda4..7c3dd8514 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,15 +1,21 @@ diff --git a/admin/src/config/index.js b/admin/src/config/index.js index 1ef44fe60..236274d1f 100644 --- a/admin/src/config/index.js +++ b/admin/src/config/index.js @@ -23,6 +23,10 @@ const endpoints = { WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1' } +const debug = { + DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false +} + const options = {} const CONFIG = { @@ -30,6 +34,7 @@ const CONFIG = { ...environment, ...endpoints, ...options, + ...debug, } export default CONFIG diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js index 6207f443e..a8bdaa2e2 100644 --- a/admin/src/router/guards.js +++ b/admin/src/router/guards.js @@ -1,5 +1,7 @@ +import CONFIG from "../config" + const addNavigationGuards = (router, store) => { - // store token on authenticate + // store token on `authenticate` router.beforeEach((to, from, next) => { if (to.path === '/authenticate' && to.query.token) { store.commit('token',to.query.token) @@ -9,11 +11,13 @@ const addNavigationGuards = (router, store) => { } }) - // protect all routes but not-found + // protect all routes but `not-found` router.beforeEach((to, from, next) => { - console.log('protect', to.path, from.path) - // handle authentication - if (!store.state.token && to.path !== '/not-found' && to.path !== '/logout') { + if (!CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes + !store.state.token && // we do not have a token + to.path !== '/not-found' && // we are not on `not-found` + to.path !== '/logout') { // we are not on `logout` + console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout') next({ path: '/not-found' }) } else { next() From c3801f37ab00a144bb2c82195510566287b00ca3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:30:05 +0100 Subject: [PATCH 1284/1843] corrected ports --- admin/src/config/index.js | 2 +- frontend/src/config/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/config/index.js b/admin/src/config/index.js index 236274d1f..9f33b59cb 100644 --- a/admin/src/config/index.js +++ b/admin/src/config/index.js @@ -20,7 +20,7 @@ const environment = { const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', // TODO port - WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost:3000/vue/authenticate?token=$1' + WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1' } const debug = { diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 01c6c009a..0f8e58c1c 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -21,7 +21,7 @@ const environment = { const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', // TODO port - ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost:8080/admin/authenticate?token=$1' + ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1' } const options = {} From 41d6a7ba45659f5f129ea0a31a30d927f71f37a2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:30:22 +0100 Subject: [PATCH 1285/1843] implemented `isAdmin` from backend --- backend/src/graphql/model/User.ts | 4 +++ backend/src/graphql/resolver/UserResolver.ts | 31 ++++++++++++++++++++ frontend/src/graphql/queries.js | 1 + frontend/src/store/store.js | 7 ++++- 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index 5b7682e01..33dce434b 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -20,6 +20,7 @@ export class User { this.pubkey = json.public_hex this.language = json.language this.publisherId = json.publisher_id + this.isAdmin = json.isAdmin } } @@ -71,6 +72,9 @@ export class User { @Field(() => Int, { nullable: true }) publisherId?: number + @Field(() => Boolean) + isAdmin: boolean + @Field(() => Boolean) coinanimation: boolean diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 25f83bb09..1fd441935 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -194,6 +194,36 @@ const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: B @Resolver() export class UserResolver { + /* + @Authorized() + @Query(() => User) + async verifyLogin(@Ctx() context: any): Promise { + const loginUserRepository = getCustomRepository(LoginUserRepository) + loginUser = loginUserRepository.findByPubkeyHex() + const user = new User(result.data.user) + + this.email = json.email + this.firstName = json.first_name + this.lastName = json.last_name + this.username = json.username + this.description = json.description + this.pubkey = json.public_hex + this.language = json.language + this.publisherId = json.publisher_id + this.isAdmin = json.isAdmin + + const userSettingRepository = getCustomRepository(UserSettingRepository) + const coinanimation = await userSettingRepository + .readBoolean(userEntity.id, Setting.COIN_ANIMATION) + .catch((error) => { + throw new Error(error) + }) + user.coinanimation = coinanimation + user.isAdmin = true // TODO implement + return user + } + */ + @Query(() => User) @UseMiddleware(klicktippNewsletterStateMiddleware) async login( @@ -265,6 +295,7 @@ export class UserResolver { throw new Error(error) }) user.coinanimation = coinanimation + user.isAdmin = true // TODO implement context.setHeaders.push({ key: 'token', diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 01021f601..9cd364ed7 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -15,6 +15,7 @@ export const login = gql` } hasElopage publisherId + isAdmin } } ` diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 1173a8685..c49197059 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -34,6 +34,9 @@ export const mutations = { if (isNaN(pubId)) pubId = null state.publisherId = pubId }, + isAdmin: (state, isAdmin) => { + state.isAdmin = !!isAdmin + }, community: (state, community) => { state.community = community }, @@ -57,6 +60,7 @@ export const actions = { commit('newsletterState', data.klickTipp.newsletterState) commit('hasElopage', data.hasElopage) commit('publisherId', data.publisherId) + commit('isAdmin', data.isAdmin) }, logout: ({ commit, state }) => { commit('token', null) @@ -69,6 +73,7 @@ export const actions = { commit('newsletterState', null) commit('hasElopage', false) commit('publisherId', null) + commit('isAdmin', false) localStorage.clear() }, } @@ -87,7 +92,7 @@ export const store = new Vuex.Store({ username: '', description: '', token: null, - isAdmin: true, // TODO implement this properly + isAdmin: false, coinanimation: true, newsletterState: null, community: { From f21587ae3abb1ed8125d4de277bfbef990047176 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:37:25 +0100 Subject: [PATCH 1286/1843] frontend lint --- frontend/src/components/SidebarPlugin/SideBar.vue | 2 +- frontend/src/config/index.js | 3 +-- frontend/src/routes/guards.js | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index d8b26318f..8277b17eb 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -122,7 +122,7 @@ export default { this.$emit('logout') }, admin() { - window.location = CONFIG.ADMIN_AUTH_URL.replace('$1',this.$store.state.token) + window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token) this.$store.dispatch('logout') // logout without redirect }, getElopageLink() { diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 0f8e58c1c..b3a9366b7 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -20,8 +20,7 @@ const environment = { const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', - // TODO port - ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1' + ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1', } const options = {} diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js index bb55ba0cf..005ed720f 100644 --- a/frontend/src/routes/guards.js +++ b/frontend/src/routes/guards.js @@ -11,16 +11,15 @@ const addNavigationGuards = (router, store) => { // store token on authenticate router.beforeEach((to, from, next) => { - console.log('token', to.path, from.path, to.query) if (to.path === '/authenticate' && to.query.token) { - console.log('token', to.query.token, to) - store.commit('token',to.query.token) - next({path: '/overview'}) + // TODO verify user in order to get user data + store.commit('token', to.query.token) + next({ path: '/overview' }) } else { next() } }) - + // handle authentication router.beforeEach((to, from, next) => { if (to.meta.requiresAuth && !store.state.token) { From 84684fe51f3cae31c3d3bb7384c500de54037276 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:40:38 +0100 Subject: [PATCH 1287/1843] lint admin --- admin/src/App.vue | 4 ++-- admin/src/components/NavBar.vue | 4 ++-- admin/src/config/index.js | 5 ++--- admin/src/layouts/defaultLayout.vue | 2 +- admin/src/router/guards.js | 18 ++++++++++-------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/admin/src/App.vue b/admin/src/App.vue index 7c3dd8514..359b63b3a 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -14,8 +14,8 @@ export default { components: { defaultLayout }, data() { return { - showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token + showLayout: CONFIG.DEBUG_DISABLE_AUTH || this.$store.state.token, } - } + }, } diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 260c066b3..6fb0cb31f 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -50,9 +50,9 @@ export default { this.$router.push('/logout') }, wallet() { - window.location = CONFIG.WALLET_AUTH_URL.replace('$1',this.$store.state.token) + window.location = CONFIG.WALLET_AUTH_URL.replace('$1', this.$store.state.token) this.$store.dispatch('logout') // logout without redirect }, - } + }, } diff --git a/admin/src/config/index.js b/admin/src/config/index.js index 9f33b59cb..69d30a66a 100644 --- a/admin/src/config/index.js +++ b/admin/src/config/index.js @@ -19,12 +19,11 @@ const environment = { const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql', - // TODO port - WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1' + WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1', } const debug = { - DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false + DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false, } const options = {} diff --git a/admin/src/layouts/defaultLayout.vue b/admin/src/layouts/defaultLayout.vue index 71d2f894b..4f6cbbe4d 100644 --- a/admin/src/layouts/defaultLayout.vue +++ b/admin/src/layouts/defaultLayout.vue @@ -16,4 +16,4 @@ export default { FooTer, }, } - \ No newline at end of file + diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js index a8bdaa2e2..f6d8058aa 100644 --- a/admin/src/router/guards.js +++ b/admin/src/router/guards.js @@ -1,11 +1,12 @@ -import CONFIG from "../config" +import CONFIG from '../config' const addNavigationGuards = (router, store) => { // store token on `authenticate` router.beforeEach((to, from, next) => { if (to.path === '/authenticate' && to.query.token) { - store.commit('token',to.query.token) - next({path: '/'}) + // TODO verify user to get user data + store.commit('token', to.query.token) + next({ path: '/' }) } else { next() } @@ -13,11 +14,12 @@ const addNavigationGuards = (router, store) => { // protect all routes but `not-found` router.beforeEach((to, from, next) => { - if (!CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes - !store.state.token && // we do not have a token - to.path !== '/not-found' && // we are not on `not-found` - to.path !== '/logout') { // we are not on `logout` - console.log(!CONFIG.DEBUG_DISABLE_AUTH,!store.state.token,to.path !== '/not-found',to.path !== '/logout') + if ( + !CONFIG.DEBUG_DISABLE_AUTH && // we did not disabled the auth module for debug purposes + !store.state.token && // we do not have a token + to.path !== '/not-found' && // we are not on `not-found` + to.path !== '/logout' // we are not on `logout` + ) { next({ path: '/not-found' }) } else { next() From 47bce06f95d74a851e1e69e22eda90466f77a1ce Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:48:10 +0100 Subject: [PATCH 1288/1843] properly handle auth shortcut in oder to not break layout on logout --- admin/src/App.vue | 8 +------- admin/src/store/store.js | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/admin/src/App.vue b/admin/src/App.vue index 359b63b3a..40460eda4 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,21 +1,15 @@ diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 4df9f6f39..7820296c6 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -1,6 +1,7 @@ import Vuex from 'vuex' import Vue from 'vue' import createPersistedState from 'vuex-persistedstate' +import CONFIG from '../config' Vue.use(Vuex) @@ -33,7 +34,7 @@ const store = new Vuex.Store({ }), ], state: { - token: null, + token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null, moderator: 'Dertest Moderator', openCreations: 0, }, From c8d188279fe0995671cb96bdf6d2f0cc6a9f6518 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:51:21 +0100 Subject: [PATCH 1289/1843] add infos about jq software requirement --- frontend/README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/README.md b/frontend/README.md index e9ac0b097..f7c60552c 100755 --- a/frontend/README.md +++ b/frontend/README.md @@ -385,4 +385,13 @@ TODO: Update GDT-Server um paging und Zugriff auf alle Einträge zu erhalten, op GET https://staging.gradido.net/state-balances/ajaxGdtTransactions Liefert wenn alles in Ordnung ist: -wenn nicht type 7 dann "amount" in euro ansonsten in GDT \ No newline at end of file +wenn nicht type 7 dann "amount" in euro ansonsten in GDT + +## Additional Software + +For `yarn locales` you will need `jq` to use it. +You can install it (on arch) via + +``` +sudo pacman -S jq +``` \ No newline at end of file From 024eb306127b6c8efebacef9bccdd1363e56c3b1 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 16:51:45 +0100 Subject: [PATCH 1290/1843] fixed locales --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3f981450d..b0dfe36d4 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,4 +1,5 @@ { + "admin_area": "Adminbereich", "back": "Zurück", "community": { "choose-another-community": "Eine andere Gemeinschaft auswählen", @@ -110,7 +111,6 @@ "login": "Anmeldung", "logout": "Abmelden", "members_area": "Mitgliederbereich", - "admin_area": "Adminbereich", "message": "hallo gradido !!", "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 08c29d646..135729ffa 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1,4 +1,5 @@ { + "admin_area": "Admin's area", "back": "Back", "community": { "choose-another-community": "Choose another community", @@ -110,7 +111,6 @@ "login": "Login", "logout": "Logout", "members_area": "Member's area", - "admin_area": "Admin's area", "message": "hello gradido !!", "overview": "Overview", "privacy_policy": "Privacy policy", From b2bb67ab9c04a570cc780f94fd7fa4cf45d4c4a2 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 20 Nov 2021 17:01:28 +0100 Subject: [PATCH 1291/1843] fix tests --- frontend/src/routes/guards.test.js | 2 +- frontend/src/routes/router.test.js | 4 ++-- frontend/src/store/store.test.js | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js index cf366eac8..f271c5427 100644 --- a/frontend/src/routes/guards.test.js +++ b/frontend/src/routes/guards.test.js @@ -30,7 +30,7 @@ describe('navigation guards', () => { }) describe('authorization', () => { - const navGuard = router.beforeHooks[0] + const navGuard = router.beforeHooks[2] const next = jest.fn() it('redirects to login when not authorized', () => { diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index df4f9c229..cd26b6f6b 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -49,8 +49,8 @@ describe('router', () => { expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' }) }) - it('has fourteen routes defined', () => { - expect(routes).toHaveLength(14) + it('has fifteen routes defined', () => { + expect(routes).toHaveLength(15) }) describe('overview', () => { diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index bdb98d03b..829678b44 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -148,11 +148,12 @@ describe('Vuex store', () => { }, hasElopage: false, publisherId: 1234, + isAdmin: true, } - it('calls ten commits', () => { + it('calls eleven commits', () => { login({ commit, state }, commitedData) - expect(commit).toHaveBeenCalledTimes(10) + expect(commit).toHaveBeenCalledTimes(11) }) it('commits email', () => { @@ -204,15 +205,20 @@ describe('Vuex store', () => { login({ commit, state }, commitedData) expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', 1234) }) + + it('commits isAdmin', () => { + login({ commit, state }, commitedData) + expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', true) + }) }) describe('logout', () => { const commit = jest.fn() const state = {} - it('calls ten commits', () => { + it('calls eleven commits', () => { logout({ commit, state }) - expect(commit).toHaveBeenCalledTimes(10) + expect(commit).toHaveBeenCalledTimes(11) }) it('commits token', () => { @@ -265,6 +271,11 @@ describe('Vuex store', () => { expect(commit).toHaveBeenNthCalledWith(10, 'publisherId', null) }) + it('commits isAdmin', () => { + logout({ commit, state }) + expect(commit).toHaveBeenNthCalledWith(11, 'isAdmin', false) + }) + // how to get this working? it.skip('calls localStorage.clear()', () => { const clearStorageMock = jest.fn() From c1381da2407d43f05b38daabe245a268d7b49aa4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 22 Nov 2021 17:51:09 +0100 Subject: [PATCH 1292/1843] test admin link, correct pointer class --- .../components/SidebarPlugin/SideBar.spec.js | 28 +++++++++++++++++++ .../src/components/SidebarPlugin/SideBar.vue | 6 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js index 8204eb604..0a3b0ec1a 100644 --- a/frontend/src/components/SidebarPlugin/SideBar.spec.js +++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js @@ -24,6 +24,7 @@ describe('SideBar', () => { hasElopage: false, }, commit: jest.fn(), + dispatch: jest.fn(), }, $i18n: { locale: 'en', @@ -154,6 +155,33 @@ describe('SideBar', () => { expect(wrapper.emitted('logout')).toEqual([[]]) }) }) + + describe('admin-area', () => { + it('is not visible when not an admin', () => { + expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area') + }) + describe('logged in as admin', () => { + const assignLocationSpy = jest.fn() + beforeEach(() => { + mocks.$store.state.isAdmin = true + mocks.$store.state.token = 'valid token' + // const { location } = window; + delete window.location + window.location = {} + Object.defineProperty(window, 'location', assignLocationSpy) + wrapper = Wrapper() + }) + + it('is visible', () => { + expect(wrapper.findAll('li').at(1).text()).toBe('admin_area') + }) + it.skip('opens a new window when clicked', async () => { + wrapper.findAll('li').at(1).find('a').trigger('click') + await wrapper.vm.$nextTick() + expect(assignLocationSpy).toHaveBeenCalledWith('peter') + }) + }) + }) }) }) }) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 8277b17eb..9cf6b6185 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -50,14 +50,14 @@ -
    +
    • - + {{ $t('admin_area') }}
      • From 599eaf495a62da460c89794adbd3d7b26394b9ea Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 12:16:18 +0100 Subject: [PATCH 1293/1843] test window location assign --- .../src/components/SidebarPlugin/SideBar.spec.js | 15 ++++++++------- frontend/src/components/SidebarPlugin/SideBar.vue | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js index 0a3b0ec1a..a129f4660 100644 --- a/frontend/src/components/SidebarPlugin/SideBar.spec.js +++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js @@ -160,25 +160,26 @@ describe('SideBar', () => { it('is not visible when not an admin', () => { expect(wrapper.findAll('li').at(1).text()).not.toBe('admin_area') }) + describe('logged in as admin', () => { const assignLocationSpy = jest.fn() beforeEach(() => { mocks.$store.state.isAdmin = true - mocks.$store.state.token = 'valid token' - // const { location } = window; - delete window.location - window.location = {} - Object.defineProperty(window, 'location', assignLocationSpy) + mocks.$store.state.token = 'valid-token' + window.location.assign = assignLocationSpy wrapper = Wrapper() }) it('is visible', () => { expect(wrapper.findAll('li').at(1).text()).toBe('admin_area') }) - it.skip('opens a new window when clicked', async () => { + + it('opens a new window when clicked', async () => { wrapper.findAll('li').at(1).find('a').trigger('click') await wrapper.vm.$nextTick() - expect(assignLocationSpy).toHaveBeenCalledWith('peter') + expect(assignLocationSpy).toHaveBeenCalledWith( + 'http://localhost/admin/authenticate?token=valid-token', + ) }) }) }) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 9cf6b6185..96882e816 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -122,7 +122,7 @@ export default { this.$emit('logout') }, admin() { - window.location = CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token) + window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token)) this.$store.dispatch('logout') // logout without redirect }, getElopageLink() { From e9ceb7e7a5e216e4957a75e06811d18e78756b0c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 12:21:47 +0100 Subject: [PATCH 1294/1843] test that logout is dispatched when clicked on admin area --- .../components/SidebarPlugin/SideBar.spec.js | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js index a129f4660..7b12b6473 100644 --- a/frontend/src/components/SidebarPlugin/SideBar.spec.js +++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js @@ -3,6 +3,8 @@ import SideBar from './SideBar' const localVue = global.localVue +const storeDispatchMock = jest.fn() + describe('SideBar', () => { let wrapper @@ -23,8 +25,7 @@ describe('SideBar', () => { lastName: 'example', hasElopage: false, }, - commit: jest.fn(), - dispatch: jest.fn(), + dispatch: storeDispatchMock, }, $i18n: { locale: 'en', @@ -163,7 +164,7 @@ describe('SideBar', () => { describe('logged in as admin', () => { const assignLocationSpy = jest.fn() - beforeEach(() => { + beforeEach(async () => { mocks.$store.state.isAdmin = true mocks.$store.state.token = 'valid-token' window.location.assign = assignLocationSpy @@ -174,12 +175,20 @@ describe('SideBar', () => { expect(wrapper.findAll('li').at(1).text()).toBe('admin_area') }) - it('opens a new window when clicked', async () => { - wrapper.findAll('li').at(1).find('a').trigger('click') - await wrapper.vm.$nextTick() - expect(assignLocationSpy).toHaveBeenCalledWith( - 'http://localhost/admin/authenticate?token=valid-token', - ) + describe('click on admin area', () => { + beforeEach(async () => { + await wrapper.findAll('li').at(1).find('a').trigger('click') + }) + + it('opens a new window when clicked', () => { + expect(assignLocationSpy).toHaveBeenCalledWith( + 'http://localhost/admin/authenticate?token=valid-token', + ) + }) + + it('dispatches logout to store', () => { + expect(storeDispatchMock).toHaveBeenCalledWith('logout') + }) }) }) }) From 52aa7e437ea2e01e0a6e5174902974115aafec7d Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 23 Nov 2021 13:12:11 +0100 Subject: [PATCH 1295/1843] Added creation to useradmin model, adding call to apollo in backend. --- admin/src/graphql/searchUsers.js | 12 ++++ admin/src/views/UserSearch.vue | 56 +++++++------------ backend/src/graphql/model/UserAdmin.ts | 3 + backend/src/graphql/resolver/AdminResolver.ts | 7 ++- 4 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 admin/src/graphql/searchUsers.js diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js new file mode 100644 index 000000000..ceba5bc6e --- /dev/null +++ b/admin/src/graphql/searchUsers.js @@ -0,0 +1,12 @@ +import gql from 'graphql-tag' + +export const searchUsers = gql` + query($searchText: String!) { + searchUsers(searchText: $searchText) { + firstName + lastName + email + creation + } + } +` diff --git a/admin/src/views/UserSearch.vue b/admin/src/views/UserSearch.vue index 7d8d87cb5..2a978e1f0 100644 --- a/admin/src/views/UserSearch.vue +++ b/admin/src/views/UserSearch.vue @@ -6,6 +6,7 @@ v-model="criteria" class="shadow p-3 mb-5 bg-white rounded" placeholder="User suche" + @input="getUsers" > diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index 170b3df36..de2c45959 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -11,4 +11,7 @@ export class UserAdmin { @Field(() => String) lastName: string + + @Field(() => [Number]) + creation: number[] } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ce1496fa5..9af50faad 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -6,7 +6,7 @@ import { LoginUserRepository } from '../../typeorm/repository/LoginUser' @Resolver() export class AdminResolver { @Query(() => [UserAdmin]) - async getUsers(@Arg('searchText') searchText: string): Promise { + async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) const users = loginUsers.map((loginUser) => { @@ -14,6 +14,11 @@ export class AdminResolver { user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email + user.creation = [ + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + ] return user }) return users From 35f297ece8b2a8e53ea4d1ae5ca233a00ca4c284 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 23 Nov 2021 13:24:09 +0100 Subject: [PATCH 1296/1843] Vue uses VueApollo to main. --- admin/src/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/src/main.js b/admin/src/main.js index aa4cc3e03..46ee8a6f6 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -62,6 +62,8 @@ Vue.use(IconsPlugin) Vue.use(moment) +Vue.use(VueApollo) + addNavigationGuards(router, store) new Vue({ From d6e8d0cc6b46719f77a68b255acbc3d54abc4363 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 23 Nov 2021 13:27:39 +0100 Subject: [PATCH 1297/1843] unused import KlickTip and Int in type-graphql remove --- backend/src/graphql/model/UserAdmin.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index de2c45959..cbf8dd21c 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -1,5 +1,4 @@ -import { ObjectType, Field, Int } from 'type-graphql' -import { KlickTipp } from './KlickTipp' +import { ObjectType, Field } from 'type-graphql' @ObjectType() export class UserAdmin { From 636c4c8df375a7d0f9966da0a8088f3a4ede2ae4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 23 Nov 2021 14:05:02 +0100 Subject: [PATCH 1298/1843] implement verifyLogin --- admin/src/main.js | 1 - backend/src/graphql/resolver/UserResolver.ts | 35 +++++++++++++++++++- frontend/src/graphql/queries.js | 20 +++++++++++ frontend/src/main.js | 2 +- frontend/src/routes/guards.js | 11 ++++-- 5 files changed, 64 insertions(+), 5 deletions(-) diff --git a/admin/src/main.js b/admin/src/main.js index aa4cc3e03..529f78605 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -25,7 +25,6 @@ import moment from 'vue-moment' const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) const authLink = new ApolloLink((operation, forward) => { - const token = store.state.token operation.setContext({ diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 1fd441935..3f53d5538 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -224,6 +224,39 @@ export class UserResolver { } */ + @Authorized() + @Query(() => User) + @UseMiddleware(klicktippNewsletterStateMiddleware) + async verifyLogin(@Ctx() context: any): Promise { + // TODO refactor and do not have duplicate code with login(see below) + const userRepository = getCustomRepository(UserRepository) + const userEntity = await userRepository.findByPubkeyHex(context.pubKey) + const loginUserRepository = getCustomRepository(LoginUserRepository) + const loginUser = await loginUserRepository.findByEmail(userEntity.email) + const user = new User() + user.email = userEntity.email + user.firstName = userEntity.firstName + user.lastName = userEntity.lastName + user.username = userEntity.username + user.description = loginUser.description + user.pubkey = userEntity.pubkey.toString('hex') + user.language = loginUser.language + + // Elopage Status & Stored PublisherId + user.hasElopage = await this.hasElopage(context) + + // coinAnimation + const userSettingRepository = getCustomRepository(UserSettingRepository) + const coinanimation = await userSettingRepository + .readBoolean(userEntity.id, Setting.COIN_ANIMATION) + .catch((error) => { + throw new Error(error) + }) + user.coinanimation = coinanimation + user.isAdmin = true // TODO implement + return user + } + @Query(() => User) @UseMiddleware(klicktippNewsletterStateMiddleware) async login( @@ -295,7 +328,7 @@ export class UserResolver { throw new Error(error) }) user.coinanimation = coinanimation - user.isAdmin = true // TODO implement + user.isAdmin = true // TODO implement context.setHeaders.push({ key: 'token', diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 9cd364ed7..8b55f4098 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -20,6 +20,26 @@ export const login = gql` } ` +export const verifyLogin = gql` + query { + verifyLogin { + email + username + firstName + lastName + language + description + coinanimation + klickTipp { + newsletterState + } + hasElopage + publisherId + isAdmin + } + } +` + export const logout = gql` query { logout diff --git a/frontend/src/main.js b/frontend/src/main.js index fd06bf9c0..1aa945608 100755 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -51,7 +51,7 @@ Vue.config.productionTip = false loadAllRules(i18n) -addNavigationGuards(router, store) +addNavigationGuards(router, store, apolloProvider.defaultClient) /* eslint-disable no-new */ new Vue({ diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js index 005ed720f..dc8df4f13 100644 --- a/frontend/src/routes/guards.js +++ b/frontend/src/routes/guards.js @@ -1,4 +1,6 @@ -const addNavigationGuards = (router, store) => { +import { verifyLogin } from '../graphql/queries' + +const addNavigationGuards = (router, store, apollo) => { // handle publisherId router.beforeEach((to, from, next) => { const publisherId = to.query.pid @@ -10,10 +12,15 @@ const addNavigationGuards = (router, store) => { }) // store token on authenticate - router.beforeEach((to, from, next) => { + router.beforeEach(async (to, from, next) => { if (to.path === '/authenticate' && to.query.token) { // TODO verify user in order to get user data store.commit('token', to.query.token) + const result = await apollo.query({ + query: verifyLogin, + fetchPolicy: 'network-only', + }) + store.dispatch('login', result.data.verifyLogin) next({ path: '/overview' }) } else { next() From 9873ac6eeee50f184d14d01ca63887bcfa0af4d7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 23 Nov 2021 16:14:24 +0100 Subject: [PATCH 1299/1843] add user search in creation.vue --- admin/src/components/CreationFormular.vue | 13 ++--- admin/src/components/UserTable.vue | 10 ++-- admin/src/graphql/searchUsers.js | 2 +- admin/src/main.js | 1 - admin/src/views/Creation.vue | 64 ++++++++++------------- admin/src/views/CreationConfirm.vue | 33 ++++++------ admin/src/views/UserSearch.vue | 6 +-- 7 files changed, 57 insertions(+), 72 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index a810528d6..0339cad45 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -4,9 +4,10 @@

      {{ this.type === 'singleCreation' - ? 'Einzelschöpfung für ' + item.first_name + ' ' + item.last_name + '' + ? 'Einzelschöpfung für ' + item.firstName + ' ' + item.lastName + '' : 'Massenschöpfung für ' + Object.keys(this.itemsMassCreation).length + ' Mitglieder' }} + {{ item }}

      Bitte wähle ein oder Mehrere Mitglieder aus für die du Schöpfen möchtest @@ -105,7 +106,6 @@ :disabled="radioSelected === '' || value <= 0 || text.length < 10" > Update Schöpfung ({{ type }},{{ pagetype }}) - {{ creationUserData }} ' + this.type + ' >> für ' + this.item.first_name + '') + alert('SUBMIT CREATION => ' + this.type + ' >> für ' + this.item.firstName + '') // erstellen eines Arrays (submitObj) mit allen Daten this.submitObj = [ { @@ -262,15 +262,12 @@ export default { // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email) alert('UPDATE EINZEL SCHÖPFUNG ABSENDEN FÜR >> ') // umschreiben, update eine bestehende Schöpfung eine - this.creationUserData.datum = this.radioSelected.long this.creationUserData.creation_gdd = this.value this.creationUserData.text = this.text - - // this.$store.commit('update-creation-user-data', this.submitObj) } else { // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email) - alert('EINZEL SCHÖPFUNG ABSENDEN FÜR >> ' + this.item.first_name + '') + alert('EINZEL SCHÖPFUNG ABSENDEN FÜR >> ' + this.item.firstName + '') // $store - offene Schöpfungen hochzählen this.$store.commit('openCreationsPlus', 1) } diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index d96438bcb..7cb34a59c 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -64,10 +64,9 @@ @@ -75,7 +74,7 @@ :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'" aria-label="Help" > - Details verbergen von {{ row.item.first_name }} {{ row.item.last_name }} + Details verbergen von {{ row.item.firstName }} {{ row.item.lastName }} @@ -149,7 +148,7 @@ export default { }, data() { return { - creationData: [], + creationData: {}, overlay: false, overlayBookmarkType: '', overlayItem: [], @@ -217,9 +216,6 @@ export default { alert(JSON.stringify(item)) this.$emit('remove-confirm-result', item, 'remove') }, - getCreationInMonths(creation) { - return creation.split(',') - }, editCreationUserTable(row, rowItem) { alert('editCreationUserTable') if (!row.detailsShowing) { diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index ceba5bc6e..86e333845 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const searchUsers = gql` - query($searchText: String!) { + query ($searchText: String!) { searchUsers(searchText: $searchText) { firstName lastName diff --git a/admin/src/main.js b/admin/src/main.js index 46ee8a6f6..3be3ae0bf 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -25,7 +25,6 @@ import moment from 'vue-moment' const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI }) const authLink = new ApolloLink((operation, forward) => { - const token = store.state.token operation.setContext({ diff --git a/admin/src/views/Creation.vue b/admin/src/views/Creation.vue index 0f88199f8..d3379159b 100644 --- a/admin/src/views/Creation.vue +++ b/admin/src/views/Creation.vue @@ -44,6 +44,7 @@ - From 30079e2039794f6002d5a21338b690234c7afb8d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 24 Nov 2021 03:56:42 +0100 Subject: [PATCH 1313/1843] fix createUser call --- frontend/src/graphql/mutations.js | 4 +--- frontend/src/views/Pages/Register.vue | 18 +++--------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index eafffd957..0c6ea51aa 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -42,12 +42,11 @@ export const updateUserInfos = gql` } ` -export const registerUser = gql` +export const createUser = gql` mutation( $firstName: String! $lastName: String! $email: String! - $password: String! $language: String! $publisherId: Int ) { @@ -55,7 +54,6 @@ export const registerUser = gql` email: $email firstName: $firstName lastName: $lastName - password: $password language: $language publisherId: $publisherId ) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index ea4000cff..d6e849345 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -85,10 +85,6 @@
      - @@ -158,14 +154,13 @@ diff --git a/admin/src/components/Footer.vue b/admin/src/components/ContentFooter.vue similarity index 75% rename from admin/src/components/Footer.vue rename to admin/src/components/ContentFooter.vue index 398f2e180..ade4e0a83 100644 --- a/admin/src/components/Footer.vue +++ b/admin/src/components/ContentFooter.vue @@ -8,3 +8,8 @@
  • {{ $t('members_area') }}  - ! + !
    • + From 6b3d28d1ff0fc5ab11549dab080c7aff93e3d886 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 10:01:13 +0100 Subject: [PATCH 1330/1843] Definition of the entity based on the database table. --- .../LoginPendingTasksAdmin.ts | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts index afd09ad68..8e5d57d3a 100644 --- a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts +++ b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts @@ -1,4 +1,25 @@ -import { BaseEntity, Entity } from 'typeorm' +import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm' @Entity('login_pending_tasks_admin') -export class LoginPendingTasksAdmin extends BaseEntity {} +export class LoginPendingTasksAdmin extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ unsigned: true, nullable: false }) + userId: number + + @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }) + created: Date + + @Column({ type: 'datetime', nullable: false }) + date: Date + + @Column({ length: 256, nullable: true, default: null }) + note: string + + @Column({ type: 'bigint', nullable: false }) + amount: BigInt + + @Column() + moderator: number +} From 4b80507c9b885552119abcdfb7d73766cd69d6ae Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 10:12:57 +0100 Subject: [PATCH 1331/1843] Change the database version in backend. --- backend/src/server/createServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4350483ff..d5fbc20ee 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -25,7 +25,7 @@ import schema from '../graphql/schema' // TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; -const DB_VERSION = '0004-login_server_data' +const DB_VERSION = '0005-admin_tables' const createServer = async (context: any = serverContext): Promise => { // open mysql connection From 43f673bd8292aa3ad9a7e760d9bb3bf534f95198 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 10:18:48 +0100 Subject: [PATCH 1332/1843] test i18n --- admin/src/i18n.test.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 admin/src/i18n.test.js diff --git a/admin/src/i18n.test.js b/admin/src/i18n.test.js new file mode 100644 index 000000000..e39e0e824 --- /dev/null +++ b/admin/src/i18n.test.js @@ -0,0 +1,30 @@ +import i18n from './i18n' +import VueI18n from 'vue-i18n' + +jest.mock('vue-i18n') + +describe('i18n', () => { + it('calls i18n with locale en', () => { + expect(VueI18n).toBeCalledWith( + expect.objectContaining({ + locale: 'en', + }), + ) + }) + + it('calls i18n with fallback locale en', () => { + expect(VueI18n).toBeCalledWith( + expect.objectContaining({ + fallbackLocale: 'en', + }), + ) + }) + + it('has a _t function', () => { + expect(i18n).toEqual( + expect.objectContaining({ + _t: expect.anything(), + }), + ) + }) +}) From c98d6151052d4d9409ee47e1baf1c9521a9bf5f8 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 10:22:09 +0100 Subject: [PATCH 1333/1843] ignore assets for test coverage --- admin/jest.config.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/jest.config.js b/admin/jest.config.js index ac132eed2..b7226bd8f 100644 --- a/admin/jest.config.js +++ b/admin/jest.config.js @@ -1,6 +1,11 @@ module.exports = { verbose: true, - collectCoverageFrom: ['src/**/*.{js,vue}', '!**/node_modules/**', '!**/?(*.)+(spec|test).js?(x)'], + collectCoverageFrom: [ + 'src/**/*.{js,vue}', + '!**/node_modules/**', + '!src/assets/**', + '!**/?(*.)+(spec|test).js?(x)', + ], moduleFileExtensions: [ 'js', // 'jsx', From 50e1a16f839907daf0776d1fb58a865eae4c1c35 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 10:28:57 +0100 Subject: [PATCH 1334/1843] test store --- admin/src/store/store.js | 4 ++-- admin/src/store/store.test.js | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 38a210fe1..d199368fb 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -6,10 +6,10 @@ Vue.use(Vuex) export const mutations = { openCreationsPlus: (state, i) => { - state.openCreations = state.openCreations + i + state.openCreations += i }, openCreationsMinus: (state, i) => { - state.openCreations = state.openCreations - i + state.openCreations -= i }, resetOpenCreations: (state) => { state.openCreations = 0 diff --git a/admin/src/store/store.test.js b/admin/src/store/store.test.js index 9ab9d980b..81d75f05f 100644 --- a/admin/src/store/store.test.js +++ b/admin/src/store/store.test.js @@ -1,6 +1,6 @@ import { mutations } from './store' -const { token } = mutations +const { token, openCreationsPlus, openCreationsMinus, resetOpenCreations } = mutations describe('Vuex store', () => { describe('mutations', () => { @@ -11,5 +11,29 @@ describe('Vuex store', () => { expect(state.token).toEqual('1234') }) }) + + describe('openCreationsPlus', () => { + it('increases the open creations by a given number', () => { + const state = { openCreations: 0 } + openCreationsPlus(state, 12) + expect(state.openCreations).toEqual(12) + }) + }) + + describe('openCreationsMinus', () => { + it('decreases the open creations by a given number', () => { + const state = { openCreations: 12 } + openCreationsMinus(state, 2) + expect(state.openCreations).toEqual(10) + }) + }) + + describe('resetOpenCreations', () => { + it('sets the open creations to 0', () => { + const state = { openCreations: 24 } + resetOpenCreations(state) + expect(state.openCreations).toEqual(0) + }) + }) }) }) From c2c03d103297ed2a348f8ec9db58dcce5343d420 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:40:49 +0100 Subject: [PATCH 1335/1843] implementation of createPendingCreation search for the state_user. --- backend/src/graphql/resolver/AdminResolver.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9af50faad..65419523f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,7 +1,8 @@ -import { Resolver, Query, Arg } from 'type-graphql' +import { Resolver, Query, Arg, Args } from 'type-graphql' import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { UserRepository } from '../../typeorm/repository/User' @Resolver() export class AdminResolver { @@ -23,4 +24,14 @@ export class AdminResolver { }) return users } + + @Query(() => Boolean) + async createPendingCreation( + @Args() { email, amount, note, creationDate }: CreatePendingCreationArgs, + ): Promise { + // TODO: Check user validity + const userRepository = getCustomRepository(UserRepository) + const user = await userRepository.findByEmail(email) + return true + } } From f3cd722e9fdc070dff7d35d4063c57f6b70238a2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:41:34 +0100 Subject: [PATCH 1336/1843] User creations logic in comments. --- backend/src/graphql/resolver/AdminResolver.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 65419523f..69a0e7c83 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -32,6 +32,13 @@ export class AdminResolver { // TODO: Check user validity const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) + // TODO: Check user open creation state (Open creation) + // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = loginUser.id + // COUNT amount from 2 tables + // if amount < 3000 => Store in pending_creations + const creations = getUserCreations(user.id) + // UserAdmin.creations() return true } } From 5f8235c7af3053a24ca0de4f4329439b20b4a1b2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:42:05 +0100 Subject: [PATCH 1337/1843] Added last todo before sending success. --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 69a0e7c83..c595692c0 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -39,6 +39,7 @@ export class AdminResolver { // if amount < 3000 => Store in pending_creations const creations = getUserCreations(user.id) // UserAdmin.creations() + // TODO: Write pending creation to DB return true } } From cd12d621fe14a57f51601eb414292850df6fcafb Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:51:40 +0100 Subject: [PATCH 1338/1843] Methode to get user creations. --- backend/src/graphql/resolver/AdminResolver.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index c595692c0..7a0872258 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -33,13 +33,17 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) - // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat - // SELECT * FROM pending_creations WHERE userId = loginUser.id - // COUNT amount from 2 tables - // if amount < 3000 => Store in pending_creations const creations = getUserCreations(user.id) // UserAdmin.creations() // TODO: Write pending creation to DB return true } } + +function getUserCreations(id: number): Promise { + // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = loginUser.id + // COUNT amount from 2 tables + // if amount < 3000 => Store in pending_creations + throw new Error('Function not implemented.') +} From e011d0a803c8af44dfd9aa06694862cf6e44d478 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:09:13 +0100 Subject: [PATCH 1339/1843] Implemented the arguments for graphql. --- .../src/graphql/arg/CreatePendingCreationArgs.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 backend/src/graphql/arg/CreatePendingCreationArgs.ts diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts new file mode 100644 index 000000000..89b1e8c26 --- /dev/null +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -0,0 +1,16 @@ +import { ArgsType, Field } from 'type-graphql' + +@ArgsType() +export default class CreatePendingCreationArgs { + @Field(() => String) + email: string + + @Field(() => Number) + amount: number + + @Field(() => String) + note: string + + @Field(() => Date) + creationDate: Date +} From 048d75f167c7be34ddf773ac375cfb007c755e30 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:09:53 +0100 Subject: [PATCH 1340/1843] Added a default random value for the last three creations. --- backend/src/graphql/resolver/AdminResolver.ts | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 7a0872258..e63cc6efe 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,6 +3,7 @@ import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { UserRepository } from '../../typeorm/repository/User' +import { CreatePendingCreationArgs } from '../arg/CreatePendingCreationArgs' @Resolver() export class AdminResolver { @@ -15,11 +16,7 @@ export class AdminResolver { user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = [ - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, - ] + user.creation = getUserCreations(loginUser.id) return user }) return users @@ -33,17 +30,27 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) - const creations = getUserCreations(user.id) - // UserAdmin.creations() - // TODO: Write pending creation to DB - return true + const creations = await getUserCreations(user.id) + if (isCreationValid(creations, amount, creationDate)) { + // UserAdmin.creations() + // TODO: Write pending creation to DB + } + return false } } function getUserCreations(id: number): Promise { - // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat - // SELECT * FROM pending_creations WHERE userId = loginUser.id + // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations - throw new Error('Function not implemented.') + return [ + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + ] +} + +function isCreationValid(creations: number[], amount: any, creationDate: any) { + return true } From 0dcceb682edd7860fea49f1d54e6e9d0e5b1e238 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:11:48 +0100 Subject: [PATCH 1341/1843] add function getUserCreations --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index e63cc6efe..7fd6266e1 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -40,7 +40,7 @@ export class AdminResolver { } function getUserCreations(id: number): Promise { - // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monat + // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations From fdc1c0bf8858b27261708f63c9fbec6300e00102 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 11:16:36 +0100 Subject: [PATCH 1342/1843] more tests for CreationFormular. Fix update for properties --- admin/src/components/CreationFormular.spec.js | 101 +++++++++++++++++- admin/src/components/CreationFormular.vue | 13 ++- admin/src/components/UserTable.vue | 6 ++ 3 files changed, 114 insertions(+), 6 deletions(-) diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index f218cf8e2..fcdf97cfa 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -19,7 +19,7 @@ const mocks = { const propsData = { type: '', item: {}, - creation: {}, + creation: [], itemsMassCreation: {}, } @@ -38,5 +38,104 @@ describe('CreationFormular', () => { it('has a DIV element with the class.component-creation-formular', () => { expect(wrapper.find('.component-creation-formular').exists()).toBeTruthy() }) + + describe('radio buttons to selcet month', () => { + it('has three radio buttons', () => { + expect(wrapper.findAll('input[type="radio"]').length).toBe(3) + }) + + describe('with mass creation', () => { + beforeEach(async () => { + jest.clearAllMocks() + await wrapper.setProps({ type: 'massCreation' }) + }) + + describe('first radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(0).setChecked() + }) + + it('emits update-radio-selected with index 0', () => { + expect(wrapper.emitted()['update-radio-selected']).toEqual([ + [expect.arrayContaining([0])], + ]) + }) + }) + + describe('second radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(1).setChecked() + }) + + it('emits update-radio-selected with index 1', () => { + expect(wrapper.emitted()['update-radio-selected']).toEqual([ + [expect.arrayContaining([1])], + ]) + }) + }) + + describe('third radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(2).setChecked() + }) + + it('emits update-radio-selected with index 2', () => { + expect(wrapper.emitted()['update-radio-selected']).toEqual([ + [expect.arrayContaining([2])], + ]) + }) + }) + }) + + describe('with single creation', () => { + beforeEach(async () => { + jest.clearAllMocks() + await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] }) + await wrapper.setData({ rangeMin: 180 }) + }) + + describe('first radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(0).setChecked() + }) + + it('sets rangeMin to 0', () => { + expect(wrapper.vm.rangeMin).toBe(0) + }) + + it('sets rangeMax to 200', () => { + expect(wrapper.vm.rangeMax).toBe(200) + }) + }) + + describe('second radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(1).setChecked() + }) + + it('sets rangeMin to 0', () => { + expect(wrapper.vm.rangeMin).toBe(0) + }) + + it('sets rangeMax to 400', () => { + expect(wrapper.vm.rangeMax).toBe(400) + }) + }) + + describe('third radio button', () => { + beforeEach(async () => { + await wrapper.findAll('input[type="radio"]').at(2).setChecked() + }) + + it('sets rangeMin to 0', () => { + expect(wrapper.vm.rangeMin).toBe(0) + }) + + it('sets rangeMax to 400', () => { + expect(wrapper.vm.rangeMax).toBe(600) + }) + }) + }) + }) }) }) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 9334f5d00..d6b637152 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -146,7 +146,7 @@ export default { required: false, }, creation: { - type: Object, + type: Array, required: true, }, itemsMassCreation: { @@ -198,9 +198,10 @@ export default { this.text = this.creationUserData.text break case 'range': - this.value = this.creationUserData.creation_gdd + this.value = this.creationUserData.creationGdd break default: + // TODO: Toast alert("I don't know such values") } }, @@ -262,9 +263,11 @@ export default { // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email) alert('UPDATE EINZEL SCHÖPFUNG ABSENDEN FÃœR >> ') // umschreiben, update eine bestehende Schöpfung eine - this.creationUserData.datum = this.radioSelected.long - this.creationUserData.creation_gdd = this.value - this.creationUserData.text = this.text + this.$emit('update-creation-data', { + datum: this.radioSelected.long, + creationGdd: this.value, + text: this.text, + }) } else { // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email) alert('EINZEL SCHÖPFUNG ABSENDEN FÃœR >> ' + this.item.firstName + '') diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 92ee0cba0..d382af138 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -67,6 +67,7 @@ :creation="row.item.creation" :item="row.item" :creationUserData="creationData" + @update-creation-data="updateCreationData" /> @@ -226,6 +227,11 @@ export default { } row.toggleDetails() }, + updateCreationData(data) { + this.creationData = { + ...data, + } + }, }, } From 4544d701fb71b93b992eee63ab49462f810ff492 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:23:21 +0100 Subject: [PATCH 1343/1843] Withdrew Promise --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 7fd6266e1..3536538cb 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,7 +3,7 @@ import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { UserRepository } from '../../typeorm/repository/User' -import { CreatePendingCreationArgs } from '../arg/CreatePendingCreationArgs' +import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @Resolver() export class AdminResolver { @@ -39,7 +39,7 @@ export class AdminResolver { } } -function getUserCreations(id: number): Promise { +function getUserCreations(id: number): number[] { // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables From 518209d2a3a9f02260091db864ce4b9051e9366a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 24 Nov 2021 11:23:51 +0100 Subject: [PATCH 1344/1843] reduce coverage --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 902b71b11..b6fa559c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -491,7 +491,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 38 + min_coverage: 37 token: ${{ github.token }} ############################################################################## From c68386be85194ac9aff73470b61426bb80b9e0ab Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:27:22 +0100 Subject: [PATCH 1345/1843] Test log. --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3536538cb..c3a311f65 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -31,6 +31,7 @@ export class AdminResolver { const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) const creations = await getUserCreations(user.id) + console.log('creations', creations) if (isCreationValid(creations, amount, creationDate)) { // UserAdmin.creations() // TODO: Write pending creation to DB From ed5baeccc0cfa9c8a51fa3473a78a4169385182e Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:46:12 +0100 Subject: [PATCH 1346/1843] Implementation of the TransactionCreationRepository. --- backend/src/graphql/resolver/AdminResolver.ts | 6 +++++- backend/src/typeorm/repository/TransactionCreation.ts | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 backend/src/typeorm/repository/TransactionCreation.ts diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index c3a311f65..2d8934ffe 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -2,6 +2,7 @@ import { Resolver, Query, Arg, Args } from 'type-graphql' import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @@ -41,7 +42,10 @@ export class AdminResolver { } function getUserCreations(id: number): number[] { - // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate + // SELECT count(amount) FROM transaction_creations WHERE state_user_id = id AND target_date > (NOW()-ActualDays - 2 Monate) + const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ + currentDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), + }) // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations diff --git a/backend/src/typeorm/repository/TransactionCreation.ts b/backend/src/typeorm/repository/TransactionCreation.ts new file mode 100644 index 000000000..89266838a --- /dev/null +++ b/backend/src/typeorm/repository/TransactionCreation.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { TransactionCreation } from '@entity/TransactionCreation' + +@EntityRepository(TransactionCreation) +export class TransactionCreationRepository extends Repository {} From 7a944306b9c3679d1e7f0db0f638992ec9130c84 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 11:59:54 +0100 Subject: [PATCH 1347/1843] Icon in test setup, test for Creation --- admin/src/components/UserTable.spec.js | 2 +- admin/src/components/UserTable.vue | 2 +- admin/src/views/Creation.spec.js | 59 ++++++++++++++++++++++++++ admin/src/views/Creation.vue | 15 ++++--- admin/test/testSetup.js | 3 +- 5 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 admin/src/views/Creation.spec.js diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js index a87497d81..3db0131a3 100644 --- a/admin/src/components/UserTable.spec.js +++ b/admin/src/components/UserTable.spec.js @@ -10,7 +10,7 @@ describe('UserTable', () => { type: 'Type', itemsUser: [], fieldsTable: [], - creation: {}, + creation: [], } const Wrapper = () => { diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index d382af138..265c2d12e 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -140,7 +140,7 @@ export default { default: '', }, creation: { - type: Object, + type: Array, required: false, }, }, diff --git a/admin/src/views/Creation.spec.js b/admin/src/views/Creation.spec.js new file mode 100644 index 000000000..02c2ed4ce --- /dev/null +++ b/admin/src/views/Creation.spec.js @@ -0,0 +1,59 @@ +import { mount } from '@vue/test-utils' +import Creation from './Creation.vue' + +const localVue = global.localVue + +const apolloQueryMock = jest.fn().mockResolvedValue({ + data: { + searchUsers: [ + { + firstName: 'Bibi', + lastName: 'Bloxberg', + email: 'bibi@bloxberg.de', + creation: [200, 400, 600], + }, + ], + }, +}) + +const toastErrorMock = jest.fn() + +const mocks = { + $apollo: { + query: apolloQueryMock, + }, + $toasted: { + error: toastErrorMock, + }, +} + +describe('Creation', () => { + let wrapper + + const Wrapper = () => { + return mount(Creation, { localVue, mocks }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('has a DIV element with the class.creation', () => { + expect(wrapper.find('div.creation').exists()).toBeTruthy() + }) + + describe('apollo returns error', () => { + beforeEach(() => { + apolloQueryMock.mockRejectedValue({ + message: 'Ouch', + }) + wrapper = Wrapper() + }) + + it('toasts an error message', () => { + expect(toastErrorMock).toBeCalledWith('Ouch') + }) + }) + }) +}) diff --git a/admin/src/views/Creation.vue b/admin/src/views/Creation.vue index df5bea28c..262d6299e 100644 --- a/admin/src/views/Creation.vue +++ b/admin/src/views/Creation.vue @@ -1,5 +1,5 @@ From e0e707e680b5b57e9eaa7d28387a8fbd5ac81efc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 21:11:33 +0100 Subject: [PATCH 1409/1843] test router navigation guards --- admin/src/router/guards.js | 2 +- admin/src/router/guards.test.js | 64 +++++++++++++++++++++++++++++++++ admin/src/router/router.test.js | 11 ++++-- 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 admin/src/router/guards.test.js diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js index f6d8058aa..d59234a25 100644 --- a/admin/src/router/guards.js +++ b/admin/src/router/guards.js @@ -3,7 +3,7 @@ import CONFIG from '../config' const addNavigationGuards = (router, store) => { // store token on `authenticate` router.beforeEach((to, from, next) => { - if (to.path === '/authenticate' && to.query.token) { + if (to.path === '/authenticate' && to.query && to.query.token) { // TODO verify user to get user data store.commit('token', to.query.token) next({ path: '/' }) diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js new file mode 100644 index 000000000..e69846aab --- /dev/null +++ b/admin/src/router/guards.test.js @@ -0,0 +1,64 @@ +import addNavigationGuards from './guards' +import router from './router' + +const storeCommitMock = jest.fn() + +const store = { + commit: storeCommitMock, + state: { + token: null, + }, +} + +addNavigationGuards(router, store) + +describe('navigation guards', () => { + beforeEach(() => { + jest.clearAllMocks() + }) + + describe('authenticate', () => { + const navGuard = router.beforeHooks[0] + const next = jest.fn() + + describe('with valid token', () => { + it('commits the token to the store', async () => { + navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next) + expect(storeCommitMock).toBeCalledWith('token', 'valid-token') + }) + + it('redirects to /', async () => { + navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next) + expect(next).toBeCalledWith({ path: '/' }) + }) + }) + + describe('without valid token', () => { + it('does not commit the token to the store', async () => { + navGuard({ path: '/authenticate' }, {}, next) + expect(storeCommitMock).not.toBeCalledWith() + }) + + it('calls next withou arguments', async () => { + navGuard({ path: '/authenticate' }, {}, next) + expect(next).toBeCalledWith() + }) + }) + }) + + describe('protect all routes', () => { + const navGuard = router.beforeHooks[1] + const next = jest.fn() + + it('redirects no not found with no token in store ', () => { + navGuard({ path: '/' }, {}, next) + expect(next).toBeCalledWith({ path: '/not-found' }) + }) + + it('does not redirect when token in store', () => { + store.state.token = 'valid token' + navGuard({ path: '/' }, {}, next) + expect(next).toBeCalledWith() + }) + }) +}) diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js index e9a622d18..eb9b646cb 100644 --- a/admin/src/router/router.test.js +++ b/admin/src/router/router.test.js @@ -44,13 +44,20 @@ describe('router', () => { }) describe('routes', () => { + it('has seven routes defined', () => { + expect(routes).toHaveLength(7) + }) + it('has "/overview" as default', async () => { const component = await routes.find((r) => r.path === '/').component() expect(component.default.name).toBe('overview') }) - it('has seven routes defined', () => { - expect(routes).toHaveLength(7) + describe('logout', () => { + it('loads the "NotFoundPage" component', async () => { + const component = await routes.find((r) => r.path === '/logout').component() + expect(component.default.name).toBe('not-found') + }) }) describe('user', () => { From 62b3600ac78885dc4e3b0cd07f4f59d7223bae01 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 21:12:59 +0100 Subject: [PATCH 1410/1843] coverage unit tests admin interface 51% --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff6f4e831..3d58752e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 47 + min_coverage: 51 token: ${{ github.token }} ############################################################################## From 1d612c034eeb923ec3a35bc322509d0497b49cb1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:07:48 +0100 Subject: [PATCH 1411/1843] add users Promis all --- backend/src/graphql/resolver/AdminResolver.ts | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 08b0f2b48..3dcb2a639 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -13,14 +13,14 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = loginUsers.map((loginUser) => { + const users = await Promise.all(loginUsers.map(async (loginUser) => { const user = new UserAdmin() user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = [10000000, 10000000, 10000000] // await getUserCreations(loginUser.id) + user.creation = await getUserCreations(loginUser.id) return user - }) + })) return users } @@ -44,10 +44,6 @@ export class AdminResolver { async function getUserCreations(id: number): Promise { // TODO: NOW()-ActualDays - 2 Monate - // const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ - // userId: id, - // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - // }) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') @@ -58,7 +54,7 @@ async function getUserCreations(id: number): Promise { }) .getRawOne() console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) - + const createdAmountLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') @@ -79,14 +75,6 @@ async function getUserCreations(id: number): Promise { .getRawOne() console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) - // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ - // targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - // }) - // const createdAmountMonth = await transactionCreationsMonthQuery.getRawOne() - // console.log('createdAmountMonth', createdAmountMonth) - // const transactionCreationsLastThreeMonth = await transactionCreationsQuery.getRawOne() - // console.log('transactionCreations', transactionCreations) - // SELECT * FROM pending_creations WHERE userId = id const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingAmountMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') @@ -114,27 +102,18 @@ async function getUserCreations(id: number): Promise { }) .getRawOne() console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) - // const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ - // userId: id, - // date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - // }) - - - // const createdAmountLastMonth = ... - // const createdAmountCurrentMonth = ... // COUNT amount from 2 tables - // if amount < 3000 => Store in pending_creations - const usedCreationBeforeLastMonth = Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum) - const usedCreationLastMonth = Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum) - const usedCreationMonth = Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum) + const usedCreationBeforeLastMonth = (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 + const usedCreationLastMonth = (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 + const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 return [ - ( 10000000 - usedCreationBeforeLastMonth ) / 1000, - ( 10000000 - usedCreationLastMonth ) / 1000, - ( 10000000 - usedCreationMonth ) / 1000, + 1000 - usedCreationBeforeLastMonth, + 1000 - usedCreationLastMonth, + 1000 - usedCreationMonth, ] } -function isCreationValid(creations: number[], amount: any, creationDate: any) { +function isCreationValid(creations: number[], amount: number, creationDate: any) { return true } From 754bd897233fbae557668ab6e5a4ec160f3127b8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 08:49:47 +0100 Subject: [PATCH 1412/1843] lint --- backend/src/graphql/resolver/UserResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 6a06fc93c..89e398496 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -303,7 +303,7 @@ export class UserResolver { user.coinanimation = coinanimation user.isAdmin = true // TODO implement - user.isAdmin = true // TODO implement + user.isAdmin = true // TODO implement context.setHeaders.push({ key: 'token', From e399ce6e2721ff9a3b1cbda1922801f41da6e037 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:55:49 +0100 Subject: [PATCH 1413/1843] Adding moment package to backend. --- backend/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/package.json b/backend/package.json index 375046363..e573a2704 100644 --- a/backend/package.json +++ b/backend/package.json @@ -29,6 +29,7 @@ "jest": "^27.2.4", "jsonwebtoken": "^8.5.1", "module-alias": "^2.2.2", + "moment": "^2.29.1", "mysql2": "^2.3.0", "nodemailer": "^6.6.5", "random-bigint": "^0.0.1", From c801d7c07c880120a4f14aa8bf90dd77421aa034 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:56:21 +0100 Subject: [PATCH 1414/1843] Adding moment package to backend in yarn lock. --- backend/yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/yarn.lock b/backend/yarn.lock index 5b74ba7c3..b46bc183d 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4139,6 +4139,11 @@ module-alias@^2.2.2: resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== +moment@^2.29.1: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" From 72f06ede08dea47c945c9da20ad08d32f7e6879f Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:57:40 +0100 Subject: [PATCH 1415/1843] Change the date calculation so we get the three last month and next month as string and search with this values. --- admin/src/components/CreationFormular.vue | 6 +- backend/src/graphql/resolver/AdminResolver.ts | 77 ++++++++++++++----- 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index d6b637152..09c42378c 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -163,15 +163,15 @@ export default { rangeMax: 1000, currentMonth: { short: this.$moment().format('MMMM'), - long: this.$moment().format('DD/MM/YYYY'), + long: this.$moment().format('YYYY-MM-DD'), }, lastMonth: { short: this.$moment().subtract(1, 'month').format('MMMM'), - long: this.$moment().subtract(1, 'month').format('DD/MM/YYYY'), + long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01', }, beforeLastMonth: { short: this.$moment().subtract(2, 'month').format('MMMM'), - long: this.$moment().subtract(2, 'month').format('DD/MM/YYYY'), + long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01', }, submitObj: null, isdisabled: true, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3dcb2a639..2864c06fd 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -6,6 +6,7 @@ import { TransactionCreationRepository } from '../../typeorm/repository/Transact import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' +import moment from 'moment' @Resolver() export class AdminResolver { @@ -13,14 +14,16 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = await Promise.all(loginUsers.map(async (loginUser) => { - const user = new UserAdmin() - user.firstName = loginUser.firstName - user.lastName = loginUser.lastName - user.email = loginUser.email - user.creation = await getUserCreations(loginUser.id) - return user - })) + const users = await Promise.all( + loginUsers.map(async (loginUser) => { + const user = new UserAdmin() + user.firstName = loginUser.firstName + user.lastName = loginUser.lastName + user.email = loginUser.email + user.creation = await getUserCreations(loginUser.id) + return user + }), + ) return users } @@ -44,13 +47,24 @@ export class AdminResolver { async function getUserCreations(id: number): Promise { // TODO: NOW()-ActualDays - 2 Monate + // const actualDate = new Date() + const dateNextMonth = moment().add(1, 'month').format('YYYY-MM') + '-01' + const dateMonth = moment().format('YYYY-MM') + '-01' + const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' + const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' + + console.log('Searching creation amount for: ', dateNextMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) + const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateBeforeLastMonth, // DATE + enddate: dateLastMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) @@ -60,7 +74,10 @@ async function getUserCreations(id: number): Promise { .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateLastMonth, + enddate: dateMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountLastMonth.sum', Number(createdAmountLastMonth.sum)) @@ -70,43 +87,61 @@ async function getUserCreations(id: number): Promise { .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateMonth, + enddate: dateNextMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) const pendingCreationRepository = getCustomRepository(PendingCreationRepository) - const pendingAmountMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-11-01', + enddate: '2021-12-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('pendingAmountMounth', Number(pendingAmountMounth.sum)) - const pendingAmountLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountLastMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-10-01', + enddate: '2021-11-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('pendingAmountLastMounth', Number(pendingAmountLastMounth.sum)) - const pendingAmountBeforeLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountBeforeLastMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-09-01', + enddate: '2021-10-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() - console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) + console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) // COUNT amount from 2 tables - const usedCreationBeforeLastMonth = (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 - const usedCreationLastMonth = (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 - const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 + const usedCreationBeforeLastMonth = + (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 + const usedCreationLastMonth = + (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 + const usedCreationMonth = + (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 return [ 1000 - usedCreationBeforeLastMonth, 1000 - usedCreationLastMonth, From 31a3837fa55d73917cc7f2071d0a9170b31d0a22 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 09:01:23 +0100 Subject: [PATCH 1416/1843] right check for searchUsers & verifyLogin --- backend/src/auth/RIGHTS.ts | 3 +++ backend/src/auth/ROLES.ts | 1 + backend/src/graphql/resolver/AdminResolver.ts | 4 +++- backend/src/graphql/resolver/UserResolver.ts | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index 08dca83b1..fa750239e 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -1,5 +1,6 @@ export enum RIGHTS { LOGIN = 'LOGIN', + VERIFY_LOGIN = 'VERIFY_LOGIN', BALANCE = 'BALANCE', GET_COMMUNITY_INFO = 'GET_COMMUNITY_INFO', COMMUNITIES = 'COMMUNITIES', @@ -20,4 +21,6 @@ export enum RIGHTS { CHECK_USERNAME = 'CHECK_USERNAME', CHECK_EMAIL = 'CHECK_EMAIL', HAS_ELOPAGE = 'HAS_ELOPAGE', + // Admin + SEARCH_USERS = 'SEARCH_USERS', } diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts index ef6746059..ada6a2cef 100644 --- a/backend/src/auth/ROLES.ts +++ b/backend/src/auth/ROLES.ts @@ -5,6 +5,7 @@ import { Role } from './Role' export const ROLE_UNAUTHORIZED = new Role('unauthorized', INALIENABLE_RIGHTS) export const ROLE_USER = new Role('user', [ ...INALIENABLE_RIGHTS, + RIGHTS.VERIFY_LOGIN, RIGHTS.BALANCE, RIGHTS.LIST_GDT_ENTRIES, RIGHTS.EXIST_PID, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9af50faad..4ae259087 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,10 +1,12 @@ -import { Resolver, Query, Arg } from 'type-graphql' +import { Resolver, Query, Arg, Authorized } from 'type-graphql' import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { RIGHTS } from '../../auth/RIGHTS' @Resolver() export class AdminResolver { + @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => [UserAdmin]) async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 89e398496..323df11fb 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -195,7 +195,7 @@ const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: B @Resolver() export class UserResolver { - @Authorized() + @Authorized([RIGHTS.VERIFY_LOGIN]) @Query(() => User) @UseMiddleware(klicktippNewsletterStateMiddleware) async verifyLogin(@Ctx() context: any): Promise { From 0565ff4d852decb270d4ce8a9f744de21831f22f Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 09:18:37 +0100 Subject: [PATCH 1417/1843] reverted createUser process - this is done in another PR --- backend/src/graphql/arg/CreateUserArgs.ts | 3 ++ backend/src/graphql/resolver/UserResolver.ts | 54 +++++++++----------- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/backend/src/graphql/arg/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts index 0d63e76bb..3a8914200 100644 --- a/backend/src/graphql/arg/CreateUserArgs.ts +++ b/backend/src/graphql/arg/CreateUserArgs.ts @@ -11,6 +11,9 @@ export default class CreateUserArgs { @Field(() => String) lastName: string + @Field(() => String) + password: string + @Field(() => String) language?: string // Will default to DEFAULT_LANGUAGE diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 323df11fb..edf2dde2a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -343,7 +343,7 @@ export class UserResolver { @Authorized([RIGHTS.CREATE_USER]) @Mutation(() => String) async createUser( - @Args() { email, firstName, lastName, language, publisherId }: CreateUserArgs, + @Args() { email, firstName, lastName, password, language, publisherId }: CreateUserArgs, ): Promise { // TODO: wrong default value (should be null), how does graphql work here? Is it an required field? // default int publisher_id = 0; @@ -353,13 +353,12 @@ export class UserResolver { language = DEFAULT_LANGUAGE } - // TODO: Register process // Validate Password - // if (!isPassword(password)) { - // throw new Error( - // 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', - // ) - // } + if (!isPassword(password)) { + throw new Error( + 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', + ) + } // Validate username // TODO: never true @@ -377,13 +376,11 @@ export class UserResolver { throw new Error(`User already exists.`) } - // TODO: Register process - // const passphrase = PassphraseGenerate() - // const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key - // const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash - // const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) - + const passphrase = PassphraseGenerate() + const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key + const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash const emailHash = getEmailHash(email) + const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) // Table: login_users const loginUser = new LoginUser() @@ -392,15 +389,13 @@ export class UserResolver { loginUser.lastName = lastName loginUser.username = username loginUser.description = '' - // TODO: Register process - // loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash + loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash loginUser.emailHash = emailHash loginUser.language = language loginUser.groupId = 1 loginUser.publisherId = publisherId - // TODO: Register process - // loginUser.pubKey = keyPair[0] - // loginUser.privKey = encryptedPrivkey + loginUser.pubKey = keyPair[0] + loginUser.privKey = encryptedPrivkey const queryRunner = getConnection().createQueryRunner() await queryRunner.connect() @@ -412,24 +407,21 @@ export class UserResolver { throw new Error('insert user failed') }) - // TODO: Register process // Table: login_user_backups - // const loginUserBackup = new LoginUserBackup() - // loginUserBackup.userId = loginUserId - // loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space - // loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; + const loginUserBackup = new LoginUserBackup() + loginUserBackup.userId = loginUserId + loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space + loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; - // TODO: Register process - // await queryRunner.manager.save(loginUserBackup).catch((error) => { - // // eslint-disable-next-line no-console - // console.log('insert LoginUserBackup failed', error) - // throw new Error('insert user backup failed') - // }) + await queryRunner.manager.save(loginUserBackup).catch((error) => { + // eslint-disable-next-line no-console + console.log('insert LoginUserBackup failed', error) + throw new Error('insert user backup failed') + }) // Table: state_users const dbUser = new DbUser() - // TODO: Register process - // dbUser.pubkey = keyPair[0] + dbUser.pubkey = keyPair[0] dbUser.email = email dbUser.firstName = firstName dbUser.lastName = lastName From 1c96161401c7f0153f3d03b9571ca342ad9b14e7 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 09:22:49 +0100 Subject: [PATCH 1418/1843] Replaced fix dates from pending queries to the calculated dates, withdrew comments. --- backend/src/graphql/resolver/AdminResolver.ts | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2864c06fd..6a18661d8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -46,13 +46,10 @@ export class AdminResolver { } async function getUserCreations(id: number): Promise { - // TODO: NOW()-ActualDays - 2 Monate - // const actualDate = new Date() const dateNextMonth = moment().add(1, 'month').format('YYYY-MM') + '-01' const dateMonth = moment().format('YYYY-MM') + '-01' const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' - console.log('Searching creation amount for: ', dateNextMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) @@ -62,8 +59,8 @@ async function getUserCreations(id: number): Promise { .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: dateBeforeLastMonth, // DATE - enddate: dateLastMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateBeforeLastMonth, + enddate: dateLastMonth, }), }) .getRawOne() @@ -76,7 +73,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: dateLastMonth, - enddate: dateMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + enddate: dateMonth, }), }) .getRawOne() @@ -89,7 +86,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: dateMonth, - enddate: dateNextMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + enddate: dateNextMonth, }), }) .getRawOne() @@ -102,8 +99,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-11-01', - enddate: '2021-12-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateMonth, + enddate: dateNextMonth, }), }) .getRawOne() @@ -115,8 +112,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-10-01', - enddate: '2021-11-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateLastMonth, + enddate: dateMonth, }), }) .getRawOne() @@ -128,8 +125,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-09-01', - enddate: '2021-10-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateBeforeLastMonth, + enddate: dateLastMonth, }), }) .getRawOne() From e838af8d4b6ad4d04bf512c186fa869237325d47 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 09:23:23 +0100 Subject: [PATCH 1419/1843] elopage hook problem --- backend/src/webhook/elopage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 90cdb159f..9e2ddeb81 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -27,7 +27,6 @@ import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { LoginUser } from '@entity/LoginUser' -import { randomBytes } from 'crypto' import { UserResolver } from '../graphql/resolver/UserResolver' export const elopageWebhook = async (req: any, res: any): Promise => { @@ -145,6 +144,7 @@ export const elopageWebhook = async (req: any, res: any): Promise => { firstName, lastName, publisherId: loginElopgaeBuy.publisherId, + password: '123', // TODO remove }) } catch (error) { // eslint-disable-next-line no-console From 4e762a12fc96eb6f8d8e49d3d54107c1f166da4d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 09:25:01 +0100 Subject: [PATCH 1420/1843] removed duplicate admin link (merge error) --- frontend/src/components/SidebarPlugin/SideBar.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 636cfe2f4..96882e816 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -63,14 +63,6 @@ - -
    + From 56e95718e19211607d491a6d32346c724a12fbaa Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 09:47:13 +0100 Subject: [PATCH 1459/1843] seed peter lustig as admin --- database/entity/0001-init_db/ServerUser.ts | 8 +++--- .../LoginUserRoles.ts | 13 ++++++++++ database/entity/LoginUserRoles.ts | 1 + database/entity/index.ts | 2 ++ .../factories/login-user-backup.factory.ts | 2 +- .../src/factories/login-user-roles.factory.ts | 20 ++++++++++++++ database/src/factories/server-user.factory.ts | 4 +-- .../seeds/users/peter-lustig.admin.seed.ts | 26 ++++++++++++++++--- 8 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 database/entity/0003-login_server_tables/LoginUserRoles.ts create mode 100644 database/entity/LoginUserRoles.ts create mode 100644 database/src/factories/login-user-roles.factory.ts diff --git a/database/entity/0001-init_db/ServerUser.ts b/database/entity/0001-init_db/ServerUser.ts index e776093ac..42b5816ae 100644 --- a/database/entity/0001-init_db/ServerUser.ts +++ b/database/entity/0001-init_db/ServerUser.ts @@ -8,8 +8,8 @@ export class ServerUser extends BaseEntity { @Column({ length: 50 }) username: string - @Column({ type: 'bigint', unsigned: true }) - password: BigInt + @Column({ length: 255 }) + password: string @Column({ length: 50, unique: true }) email: string @@ -23,9 +23,9 @@ export class ServerUser extends BaseEntity { @Column({ name: 'last_login', default: null, nullable: true }) lastLogin: Date - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ default: () => 'CURRENT_TIMESTAMP' }) created: Date - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ default: () => 'CURRENT_TIMESTAMP' }) modified: Date } diff --git a/database/entity/0003-login_server_tables/LoginUserRoles.ts b/database/entity/0003-login_server_tables/LoginUserRoles.ts new file mode 100644 index 000000000..33553fea4 --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginUserRoles.ts @@ -0,0 +1,13 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +@Entity('login_user_roles') +export class LoginUserRoles extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ name: 'user_id' }) + userId: number + + @Column({ name: 'role_id' }) + roleId: number +} diff --git a/database/entity/LoginUserRoles.ts b/database/entity/LoginUserRoles.ts new file mode 100644 index 000000000..1efa81caf --- /dev/null +++ b/database/entity/LoginUserRoles.ts @@ -0,0 +1 @@ +export { LoginUserRoles } from './0003-login_server_tables/LoginUserRoles' diff --git a/database/entity/index.ts b/database/entity/index.ts index 53a6a14bf..901b4ab0d 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -2,6 +2,7 @@ import { Balance } from './Balance' import { LoginElopageBuys } from './LoginElopageBuys' import { LoginEmailOptIn } from './LoginEmailOptIn' import { LoginUser } from './LoginUser' +import { LoginUserRoles } from './LoginUserRoles' import { LoginUserBackup } from './LoginUserBackup' import { Migration } from './Migration' import { ServerUser } from './ServerUser' @@ -17,6 +18,7 @@ export const entities = [ LoginElopageBuys, LoginEmailOptIn, LoginUser, + LoginUserRoles, LoginUserBackup, Migration, ServerUser, diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts index c8f047681..054e1bca8 100644 --- a/database/src/factories/login-user-backup.factory.ts +++ b/database/src/factories/login-user-backup.factory.ts @@ -10,7 +10,7 @@ interface LoginUserBackupContext { define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { if (!context) context = {} - if (!context.userId) throw new Error('LoginUserBackup: No iserId present!') + if (!context.userId) throw new Error('LoginUserBackup: No userId present!') const userBackup = new LoginUserBackup() // TODO: Get the real passphrase diff --git a/database/src/factories/login-user-roles.factory.ts b/database/src/factories/login-user-roles.factory.ts new file mode 100644 index 000000000..2d73564f1 --- /dev/null +++ b/database/src/factories/login-user-roles.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { LoginUserRoles } from '../../entity/LoginUserRoles' + +interface LoginUserRolesContext { + userId?: number + roleId?: number +} + +define(LoginUserRoles, (faker: typeof Faker, context?: LoginUserRolesContext) => { + if (!context) context = {} + if (!context.userId) throw new Error('LoginUserRoles: No userId present!') + if (!context.roleId) throw new Error('LoginUserRoles: No roleId present!') + + const userRoles = new LoginUserRoles() + userRoles.userId = context.userId + userRoles.roleId = context.roleId + + return userRoles +}) diff --git a/database/src/factories/server-user.factory.ts b/database/src/factories/server-user.factory.ts index ab3dca811..5db99f374 100644 --- a/database/src/factories/server-user.factory.ts +++ b/database/src/factories/server-user.factory.ts @@ -4,7 +4,7 @@ import { ServerUser } from '../../entity/ServerUser' interface ServerUserContext { username?: string - password?: BigInt + password?: string email?: string role?: string activated?: number @@ -18,7 +18,7 @@ define(ServerUser, (faker: typeof Faker, context?: ServerUserContext) => { const user = new ServerUser() user.username = context.username ? context.username : faker.internet.userName() - user.password = context.password ? context.password : BigInt(0) + user.password = context.password ? context.password : faker.internet.password() user.email = context.email ? context.email : faker.internet.email() user.role = context.role ? context.role : 'admin' user.activated = context.activated ? context.activated : 0 diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 85c7f09e8..53c7be395 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -2,7 +2,8 @@ import { Factory, Seeder } from 'typeorm-seeding' import { User } from '../../../entity/User' import { LoginUser } from '../../../entity/LoginUser' import { LoginUserBackup } from '../../../entity/LoginUserBackup' -// import { ServerUser } from '../../../entity/ServerUser' +import { ServerUser } from '../../../entity/ServerUser' +import { LoginUserRoles } from '../../../entity/LoginUserRoles' const peterLustig = { email: 'peter@lustig.de', @@ -17,7 +18,7 @@ const peterLustig = { 'hex', ), emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), - createdAt: new Date('2021-11-25T10:48:43'), + createdAt: new Date('2020-11-25T10:48:43'), emailChecked: true, passphraseShown: false, language: 'de', @@ -28,9 +29,10 @@ const peterLustig = { 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', mnemonicType: 2, role: 'admin', - activated: 0, + serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', + activated: 1, lastLogin: new Date('2021-10-27T12:25:57'), - modified: new Date('2021-10-27T12:25:57'), + modified: new Date('2021-09-27T12:25:57'), isAdmin: true, } @@ -69,5 +71,21 @@ export class CreatePeterLustigSeed implements Seeder { mnemonicType: peterLustig.mnemonicType, userId: loginUser.id, }).create() + + await factory(ServerUser)({ + role: peterLustig.role, + username: peterLustig.username, + password: peterLustig.serverUserPassword, + email: peterLustig.email, + activated: peterLustig.activated, + created: peterLustig.createdAt, + lastLogin: peterLustig.lastLogin, + modified: peterLustig.modified, + }).create() + + await factory(LoginUserRoles)({ + userId: loginUser.id, + roleId: 1, + }).create() } } From b639da68e77371bb9ad9b7c01f017ea4d8c4bffb Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 10:07:16 +0100 Subject: [PATCH 1460/1843] Add CSS Logo img height: 2rem --- admin/src/components/NavBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 2a58b6f75..ba6bb60ca 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -66,6 +66,6 @@ export default { From 9e45a2168773b1ede494ac99ceb6a7a99af72e26 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 10:59:32 +0100 Subject: [PATCH 1461/1843] Call Apollo query to get the pendingCreations. --- admin/src/graphql/getPendingCreations.js | 7 +++++++ admin/src/pages/CreationConfirm.vue | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 admin/src/graphql/getPendingCreations.js diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js new file mode 100644 index 000000000..322d46269 --- /dev/null +++ b/admin/src/graphql/getPendingCreations.js @@ -0,0 +1,7 @@ +import gql from 'graphql-tag' + +export const getPendingCreations = gql` + query { + getPendingCreations + } +` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 0d68635e0..d035e1b74 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -15,6 +15,7 @@ diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 140a92391..9559e3d58 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -18,6 +18,9 @@ export const mutations = { token: (state, token) => { state.token = token }, + setOpenCreations: (state, openCreations) => { + state.openCreations = openCreations + }, } export const actions = { From 99749eebb2a6459a59844dd4d060aa3b6297054b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 11:28:14 +0100 Subject: [PATCH 1463/1843] Apollo first steps getPendingCreations. --- admin/src/pages/CreationConfirm.vue | 1 + backend/src/graphql/resolver/AdminResolver.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index d035e1b74..5e5078283 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -153,6 +153,7 @@ export default { }, }, created() { + this.getPendingCreations() this.$store.commit('resetOpenCreations') this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f08b1a4dc..6b81ce220 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,5 +1,5 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw } from 'typeorm' +import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' @@ -7,6 +7,7 @@ import { TransactionCreationRepository } from '../../typeorm/repository/Transact import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() @@ -52,6 +53,14 @@ export class AdminResolver { } return await getUserCreations(user.id) } + + @Query(() => String) + async getPendingCreations(): Promise { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const pendingCreations = await pendingCreationRepository.find() + console.log('pendingCreations', pendingCreations) + return pendingCreations.toString() + } } async function getUserCreations(id: number): Promise { From 6a404841ed9a991f0ee48e89ddf19c07c318b2e4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 26 Nov 2021 11:48:10 +0100 Subject: [PATCH 1464/1843] renew token --- admin/src/main.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/admin/src/main.js b/admin/src/main.js index 3be3ae0bf..0f230e0a4 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -32,18 +32,17 @@ const authLink = new ApolloLink((operation, forward) => { Authorization: token && token.length > 0 ? `Bearer ${token}` : '', }, }) - return forward(operation) - /* .map((response) => { + return forward(operation).map((response) => { if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') { response.errors[0].message = i18n.t('error.session-expired') store.dispatch('logout', null) - if (router.currentRoute.path !== '/login') router.push('/login') + if (router.currentRoute.path !== '/not-found') router.push('/not-found') return response } const newToken = operation.getContext().response.headers.get('token') if (newToken) store.commit('token', newToken) return response - }) */ + }) }) const apolloClient = new ApolloClient({ From e2f8de0acb559ba963098790d9c722750b8db1e3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:08:18 +0100 Subject: [PATCH 1465/1843] refactor seed function --- .../factories/login-user-backup.factory.ts | 7 +- .../src/factories/login-user-roles.factory.ts | 6 +- database/src/factories/login-user.factory.ts | 20 +--- database/src/factories/server-user.factory.ts | 12 +-- database/src/factories/user.factory.ts | 10 +- database/src/interface/UserContext.ts | 32 +++++-- database/src/interface/UserInterface.ts | 30 ++++++ database/src/seeds/helpers/user-helpers.ts | 72 ++++++++++++++ .../seeds/users/peter-lustig.admin.seed.ts | 95 ++++--------------- database/src/seeds/users/peter-lustig.ts | 30 ++++++ 10 files changed, 181 insertions(+), 133 deletions(-) create mode 100644 database/src/interface/UserInterface.ts create mode 100644 database/src/seeds/helpers/user-helpers.ts create mode 100644 database/src/seeds/users/peter-lustig.ts diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts index 054e1bca8..40b82de9b 100644 --- a/database/src/factories/login-user-backup.factory.ts +++ b/database/src/factories/login-user-backup.factory.ts @@ -1,12 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUserBackup } from '../../entity/LoginUserBackup' - -interface LoginUserBackupContext { - userId?: number - passphrase?: string - mnemonicType?: number -} +import { LoginUserBackupContext } from '../interface/UserContext' define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { if (!context) context = {} diff --git a/database/src/factories/login-user-roles.factory.ts b/database/src/factories/login-user-roles.factory.ts index 2d73564f1..5b7ba9c9d 100644 --- a/database/src/factories/login-user-roles.factory.ts +++ b/database/src/factories/login-user-roles.factory.ts @@ -1,11 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUserRoles } from '../../entity/LoginUserRoles' - -interface LoginUserRolesContext { - userId?: number - roleId?: number -} +import { LoginUserRolesContext } from '../interface/UserContext' define(LoginUserRoles, (faker: typeof Faker, context?: LoginUserRolesContext) => { if (!context) context = {} diff --git a/database/src/factories/login-user.factory.ts b/database/src/factories/login-user.factory.ts index 00a0a0ee0..a5a28943e 100644 --- a/database/src/factories/login-user.factory.ts +++ b/database/src/factories/login-user.factory.ts @@ -2,25 +2,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUser } from '../../entity/LoginUser' import { randomBytes } from 'crypto' - -interface LoginUserContext { - email?: string - firstName?: string - lastName?: string - username?: string - description?: string - password?: BigInt - pubKey?: Buffer - privKey?: Buffer - emailHash?: Buffer - createdAt?: Date - emailChecked?: boolean - passphraseShown?: boolean - language?: string - disabled?: boolean - groupId?: number - publisherId?: number -} +import { LoginUserContext } from '../interface/UserContext' define(LoginUser, (faker: typeof Faker, context?: LoginUserContext) => { if (!context) context = {} diff --git a/database/src/factories/server-user.factory.ts b/database/src/factories/server-user.factory.ts index 5db99f374..06ff17c35 100644 --- a/database/src/factories/server-user.factory.ts +++ b/database/src/factories/server-user.factory.ts @@ -1,17 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { ServerUser } from '../../entity/ServerUser' - -interface ServerUserContext { - username?: string - password?: string - email?: string - role?: string - activated?: number - lastLogin?: Date - created?: Date - modified?: Date -} +import { ServerUserContext } from '../interface/UserContext' define(ServerUser, (faker: typeof Faker, context?: ServerUserContext) => { if (!context) context = {} diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts index ffa32e815..1f684f23f 100644 --- a/database/src/factories/user.factory.ts +++ b/database/src/factories/user.factory.ts @@ -2,15 +2,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { User } from '../../entity/User' import { randomBytes } from 'crypto' - -interface UserContext { - pubkey?: Buffer - email?: string - firstName?: string - lastName?: string - username?: string - disabled?: boolean -} +import { UserContext } from '../interface/UserContext' define(User, (faker: typeof Faker, context?: UserContext) => { if (!context) context = {} diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts index 201a2c944..4e188904c 100644 --- a/database/src/interface/UserContext.ts +++ b/database/src/interface/UserContext.ts @@ -1,5 +1,13 @@ export interface UserContext { - // from login user (contains state user) + pubkey?: Buffer + email?: string + firstName?: string + lastName?: string + username?: string + disabled?: boolean +} + +export interface LoginUserContext { email?: string firstName?: string lastName?: string @@ -15,15 +23,27 @@ export interface UserContext { language?: string disabled?: boolean groupId?: number - publisherId?: number - // from login user backup + publisherId?: number | null +} + +export interface LoginUserBackupContext { + userId?: number passphrase?: string mnemonicType?: number - // from server user +} + +export interface ServerUserContext { + username?: string + password?: string + email?: string role?: string activated?: number lastLogin?: Date + created?: Date modified?: Date - // flag for admin - isAdmin?: boolean +} + +export interface LoginUserRolesContext { + userId?: number + roleId?: number } diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts new file mode 100644 index 000000000..942158593 --- /dev/null +++ b/database/src/interface/UserInterface.ts @@ -0,0 +1,30 @@ +export interface UserInterface { + // from login user (contains state user) + email?: string + firstName?: string + lastName?: string + username?: string + description?: string + password?: BigInt + pubKey?: Buffer + privKey?: Buffer + emailHash?: Buffer + createdAt?: Date + emailChecked?: boolean + passphraseShown?: boolean + language?: string + disabled?: boolean + groupId?: number + publisherId?: number | null + // from login user backup + passphrase?: string + mnemonicType?: number + // from server user + serverUserPassword?: string + role?: string + activated?: number + lastLogin?: Date + modified?: Date + // flag for admin + isAdmin?: boolean +} diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts new file mode 100644 index 000000000..2474b1241 --- /dev/null +++ b/database/src/seeds/helpers/user-helpers.ts @@ -0,0 +1,72 @@ +import { + UserContext, + LoginUserContext, + LoginUserBackupContext, + ServerUserContext, + LoginUserRolesContext, +} from '../../interface/UserContext' +import { UserInterface } from '../../interface/UserInterface' +import { LoginUser } from '../../../entity/LoginUser' + +export const createUserContext = (context: UserInterface): UserContext => { + return { + pubkey: context.pubKey, + email: context.email, + firstName: context.firstName, + lastName: context.lastName, + username: context.username, + disabled: context.disabled, + } +} + +export const createLoginUserContext = (context: UserInterface): LoginUserContext => { + return { + email: context.email, + firstName: context.firstName, + lastName: context.lastName, + username: context.username, + description: context.description, + password: context.password, + pubKey: context.pubKey, + privKey: context.privKey, + emailHash: context.emailHash, + createdAt: context.createdAt, + emailChecked: context.emailChecked, + passphraseShown: context.passphraseShown, + language: context.language, + disabled: context.disabled, + groupId: context.groupId, + publisherId: context.publisherId, + } +} + +export const createLoginUserBackupContext = ( + context: UserInterface, + loginUser: LoginUser, +): LoginUserBackupContext => { + return { + passphrase: context.passphrase, + mnemonicType: context.mnemonicType, + userId: loginUser.id, + } +} + +export const createServerUserContext = (context: UserInterface): ServerUserContext => { + return { + role: context.role, + username: context.username, + password: context.serverUserPassword, + email: context.email, + activated: context.activated, + created: context.createdAt, + lastLogin: context.lastLogin, + modified: context.modified, + } +} + +export const createLoginUserRolesContext = (loginUser: LoginUser): LoginUserRolesContext => { + return { + userId: loginUser.id, + roleId: 1, + } +} diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 53c7be395..a8d17a6e4 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -4,88 +4,29 @@ import { LoginUser } from '../../../entity/LoginUser' import { LoginUserBackup } from '../../../entity/LoginUserBackup' import { ServerUser } from '../../../entity/ServerUser' import { LoginUserRoles } from '../../../entity/LoginUserRoles' +import { + createUserContext, + createLoginUserContext, + createLoginUserBackupContext, + createServerUserContext, + createLoginUserRolesContext, +} from '../helpers/user-helpers' +import { peterLustig } from './peter-lustig' -const peterLustig = { - email: 'peter@lustig.de', - firstName: 'Peter', - lastName: 'Lustig', - username: 'peter', - description: 'Latzhose und Nickelbrille', - password: BigInt('3917921995996627700'), - pubKey: Buffer.from('7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770', 'hex'), - privKey: Buffer.from( - '3c7c0253033212ed983f6bb10ce73362a99f0bd01d4d1b21ca702d532ca32710ba36abf72a22a963b9026e764e954f441f4905b87a66861bd6b9d9689b7f8aefea66cc493e21da4244e85be81660b9c4', - 'hex', - ), - emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), - createdAt: new Date('2020-11-25T10:48:43'), - emailChecked: true, - passphraseShown: false, - language: 'de', - disabled: false, - groupId: 1, - publisherId: null, - passphrase: - 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', - mnemonicType: 2, - role: 'admin', - serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', - activated: 1, - lastLogin: new Date('2021-10-27T12:25:57'), - modified: new Date('2021-09-27T12:25:57'), - isAdmin: true, -} +const userData = peterLustig export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)({ - pubkey: peterLustig.pubKey, - email: peterLustig.email, - firstName: peterLustig.firstName, - lastName: peterLustig.lastName, - username: peterLustig.username, - disabled: peterLustig.disabled, - }).create() + await factory(User)(createUserContext(userData)).create() + const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() + await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() - const loginUser = await factory(LoginUser)({ - email: peterLustig.email, - firstName: peterLustig.firstName, - lastName: peterLustig.lastName, - username: peterLustig.username, - description: peterLustig.description, - password: peterLustig.password, - pubKey: peterLustig.pubKey, - privKey: peterLustig.privKey, - emailHash: peterLustig.emailHash, - createdAt: peterLustig.createdAt, - emailChecked: peterLustig.emailChecked, - passphraseShown: peterLustig.passphraseShown, - language: peterLustig.language, - disabled: peterLustig.disabled, - groupId: peterLustig.groupId, - publisherId: peterLustig.publisherId, - }).create() + if (userData.isAdmin) { + await factory(ServerUser)(createServerUserContext(userData)).create() - await factory(LoginUserBackup)({ - passphrase: peterLustig.passphrase, - mnemonicType: peterLustig.mnemonicType, - userId: loginUser.id, - }).create() - - await factory(ServerUser)({ - role: peterLustig.role, - username: peterLustig.username, - password: peterLustig.serverUserPassword, - email: peterLustig.email, - activated: peterLustig.activated, - created: peterLustig.createdAt, - lastLogin: peterLustig.lastLogin, - modified: peterLustig.modified, - }).create() - - await factory(LoginUserRoles)({ - userId: loginUser.id, - roleId: 1, - }).create() + // This is crazy: we just need the relation to roleId but no role at all + // It works with LoginRoles empty!! + await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() + } } } diff --git a/database/src/seeds/users/peter-lustig.ts b/database/src/seeds/users/peter-lustig.ts new file mode 100644 index 000000000..63caf55f6 --- /dev/null +++ b/database/src/seeds/users/peter-lustig.ts @@ -0,0 +1,30 @@ +export const peterLustig = { + email: 'peter@lustig.de', + firstName: 'Peter', + lastName: 'Lustig', + username: 'peter', + description: 'Latzhose und Nickelbrille', + password: BigInt('3917921995996627700'), + pubKey: Buffer.from('7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770', 'hex'), + privKey: Buffer.from( + '3c7c0253033212ed983f6bb10ce73362a99f0bd01d4d1b21ca702d532ca32710ba36abf72a22a963b9026e764e954f441f4905b87a66861bd6b9d9689b7f8aefea66cc493e21da4244e85be81660b9c4', + 'hex', + ), + emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), + createdAt: new Date('2020-11-25T10:48:43'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', + mnemonicType: 2, + role: 'admin', + serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', + activated: 1, + lastLogin: new Date('2021-10-27T12:25:57'), + modified: new Date('2021-09-27T12:25:57'), + isAdmin: true, +} From 62c4552535f5555999f8e2f0f146894bff937323 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:24 +0100 Subject: [PATCH 1466/1843] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 5f64c34bc..069c9038f 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -6,7 +6,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From 8ad35aa5f364d74ea9569c454e480b2aef2553f1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:35 +0100 Subject: [PATCH 1467/1843] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 069c9038f..7280dca40 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -9,7 +9,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' }) From aacfaa67c4e457ba753de8f231b993a0a31ef501 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:51 +0100 Subject: [PATCH 1468/1843] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index 8ec279fdb..f3533fd86 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -7,7 +7,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From c8720673fd0f3323a547959c55b514197f3a810c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:23:00 +0100 Subject: [PATCH 1469/1843] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index f3533fd86..6f3067c79 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -10,7 +10,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' }) From ae8fc914fb1d53f2293fff347a63464f47669a25 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:24:56 +0100 Subject: [PATCH 1470/1843] further refactoring --- database/package.json | 1 - database/src/index.ts | 2 ++ database/src/seeds/helpers/user-helpers.ts | 19 ++++++++++++++ .../seeds/users/peter-lustig.admin.seed.ts | 26 +------------------ 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/database/package.json b/database/package.json index a84026e6a..bc9fbe961 100644 --- a/database/package.json +++ b/database/package.json @@ -12,7 +12,6 @@ "clean": "tsc --build --clean", "up": "cd build && node src/index.js up", "down": "cd build && node src/index.js down", - "reset": "cd build && node src/index.js reset", "dev_up": "nodemon -w ./ --ext ts --exec ts-node src/index.ts up", "dev_down": "nodemon -w ./ --ext ts --exec ts-node src/index.ts down", "dev_reset": "nodemon -w ./ --ext ts --exec ts-node src/index.ts reset", diff --git a/database/src/index.ts b/database/src/index.ts index f781b09db..f6ca719cc 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -47,9 +47,11 @@ const run = async (command: string) => { await migration.down() // use for downgrade script break case 'reset': + // TODO protect from production await migration.reset() // use for resetting database break case 'seed': + // TODO protect from production await useSeeding({ root: process.cwd(), configName: 'ormconfig.js', diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts index 2474b1241..805104519 100644 --- a/database/src/seeds/helpers/user-helpers.ts +++ b/database/src/seeds/helpers/user-helpers.ts @@ -6,7 +6,26 @@ import { LoginUserRolesContext, } from '../../interface/UserContext' import { UserInterface } from '../../interface/UserInterface' +import { User } from '../../../entity/User' import { LoginUser } from '../../../entity/LoginUser' +import { LoginUserBackup } from '../../../entity/LoginUserBackup' +import { ServerUser } from '../../../entity/ServerUser' +import { LoginUserRoles } from '../../../entity/LoginUserRoles' +import { Factory } from 'typeorm-seeding' + +export const userSeeder = async (factory: Factory, userData: UserInterface): Promise => { + await factory(User)(createUserContext(userData)).create() + const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() + await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() + + if (userData.isAdmin) { + await factory(ServerUser)(createServerUserContext(userData)).create() + + // This is crazy: we just need the relation to roleId but no role at all + // It works with LoginRoles empty!! + await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() + } +} export const createUserContext = (context: UserInterface): UserContext => { return { diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index a8d17a6e4..49cbab072 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -1,32 +1,8 @@ import { Factory, Seeder } from 'typeorm-seeding' -import { User } from '../../../entity/User' -import { LoginUser } from '../../../entity/LoginUser' -import { LoginUserBackup } from '../../../entity/LoginUserBackup' -import { ServerUser } from '../../../entity/ServerUser' -import { LoginUserRoles } from '../../../entity/LoginUserRoles' -import { - createUserContext, - createLoginUserContext, - createLoginUserBackupContext, - createServerUserContext, - createLoginUserRolesContext, -} from '../helpers/user-helpers' import { peterLustig } from './peter-lustig' -const userData = peterLustig - export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)(createUserContext(userData)).create() - const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() - await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() - - if (userData.isAdmin) { - await factory(ServerUser)(createServerUserContext(userData)).create() - - // This is crazy: we just need the relation to roleId but no role at all - // It works with LoginRoles empty!! - await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() - } + await userSeeder(factory, peterLustig) } } From 3824920c47d34a4f4e4cd0e3dc3fb489aa56e757 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:31:02 +0100 Subject: [PATCH 1471/1843] get things working --- database/src/seeds/users/peter-lustig.admin.seed.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 49cbab072..9dd3fd4c7 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -1,5 +1,6 @@ import { Factory, Seeder } from 'typeorm-seeding' import { peterLustig } from './peter-lustig' +import { userSeeder } from '../helpers/user-helpers' export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { From 602dfd64f1edb5ac5ada8ce34c3859ced92c6922 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 12:36:01 +0100 Subject: [PATCH 1472/1843] Corected return type for getPendingCreations and corected query. --- admin/src/graphql/getPendingCreations.js | 10 +++++- backend/src/graphql/model/PendingCreation.ts | 31 +++++++++++++++++++ backend/src/graphql/resolver/AdminResolver.ts | 25 ++++++++++++--- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 backend/src/graphql/model/PendingCreation.ts diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index 322d46269..c387c368e 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -2,6 +2,14 @@ import gql from 'graphql-tag' export const getPendingCreations = gql` query { - getPendingCreations + getPendingCreations { + firstName + lastName + email + amount + note + date + moderator + } } ` diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts new file mode 100644 index 000000000..56bbe6d27 --- /dev/null +++ b/backend/src/graphql/model/PendingCreation.ts @@ -0,0 +1,31 @@ +import { ObjectType, Field, Int } from 'type-graphql' + +@ObjectType() +export class PendingCreation { + @Field(() => String) + firstName: string + + @Field(() => Int) + id?: number + + @Field(() => String) + lastName: string + + @Field(() => Number) + userId: number + + @Field(() => String) + email: string + + @Field(() => Date) + date: Date + + @Field(() => String) + note: string + + @Field(() => Number) + amount: BigInt + + @Field(() => Number) + moderator: number +} diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 6b81ce220..8dd0293ce 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,6 +1,7 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' +import { PendingCreation } from '../model/PendingCreation' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' @@ -54,12 +55,28 @@ export class AdminResolver { return await getUserCreations(user.id) } - @Query(() => String) - async getPendingCreations(): Promise { + @Query(() => [PendingCreation]) + async getPendingCreations(): Promise { const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingCreations = await pendingCreationRepository.find() - console.log('pendingCreations', pendingCreations) - return pendingCreations.toString() + + const pendingCreationsPromise = await Promise.all( + pendingCreations.map(async (pendingCreation) => { + const userRepository = getCustomRepository(UserRepository) + const user = await userRepository.findOneOrFail({ id: pendingCreation.userId }) + + const newPendingCreation = { + ...pendingCreation, + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + } + + return newPendingCreation + }), + ) + console.log('pendingCreations', pendingCreationsPromise) + return pendingCreationsPromise } } From 2fe18e851c702adfb314b1498ecb0aca339ca9b1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:48:33 +0100 Subject: [PATCH 1473/1843] seed Bibi Bloxberg --- database/src/index.ts | 2 ++ .../src/seeds/users/bibi-bloxberg.seed.ts | 9 +++++++ database/src/seeds/users/bibi-bloxberg.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/bibi-bloxberg.seed.ts create mode 100644 database/src/seeds/users/bibi-bloxberg.ts diff --git a/database/src/index.ts b/database/src/index.ts index f6ca719cc..622f8bbec 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -6,6 +6,7 @@ import prepare from './prepare' import connection from './typeorm/connection' import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' +import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -57,6 +58,7 @@ const run = async (command: string) => { configName: 'ormconfig.js', }) await runSeeder(CreatePeterLustigSeed) + await runSeeder(CreateBibiBloxbergSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/bibi-bloxberg.seed.ts b/database/src/seeds/users/bibi-bloxberg.seed.ts new file mode 100644 index 000000000..4899f3809 --- /dev/null +++ b/database/src/seeds/users/bibi-bloxberg.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { bibiBloxberg } from './bibi-bloxberg' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateBibiBloxbergSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, bibiBloxberg) + } +} diff --git a/database/src/seeds/users/bibi-bloxberg.ts b/database/src/seeds/users/bibi-bloxberg.ts new file mode 100644 index 000000000..d87e3eb4a --- /dev/null +++ b/database/src/seeds/users/bibi-bloxberg.ts @@ -0,0 +1,25 @@ +export const bibiBloxberg = { + email: 'bibi@bloxberg.de', + firstName: 'Bibi', + lastName: 'Bloxberg', + username: 'bibi', + description: 'Hex Hex', + password: BigInt('12825419584724616625'), + pubKey: Buffer.from('42de7e4754625b730018c3b4ea745a4d043d9d867af352d0f08871793dfa6743', 'hex'), + privKey: Buffer.from( + '60681365b6ad6fd500eae09ac8df0de6beb7554226e0ca1049e957cc6f202205b86e258bbbe98561a86bd9b986ea8b2a6c60abdff8a745f73c8932d4b6545a8da09bbcd6e18ec61a2ef30bac85f83c5d', + 'hex', + ), + emailHash: Buffer.from('38a0d8c8658a5681cc1180c5d9e2b2a18e4f611db8ab3ca61de4aa91ae94219b', 'hex'), + createdAt: new Date('2021-11-26T11:32:16'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'knife normal level all hurdle crucial color avoid warrior stadium road bachelor affair topple hawk pottery right afford immune two ceiling budget glance hour ', + mnemonicType: 2, + isAdmin: false, +} From a6f36cd3058f539bb56189e979ce64a41e8f13b5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:56:48 +0100 Subject: [PATCH 1474/1843] =?UTF-8?q?seed=20R=C3=A4uber=20Hotzenplotz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/src/index.ts | 2 ++ .../seeds/users/raeuber-hotzenplotz.seed.ts | 9 +++++++ .../src/seeds/users/raeuber-hotzenplotz.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/raeuber-hotzenplotz.seed.ts create mode 100644 database/src/seeds/users/raeuber-hotzenplotz.ts diff --git a/database/src/index.ts b/database/src/index.ts index 622f8bbec..9df88616c 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -7,6 +7,7 @@ import connection from './typeorm/connection' import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' +import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -59,6 +60,7 @@ const run = async (command: string) => { }) await runSeeder(CreatePeterLustigSeed) await runSeeder(CreateBibiBloxbergSeed) + await runSeeder(CreateRaeuberHotzenplotzSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/raeuber-hotzenplotz.seed.ts b/database/src/seeds/users/raeuber-hotzenplotz.seed.ts new file mode 100644 index 000000000..2399136d2 --- /dev/null +++ b/database/src/seeds/users/raeuber-hotzenplotz.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { raeuberHotzenplotz } from './raeuber-hotzenplotz' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateRaeuberHotzenplotzSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, raeuberHotzenplotz) + } +} diff --git a/database/src/seeds/users/raeuber-hotzenplotz.ts b/database/src/seeds/users/raeuber-hotzenplotz.ts new file mode 100644 index 000000000..10fcf8af1 --- /dev/null +++ b/database/src/seeds/users/raeuber-hotzenplotz.ts @@ -0,0 +1,25 @@ +export const raeuberHotzenplotz = { + email: 'raeuber@hotzenplotz.de', + firstName: 'Räuber', + lastName: 'Hotzenplotz', + username: 'räuber', + description: 'Pfefferpistole', + password: BigInt('12123692783243004812'), + pubKey: Buffer.from('d7c70f94234dff071d982aa8f41583876c356599773b5911b39080da2b8c2d2b', 'hex'), + privKey: Buffer.from( + 'c4ede7e7e65acd4cc0a2d91136ee8f753c6903b3594798afde341092b21a4c1589f296d43c6e7adcd7602fcc2a2bcbf74c9f42453ad49cc5186eadf654bbd2c5fa9aa027f152592819246da896ebfcd2', + 'hex', + ), + emailHash: Buffer.from('ec8d34112adb40ff2f6538b05660b03440372690f034cd7d6322d17020233c77', 'hex'), + createdAt: new Date('2021-11-26T11:32:16'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'gospel trip tenant mouse spider skill auto curious man video chief response same little over expire drum display fancy clinic keen throw urge basket ', + mnemonicType: 2, + isAdmin: false, +} From ac0c0c8449a1dfd364b96cc2c7f55be6623941e5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 13:09:00 +0100 Subject: [PATCH 1475/1843] seed Bob der Baumeister --- database/src/index.ts | 2 ++ .../src/seeds/users/bob-baumeister.seed.ts | 9 +++++++ database/src/seeds/users/bob-baumeister.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/bob-baumeister.seed.ts create mode 100644 database/src/seeds/users/bob-baumeister.ts diff --git a/database/src/index.ts b/database/src/index.ts index 9df88616c..ec5328a9a 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -8,6 +8,7 @@ import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed' +import { CreateBobBaumeisterSeed } from './seeds/users/bob-baumeister.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -61,6 +62,7 @@ const run = async (command: string) => { await runSeeder(CreatePeterLustigSeed) await runSeeder(CreateBibiBloxbergSeed) await runSeeder(CreateRaeuberHotzenplotzSeed) + await runSeeder(CreateBobBaumeisterSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/bob-baumeister.seed.ts b/database/src/seeds/users/bob-baumeister.seed.ts new file mode 100644 index 000000000..22ff30824 --- /dev/null +++ b/database/src/seeds/users/bob-baumeister.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { bobBaumeister } from './bob-baumeister' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateBobBaumeisterSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, bobBaumeister) + } +} diff --git a/database/src/seeds/users/bob-baumeister.ts b/database/src/seeds/users/bob-baumeister.ts new file mode 100644 index 000000000..33ce35656 --- /dev/null +++ b/database/src/seeds/users/bob-baumeister.ts @@ -0,0 +1,25 @@ +export const bobBaumeister = { + email: 'bob@baumeister.de', + firstName: 'Bob', + lastName: 'der Baumeister', + username: 'bob', + description: 'Können wir das schaffen? Ja, wir schaffen das!', + password: BigInt('3296644341468822636'), + pubKey: Buffer.from('a509d9a146374fc975e3677db801ae8a4a83bff9dea96da64053ff6de6b2dd7e', 'hex'), + privKey: Buffer.from( + 'd30606ac59c29058896180bebd6dcd1714dbdd697cc14b65eb4de9ef5241a5d5fc789eaab48957a887c45b7e71ab75c47fd132c14b99007891b5bdfb1026575009f0802b0126930803c113ab3f44e1be', + 'hex', + ), + emailHash: Buffer.from('4b8ce4e175587aaf33da19e272719da1a547daff557820191fab0c65c5a3b7f1', 'hex'), + createdAt: new Date('2021-11-26T11:36:31'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'detail master source effort unable waste tilt flush domain orchard art truck hint barrel response gate impose peanut secret merry three uncle wink resource ', + mnemonicType: 2, + isAdmin: false, +} From 0909a3a99a038a9fe422db4cc01dba68677f1f74 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 13:15:58 +0100 Subject: [PATCH 1476/1843] add README --- database/README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 database/README.md diff --git a/database/README.md b/database/README.md new file mode 100644 index 000000000..f78eca113 --- /dev/null +++ b/database/README.md @@ -0,0 +1,46 @@ +# database + +## Project setup +``` +yarn install +``` + +## Upgrade migrations production +``` +yarn up +``` + +## Upgrade migrations development +``` +yarn dev_up +``` + +## Downgrade migrations production +``` +yarn down +``` + +## Downgrade migrations development +``` +yarn dev_down +``` + + +## Reset DB +``` +yarn dev_reset +``` + +## Seed DB +``` +yarn seed +``` + +## Seeded Users + +| email | password | admin | +| peter@lustig.de | `Aa12345_` | `true` | +| bibi@bloxberg.de | `Aa12345_` | `false` | +| raeuber@hotzenplotz.de | `Aa12345_` | `false` | +| bob@baumeister.de | `Aa12345_` | `false` | + From 48c0b687d6be249025dc512c12038b7c5fca33a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:05:49 +0100 Subject: [PATCH 1477/1843] Query changed to Type PendingCreation, changed the login user search to state user search, adding parameters to PendingCreation object, changed frontend to map the query informations. --- admin/src/graphql/getPendingCreations.js | 1 + admin/src/pages/CreationConfirm.vue | 98 +++---------------- backend/src/graphql/model/PendingCreation.ts | 3 + backend/src/graphql/resolver/AdminResolver.ts | 24 ++--- backend/src/typeorm/repository/User.ts | 13 +++ 5 files changed, 43 insertions(+), 96 deletions(-) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index c387c368e..f359c79db 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -10,6 +10,7 @@ export const getPendingCreations = gql` note date moderator + creation } } ` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 5e5078283..660436d6c 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -31,98 +31,25 @@ export default { { key: 'firstName', label: 'Vorname' }, { key: 'lastName', label: 'Nachname' }, { - key: 'creation_gdd', + key: 'amount', label: 'Schöpfung', formatter: (value) => { return value + ' GDD' }, }, - { key: 'text', label: 'Text' }, + { key: 'note', label: 'Text' }, { - key: 'creation_date', + key: 'date', label: 'Datum', formatter: (value) => { - return value.long + return this.$moment(value).format('ll') }, }, - { key: 'creation_moderator', label: 'Moderator' }, + { key: 'moderator', label: 'Moderator' }, { key: 'edit_creation', label: 'ändern' }, { key: 'confirm', label: 'speichern' }, ], - confirmResult: [ - { - id: 1, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[450,200,700]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '22/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 2, - email: 'larsen@woob.de', - firstName: 'Larsen', - lastName: 'Shaw', - creation: '[300,200,1000]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '03/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 3, - email: 'geneva@tete.de', - firstName: 'Geneva', - lastName: 'Wilson', - creation: '[350,200,900]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam', - creation_date: { - short: 'September', - long: '27/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 4, - email: 'viewrter@asdfvb.com', - firstName: 'Soledare', - lastName: 'Takker', - creation: '[100,400,800]', - creation_gdd: '500', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo ', - creation_date: { - short: 'Oktober', - long: '12/10/2021', - }, - creation_moderator: 'Evelyn Roller', - }, - { - id: 5, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[100,400,800]', - creation_gdd: '200', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At', - creation_date: { - short: 'September', - long: '05/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - ], + confirmResult: [], } }, @@ -141,20 +68,21 @@ export default { this.$store.commit('openCreationsMinus', 1) } }, - getPendingCreations() { + async getPendingCreations() { this.$apollo .query({ query: getPendingCreations, }) .then((result) => { - console.log('getPendingCreations.Result', result) + this.confirmResult = result.data.getPendingCreations + }) + .catch((error) => { + this.$toasted.error(error.message) }) - .catch() }, }, - created() { - this.getPendingCreations() - this.$store.commit('resetOpenCreations') + async created() { + await this.getPendingCreations() this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts index 56bbe6d27..aa12bd94b 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingCreation.ts @@ -28,4 +28,7 @@ export class PendingCreation { @Field(() => Number) moderator: number + + @Field(() => [Number]) + creation: number[] } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8dd0293ce..3c960b0fa 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -16,19 +16,19 @@ export class AdminResolver { @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => [UserAdmin]) async searchUsers(@Arg('searchText') searchText: string): Promise { - const loginUserRepository = getCustomRepository(LoginUserRepository) - const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = await Promise.all( - loginUsers.map(async (loginUser) => { - const user = new UserAdmin() - user.firstName = loginUser.firstName - user.lastName = loginUser.lastName - user.email = loginUser.email - user.creation = await getUserCreations(loginUser.id) - return user + const userRepository = getCustomRepository(UserRepository) + const users = await userRepository.findBySearchCriteria(searchText) + const adminUsers = await Promise.all( + users.map(async (user) => { + const adminUser = new UserAdmin() + adminUser.firstName = user.firstName + adminUser.lastName = user.lastName + adminUser.email = user.email + adminUser.creation = await getUserCreations(user.id) + return adminUser }), ) - return users + return adminUsers } @Query(() => [Number]) @@ -38,6 +38,7 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) + console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -70,6 +71,7 @@ export class AdminResolver { firstName: user.firstName, lastName: user.lastName, email: user.email, + creation: await getUserCreations(user.id), } return newPendingCreation diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index e127c179c..cf67c837b 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -30,4 +30,17 @@ export class UserRepository extends Repository { }) return usersIndiced } + + async findBySearchCriteria(searchCriteria: string): Promise { + return await this.createQueryBuilder('user') + .where( + 'user.firstName like :name or user.lastName like :lastName or user.email like :email', + { + name: `%${searchCriteria}%`, + lastName: `%${searchCriteria}%`, + email: `%${searchCriteria}%`, + }, + ) + .getMany() + } } From 18a530b1b129cb270b85ac651a24bcfdb9b17c32 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:03 +0100 Subject: [PATCH 1478/1843] Withdrew console.logs. --- backend/src/graphql/resolver/AdminResolver.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3c960b0fa..ca903f49b 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -38,7 +38,6 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -77,7 +76,6 @@ export class AdminResolver { return newPendingCreation }), ) - console.log('pendingCreations', pendingCreationsPromise) return pendingCreationsPromise } } From e0ad9ab40a609728127c26ca0597a9f196033c8c Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:46 +0100 Subject: [PATCH 1479/1843] Removed unused imports. --- backend/src/graphql/resolver/AdminResolver.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ca903f49b..a93696814 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,14 +1,12 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw, Any } from 'typeorm' +import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { PendingCreation } from '../model/PendingCreation' -import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' -import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() From a618ac678e3685c26a83c68a31ab710286368bbb Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:35:21 +0100 Subject: [PATCH 1480/1843] Created delete query. --- admin/src/graphql/getPendingCreations.js | 1 + backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index f359c79db..add9efc29 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -3,6 +3,7 @@ import gql from 'graphql-tag' export const getPendingCreations = gql` query { getPendingCreations { + id firstName lastName email diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a93696814..70f6c35ec 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -8,6 +8,7 @@ import { PendingCreationRepository } from '../../typeorm/repository/PendingCreat import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' import moment from 'moment' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' @Resolver() export class AdminResolver { @@ -76,6 +77,15 @@ export class AdminResolver { ) return pendingCreationsPromise } + + @Query(() => Boolean) + async deletePendingCreation(@Arg('id') id: number): Promise { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const entity = await pendingCreationRepository.findOne(id) + if (!entity) throw new Error('Not pending creation with this id.') + const res = await pendingCreationRepository.manager.remove(entity) + return res ? true : false + } } async function getUserCreations(id: number): Promise { From 2f6a1a06300c58bbfa567352bdf632de84a9d367 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 17:43:24 +0100 Subject: [PATCH 1481/1843] In CreationConfirm.vue number of all open creations and transferred to the store --- admin/src/pages/CreationConfirm.vue | 3 ++- admin/src/pages/Overview.vue | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 660436d6c..c44402a1e 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -75,6 +75,8 @@ export default { }) .then((result) => { this.confirmResult = result.data.getPendingCreations + this.$store.commit('resetOpenCreations') + this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }) .catch((error) => { this.$toasted.error(error.message) @@ -83,7 +85,6 @@ export default { }, async created() { await this.getPendingCreations() - this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index d63c46199..329843cad 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -76,21 +76,27 @@
    From f2c31b7d6837ef22e9c79a65d1d4f60323c3a724 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 17:49:29 +0100 Subject: [PATCH 1483/1843] pendingCreationRepository.manager.remove res - fix prettier --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 70f6c35ec..5d2ed47a2 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -84,7 +84,7 @@ export class AdminResolver { const entity = await pendingCreationRepository.findOne(id) if (!entity) throw new Error('Not pending creation with this id.') const res = await pendingCreationRepository.manager.remove(entity) - return res ? true : false + return !!res } } From 30ba6e473b176d02614a6360e93cd8cc854b7f7a Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 18:02:18 +0100 Subject: [PATCH 1484/1843] chnaged simpler counting, number of open creations --- admin/src/pages/CreationConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index c44402a1e..1b53dc85b 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -76,7 +76,7 @@ export default { .then((result) => { this.confirmResult = result.data.getPendingCreations this.$store.commit('resetOpenCreations') - this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) + this.$store.commit('openCreationsPlus', result.data.getPendingCreations.length) }) .catch((error) => { this.$toasted.error(error.message) From 38da2dcdfd34d7b4331a4593849dffdeee2cbdaa Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 18:09:10 +0100 Subject: [PATCH 1485/1843] Remove hint text for test creations on CreationConfirm Table. --- admin/src/pages/CreationConfirm.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 1b53dc85b..ec0e6e7af 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,9 +1,5 @@