fix lockfile

pull/9046/head
Ben McCann 3 years ago
parent 32d57a2e1b
commit b630fdec92

@ -104,11 +104,7 @@ importers:
version: 15.1.0(rollup@3.26.2)
'@sveltejs/eslint-config':
specifier: ^6.0.4
<<<<<<< HEAD
version: 6.0.4(@typescript-eslint/eslint-plugin@5.60.0)(@typescript-eslint/parser@6.0.0)(eslint-config-prettier@8.8.0)(eslint-plugin-svelte@2.32.2)(eslint-plugin-unicorn@47.0.0)(eslint@8.44.0)(typescript@5.1.3)
=======
version: 6.0.4(@typescript-eslint/eslint-plugin@5.60.0)(@typescript-eslint/parser@6.2.1)(eslint-config-prettier@8.10.0)(eslint-plugin-svelte@2.32.4)(eslint-plugin-unicorn@47.0.0)(eslint@8.46.0)(typescript@5.1.3)
>>>>>>> master
'@types/aria-query':
specifier: ^5.0.1
version: 5.0.1
@ -1964,11 +1960,7 @@ packages:
- supports-color
dev: true
<<<<<<< HEAD
/@sveltejs/eslint-config@6.0.4(@typescript-eslint/eslint-plugin@5.60.0)(@typescript-eslint/parser@6.0.0)(eslint-config-prettier@8.8.0)(eslint-plugin-svelte@2.32.2)(eslint-plugin-unicorn@47.0.0)(eslint@8.44.0)(typescript@5.1.3):
=======
/@sveltejs/eslint-config@6.0.4(@typescript-eslint/eslint-plugin@5.60.0)(@typescript-eslint/parser@6.2.1)(eslint-config-prettier@8.10.0)(eslint-plugin-svelte@2.32.4)(eslint-plugin-unicorn@47.0.0)(eslint@8.46.0)(typescript@5.1.3):
>>>>>>> master
resolution: {integrity: sha512-U9pwmDs+DbmsnCgTfu6Bacdwqn0DuI1IQNSiQqTgzVyYfaaj+zy9ZoQCiJfxFBGXHkklyXuRHp0KMx346N0lcQ==}
peerDependencies:
'@typescript-eslint/eslint-plugin': '>= 5'
@ -1979,21 +1971,12 @@ packages:
eslint-plugin-unicorn: '>= 47'
typescript: '>= 4'
dependencies:
<<<<<<< HEAD
'@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.3)
'@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.3)
eslint: 8.44.0
eslint-config-prettier: 8.8.0(eslint@8.44.0)
eslint-plugin-svelte: 2.32.2(eslint@8.44.0)(svelte@packages+svelte)
eslint-plugin-unicorn: 47.0.0(eslint@8.44.0)
=======
'@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/parser@6.2.1)(eslint@8.46.0)(typescript@5.1.3)
'@typescript-eslint/parser': 6.2.1(eslint@8.46.0)(typescript@5.1.3)
eslint: 8.46.0
eslint-config-prettier: 8.10.0(eslint@8.46.0)
eslint-plugin-svelte: 2.32.4(eslint@8.46.0)(svelte@packages+svelte)
eslint-plugin-unicorn: 47.0.0(eslint@8.46.0)
>>>>>>> master
typescript: 5.1.3
dev: true
@ -2246,11 +2229,7 @@ packages:
- supports-color
dev: true
<<<<<<< HEAD
/@typescript-eslint/eslint-plugin@5.60.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.3):
=======
/@typescript-eslint/eslint-plugin@5.60.0(@typescript-eslint/parser@6.2.1)(eslint@8.46.0)(typescript@5.1.3):
>>>>>>> master
resolution: {integrity: sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
@ -2262,17 +2241,10 @@ packages:
optional: true
dependencies:
'@eslint-community/regexpp': 4.5.1
<<<<<<< HEAD
'@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.3)
'@typescript-eslint/scope-manager': 5.60.0
'@typescript-eslint/type-utils': 5.60.0(eslint@8.44.0)(typescript@5.1.3)
'@typescript-eslint/utils': 5.60.0(eslint@8.44.0)(typescript@5.1.3)
=======
'@typescript-eslint/parser': 6.2.1(eslint@8.46.0)(typescript@5.1.3)
'@typescript-eslint/scope-manager': 5.60.0
'@typescript-eslint/type-utils': 5.60.0(eslint@8.46.0)(typescript@5.1.3)
'@typescript-eslint/utils': 5.60.0(eslint@8.46.0)(typescript@5.1.3)
>>>>>>> master
debug: 4.3.4
eslint: 8.46.0
grapheme-splitter: 1.0.4
@ -2350,26 +2322,6 @@ packages:
'@typescript-eslint/visitor-keys': 6.2.1
dev: true
/@typescript-eslint/type-utils@5.60.0(eslint@8.44.0)(typescript@5.1.3):
resolution: {integrity: sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: '*'
typescript: '*'
peerDependenciesMeta:
typescript:
optional: true
dependencies:
'@typescript-eslint/typescript-estree': 5.60.0(typescript@5.1.3)
'@typescript-eslint/utils': 5.60.0(eslint@8.44.0)(typescript@5.1.3)
debug: 4.3.4
eslint: 8.44.0
tsutils: 3.21.0(typescript@5.1.3)
typescript: 5.1.3
transitivePeerDependencies:
- supports-color
dev: true
/@typescript-eslint/type-utils@5.60.0(eslint@8.44.0)(typescript@5.1.6):
resolution: {integrity: sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2390,8 +2342,6 @@ packages:
- supports-color
dev: true
<<<<<<< HEAD
=======
/@typescript-eslint/type-utils@5.60.0(eslint@8.46.0)(typescript@5.1.3):
resolution: {integrity: sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2412,7 +2362,6 @@ packages:
- supports-color
dev: true
>>>>>>> master
/@typescript-eslint/types@5.60.0:
resolution: {integrity: sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2512,26 +2461,6 @@ packages:
- supports-color
dev: true
/@typescript-eslint/utils@5.60.0(eslint@8.44.0)(typescript@5.1.3):
resolution: {integrity: sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.44.0)
'@types/json-schema': 7.0.12
'@types/semver': 7.5.0
'@typescript-eslint/scope-manager': 5.60.0
'@typescript-eslint/types': 5.60.0
'@typescript-eslint/typescript-estree': 5.60.0(typescript@5.1.3)
eslint: 8.44.0
eslint-scope: 5.1.1
semver: 7.5.3
transitivePeerDependencies:
- supports-color
- typescript
dev: true
/@typescript-eslint/utils@5.60.0(eslint@8.44.0)(typescript@5.1.6):
resolution: {integrity: sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2552,8 +2481,6 @@ packages:
- typescript
dev: true
<<<<<<< HEAD
=======
/@typescript-eslint/utils@5.60.0(eslint@8.46.0)(typescript@5.1.3):
resolution: {integrity: sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2574,7 +2501,6 @@ packages:
- typescript
dev: true
>>>>>>> master
/@typescript-eslint/visitor-keys@5.60.0:
resolution: {integrity: sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@ -2692,15 +2618,6 @@ packages:
resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
dev: true
<<<<<<< HEAD
=======
/acorn-globals@7.0.1:
resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
dependencies:
acorn: 8.9.0
acorn-walk: 8.2.0
dev: true
/acorn-jsx@5.3.2(acorn@8.10.0):
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
peerDependencies:
@ -2709,7 +2626,6 @@ packages:
acorn: 8.10.0
dev: true
>>>>>>> master
/acorn-jsx@5.3.2(acorn@8.9.0):
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
peerDependencies:
@ -3722,26 +3638,8 @@ packages:
engines: {node: '>=10'}
dev: true
<<<<<<< HEAD
/eslint-config-prettier@8.8.0(eslint@8.44.0):
resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==}
=======
/escodegen@2.0.0:
resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
engines: {node: '>=6.0'}
hasBin: true
dependencies:
esprima: 4.0.1
estraverse: 5.3.0
esutils: 2.0.3
optionator: 0.8.3
optionalDependencies:
source-map: 0.6.1
dev: true
/eslint-config-prettier@8.10.0(eslint@8.46.0):
resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==}
>>>>>>> master
hasBin: true
peerDependencies:
eslint: '>=7.0.0'
@ -4935,21 +4833,10 @@ packages:
resolution: {integrity: sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==}
dev: true
<<<<<<< HEAD
=======
/known-css-properties@0.28.0:
resolution: {integrity: sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==}
dev: true
/levn@0.3.0:
resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
engines: {node: '>= 0.8.0'}
dependencies:
prelude-ls: 1.1.2
type-check: 0.3.2
dev: true
>>>>>>> master
/levn@0.4.1:
resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
engines: {node: '>= 0.8.0'}
@ -7154,9 +7041,9 @@ packages:
optional: true
dependencies:
'@types/node': 14.18.51
esbuild: 0.18.11
esbuild: 0.18.17
postcss: 8.4.27
rollup: 3.26.2
rollup: 3.27.1
optionalDependencies:
fsevents: 2.3.2
dev: true

Loading…
Cancel
Save