Skip to content

Commit 1e41fec

Browse files
committed
Merge branch 'main' into alpha
# Conflicts: # yarn.lock
2 parents 06b0e9a + ff8553f commit 1e41fec

File tree

2 files changed

+34
-20
lines changed

2 files changed

+34
-20
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
},
2323
"sideEffects": false,
2424
"devDependencies": {
25-
"@softwareventures/eslint-config": "3.5.0",
25+
"@softwareventures/eslint-config": "3.6.0",
2626
"@softwareventures/prettier-config": "1.0.2",
2727
"@softwareventures/semantic-release-config": "1.1.1",
2828
"@softwareventures/tsconfig": "5.0.1",
2929
"ava": "3.15.0",
3030
"cz-conventional-changelog": "3.3.0",
31-
"eslint": "7.21.0",
31+
"eslint": "7.22.0",
3232
"prettier": "2.2.1",
33-
"semantic-release": "17.4.1",
33+
"semantic-release": "17.4.2",
3434
"ts-node": "9.1.1",
3535
"typescript": "4.2.3"
3636
},

yarn.lock

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@
299299
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
300300
integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
301301

302-
"@softwareventures/eslint-config@3.5.0":
303-
version "3.5.0"
304-
resolved "https://registry.yarnpkg.com/@softwareventures/eslint-config/-/eslint-config-3.5.0.tgz#96506c6e8e2a24127d406a3dcaf3d32613a56f6f"
305-
integrity sha512-3sqQHAjsG7Nacq6yp+2jlnf/pdISZPVf3U5Cxc9DoxqYT3W58a0y5rPMSGPsf6JDbhvArVvVjy9jUhMB87T0wQ==
302+
"@softwareventures/eslint-config@3.6.0":
303+
version "3.6.0"
304+
resolved "https://registry.yarnpkg.com/@softwareventures/eslint-config/-/eslint-config-3.6.0.tgz#d0c27b8f1cc130442bf47d6854faf65c0023cc7a"
305+
integrity sha512-ijPdfwHj9NNuq4cYuezFiIoSFFpyZED07mr24bhHQwDW23PiLBcKAek5QkOn8SEPcV5OgCNlPYfuGU98caDpRQ==
306306
dependencies:
307307
"@typescript-eslint/eslint-plugin" "^2.31.0 || ^3.0.0 || ^4.0.0"
308308
"@typescript-eslint/eslint-plugin-tslint" "^2.31.0 || ^3.0.0 || ^4.0.0"
@@ -2210,10 +2210,10 @@ eslint-visitor-keys@^2.0.0:
22102210
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
22112211
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
22122212

2213-
eslint@7.21.0:
2214-
version "7.21.0"
2215-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
2216-
integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
2213+
eslint@7.22.0:
2214+
version "7.22.0"
2215+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f"
2216+
integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==
22172217
dependencies:
22182218
"@babel/code-frame" "7.12.11"
22192219
"@eslint/eslintrc" "^0.4.0"
@@ -2232,15 +2232,15 @@ [email protected]:
22322232
file-entry-cache "^6.0.1"
22332233
functional-red-black-tree "^1.0.1"
22342234
glob-parent "^5.0.0"
2235-
globals "^12.1.0"
2235+
globals "^13.6.0"
22362236
ignore "^4.0.6"
22372237
import-fresh "^3.0.0"
22382238
imurmurhash "^0.1.4"
22392239
is-glob "^4.0.0"
22402240
js-yaml "^3.13.1"
22412241
json-stable-stringify-without-jsonify "^1.0.1"
22422242
levn "^0.4.1"
2243-
lodash "^4.17.20"
2243+
lodash "^4.17.21"
22442244
minimatch "^3.0.4"
22452245
natural-compare "^1.4.0"
22462246
optionator "^0.9.1"
@@ -2859,6 +2859,13 @@ globals@^12.1.0:
28592859
dependencies:
28602860
type-fest "^0.8.1"
28612861

2862+
globals@^13.6.0:
2863+
version "13.6.0"
2864+
resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7"
2865+
integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==
2866+
dependencies:
2867+
type-fest "^0.20.2"
2868+
28622869
globby@^11.0.0, globby@^11.0.1:
28632870
version "11.0.2"
28642871
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
@@ -3025,13 +3032,20 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
30253032
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
30263033
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
30273034

3028-
hosted-git-info@^3.0.0, hosted-git-info@^3.0.6:
3035+
hosted-git-info@^3.0.6:
30293036
version "3.0.8"
30303037
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d"
30313038
integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==
30323039
dependencies:
30333040
lru-cache "^6.0.0"
30343041

3042+
hosted-git-info@^4.0.0:
3043+
version "4.0.0"
3044+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.0.tgz#9f06639a90beff66cacae6e77f8387b431d61ddc"
3045+
integrity sha512-fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA==
3046+
dependencies:
3047+
lru-cache "^6.0.0"
3048+
30353049
http-cache-semantics@^3.8.1:
30363050
version "3.8.1"
30373051
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
@@ -4113,7 +4127,7 @@ lodash.without@~4.4.0:
41134127
resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
41144128
integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
41154129

4116-
lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4:
4130+
lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
41174131
version "4.17.21"
41184132
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
41194133
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5921,10 +5935,10 @@ safe-regex@^1.1.0:
59215935
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
59225936
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
59235937

5924-
5925-
version "17.4.1"
5926-
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-17.4.1.tgz#71b89a772452f8cd3bbd55bbf99287630be1c81f"
5927-
integrity sha512-o/Rjk0HCBUWEYxN99Vq04Th+XtRQAxbC+FN+pBQ49wpqQ5NW/cfwhfw0qyxeTEhbchQ/1/KGMPWqD4/rRScAag==
5938+
5939+
version "17.4.2"
5940+
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-17.4.2.tgz#b5147b5a629c227b7074ad4cc89920a14cb08c96"
5941+
integrity sha512-TPLWuoe2L2DmgnQEh+OLWW5V1T+ZAa1xWuHXsuPAWEko0BqSdLPl+5+BlQ+D5Bp27S5gDJ1//Y1tgbmvUhnOCw==
59285942
dependencies:
59295943
"@semantic-release/commit-analyzer" "^8.0.0"
59305944
"@semantic-release/error" "^2.2.0"
@@ -5941,7 +5955,7 @@ [email protected]:
59415955
get-stream "^6.0.0"
59425956
git-log-parser "^1.2.0"
59435957
hook-std "^2.0.0"
5944-
hosted-git-info "^3.0.0"
5958+
hosted-git-info "^4.0.0"
59455959
lodash "^4.17.15"
59465960
marked "^2.0.0"
59475961
marked-terminal "^4.1.1"

0 commit comments

Comments
 (0)