Skip to content

Commit c76c92a

Browse files
IgnisDaIgnisDa
authored
Downgrade remix version (#530)
* build(frontend): downgrade remix to `v2.3.1`. Because of remix-run/remix#8309. * ci(frontend): downgrade remix version * build(backend): bump version
1 parent 0b166f5 commit c76c92a

File tree

7 files changed

+112
-68
lines changed

7 files changed

+112
-68
lines changed

‎Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ COPY --from=reverse-proxy /usr/bin/caddy /usr/local/bin/caddy
5454
COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/node_modules ./node_modules
5555
COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/package.json ./package.json
5656
COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/build ./build
57+
COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/public ./public
5758
COPY --from=app-builder --chown=ryot:ryot /app/ryot /usr/local/bin/ryot
5859
HEALTHCHECK --interval=5m --timeout=3s \
5960
CMD curl -f http://localhost:5000/config || exit 1

‎apps/backend/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ryot"
3-
version = "4.0.0"
3+
version = "4.0.1"
44
edition = "2021"
55
repository = "https://github.com/IgnisDa/ryot"
66
license = "GPL-V3"

‎apps/frontend/moon.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@ tasks:
1212
- '@group(remix)'
1313

1414
dev:
15-
command: 'remix vite:dev --port 3000 --host'
15+
command: vite dev --port 3000 --host
1616
local: true
1717
deps:
1818
- routes
1919

2020
build-basic:
21-
command: 'remix vite:build'
21+
command: vite build
22+
23+
build-ssr:
24+
command: vite build --ssr
2225

2326
build:
2427
deps:
2528
- routes
2629
- build-basic
30+
- build-ssr
2731
inputs:
2832
- '@group(remix)'
2933
outputs:

‎apps/frontend/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"@mantine/form": "7.3.2",
2222
"@mantine/hooks": "7.3.2",
2323
"@mantine/notifications": "7.3.2",
24-
"@remix-run/node": "2.4.1",
25-
"@remix-run/react": "2.4.1",
26-
"@remix-run/serve": "2.4.1",
24+
"@remix-run/node": "2.3.1",
25+
"@remix-run/react": "2.3.1",
26+
"@remix-run/serve": "2.3.1",
2727
"@ryot/generated": "workspace:*",
2828
"@ryot/graphql": "workspace:*",
2929
"@ryot/ts-utils": "workspace:*",
@@ -58,7 +58,7 @@
5858
},
5959
"devDependencies": {
6060
"@ignisda/remix-routes": "3.3.0",
61-
"@remix-run/dev": "2.4.1",
61+
"@remix-run/dev": "2.3.1",
6262
"@types/cookie": "0.6.0",
6363
"@types/crypto-js": "4.2.1",
6464
"@types/howler": "2.2.11",

‎config/supervisord.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ command=ryot
77
environment=
88

99
[program:frontend]
10-
command=npx remix-serve ./build/server/index.js
10+
command=npx remix-serve ./build/index.js
1111
environment=API_URL=http://localhost:5000
1212

1313
[program:reverse-proxy]

‎yarn.lock

+98-59
Original file line numberDiff line numberDiff line change
@@ -1923,6 +1923,13 @@ __metadata:
19231923
languageName: node
19241924
linkType: hard
19251925

1926+
"@fastify/busboy@npm:^2.0.0":
1927+
version: 2.1.0
1928+
resolution: "@fastify/busboy@npm:2.1.0"
1929+
checksum: f22c1e5c52dc350ddf9ba8be9f87b48d3ea5af00a37fd0a0d1e3e4b37f94d96763e514c68a350c7f570260fdd2f08b55ee090cdd879f92a03249eb0e3fd19113
1930+
languageName: node
1931+
linkType: hard
1932+
19261933
"@floating-ui/core@npm:^1.4.2":
19271934
version: 1.5.0
19281935
resolution: "@floating-ui/core@npm:1.5.0"
@@ -2933,9 +2940,9 @@ __metadata:
29332940
languageName: node
29342941
linkType: hard
29352942

2936-
"@remix-run/dev@npm:2.4.1":
2937-
version: 2.4.1
2938-
resolution: "@remix-run/dev@npm:2.4.1"
2943+
"@remix-run/dev@npm:2.3.1":
2944+
version: 2.3.1
2945+
resolution: "@remix-run/dev@npm:2.3.1"
29392946
dependencies:
29402947
"@babel/core": "npm:^7.21.8"
29412948
"@babel/generator": "npm:^7.21.5"
@@ -2947,9 +2954,9 @@ __metadata:
29472954
"@babel/types": "npm:^7.22.5"
29482955
"@mdx-js/mdx": "npm:^2.3.0"
29492956
"@npmcli/package-json": "npm:^4.0.1"
2950-
"@remix-run/node": "npm:2.4.1"
2951-
"@remix-run/router": "npm:1.14.1"
2952-
"@remix-run/server-runtime": "npm:2.4.1"
2957+
"@remix-run/node": "npm:2.3.1"
2958+
"@remix-run/router": "npm:1.13.0"
2959+
"@remix-run/server-runtime": "npm:2.3.1"
29532960
"@types/mdx": "npm:^2.0.5"
29542961
"@vanilla-extract/integration": "npm:^6.2.0"
29552962
arg: "npm:^5.0.1"
@@ -2972,7 +2979,9 @@ __metadata:
29722979
lodash: "npm:^4.17.21"
29732980
lodash.debounce: "npm:^4.0.8"
29742981
minimatch: "npm:^9.0.0"
2982+
node-fetch: "npm:^2.6.9"
29752983
ora: "npm:^5.4.1"
2984+
parse-multipart-data: "npm:^1.5.0"
29762985
picocolors: "npm:^1.0.0"
29772986
picomatch: "npm:^2.3.1"
29782987
pidtree: "npm:^0.6.0"
@@ -2989,11 +2998,12 @@ __metadata:
29892998
set-cookie-parser: "npm:^2.6.0"
29902999
tar-fs: "npm:^2.1.1"
29913000
tsconfig-paths: "npm:^4.0.0"
3001+
undici: "npm:^5.22.1"
29923002
ws: "npm:^7.4.5"
29933003
peerDependencies:
2994-
"@remix-run/serve": ^2.4.1
3004+
"@remix-run/serve": ^2.3.1
29953005
typescript: ^5.1.0
2996-
vite: ^5.0.0
3006+
vite: ^4.4.9 || ^5.0.0
29973007
peerDependenciesMeta:
29983008
"@remix-run/serve":
29993009
optional: true
@@ -3003,31 +3013,31 @@ __metadata:
30033013
optional: true
30043014
bin:
30053015
remix: dist/cli.js
3006-
checksum: c2df048cc1021339ce201608cea9ee616eec42abccbe4f753943f4b076faad2f3af666c56ce23775625d1e9c4d9bc0f6f3c5e3c6c5a9f8005a56a0d66c6ed3f1
3016+
checksum: e1e86c7e3539b069f9ba9620a1b773dd862b58ecb1de858089094920f249bbc5bc0012a22cde4fa87147d53c10723c6ed8097fc543dfb20ff34d83b891ae6644
30073017
languageName: node
30083018
linkType: hard
30093019

3010-
"@remix-run/express@npm:2.4.1":
3011-
version: 2.4.1
3012-
resolution: "@remix-run/express@npm:2.4.1"
3020+
"@remix-run/express@npm:2.3.1":
3021+
version: 2.3.1
3022+
resolution: "@remix-run/express@npm:2.3.1"
30133023
dependencies:
3014-
"@remix-run/node": "npm:2.4.1"
3024+
"@remix-run/node": "npm:2.3.1"
30153025
peerDependencies:
30163026
express: ^4.17.1
30173027
typescript: ^5.1.0
30183028
peerDependenciesMeta:
30193029
typescript:
30203030
optional: true
3021-
checksum: cfcecca56c5af8d61ad2d6c66325c4980b4bd77bc343f83d644e3912855af053da5adee13cffddbcf2e1656ccddae9d720ce1713362565a151440372e01243dc
3031+
checksum: ccecf3a3a152b86773212baaf940112c763477fcd5474af1b7c1e7e2782517c72606a0f849abddc59b55c25a1d5c1befd3f2830d7851b8f8169bbd3e82a3e883
30223032
languageName: node
30233033
linkType: hard
30243034

3025-
"@remix-run/node@npm:2.4.1":
3026-
version: 2.4.1
3027-
resolution: "@remix-run/node@npm:2.4.1"
3035+
"@remix-run/node@npm:2.3.1":
3036+
version: 2.3.1
3037+
resolution: "@remix-run/node@npm:2.3.1"
30283038
dependencies:
3029-
"@remix-run/server-runtime": "npm:2.4.1"
3030-
"@remix-run/web-fetch": "npm:^4.4.2"
3039+
"@remix-run/server-runtime": "npm:2.3.1"
3040+
"@remix-run/web-fetch": "npm:^4.4.1"
30313041
"@remix-run/web-file": "npm:^3.1.0"
30323042
"@remix-run/web-stream": "npm:^1.1.0"
30333043
"@web3-storage/multipart-parser": "npm:^1.0.0"
@@ -3039,42 +3049,41 @@ __metadata:
30393049
peerDependenciesMeta:
30403050
typescript:
30413051
optional: true
3042-
checksum: a7c8b7788305d0d52703ec3557aa711125d69b61182cd9038d2d60bbbecd5cfcc473f6727bf2674e09f1c5f2574498856262109e1275dbd044fe73ac8f8fca8b
3052+
checksum: 4656c8279374a20057c344558619368bb46d31c39ed4dc37540f7d328a35d87b2a98791dbaa925e05b79be2839a1a9bbae97b1eb25611c205e7b5ccadb65a628
30433053
languageName: node
30443054
linkType: hard
30453055

3046-
"@remix-run/react@npm:2.4.1":
3047-
version: 2.4.1
3048-
resolution: "@remix-run/react@npm:2.4.1"
3056+
"@remix-run/react@npm:2.3.1":
3057+
version: 2.3.1
3058+
resolution: "@remix-run/react@npm:2.3.1"
30493059
dependencies:
3050-
"@remix-run/router": "npm:1.14.1"
3051-
"@remix-run/server-runtime": "npm:2.4.1"
3052-
react-router: "npm:6.21.1"
3053-
react-router-dom: "npm:6.21.1"
3060+
"@remix-run/router": "npm:1.13.0"
3061+
"@remix-run/server-runtime": "npm:2.3.1"
3062+
react-router-dom: "npm:6.20.0"
30543063
peerDependencies:
30553064
react: ^18.0.0
30563065
react-dom: ^18.0.0
30573066
typescript: ^5.1.0
30583067
peerDependenciesMeta:
30593068
typescript:
30603069
optional: true
3061-
checksum: 5f9a2f3b82824acffa0fb81b34e1464d7cf73be76e21f5a6247b33311828e6814f9d09cfbc8177a738a85858d1ebd593848944db9c6b1a51b0324c85d7b24ab7
3070+
checksum: c246b11cd616a1ae52a08608f89d69fbecc115579ca2f8e45d6921c37495204aa31370c4b59f32526ab881059828caff8f4112fc6a265b3167be4397dd28ae29
30623071
languageName: node
30633072
linkType: hard
30643073

3065-
"@remix-run/router@npm:1.14.1":
3066-
version: 1.14.1
3067-
resolution: "@remix-run/router@npm:1.14.1"
3068-
checksum: caed61639006444a66ca832f1e500bac2fcf02695183e967ff1452d3172f888f2bb40591b239c85f9003b9628383cfd4c8ef55cde800d14276905c7031c9f0b9
3074+
"@remix-run/router@npm:1.13.0":
3075+
version: 1.13.0
3076+
resolution: "@remix-run/router@npm:1.13.0"
3077+
checksum: bb173a012d2036c5ee69babfe30c73975b970c2e5a0edaba138c302ae80d255e238e462e77365ab4efe819b6397e1a7f3a416d6200d17f9655f0ca1c51c4f45e
30693078
languageName: node
30703079
linkType: hard
30713080

3072-
"@remix-run/serve@npm:2.4.1":
3073-
version: 2.4.1
3074-
resolution: "@remix-run/serve@npm:2.4.1"
3081+
"@remix-run/serve@npm:2.3.1":
3082+
version: 2.3.1
3083+
resolution: "@remix-run/serve@npm:2.3.1"
30753084
dependencies:
3076-
"@remix-run/express": "npm:2.4.1"
3077-
"@remix-run/node": "npm:2.4.1"
3085+
"@remix-run/express": "npm:2.3.1"
3086+
"@remix-run/node": "npm:2.3.1"
30783087
chokidar: "npm:^3.5.3"
30793088
compression: "npm:^1.7.4"
30803089
express: "npm:^4.17.1"
@@ -3083,15 +3092,15 @@ __metadata:
30833092
source-map-support: "npm:^0.5.21"
30843093
bin:
30853094
remix-serve: dist/cli.js
3086-
checksum: 554ef4401a511572203ab510d53e07a1cf9333a4d9404bb74d94251f7a8bf10a53aa29678276c761142cfa993e9e8e1391782553204b9314e6541ae8876ffc18
3095+
checksum: d7d8d326cb2f57f175aea14ff4797ea69e822b7c8acf8ec20bdae67626bdf67f033cbbf8e65477266e123f7291435dfb0bbf8e4b2576e50f8e600bdde8210aa6
30873096
languageName: node
30883097
linkType: hard
30893098

3090-
"@remix-run/server-runtime@npm:2.4.1":
3091-
version: 2.4.1
3092-
resolution: "@remix-run/server-runtime@npm:2.4.1"
3099+
"@remix-run/server-runtime@npm:2.3.1":
3100+
version: 2.3.1
3101+
resolution: "@remix-run/server-runtime@npm:2.3.1"
30933102
dependencies:
3094-
"@remix-run/router": "npm:1.14.1"
3103+
"@remix-run/router": "npm:1.13.0"
30953104
"@types/cookie": "npm:^0.5.3"
30963105
"@web3-storage/multipart-parser": "npm:^1.0.0"
30973106
cookie: "npm:^0.5.0"
@@ -3102,7 +3111,7 @@ __metadata:
31023111
peerDependenciesMeta:
31033112
typescript:
31043113
optional: true
3105-
checksum: c57df47d413728ea870460503ab11b843e93eb4c4044b94f92ca5f382b25cc366efc0a75d74405d77f5dd62ff3c191736bb67612c67eb653b097dba525ed8cc7
3114+
checksum: f5b36b86f98d2ecc78683cbefc084e52dd99661ef6106ff403a4fa01b997e087cca92f17d8c01907d93d87d8a8d1c39752b90daf4f5689ccecea33f56c195e2d
31063115
languageName: node
31073116
linkType: hard
31083117

@@ -3116,7 +3125,7 @@ __metadata:
31163125
languageName: node
31173126
linkType: hard
31183127

3119-
"@remix-run/web-fetch@npm:^4.4.2":
3128+
"@remix-run/web-fetch@npm:^4.4.1":
31203129
version: 4.4.2
31213130
resolution: "@remix-run/web-fetch@npm:4.4.2"
31223131
dependencies:
@@ -3272,10 +3281,10 @@ __metadata:
32723281
"@mantine/form": "npm:7.3.2"
32733282
"@mantine/hooks": "npm:7.3.2"
32743283
"@mantine/notifications": "npm:7.3.2"
3275-
"@remix-run/dev": "npm:2.4.1"
3276-
"@remix-run/node": "npm:2.4.1"
3277-
"@remix-run/react": "npm:2.4.1"
3278-
"@remix-run/serve": "npm:2.4.1"
3284+
"@remix-run/dev": "npm:2.3.1"
3285+
"@remix-run/node": "npm:2.3.1"
3286+
"@remix-run/react": "npm:2.3.1"
3287+
"@remix-run/serve": "npm:2.3.1"
32793288
"@ryot/generated": "workspace:*"
32803289
"@ryot/graphql": "workspace:*"
32813290
"@ryot/ts-utils": "workspace:*"
@@ -8643,6 +8652,20 @@ __metadata:
86438652
languageName: node
86448653
linkType: hard
86458654

8655+
"node-fetch@npm:^2.6.9":
8656+
version: 2.7.0
8657+
resolution: "node-fetch@npm:2.7.0"
8658+
dependencies:
8659+
whatwg-url: "npm:^5.0.0"
8660+
peerDependencies:
8661+
encoding: ^0.1.0
8662+
peerDependenciesMeta:
8663+
encoding:
8664+
optional: true
8665+
checksum: b24f8a3dc937f388192e59bcf9d0857d7b6940a2496f328381641cb616efccc9866e89ec43f2ec956bbd6c3d3ee05524ce77fe7b29ccd34692b3a16f237d6676
8666+
languageName: node
8667+
linkType: hard
8668+
86468669
"node-gyp@npm:latest":
86478670
version: 9.3.1
86488671
resolution: "node-gyp@npm:9.3.1"
@@ -9027,6 +9050,13 @@ __metadata:
90279050
languageName: node
90289051
linkType: hard
90299052

9053+
"parse-multipart-data@npm:^1.5.0":
9054+
version: 1.5.0
9055+
resolution: "parse-multipart-data@npm:1.5.0"
9056+
checksum: fb029f1446f086f2989fb24eaf549d28cfde7df1d323d069f343d5b0a62d8ee756c6a5a347874e148c9cf8c3fe523e295e6f2be3dd05ce73cb19e5e3cd5081ea
9057+
languageName: node
9058+
linkType: hard
9059+
90309060
"parse-node-version@npm:^1.0.1":
90319061
version: 1.0.1
90329062
resolution: "parse-node-version@npm:1.0.1"
@@ -9727,27 +9757,27 @@ __metadata:
97279757
languageName: node
97289758
linkType: hard
97299759

9730-
"react-router-dom@npm:6.21.1":
9731-
version: 6.21.1
9732-
resolution: "react-router-dom@npm:6.21.1"
9760+
"react-router-dom@npm:6.20.0":
9761+
version: 6.20.0
9762+
resolution: "react-router-dom@npm:6.20.0"
97339763
dependencies:
9734-
"@remix-run/router": "npm:1.14.1"
9735-
react-router: "npm:6.21.1"
9764+
"@remix-run/router": "npm:1.13.0"
9765+
react-router: "npm:6.20.0"
97369766
peerDependencies:
97379767
react: ">=16.8"
97389768
react-dom: ">=16.8"
9739-
checksum: 2d75bd889828fa5516ad076b44506656d826c365645e7079138cd0ef899db28a1b212f708a6c6e3b543ae11b96b2031f01201cc2fe1733dd4d9c5cbdd4d734ef
9769+
checksum: 4b6741c545cedf5a5c4f996deb953679dcc985425e0664e27b97fdb9ab1387cbe1a6a12bfc7f7c38ec40b15759b4bf6396930ec26540a4a81ae16d154fd35049
97409770
languageName: node
97419771
linkType: hard
97429772

9743-
"react-router@npm:6.21.1":
9744-
version: 6.21.1
9745-
resolution: "react-router@npm:6.21.1"
9773+
"react-router@npm:6.20.0":
9774+
version: 6.20.0
9775+
resolution: "react-router@npm:6.20.0"
97469776
dependencies:
9747-
"@remix-run/router": "npm:1.14.1"
9777+
"@remix-run/router": "npm:1.13.0"
97489778
peerDependencies:
97499779
react: ">=16.8"
9750-
checksum: 1220cc75e0c915a26dde9dbb6509a8f0b0163d96e5ad591af91d9bb5a92a18401718f8d872a03d1cb366e7a6216c165a5cadd12375adf97943f37d7f5c487a90
9780+
checksum: 2cdac5ad8b7a7bc230173b26768bcf3f6a9abc0a19983fa7b76b9ffdbeb44bfbd88fcc2033e9062defafef144db207859eb3162a9c9742d70cfce4e7166ff1e5
97519781
languageName: node
97529782
linkType: hard
97539783

@@ -11267,6 +11297,15 @@ __metadata:
1126711297
languageName: node
1126811298
linkType: hard
1126911299

11300+
"undici@npm:^5.22.1":
11301+
version: 5.28.2
11302+
resolution: "undici@npm:5.28.2"
11303+
dependencies:
11304+
"@fastify/busboy": "npm:^2.0.0"
11305+
checksum: 07ab8b812c7322f5faba55268562e3626463171ace8a2e5861e5793e69f8901e809bcdeb4013126fe8d1602baac247ea3c0c996073dbf9709516295b0a4dd18f
11306+
languageName: node
11307+
linkType: hard
11308+
1127011309
"unified@npm:^10.0.0":
1127111310
version: 10.1.2
1127211311
resolution: "unified@npm:10.1.2"

0 commit comments

Comments
 (0)