smarthut
/
frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
britea 2020-05-26 13:46:06 +02:00
parent 066eb1535b 1872fff6f4
commit 3ca4abaf62
4 changed files with 150 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
smart-hut/src/components/SceneModal.js
View File

@ -78,6 +78,7 @@ class SceneModal extends Component {
this.closeModal();
})
.catch((err) => console.error('error in creating room', err));
this.closeModal();
};
modifySceneModal = (e) => {

2
smart-hut/src/components/dashboard/ScenesPanel.js
View File

@ -37,7 +37,7 @@ class ScenesPanel extends Component {
</Card.Content>
<Card.Content extra>
<div className="ui two buttons">
<Button color="blue" onClick={this.applyScene}>
<Button color="green" onClick={this.applyScene}>
Apply Scene
</Button>
</div>

2
smart-hut/src/components/dashboard/devices/Device.js
View File

@ -108,7 +108,7 @@ class Device extends React.Component {
onClick={this.deleteState}
labelPosition="left"
>
<Icon name="undo" />
<Icon name="trash alternate" />
Delete
</Button>
</div>

147
smart-hut/yarn.lock
View File

@ -1703,6 +1703,9 @@
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
@ -1710,12 +1713,16 @@
version "2.0.2"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
version "2.0.2"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
"@types/istanbul-lib-report@*":
version "3.0.0"
@ -1727,6 +1734,9 @@
"@types/istanbul-reports@^1.1.1":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "1.1.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
@ -1734,12 +1744,16 @@
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==
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
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==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-lib-report" "*"
@ -1757,10 +1771,14 @@
"@types/node@*":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "13.13.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz#96ec3b0afafd64a4ccea9107b75bf8489f0e5765"
integrity sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==
=======
<<<<<<< HEAD
version "14.0.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
@ -1770,6 +1788,12 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "14.0.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c"
integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA==
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
"@types/parse-json@^4.0.0":
version "4.0.0"
@ -1887,10 +1911,14 @@
"@types/yargs@^15.0.0":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "15.0.4"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
=======
<<<<<<< HEAD
version "15.0.5"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
@ -1900,11 +1928,18 @@
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "15.0.5"
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^2.10.0":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version "2.31.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz#942c921fec5e200b79593c71fafb1e3f57aa2e36"
@ -1914,19 +1949,32 @@
=======
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "2.32.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.32.0.tgz#5d5cc2e00b1d4a4b848cc68bfdd3aede1ef0ad16"
integrity sha512-nb1kSUa8cd22hGgxpGdVT6/iyP7IKyrnyZEGYo+tN8iyDdXvXa+nfsX03tJVeFfhbkwR/0CDk910zPbqSflAsg==
dependencies:
"@typescript-eslint/experimental-utils" "2.32.0"
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "2.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz#d6c8319d5011b4783bb3d2dadf105d8bdd499bd5"
integrity sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ==
dependencies:
"@typescript-eslint/experimental-utils" "2.33.0"
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
functional-red-black-tree "^1.0.1"
regexpp "^3.0.0"
tsutils "^3.17.1"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@typescript-eslint/experimental-utils@2.31.0":
@ -1939,6 +1987,16 @@
=======
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
"@typescript-eslint/experimental-utils@2.32.0":
version "2.32.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.32.0.tgz#bee7fbe1d21d13a273066d70abc82549d0b7943e"
integrity sha512-oDWuB2q5AXsQ/mLq2N4qtWiBASWXPf7KhqXgeGH4QsyVKx+km8F6Vfqd3bspJQyhyCqxcbLO/jKJuIV3DzHZ6A==
dependencies:
"@types/json-schema" "^7.0.3"
"@typescript-eslint/typescript-estree" "2.32.0"
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
"@typescript-eslint/experimental-utils@2.33.0":
version "2.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz#000f1e5f344fbea1323dc91cc174805d75f99a03"
@ -1947,14 +2005,19 @@
"@types/json-schema" "^7.0.3"
"@typescript-eslint/typescript-estree" "2.33.0"
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^2.10.0":
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version "2.31.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz#beddd4e8efe64995108b229b2862cd5752d40d6f"
@ -1972,6 +2035,22 @@
=======
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "2.32.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.32.0.tgz#a1ace8ab1af529580bfb6cc2cd55fd8d8b1e68ab"
integrity sha512-swRtH835fUfm2khchiOVNchU3gVNaZNj2pY92QSx4kXan+RzaGNrwIRaCyX8uqzmK0xNPzseaUYHP8CsmrsjFw==
dependencies:
"@types/eslint-visitor-keys" "^1.0.0"
"@typescript-eslint/experimental-utils" "2.32.0"
"@typescript-eslint/typescript-estree" "2.32.0"
eslint-visitor-keys "^1.1.0"
"@typescript-eslint/typescript-estree@2.32.0":
version "2.32.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.32.0.tgz#0e4ae2e883557f94039b13ac0ecfcfbb09835b8d"
integrity sha512-hQpbWM/Y2iq6jB9FHYJBqa3h1R9IEGodOtajhb261cVHt9cz30AKjXM6WP7LxJdEPPlyJ9rPTZVgBUgZgiyPgw==
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "2.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.33.0.tgz#395c0ef229ebef883608f8632a34f0acf02b9bdd"
integrity sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==
@ -1986,9 +2065,13 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz#33504c050ccafd38f397a645d4e9534d2eccbb5c"
integrity sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
debug "^4.1.1"
eslint-visitor-keys "^1.1.0"
@ -3212,20 +3295,30 @@ caniuse-api@^3.0.0:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version "1.0.30001054"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz#7e82fc42d927980b0ce1426c4813df12381e1a75"
integrity sha512-jiKlTI6Ur8Kjfj8z0muGrV6FscpRvefcQVPSuMuXnvRCfExU7zlVLNjmOz1TnurWgUrAY7MMmjyy+uTgIl1XHw==
=======
version "1.0.30001055"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001055.tgz#7b52c3537f7a8c0408aca867e83d2b04268b54cd"
integrity sha512-MbwsBmKrBSKIWldfdIagO5OJWZclpJtS4h0Jrk/4HFrXJxTdVdH23Fd+xCiHriVGvYcWyW8mR/CPsYajlH8Iuw==
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
=======
version "1.0.30001059"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34"
integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
version "1.0.30001059"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34"
integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
capture-exit@^2.0.0:
version "2.0.0"
@ -4510,6 +4603,7 @@ ee-first@1.1.1:
electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version "1.3.432"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.432.tgz#3bf7b191978ff2e8bc3caf811bb52b1e9f9eab25"
@ -4519,11 +4613,20 @@ electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920"
integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg==
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
version "1.3.434"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.434.tgz#a67dcb268e93768e2169399999ccffa4783f048e"
integrity sha512-WjzGrE6appXvMyc2kH9Ide7OxsgTuRzag9sjQ5AcbOnbS9ut7P1HzOeEbJFLhr81IR7n2Hlr6qTTSGTXLIX5Pg==
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
=======
version "1.3.438"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920"
integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg==
<<<<<<< HEAD
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
elliptic@^6.0.0, elliptic@^6.5.2:
version "6.5.2"
@ -5991,10 +6094,14 @@ html-escaper@^2.0.0:
html-minifier-terser@^5.0.1:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "5.1.0"
resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916"
integrity sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ==
=======
<<<<<<< HEAD
version "5.1.1"
resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
@ -6004,6 +6111,12 @@ html-minifier-terser@^5.0.1:
resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "5.1.1"
resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
camel-case "^4.1.1"
clean-css "^4.2.3"
@ -7941,6 +8054,9 @@ minipass-flush@^1.0.5:
minipass-pipeline@^1.2.2:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "1.2.2"
resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==
@ -7948,18 +8064,25 @@ minipass-pipeline@^1.2.2:
version "1.2.3"
resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
version "1.2.3"
resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
minipass "^3.0.0"
minipass@^3.0.0, minipass@^3.1.1:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "3.1.1"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==
@ -7967,12 +8090,16 @@ minipass@^3.0.0, minipass@^3.1.1:
version "3.1.3"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
<<<<<<< HEAD
>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7
=======
version "3.1.3"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
yallist "^4.0.0"
@ -11163,10 +11290,14 @@ spdx-exceptions@^2.1.0:
spdx-expression-parse@^3.0.0:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "3.0.0"
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
=======
<<<<<<< HEAD
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==
@ -11176,6 +11307,12 @@ spdx-expression-parse@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
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==
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
dependencies:
spdx-exceptions "^2.1.0"
spdx-license-ids "^3.0.0"
@ -11832,10 +11969,14 @@ ts-pnp@^1.1.2:
tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
version "1.11.2"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9"
integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==
=======
<<<<<<< HEAD
version "1.13.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
@ -11845,6 +11986,12 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b
=======
version "1.13.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
>>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb
>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4
tsutils@^3.17.1:
version "3.17.1"