devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MORE BROKEN MERGE STUFF AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaa

Browse source
This commit is contained in:
Kaitlyn 2023-09-28 14:14:22 -04:00
parent 0c8ce8ef51
commit f1cacc5720
1 changed files with 41 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
pnpm-lock.yaml
View file

@ -18,10 +18,10 @@ devDependencies:
version: 2.1.2
'@types/node':
specifier: ^20.7.0
version: 20.7.0
version: 20.7.1
'@types/react':
specifier: ^18.2.22
version: 18.2.22
version: 18.2.23
'@typescript-eslint/eslint-plugin':
specifier: ^6.7.3
version: 6.7.3(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2)
@ -35,24 +35,19 @@ devDependencies:
specifier: ^16.3.1
version: 16.3.1
electron:
<<<<<<< HEAD
specifier: ^26.2.2
version: 26.2.2
=======
specifier: 26.2.3
version: 26.2.3
>>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
electron-builder:
specifier: ^24.6.4
specifier: ^24.6.3
version: 24.6.4
esbuild:
specifier: ^0.18.20
specifier: ^0.18.17
version: 0.18.20
eslint:
specifier: ^8.50.0
specifier: ^8.46.0
version: 8.50.0
eslint-config-prettier:
specifier: ^8.10.0
specifier: ^8.9.0
version: 8.10.0(eslint@8.50.0)
eslint-import-resolver-alias:
specifier: ^1.1.2
@ -83,7 +78,7 @@ devDependencies:
version: 3.13.0
type-fest:
specifier: ^4.3.1
version: 4.3.1
version: 4.3.2
typescript:
specifier: ^5.2.2
version: 5.2.2
@ -107,8 +102,8 @@ packages:
ajv-keywords: 3.5.2(ajv@6.12.6)
dev: true
/@electron/asar@3.2.6:
resolution: {integrity: sha512-g3Qj43/4Fi8EOB7hwVF6TCwPfwWXTYqD6R16cuCWKD3khKIQJT0WOloF55+LzaP92rYovlE6XLlaESitrxSKmg==}
/@electron/asar@3.2.7:
resolution: {integrity: sha512-8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg==}
engines: {node: '>=10.12.0'}
hasBin: true
dependencies:
@ -164,7 +159,7 @@ packages:
resolution: {integrity: sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==}
engines: {node: '>=8.6'}
dependencies:
'@electron/asar': 3.2.6
'@electron/asar': 3.2.7
'@malept/cross-spawn-promise': 1.1.1
debug: 4.3.4
dir-compare: 3.3.0
@ -383,8 +378,8 @@ packages:
eslint-visitor-keys: 3.4.3
dev: true
/@eslint-community/regexpp@4.8.2:
resolution: {integrity: sha512-0MGxAVt1m/ZK+LTJp/j0qF7Hz97D9O/FH9Ms3ltnyIdDD57cbb1ACIQTkbHvNXtWDv5TPq7w5Kq56+cNukbo7g==}
/@eslint-community/regexpp@4.9.0:
resolution: {integrity: sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
dev: true
@ -526,20 +521,20 @@ packages:
dependencies:
'@types/http-cache-semantics': 4.0.2
'@types/keyv': 3.1.4
'@types/node': 20.7.0
'@types/responselike': 1.0.0
'@types/node': 20.7.1
'@types/responselike': 1.0.1
dev: true
/@types/debug@4.1.9:
resolution: {integrity: sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==}
dependencies:
'@types/ms': 0.7.31
'@types/ms': 0.7.32
dev: true
/@types/fs-extra@9.0.13:
resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==}
dependencies:
'@types/node': 20.7.0
'@types/node': 20.7.1
dev: true
/@types/http-cache-semantics@4.0.2:
@ -557,30 +552,30 @@ packages:
/@types/keyv@3.1.4:
resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
dependencies:
'@types/node': 20.7.0
'@types/node': 20.7.1
dev: true
/@types/lodash@4.14.199:
resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==}
dev: true
/@types/ms@0.7.31:
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
/@types/ms@0.7.32:
resolution: {integrity: sha512-xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g==}
dev: true
/@types/node@18.18.0:
resolution: {integrity: sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw==}
dev: true
/@types/node@20.7.0:
resolution: {integrity: sha512-zI22/pJW2wUZOVyguFaUL1HABdmSVxpXrzIqkjsHmyUjNhPoWM1CKfvVuXfetHhIok4RY573cqS0mZ1SJEnoTg==}
/@types/node@20.7.1:
resolution: {integrity: sha512-LT+OIXpp2kj4E2S/p91BMe+VgGX2+lfO+XTpfXhh+bCk2LkQtHZSub8ewFBMGP5ClysPjTDFa4sMI8Q3n4T0wg==}
dev: true
/@types/plist@3.0.3:
resolution: {integrity: sha512-DXkBoKc7jwUR0p439icInmXXMJNhoImdpOrrgA5/nDFK7LVtcJ9MyQNKhJEKpEztnHGWnNWMWLOIR62By0Ln0A==}
requiresBuild: true
dependencies:
'@types/node': 20.7.0
'@types/node': 20.7.1
xmlbuilder: 15.1.1
dev: true
optional: true
@ -589,10 +584,10 @@ packages:
resolution: {integrity: sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog==}
dev: true
/@types/react-dom@18.2.7:
resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
/@types/react-dom@18.2.8:
resolution: {integrity: sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==}
dependencies:
'@types/react': 18.2.22
'@types/react': 18.2.23
dev: true
/@types/react@17.0.2:
@ -602,18 +597,18 @@ packages:
csstype: 3.1.2
dev: true
/@types/react@18.2.22:
resolution: {integrity: sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==}
/@types/react@18.2.23:
resolution: {integrity: sha512-qHLW6n1q2+7KyBEYnrZpcsAmU/iiCh9WGCKgXvMxx89+TYdJWRjZohVIo9XTcoLhfX3+/hP0Pbulu3bCZQ9PSA==}
dependencies:
'@types/prop-types': 15.7.7
'@types/scheduler': 0.16.4
csstype: 3.1.2
dev: true
/@types/responselike@1.0.0:
resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
/@types/responselike@1.0.1:
resolution: {integrity: sha512-TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg==}
dependencies:
'@types/node': 20.7.0
'@types/node': 20.7.1
dev: true
/@types/scheduler@0.16.4:
@ -634,7 +629,7 @@ packages:
resolution: {integrity: sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==}
requiresBuild: true
dependencies:
'@types/node': 20.7.0
'@types/node': 20.7.1
dev: true
optional: true
@ -649,7 +644,7 @@ packages:
typescript:
optional: true
dependencies:
'@eslint-community/regexpp': 4.8.2
'@eslint-community/regexpp': 4.9.0
'@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2)
'@typescript-eslint/scope-manager': 6.7.3
'@typescript-eslint/type-utils': 6.7.3(eslint@8.50.0)(typescript@5.2.2)
@ -774,8 +769,8 @@ packages:
dependencies:
'@types/lodash': 4.14.199
'@types/node': 18.18.0
'@types/react': 18.2.22
'@types/react-dom': 18.2.7
'@types/react': 18.2.23
'@types/react-dom': 18.2.8
discord-types: 1.3.26
standalone-electron-types: 1.0.0
type-fest: 3.13.1
@ -1122,7 +1117,7 @@ packages:
engines: {node: '>=12.0.0'}
dependencies:
debug: 4.3.4
sax: 1.2.4
sax: 1.3.0
transitivePeerDependencies:
- supports-color
dev: true
@ -1615,13 +1610,8 @@ packages:
- supports-color
dev: true
<<<<<<< HEAD
/electron@26.2.2:
resolution: {integrity: sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==}
=======
/electron@26.2.3:
resolution: {integrity: sha512-osdKf9mbhrqE81ITdvQ7TjVOayXfcAlWm8A6EtBt/eFSh7a/FijebGVkgs0S7qWQdhO0KaNZDb1Gx00sWuDQdw==}
>>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
engines: {node: '>= 12.20.55'}
hasBin: true
requiresBuild: true
@ -1943,7 +1933,7 @@ packages:
hasBin: true
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
'@eslint-community/regexpp': 4.8.2
'@eslint-community/regexpp': 4.9.0
'@eslint/eslintrc': 2.1.2
'@eslint/js': 8.50.0
'@humanwhocodes/config-array': 0.11.11
@ -2389,7 +2379,7 @@ packages:
'@sindresorhus/is': 4.6.0
'@szmarczak/http-timer': 4.0.6
'@types/cacheable-request': 6.0.3
'@types/responselike': 1.0.0
'@types/responselike': 1.0.1
cacheable-lookup: 5.0.4
cacheable-request: 7.0.4
decompress-response: 6.0.0
@ -3647,8 +3637,8 @@ packages:
truncate-utf8-bytes: 1.0.2
dev: true
/sax@1.2.4:
resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
/sax@1.3.0:
resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
dev: true
/semver-compare@1.0.0:
@ -4059,8 +4049,8 @@ packages:
engines: {node: '>=14.16'}
dev: true
/type-fest@4.3.1:
resolution: {integrity: sha512-pphNW/msgOUSkJbH58x8sqpq8uQj6b0ZKGxEsLKMUnGorRcDjrUaLS+39+/ub41JNTwrrMyJcUB8+YZs3mbwqw==}
/type-fest@4.3.2:
resolution: {integrity: sha512-VpwuOgnTsQUUWi0id8Hl4/xiQ+OoaeJGe8dnFjzubJYe/lOc2/d1Qx/d3FqWR0FlpOG/cvukAXfB12A49Y4iiA==}
engines: {node: '>=16'}
dev: true