Madeorsk
/
rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into beta

This commit is contained in:
ThatOneCalculator 2023-09-20 10:17:13 -07:00
parent 00cc28262d 70ad42c49c
commit 52d2a7c918
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
4 changed files with 72 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/package.json
View File

@ -143,7 +143,7 @@
},
"devDependencies": {
"@swc/cli": "^0.1.62",
"@swc/core": "1.3.82",
"@swc/core": "1.3.78",
"@types/adm-zip": "^0.5.0",
"@types/bcryptjs": "2.4.2",
"@types/escape-regexp": "0.0.1",

2
packages/firefish-js/package.json
View File

@ -25,7 +25,7 @@
"@microsoft/api-extractor": "^7.36.0",
"@microsoft/api-documenter": "^7.22.21",
"@swc/cli": "^0.1.62",
"@swc/core": "1.3.82",
"@swc/core": "1.3.78",
"@types/jest": "^27.4.0",
"@types/node": "20.3.1",
"jest": "^27.4.5",

2
packages/sw/package.json
View File

@ -10,7 +10,7 @@
},
"devDependencies": {
"@swc/cli": "^0.1.62",
"@swc/core": "1.3.82",
"@swc/core": "1.3.78",
"@swc/core-android-arm64": "1.3.11",
"firefish-js": "workspace:*",
"idb-keyval": "^6.2.1",

143
pnpm-lock.yaml
View File

@ -448,10 +448,10 @@ importers:
devDependencies:
'@swc/cli':
specifier: ^0.1.62
version: 0.1.62(@swc/core@1.3.82)(chokidar@3.5.3)
version: 0.1.62(@swc/core@1.3.78)(chokidar@3.5.3)
'@swc/core':
specifier: 1.3.82
version: 1.3.82
specifier: 1.3.78
version: 1.3.78
'@types/adm-zip':
specifier: ^0.5.0
version: 0.5.1
@ -598,13 +598,13 @@ importers:
version: 2.0.0
swc-loader:
specifier: ^0.2.3
version: 0.2.3(@swc/core@1.3.82)(webpack@5.88.2)
version: 0.2.3(@swc/core@1.3.78)(webpack@5.88.2)
ts-loader:
specifier: 9.4.4
version: 9.4.4(typescript@5.1.6)(webpack@5.88.2)
ts-node:
specifier: 10.9.1
version: 10.9.1(@swc/core@1.3.82)(@types/node@18.11.18)(typescript@5.1.6)
version: 10.9.1(@swc/core@1.3.78)(@types/node@18.11.18)(typescript@5.1.6)
tsconfig-paths:
specifier: 4.2.0
version: 4.2.0
@ -613,7 +613,7 @@ importers:
version: 5.1.6
webpack:
specifier: ^5.88.2
version: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
version: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
ws:
specifier: 8.13.0
version: 8.13.0
@ -912,10 +912,10 @@ importers:
version: 7.37.0(@types/node@20.3.1)
'@swc/cli':
specifier: ^0.1.62
version: 0.1.62(@swc/core@1.3.82)(chokidar@3.5.3)
version: 0.1.62(@swc/core@1.3.78)(chokidar@3.5.3)
'@swc/core':
specifier: 1.3.82
version: 1.3.82
specifier: 1.3.78
version: 1.3.78
'@types/jest':
specifier: ^27.4.0
version: 27.5.2
@ -939,7 +939,7 @@ importers:
version: 27.1.5(@babel/core@7.22.20)(@types/jest@27.5.2)(jest@27.5.1)(typescript@5.1.3)
ts-node:
specifier: 10.4.0
version: 10.4.0(@swc/core@1.3.82)(@types/node@20.3.1)(typescript@5.1.3)
version: 10.4.0(@swc/core@1.3.78)(@types/node@20.3.1)(typescript@5.1.3)
tsd:
specifier: ^0.28.1
version: 0.28.1
@ -1069,10 +1069,10 @@ importers:
devDependencies:
'@swc/cli':
specifier: ^0.1.62
version: 0.1.62(@swc/core@1.3.82)(chokidar@3.5.3)
version: 0.1.62(@swc/core@1.3.78)(chokidar@3.5.3)
'@swc/core':
specifier: 1.3.82
version: 1.3.82
specifier: 1.3.78
version: 1.3.78
'@swc/core-android-arm64':
specifier: 1.3.11
version: 1.3.11
@ -1084,10 +1084,10 @@ importers:
version: 6.2.1
swc-loader:
specifier: ^0.2.3
version: 0.2.3(@swc/core@1.3.82)(webpack@5.88.2)
version: 0.2.3(@swc/core@1.3.78)(webpack@5.88.2)
webpack:
specifier: ^5.85.1
version: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
version: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
webpack-cli:
specifier: ^5.1.3
version: 5.1.4(webpack@5.88.2)
@ -3277,7 +3277,7 @@ packages:
resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
dev: false
/@swc/cli@0.1.62(@swc/core@1.3.82)(chokidar@3.5.3):
/@swc/cli@0.1.62(@swc/core@1.3.78)(chokidar@3.5.3):
resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==}
engines: {node: '>= 12.13'}
hasBin: true
@ -3289,7 +3289,7 @@ packages:
optional: true
dependencies:
'@mole-inc/bin-wrapper': 8.0.1
'@swc/core': 1.3.82
'@swc/core': 1.3.78
chokidar: 3.5.3
commander: 7.2.0
fast-glob: 3.3.1
@ -3306,88 +3306,88 @@ packages:
dependencies:
'@swc/wasm': 1.2.130
/@swc/core-darwin-arm64@1.3.82:
resolution: {integrity: sha512-JfsyDW34gVKD3uE0OUpUqYvAD3yseEaicnFP6pB292THtLJb0IKBBnK50vV/RzEJtc1bR3g1kNfxo2PeurZTrA==}
/@swc/core-darwin-arm64@1.3.78:
resolution: {integrity: sha512-596KRua/d5Gx1buHKKchSyHuwoIL4S1BRD/wCvYNLNZ3xOzcuBBmXOjrDVigKi1ztNDeS07p30RO5UyYur0XAA==}
engines: {node: '>=10'}
cpu: [arm64]
os: [darwin]
requiresBuild: true
optional: true
/@swc/core-darwin-x64@1.3.82:
resolution: {integrity: sha512-ogQWgNMq7qTpITjcP3dnzkFNj7bh6SwMr859GvtOTrE75H7L7jDWxESfH4f8foB/LGxBKiDNmxKhitCuAsZK4A==}
/@swc/core-darwin-x64@1.3.78:
resolution: {integrity: sha512-w0RsD1onQAj0vuLAoOVi48HgnW6D6oBEIZP17l0HYejCDBZ+FRZLjml7wgNAWMqHcd2qNRqgtZ+v7aLza2JtBQ==}
engines: {node: '>=10'}
cpu: [x64]
os: [darwin]
requiresBuild: true
optional: true
/@swc/core-linux-arm-gnueabihf@1.3.82:
resolution: {integrity: sha512-7TMXG1lXlNhD0kUiEqs+YlGV4irAdBa2quuy+XI3oJf2fBK6dQfEq4xBy65B3khrorzQS3O0oDGQ+cmdpHExHA==}
/@swc/core-linux-arm-gnueabihf@1.3.78:
resolution: {integrity: sha512-v1CpRn+H6fha1WIqmdRvJM40pFdjUHrGfhf4Ygci72nlAU41l5XimN8Iwkm8FgIwf2wnv0lLzedSM4IHvpq/yA==}
engines: {node: '>=10'}
cpu: [arm]
os: [linux]
requiresBuild: true
optional: true
/@swc/core-linux-arm64-gnu@1.3.82:
resolution: {integrity: sha512-26JkOujbzcItPAmIbD5vHJxQVy5ihcSu3YHTKwope1h28sApZdtE7S3e2G3gsZRTIdsCQkXUtAQeqHxGWWR3pw==}
/@swc/core-linux-arm64-gnu@1.3.78:
resolution: {integrity: sha512-Sis17dz9joJRFVvR/gteOZSUNrrrioo81RQzani0Zr5ZZOfWLMTB9DA+0MVlfnVa2taYcsJHJZFoAv9JkLwbzg==}
engines: {node: '>=10'}
cpu: [arm64]
os: [linux]
requiresBuild: true
optional: true
/@swc/core-linux-arm64-musl@1.3.82:
resolution: {integrity: sha512-8Izj9tuuMpoc3cqiPBRtwqpO1BZ/+sfZVsEhLxrbOFlcSb8LnKyMle1g3JMMUwI4EU75RGVIzZMn8A6GOKdJbA==}
/@swc/core-linux-arm64-musl@1.3.78:
resolution: {integrity: sha512-E5F8/qp+QupnfBnsP4vN1PKyCmAHYHDG1GMyPE/zLFOUYLgw+jK4C9rfyLBR0o2bWo1ay2WCIjusBZD9XHGOSA==}
engines: {node: '>=10'}
cpu: [arm64]
os: [linux]
requiresBuild: true
optional: true
/@swc/core-linux-x64-gnu@1.3.82:
resolution: {integrity: sha512-0GSrIBScQwTaPv46T2qB7XnDYxndRCpwH4HMjh6FN+I+lfPUhTSJKW8AonqrqT1TbpFIgvzQs7EnTsD7AnSCow==}
/@swc/core-linux-x64-gnu@1.3.78:
resolution: {integrity: sha512-iDxa+RknnTQlyy+WfPor1FM6y44ERNI2E0xiUV6gV6uPwegCngi8LFC+E7IvP6+p+yXtAkesunAaiZ8nn0s+rw==}
engines: {node: '>=10'}
cpu: [x64]
os: [linux]
requiresBuild: true
optional: true
/@swc/core-linux-x64-musl@1.3.82:
resolution: {integrity: sha512-KJUnaaepDKNzrEbwz4jv0iC3/t9x0NSoe06fnkAlhh2+NFKWKKJhVCOBTrpds8n7eylBDIXUlK34XQafjVMUdg==}
/@swc/core-linux-x64-musl@1.3.78:
resolution: {integrity: sha512-dWtIYUFL5sMTE2UKshkXTusHcK8+zAhhGzvqWq1wJS45pqTlrAbzpyqB780fle880x3A6DMitWmsAFARdNzpuQ==}
engines: {node: '>=10'}
cpu: [x64]
os: [linux]
requiresBuild: true
optional: true
/@swc/core-win32-arm64-msvc@1.3.82:
resolution: {integrity: sha512-TR3MHKhDYIyGyFcyl2d/p1ftceXcubAhX5wRSOdtOyr5+K/v3jbyCCqN7bbqO5o43wQVCwwR/drHleYyDZvg8Q==}
/@swc/core-win32-arm64-msvc@1.3.78:
resolution: {integrity: sha512-CXFaGEc2M9Su3UoUMC8AnzKb9g+GwPxXfakLWZsjwS448h6jcreExq3nwtBNdVGzQ26xqeVLMFfb1l/oK99Hwg==}
engines: {node: '>=10'}
cpu: [arm64]
os: [win32]
requiresBuild: true
optional: true
/@swc/core-win32-ia32-msvc@1.3.82:
resolution: {integrity: sha512-ZX4HzVVt6hs84YUg70UvyBJnBOIspmQQM0iXSzBvOikk3zRoN7BnDwQH4GScvevCEBuou60+i4I6d5kHLOfh8Q==}
/@swc/core-win32-ia32-msvc@1.3.78:
resolution: {integrity: sha512-FaH1jwWnJpWkdImpMoiZpMg9oy9UUyZwltzN7hFwjR48e3Li82cRFb+9PifIBHCUSBM+CrrsJXbHP213IMVAyw==}
engines: {node: '>=10'}
cpu: [ia32]
os: [win32]
requiresBuild: true
optional: true
/@swc/core-win32-x64-msvc@1.3.82:
resolution: {integrity: sha512-4mJMnex21kbQoaHeAmHnVwQN9/XAfPszJ6n9HI7SVH+aAHnbBIR0M59/b50/CJMjTj5niUGk7EwQ3nhVNOG32g==}
/@swc/core-win32-x64-msvc@1.3.78:
resolution: {integrity: sha512-oYxa+tPdhlx1aH14AIoF6kvVjo49tEOW0drNqoEaVHufvgH0y43QU2Jum3b2+xXztmMRtzK2CSN3GPOAXDKKKg==}
engines: {node: '>=10'}
cpu: [x64]
os: [win32]
requiresBuild: true
optional: true
/@swc/core@1.3.82:
resolution: {integrity: sha512-jpC1a18HMH67018Ij2jh+hT7JBFu7ZKcQVfrZ8K6JuEY+kjXmbea07P9MbQUZbAe0FB+xi3CqEVCP73MebodJQ==}
/@swc/core@1.3.78:
resolution: {integrity: sha512-y6DQP571v7fbUUY7nz5G4lNIRGofuO48K5pGhD9VnuOCTuptfooCdi8wnigIrIhM/M4zQ53m/YCMDCbOtDgEww==}
engines: {node: '>=10'}
requiresBuild: true
peerDependencies:
@ -3395,22 +3395,17 @@ packages:
peerDependenciesMeta:
'@swc/helpers':
optional: true
dependencies:
'@swc/types': 0.1.4
optionalDependencies:
'@swc/core-darwin-arm64': 1.3.82
'@swc/core-darwin-x64': 1.3.82
'@swc/core-linux-arm-gnueabihf': 1.3.82
'@swc/core-linux-arm64-gnu': 1.3.82
'@swc/core-linux-arm64-musl': 1.3.82
'@swc/core-linux-x64-gnu': 1.3.82
'@swc/core-linux-x64-musl': 1.3.82
'@swc/core-win32-arm64-msvc': 1.3.82
'@swc/core-win32-ia32-msvc': 1.3.82
'@swc/core-win32-x64-msvc': 1.3.82
/@swc/types@0.1.4:
resolution: {integrity: sha512-z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg==}
'@swc/core-darwin-arm64': 1.3.78
'@swc/core-darwin-x64': 1.3.78
'@swc/core-linux-arm-gnueabihf': 1.3.78
'@swc/core-linux-arm64-gnu': 1.3.78
'@swc/core-linux-arm64-musl': 1.3.78
'@swc/core-linux-x64-gnu': 1.3.78
'@swc/core-linux-x64-musl': 1.3.78
'@swc/core-win32-arm64-msvc': 1.3.78
'@swc/core-win32-ia32-msvc': 1.3.78
'@swc/core-win32-x64-msvc': 1.3.78
/@swc/wasm@1.2.130:
resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
@ -5000,7 +4995,7 @@ packages:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
webpack-cli: 5.1.4(webpack@5.88.2)
dev: true
@ -5011,7 +5006,7 @@ packages:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
webpack-cli: 5.1.4(webpack@5.88.2)
dev: true
@ -5026,7 +5021,7 @@ packages:
webpack-dev-server:
optional: true
dependencies:
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
webpack-cli: 5.1.4(webpack@5.88.2)
dev: true
@ -11579,7 +11574,7 @@ packages:
pretty-format: 27.5.1
slash: 3.0.0
strip-json-comments: 3.1.1
ts-node: 10.4.0(@swc/core@1.3.82)(@types/node@20.3.1)(typescript@5.1.3)
ts-node: 10.4.0(@swc/core@1.3.78)(@types/node@20.3.1)(typescript@5.1.3)
transitivePeerDependencies:
- bufferutil
- canvas
@ -12542,7 +12537,7 @@ packages:
json5: 2.2.3
loader-utils: 2.0.4
schema-utils: 3.3.0
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
dev: true
/json5@1.0.2:
@ -17093,14 +17088,14 @@ packages:
whet.extend: 0.9.9
dev: true
/swc-loader@0.2.3(@swc/core@1.3.82)(webpack@5.88.2):
/swc-loader@0.2.3(@swc/core@1.3.78)(webpack@5.88.2):
resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==}
peerDependencies:
'@swc/core': ^1.2.147
webpack: '>=2'
dependencies:
'@swc/core': 1.3.82
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
'@swc/core': 1.3.78
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
dev: true
/swiper@10.2.0:
@ -17236,7 +17231,7 @@ packages:
supports-hyperlinks: 2.3.0
dev: true
/terser-webpack-plugin@5.3.9(@swc/core@1.3.82)(webpack@5.88.2):
/terser-webpack-plugin@5.3.9(@swc/core@1.3.78)(webpack@5.88.2):
resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
engines: {node: '>= 10.13.0'}
peerDependencies:
@ -17253,12 +17248,12 @@ packages:
optional: true
dependencies:
'@jridgewell/trace-mapping': 0.3.19
'@swc/core': 1.3.82
'@swc/core': 1.3.78
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.1
terser: 5.19.4
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
dev: true
/terser@5.19.4:
@ -17605,10 +17600,10 @@ packages:
micromatch: 4.0.5
semver: 7.5.4
typescript: 5.1.6
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
dev: true
/ts-node@10.4.0(@swc/core@1.3.82)(@types/node@20.3.1)(typescript@5.1.3):
/ts-node@10.4.0(@swc/core@1.3.78)(@types/node@20.3.1)(typescript@5.1.3):
resolution: {integrity: sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A==}
hasBin: true
peerDependencies:
@ -17623,7 +17618,7 @@ packages:
optional: true
dependencies:
'@cspotcode/source-map-support': 0.7.0
'@swc/core': 1.3.82
'@swc/core': 1.3.78
'@tsconfig/node10': 1.0.9
'@tsconfig/node12': 1.0.11
'@tsconfig/node14': 1.0.3
@ -17639,7 +17634,7 @@ packages:
yn: 3.1.1
dev: true
/ts-node@10.9.1(@swc/core@1.3.82)(@types/node@18.11.18)(typescript@5.1.6):
/ts-node@10.9.1(@swc/core@1.3.78)(@types/node@18.11.18)(typescript@5.1.6):
resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
hasBin: true
peerDependencies:
@ -17654,7 +17649,7 @@ packages:
optional: true
dependencies:
'@cspotcode/source-map-support': 0.8.1
'@swc/core': 1.3.82
'@swc/core': 1.3.78
'@tsconfig/node10': 1.0.9
'@tsconfig/node12': 1.0.11
'@tsconfig/node14': 1.0.3
@ -17944,7 +17939,7 @@ packages:
pg: 8.11.3
reflect-metadata: 0.1.13
sha.js: 2.4.11
ts-node: 10.9.1(@swc/core@1.3.82)(@types/node@18.11.18)(typescript@5.1.6)
ts-node: 10.9.1(@swc/core@1.3.78)(@types/node@18.11.18)(typescript@5.1.6)
tslib: 2.6.2
uuid: 9.0.0
yargs: 17.7.2
@ -18577,7 +18572,7 @@ packages:
import-local: 3.1.0
interpret: 3.1.1
rechoir: 0.8.0
webpack: 5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4)
webpack: 5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4)
webpack-merge: 5.9.0
dev: true
@ -18594,7 +18589,7 @@ packages:
engines: {node: '>=10.13.0'}
dev: true
/webpack@5.88.2(@swc/core@1.3.82)(webpack-cli@5.1.4):
/webpack@5.88.2(@swc/core@1.3.78)(webpack-cli@5.1.4):
resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==}
engines: {node: '>=10.13.0'}
hasBin: true
@ -18625,7 +18620,7 @@ packages:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
terser-webpack-plugin: 5.3.9(@swc/core@1.3.82)(webpack@5.88.2)
terser-webpack-plugin: 5.3.9(@swc/core@1.3.78)(webpack@5.88.2)
watchpack: 2.4.0
webpack-cli: 5.1.4(webpack@5.88.2)
webpack-sources: 3.2.3