From 38326781d75fb125da2a7f417903ac83148c991e Mon Sep 17 00:00:00 2001 From: Rostislav Provodenko <60982217+rostislavdeepcrawl@users.noreply.github.com> Date: Mon, 21 Jun 2021 14:14:18 +0300 Subject: [PATCH] feat: upgrade to duckdb v. 0.2.7 (#102) * upgrade to 0.2.7 * dependency vulnerabilities fixes --- .gitignore | 1 + addon/result_iterator.cc | 3 +- package.json | 9 +- yarn.lock | 191 +++++++++++++++++++++++++++++---------- 4 files changed, 149 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 1f83713..4862377 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /temp /etc /yarn-error.log +.idea diff --git a/addon/result_iterator.cc b/addon/result_iterator.cc index 55116b1..ea00ceb 100644 --- a/addon/result_iterator.cc +++ b/addon/result_iterator.cc @@ -225,7 +225,8 @@ Napi::Value ResultIterator::getMappedValue(Napi::Env env, duckdb::Value value) { case duckdb::LogicalTypeId::STRUCT: { auto object = Napi::Object::New(env); for (size_t i = 0; i < value.struct_value.size(); i++) { - auto &key = value.type().child_types()[i].first; + auto &child_types = duckdb::StructType::GetChildTypes(value.type()); + auto &key = child_types[i].first; auto &element = value.struct_value[i]; auto child_value = getMappedValue(env, element); object.Set(key, child_value); diff --git a/package.json b/package.json index 27f9c6b..2971a50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-duckdb", - "version": "0.0.71", + "version": "0.0.72", "private": false, "description": "DuckDB for Node.JS", "keywords": [ @@ -40,7 +40,7 @@ "clang:check": "yarn clang-format --dry-run --Werror addon/**", "clang:fix": "yarn clang-format -i addon/**", "cleanup:binaries": "rm -rf build prebuilds duckdb", - "download-duckdb": "rm -rf duckdb && curl -L https://github.com/cwida/duckdb/archive/6d3586322e55390fd5d9280febaf4d53fdc927c0.tar.gz > duckdb.tar.gz && tar xf duckdb.tar.gz && mv duckdb-6d3586322e55390fd5d9280febaf4d53fdc927c0 duckdb && rm duckdb.tar.gz", + "download-duckdb": "rm -rf duckdb && curl -L https://github.com/cwida/duckdb/archive/v0.2.7.tar.gz > duckdb.tar.gz && tar xf duckdb.tar.gz && mv duckdb-0.2.7 duckdb && rm duckdb.tar.gz", "eslint:check": "eslint --ext .js,.json,.ts ./", "eslint:fix": "eslint --fix --ext .js,.json,.ts ./", "generate-doc": "yarn build:ts && rm -rf temp etc && mkdir etc && yarn api-extractor run --local --verbose && yarn api-documenter markdown -i temp -o docs/api && ./docs/replace.sh", @@ -58,7 +58,8 @@ "test": "yarn build:ts && NODE_OPTIONS='--max-old-space-size=8192' jest --runInBand --testTimeout=60000" }, "resolutions": { - "cmake-js/yargs/y18n": ">=5.0.5||>=4.0.1 <5.0.0||>=3.2.2 <4.0.0" + "cmake-js/yargs/y18n": ">=5.0.5||>=4.0.1 <5.0.0||>=3.2.2 <4.0.0", + "trim-newlines": ">=3.0.1 <4.0.0 || >=4.0.1" }, "dependencies": { "cmake-js": "^6.1.0", @@ -99,7 +100,7 @@ "standard-version": "^9.1.1", "ttypescript": "^1.5.12", "typescript": "^4.0.3", - "yarn-audit-fix": "^5.0.0" + "yarn-audit-fix": "6.3.2" }, "engines": { "node": ">= 12.17.0" diff --git a/yarn.lock b/yarn.lock index 668f933..f94d3a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -644,6 +644,40 @@ treeverse "^1.0.4" walk-up-path "^1.0.0" +"@npmcli/arborist@^2.6.3": + version "2.6.3" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.6.3.tgz#da75b0c6a6c73c24e2b848df71a45a298d9c6932" + integrity sha512-R8U2dZ8+jeE7go+qNU4Mt6aiXyBu3mM75iRIugNCA4P0OWlsLOpuDPPhsaRcOVbtXheOGZXrqe36qP1g+M68KQ== + dependencies: + "@npmcli/installed-package-contents" "^1.0.7" + "@npmcli/map-workspaces" "^1.0.2" + "@npmcli/metavuln-calculator" "^1.1.0" + "@npmcli/move-file" "^1.1.0" + "@npmcli/name-from-folder" "^1.0.1" + "@npmcli/node-gyp" "^1.0.1" + "@npmcli/run-script" "^1.8.2" + bin-links "^2.2.1" + cacache "^15.0.3" + common-ancestor-path "^1.0.1" + json-parse-even-better-errors "^2.3.1" + json-stringify-nice "^1.1.4" + mkdirp-infer-owner "^2.0.0" + npm-install-checks "^4.0.0" + npm-package-arg "^8.1.0" + npm-pick-manifest "^6.1.0" + npm-registry-fetch "^11.0.0" + pacote "^11.2.6" + parse-conflict-json "^1.1.1" + proc-log "^1.0.0" + promise-all-reject-late "^1.0.0" + promise-call-limit "^1.0.1" + read-package-json-fast "^2.0.2" + readdir-scoped-modules "^1.1.0" + semver "^7.3.5" + tar "^6.1.0" + treeverse "^1.0.4" + walk-up-path "^1.0.0" + "@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a" @@ -948,6 +982,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.167.tgz#ce7d78553e3c886d4ea643c37ec7edc20f16765e" integrity sha512-w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw== +"@types/lodash@^4.14.170": + version "4.14.170" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6" + integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q== + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1026,6 +1065,11 @@ dependencies: "@types/yargs-parser" "*" +"@types/yarnpkg__lockfile@^1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@types/yarnpkg__lockfile/-/yarnpkg__lockfile-1.1.4.tgz#445251eb00bd9c1e751f82c7c6bf4f714edfd464" + integrity sha512-/emrKCfQMQmFCqRqqBJ0JueHBT06jBRM3e8OgnvDUcvuExONujIk2hFA5dNsN9Nt41ljGVDdChvCydATZ+KOZw== + "@typescript-eslint/eslint-plugin@^4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa" @@ -1814,7 +1858,7 @@ byte-size@^7.0.1: resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A== -cacache@^15.0.3, cacache@^15.0.5, cacache@^15.0.6: +cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0: version "15.2.0" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" integrity "sha1-c69193xY5y2MYwp6KFjLGO9SM4k= sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==" @@ -3797,9 +3841,9 @@ github-from-package@0.0.0: integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + 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" @@ -5359,10 +5403,10 @@ libnpmdiff@^2.0.4: pacote "^11.3.0" tar "^6.1.0" -libnpmexec@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.2.0.tgz#ab0294ab63bb599b3ac6921129b7a706d4d56da2" - integrity "sha1-qwKUq2O7WZs6xpIRKbenBtTVbaI= sha512-LkxnH2wsMUI4thsgUK0r+EFZ5iCjKlp21J68dFY7AzD5uaaIPqO3lqVvYbyl1Umz1R4rY9t3vFa1fF3hzo6Y2Q==" +libnpmexec@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.0.tgz#9154549a30cd7825afee77de97e71336fb1792bf" + integrity sha512-9zHswx//Lp2ao+huWF2aL+6v4haMncyxNusk6Us2fbLNnPh3+rgSkv38LJ2v8gmKS2kAnkUmQf8pHjcZ+7Z3NA== dependencies: "@npmcli/arborist" "^2.3.0" "@npmcli/ci-detect" "^1.3.0" @@ -5434,10 +5478,10 @@ libnpmteam@^2.0.3: aproba "^2.0.0" npm-registry-fetch "^10.0.0" -libnpmversion@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.0.tgz#e181eb7ab750003b7fd29a578c31e84bb91a67b9" - integrity sha512-0pfmobLZbOvq1cLIONZk8ISvEM1k3JdkNXWhMDZvUeH+ijBNvMVdPu/CPUr1eDFbNINS3b6R/0PbTIZDVz7thg== +libnpmversion@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9" + integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ== dependencies: "@npmcli/git" "^2.0.7" "@npmcli/run-script" "^1.8.4" @@ -5636,7 +5680,7 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-fetch-happen@^8.0.14, make-fetch-happen@^8.0.9: +make-fetch-happen@^8.0.9: version "8.0.14" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222" integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ== @@ -5657,6 +5701,28 @@ make-fetch-happen@^8.0.14, make-fetch-happen@^8.0.9: socks-proxy-agent "^5.0.0" ssri "^8.0.0" +make-fetch-happen@^9.0.1, make-fetch-happen@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.3.tgz#57bbfb5b859807cd28005ca85aa6a72568675e24" + integrity sha512-uZ/9Cf2vKqsSWZyXhZ9wHHyckBrkntgbnqV68Bfe8zZenlf7D6yuGMXvHZQ+jSnzPkjosuNP1HGasj1J4h8OlQ== + dependencies: + agentkeepalive "^4.1.3" + cacache "^15.2.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.2" + promise-retry "^2.0.1" + socks-proxy-agent "^5.0.0" + ssri "^8.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -5979,6 +6045,11 @@ natural-compare@^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.6.0: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -6178,14 +6249,14 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity "sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" -npm-audit-report@^2.1.4: +npm-audit-report@^2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5" - integrity "sha1-pbiFCr4uhFL86XbIlg3UMpgXN7U= sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==" + integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw== dependencies: chalk "^4.0.0" @@ -6217,6 +6288,15 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack semver "^7.3.4" validate-npm-package-name "^3.0.0" +npm-package-arg@^8.1.5: + version "8.1.5" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" + integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q== + dependencies: + hosted-git-info "^4.0.1" + semver "^7.3.4" + validate-npm-package-name "^3.0.0" + npm-packlist@^2.1.4: version "2.2.2" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8" @@ -6251,7 +6331,7 @@ npm-profile@^5.0.3: dependencies: npm-registry-fetch "^10.0.0" -npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.1: +npm-registry-fetch@^10.0.0: version "10.1.2" resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz#11ffe03d813c653e768bdf762cfc5f1afe91b8bd" integrity "sha1-Ef/gPYE8ZT52i992LPxfGv6RuL0= sha512-KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA==" @@ -6264,6 +6344,18 @@ npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.1: minizlib "^2.0.0" npm-package-arg "^8.0.0" +npm-registry-fetch@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76" + integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA== + dependencies: + make-fetch-happen "^9.0.1" + minipass "^3.1.3" + minipass-fetch "^1.3.0" + minipass-json-stream "^1.0.1" + minizlib "^2.0.0" + npm-package-arg "^8.0.0" + 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" @@ -6292,12 +6384,12 @@ npm-which@^3.0.1: npm-path "^2.0.2" which "^1.2.10" -npm@7.13.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/npm/-/npm-7.13.0.tgz#c2c094fdb830320cf6eb4143dab0bd1dc3c0119a" - integrity sha512-6D9tWuUN4ef9Mi0o4Gwkv92SKsd+AS8QF/xtdWCNpX5aLlvb1x3juyiPvzPxuisxFUq2S3fZBMNehEt+Aae9Hg== +npm@7.18.1: + version "7.18.1" + resolved "https://registry.yarnpkg.com/npm/-/npm-7.18.1.tgz#9f5b74f567c64b9ce3ad8c4b6ecde5ce69137c98" + integrity sha512-fu7rMtc4ZaDnFlZsiLhqwWWs6KixOcBGiBLoJH+AbuaznwtT8mYQnq5nGNN14Jib+E9OjkjNRgg+X45Ia9xtKQ== dependencies: - "@npmcli/arborist" "^2.5.0" + "@npmcli/arborist" "^2.6.3" "@npmcli/ci-detect" "^1.2.0" "@npmcli/config" "^2.2.0" "@npmcli/run-script" "^1.8.5" @@ -6306,7 +6398,7 @@ npm@7.13.0: ansistyles "~0.1.3" archy "~1.0.0" byte-size "^7.0.1" - cacache "^15.0.6" + cacache "^15.2.0" chalk "^4.1.0" chownr "^2.0.0" cli-columns "^3.1.2" @@ -6322,7 +6414,7 @@ npm@7.13.0: leven "^3.1.0" libnpmaccess "^4.0.2" libnpmdiff "^2.0.4" - libnpmexec "^1.1.1" + libnpmexec "^2.0.0" libnpmfund "^1.1.0" libnpmhook "^6.0.2" libnpmorg "^2.0.2" @@ -6330,8 +6422,8 @@ npm@7.13.0: libnpmpublish "^4.0.1" libnpmsearch "^3.1.1" libnpmteam "^2.0.3" - libnpmversion "^1.2.0" - make-fetch-happen "^8.0.14" + libnpmversion "^1.2.1" + make-fetch-happen "^9.0.3" minipass "^3.1.3" minipass-pipeline "^1.2.4" mkdirp "^1.0.4" @@ -6339,11 +6431,11 @@ npm@7.13.0: ms "^2.1.2" node-gyp "^7.1.2" nopt "^5.0.0" - npm-audit-report "^2.1.4" - npm-package-arg "^8.1.2" + npm-audit-report "^2.1.5" + npm-package-arg "^8.1.5" npm-pick-manifest "^6.1.1" npm-profile "^5.0.3" - npm-registry-fetch "^10.1.1" + npm-registry-fetch "^11.0.0" npm-user-validate "^1.0.1" npmlog "~4.1.2" opener "^1.5.2" @@ -8468,15 +8560,10 @@ treeverse@^1.0.4: resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f" integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g== -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= - -trim-newlines@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" - integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA== +"trim-newlines@>=3.0.1 <4.0.0 || >=4.0.1", trim-newlines@^1.0.0, trim-newlines@^3.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c" + integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew== trim-off-newlines@^1.0.0: version "1.0.1" @@ -8498,10 +8585,10 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== -tslib@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" - integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tslib@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== tsutils@^3.17.1: version "3.17.1" @@ -9073,24 +9160,28 @@ yargs@^3.6.0: window-size "^0.1.4" y18n "^3.2.0" -yarn-audit-fix@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yarn-audit-fix/-/yarn-audit-fix-5.0.0.tgz#939332bcaec8d6d5531d33d66e6ad10d74f90576" - integrity sha512-PSpdd3H7TBLxTrF4iDSMCqnrkG2q/UOlLEXY+8j9cRLymbk2p05g0pHEZv7N98UHOsNdmYuZZTFGsfhRpUgksQ== +yarn-audit-fix@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/yarn-audit-fix/-/yarn-audit-fix-6.3.2.tgz#319a3433aac6ad60d8f8c84439d71b604735eded" + integrity sha512-KK1MtLJQOzrP1sOj40aU/nqkabIPnMqpepri9dWfZj7WruZW60vaTUWzdXaN800BrBispKBpERxFslMD0ILmWg== dependencies: "@types/find-cache-dir" "^3.2.0" "@types/fs-extra" "^9.0.11" + "@types/lodash" "^4.14.170" "@types/semver" "^7.3.6" + "@types/yarnpkg__lockfile" "^1.1.4" + "@yarnpkg/lockfile" "^1.1.0" chalk "^4.1.1" commander "^7.2.0" find-cache-dir "^3.3.1" fs-extra "^10.0.0" globby "^11.0.3" - npm "7.13.0" + lodash "^4.17.21" + npm "7.18.1" pkg-dir "^5.0.0" semver "^7.3.5" synp "^1.9.7" - tslib "^2.2.0" + tslib "^2.3.0" yocto-queue@^0.1.0: version "0.1.0"