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
IgnisDa · Dec 31, 2023 · c76c92a · c76c92a
1 parent 0b166f5
commit c76c92a
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 68 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -54,6 +54,7 @@ COPY --from=reverse-proxy /usr/bin/caddy /usr/local/bin/caddy
 COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/node_modules ./node_modules
 COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/package.json ./package.json
 COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/build ./build
+COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/public ./public
 COPY --from=app-builder --chown=ryot:ryot /app/ryot /usr/local/bin/ryot
 HEALTHCHECK --interval=5m --timeout=3s \
   CMD curl -f http://localhost:5000/config || exit 1

diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "4.0.0"
+version = "4.0.1"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-V3"

diff --git a/apps/frontend/moon.yml b/apps/frontend/moon.yml
@@ -12,18 +12,22 @@ tasks:
       - '@group(remix)'
 
   dev:
-    command: 'remix vite:dev --port 3000 --host'
+    command: vite dev --port 3000 --host
     local: true
     deps:
       - routes
 
   build-basic:
-    command: 'remix vite:build'
+    command: vite build
+
+  build-ssr:
+    command: vite build --ssr
 
   build:
     deps:
       - routes
       - build-basic
+      - build-ssr
     inputs:
       - '@group(remix)'
     outputs:

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -21,9 +21,9 @@
 		"@mantine/form": "7.3.2",
 		"@mantine/hooks": "7.3.2",
 		"@mantine/notifications": "7.3.2",
-		"@remix-run/node": "2.4.1",
-		"@remix-run/react": "2.4.1",
-		"@remix-run/serve": "2.4.1",
+		"@remix-run/node": "2.3.1",
+		"@remix-run/react": "2.3.1",
+		"@remix-run/serve": "2.3.1",
 		"@ryot/generated": "workspace:*",
 		"@ryot/graphql": "workspace:*",
 		"@ryot/ts-utils": "workspace:*",
@@ -58,7 +58,7 @@
 	},
 	"devDependencies": {
 		"@ignisda/remix-routes": "3.3.0",
-		"@remix-run/dev": "2.4.1",
+		"@remix-run/dev": "2.3.1",
 		"@types/cookie": "0.6.0",
 		"@types/crypto-js": "4.2.1",
 		"@types/howler": "2.2.11",

diff --git a/config/supervisord.conf b/config/supervisord.conf
@@ -7,7 +7,7 @@ command=ryot
 environment=
 
 [program:frontend]
-command=npx remix-serve ./build/server/index.js
+command=npx remix-serve ./build/index.js
 environment=API_URL=http://localhost:5000
 
 [program:reverse-proxy]

diff --git a/yarn.lock b/yarn.lock
@@ -1923,6 +1923,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@fastify/busboy@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "@fastify/busboy@npm:2.1.0"
+  checksum: f22c1e5c52dc350ddf9ba8be9f87b48d3ea5af00a37fd0a0d1e3e4b37f94d96763e514c68a350c7f570260fdd2f08b55ee090cdd879f92a03249eb0e3fd19113
+  languageName: node
+  linkType: hard
+
 "@floating-ui/core@npm:^1.4.2":
   version: 1.5.0
   resolution: "@floating-ui/core@npm:1.5.0"
@@ -2933,9 +2940,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/dev@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/dev@npm:2.4.1"
+"@remix-run/dev@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/dev@npm:2.3.1"
   dependencies:
     "@babel/core": "npm:^7.21.8"
     "@babel/generator": "npm:^7.21.5"
@@ -2947,9 +2954,9 @@ __metadata:
     "@babel/types": "npm:^7.22.5"
     "@mdx-js/mdx": "npm:^2.3.0"
     "@npmcli/package-json": "npm:^4.0.1"
-    "@remix-run/node": "npm:2.4.1"
-    "@remix-run/router": "npm:1.14.1"
-    "@remix-run/server-runtime": "npm:2.4.1"
+    "@remix-run/node": "npm:2.3.1"
+    "@remix-run/router": "npm:1.13.0"
+    "@remix-run/server-runtime": "npm:2.3.1"
     "@types/mdx": "npm:^2.0.5"
     "@vanilla-extract/integration": "npm:^6.2.0"
     arg: "npm:^5.0.1"
@@ -2972,7 +2979,9 @@ __metadata:
     lodash: "npm:^4.17.21"
     lodash.debounce: "npm:^4.0.8"
     minimatch: "npm:^9.0.0"
+    node-fetch: "npm:^2.6.9"
     ora: "npm:^5.4.1"
+    parse-multipart-data: "npm:^1.5.0"
     picocolors: "npm:^1.0.0"
     picomatch: "npm:^2.3.1"
     pidtree: "npm:^0.6.0"
@@ -2989,11 +2998,12 @@ __metadata:
     set-cookie-parser: "npm:^2.6.0"
     tar-fs: "npm:^2.1.1"
     tsconfig-paths: "npm:^4.0.0"
+    undici: "npm:^5.22.1"
     ws: "npm:^7.4.5"
   peerDependencies:
-    "@remix-run/serve": ^2.4.1
+    "@remix-run/serve": ^2.3.1
     typescript: ^5.1.0
-    vite: ^5.0.0
+    vite: ^4.4.9 || ^5.0.0
   peerDependenciesMeta:
     "@remix-run/serve":
       optional: true
@@ -3003,31 +3013,31 @@ __metadata:
       optional: true
   bin:
     remix: dist/cli.js
-  checksum: c2df048cc1021339ce201608cea9ee616eec42abccbe4f753943f4b076faad2f3af666c56ce23775625d1e9c4d9bc0f6f3c5e3c6c5a9f8005a56a0d66c6ed3f1
+  checksum: e1e86c7e3539b069f9ba9620a1b773dd862b58ecb1de858089094920f249bbc5bc0012a22cde4fa87147d53c10723c6ed8097fc543dfb20ff34d83b891ae6644
   languageName: node
   linkType: hard
 
-"@remix-run/express@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/express@npm:2.4.1"
+"@remix-run/express@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/express@npm:2.3.1"
   dependencies:
-    "@remix-run/node": "npm:2.4.1"
+    "@remix-run/node": "npm:2.3.1"
   peerDependencies:
     express: ^4.17.1
     typescript: ^5.1.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cfcecca56c5af8d61ad2d6c66325c4980b4bd77bc343f83d644e3912855af053da5adee13cffddbcf2e1656ccddae9d720ce1713362565a151440372e01243dc
+  checksum: ccecf3a3a152b86773212baaf940112c763477fcd5474af1b7c1e7e2782517c72606a0f849abddc59b55c25a1d5c1befd3f2830d7851b8f8169bbd3e82a3e883
   languageName: node
   linkType: hard
 
-"@remix-run/node@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/node@npm:2.4.1"
+"@remix-run/node@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/node@npm:2.3.1"
   dependencies:
-    "@remix-run/server-runtime": "npm:2.4.1"
-    "@remix-run/web-fetch": "npm:^4.4.2"
+    "@remix-run/server-runtime": "npm:2.3.1"
+    "@remix-run/web-fetch": "npm:^4.4.1"
     "@remix-run/web-file": "npm:^3.1.0"
     "@remix-run/web-stream": "npm:^1.1.0"
     "@web3-storage/multipart-parser": "npm:^1.0.0"
@@ -3039,42 +3049,41 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a7c8b7788305d0d52703ec3557aa711125d69b61182cd9038d2d60bbbecd5cfcc473f6727bf2674e09f1c5f2574498856262109e1275dbd044fe73ac8f8fca8b
+  checksum: 4656c8279374a20057c344558619368bb46d31c39ed4dc37540f7d328a35d87b2a98791dbaa925e05b79be2839a1a9bbae97b1eb25611c205e7b5ccadb65a628
   languageName: node
   linkType: hard
 
-"@remix-run/react@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/react@npm:2.4.1"
+"@remix-run/react@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/react@npm:2.3.1"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
-    "@remix-run/server-runtime": "npm:2.4.1"
-    react-router: "npm:6.21.1"
-    react-router-dom: "npm:6.21.1"
+    "@remix-run/router": "npm:1.13.0"
+    "@remix-run/server-runtime": "npm:2.3.1"
+    react-router-dom: "npm:6.20.0"
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
     typescript: ^5.1.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 5f9a2f3b82824acffa0fb81b34e1464d7cf73be76e21f5a6247b33311828e6814f9d09cfbc8177a738a85858d1ebd593848944db9c6b1a51b0324c85d7b24ab7
+  checksum: c246b11cd616a1ae52a08608f89d69fbecc115579ca2f8e45d6921c37495204aa31370c4b59f32526ab881059828caff8f4112fc6a265b3167be4397dd28ae29
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.14.1":
-  version: 1.14.1
-  resolution: "@remix-run/router@npm:1.14.1"
-  checksum: caed61639006444a66ca832f1e500bac2fcf02695183e967ff1452d3172f888f2bb40591b239c85f9003b9628383cfd4c8ef55cde800d14276905c7031c9f0b9
+"@remix-run/router@npm:1.13.0":
+  version: 1.13.0
+  resolution: "@remix-run/router@npm:1.13.0"
+  checksum: bb173a012d2036c5ee69babfe30c73975b970c2e5a0edaba138c302ae80d255e238e462e77365ab4efe819b6397e1a7f3a416d6200d17f9655f0ca1c51c4f45e
   languageName: node
   linkType: hard
 
-"@remix-run/serve@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/serve@npm:2.4.1"
+"@remix-run/serve@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/serve@npm:2.3.1"
   dependencies:
-    "@remix-run/express": "npm:2.4.1"
-    "@remix-run/node": "npm:2.4.1"
+    "@remix-run/express": "npm:2.3.1"
+    "@remix-run/node": "npm:2.3.1"
     chokidar: "npm:^3.5.3"
     compression: "npm:^1.7.4"
     express: "npm:^4.17.1"
@@ -3083,15 +3092,15 @@ __metadata:
     source-map-support: "npm:^0.5.21"
   bin:
     remix-serve: dist/cli.js
-  checksum: 554ef4401a511572203ab510d53e07a1cf9333a4d9404bb74d94251f7a8bf10a53aa29678276c761142cfa993e9e8e1391782553204b9314e6541ae8876ffc18
+  checksum: d7d8d326cb2f57f175aea14ff4797ea69e822b7c8acf8ec20bdae67626bdf67f033cbbf8e65477266e123f7291435dfb0bbf8e4b2576e50f8e600bdde8210aa6
   languageName: node
   linkType: hard
 
-"@remix-run/server-runtime@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@remix-run/server-runtime@npm:2.4.1"
+"@remix-run/server-runtime@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@remix-run/server-runtime@npm:2.3.1"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
+    "@remix-run/router": "npm:1.13.0"
     "@types/cookie": "npm:^0.5.3"
     "@web3-storage/multipart-parser": "npm:^1.0.0"
     cookie: "npm:^0.5.0"
@@ -3102,7 +3111,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c57df47d413728ea870460503ab11b843e93eb4c4044b94f92ca5f382b25cc366efc0a75d74405d77f5dd62ff3c191736bb67612c67eb653b097dba525ed8cc7
+  checksum: f5b36b86f98d2ecc78683cbefc084e52dd99661ef6106ff403a4fa01b997e087cca92f17d8c01907d93d87d8a8d1c39752b90daf4f5689ccecea33f56c195e2d
   languageName: node
   linkType: hard
 
@@ -3116,7 +3125,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/web-fetch@npm:^4.4.2":
+"@remix-run/web-fetch@npm:^4.4.1":
   version: 4.4.2
   resolution: "@remix-run/web-fetch@npm:4.4.2"
   dependencies:
@@ -3272,10 +3281,10 @@ __metadata:
     "@mantine/form": "npm:7.3.2"
     "@mantine/hooks": "npm:7.3.2"
     "@mantine/notifications": "npm:7.3.2"
-    "@remix-run/dev": "npm:2.4.1"
-    "@remix-run/node": "npm:2.4.1"
-    "@remix-run/react": "npm:2.4.1"
-    "@remix-run/serve": "npm:2.4.1"
+    "@remix-run/dev": "npm:2.3.1"
+    "@remix-run/node": "npm:2.3.1"
+    "@remix-run/react": "npm:2.3.1"
+    "@remix-run/serve": "npm:2.3.1"
     "@ryot/generated": "workspace:*"
     "@ryot/graphql": "workspace:*"
     "@ryot/ts-utils": "workspace:*"
@@ -8643,6 +8652,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-fetch@npm:^2.6.9":
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
+  dependencies:
+    whatwg-url: "npm:^5.0.0"
+  peerDependencies:
+    encoding: ^0.1.0
+  peerDependenciesMeta:
+    encoding:
+      optional: true
+  checksum: b24f8a3dc937f388192e59bcf9d0857d7b6940a2496f328381641cb616efccc9866e89ec43f2ec956bbd6c3d3ee05524ce77fe7b29ccd34692b3a16f237d6676
+  languageName: node
+  linkType: hard
+
 "node-gyp@npm:latest":
   version: 9.3.1
   resolution: "node-gyp@npm:9.3.1"
@@ -9027,6 +9050,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-multipart-data@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "parse-multipart-data@npm:1.5.0"
+  checksum: fb029f1446f086f2989fb24eaf549d28cfde7df1d323d069f343d5b0a62d8ee756c6a5a347874e148c9cf8c3fe523e295e6f2be3dd05ce73cb19e5e3cd5081ea
+  languageName: node
+  linkType: hard
+
 "parse-node-version@npm:^1.0.1":
   version: 1.0.1
   resolution: "parse-node-version@npm:1.0.1"
@@ -9727,27 +9757,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:6.21.1":
-  version: 6.21.1
-  resolution: "react-router-dom@npm:6.21.1"
+"react-router-dom@npm:6.20.0":
+  version: 6.20.0
+  resolution: "react-router-dom@npm:6.20.0"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
-    react-router: "npm:6.21.1"
+    "@remix-run/router": "npm:1.13.0"
+    react-router: "npm:6.20.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 2d75bd889828fa5516ad076b44506656d826c365645e7079138cd0ef899db28a1b212f708a6c6e3b543ae11b96b2031f01201cc2fe1733dd4d9c5cbdd4d734ef
+  checksum: 4b6741c545cedf5a5c4f996deb953679dcc985425e0664e27b97fdb9ab1387cbe1a6a12bfc7f7c38ec40b15759b4bf6396930ec26540a4a81ae16d154fd35049
   languageName: node
   linkType: hard
 
-"react-router@npm:6.21.1":
-  version: 6.21.1
-  resolution: "react-router@npm:6.21.1"
+"react-router@npm:6.20.0":
+  version: 6.20.0
+  resolution: "react-router@npm:6.20.0"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
+    "@remix-run/router": "npm:1.13.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 1220cc75e0c915a26dde9dbb6509a8f0b0163d96e5ad591af91d9bb5a92a18401718f8d872a03d1cb366e7a6216c165a5cadd12375adf97943f37d7f5c487a90
+  checksum: 2cdac5ad8b7a7bc230173b26768bcf3f6a9abc0a19983fa7b76b9ffdbeb44bfbd88fcc2033e9062defafef144db207859eb3162a9c9742d70cfce4e7166ff1e5
   languageName: node
   linkType: hard
 
@@ -11267,6 +11297,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici@npm:^5.22.1":
+  version: 5.28.2
+  resolution: "undici@npm:5.28.2"
+  dependencies:
+    "@fastify/busboy": "npm:^2.0.0"
+  checksum: 07ab8b812c7322f5faba55268562e3626463171ace8a2e5861e5793e69f8901e809bcdeb4013126fe8d1602baac247ea3c0c996073dbf9709516295b0a4dd18f
+  languageName: node
+  linkType: hard
+
 "unified@npm:^10.0.0":
   version: 10.1.2
   resolution: "unified@npm:10.1.2"