upgrade yarn to 4.0

.dockerignore

@@ -1 +1,7 @@
-node_modules
+node_modules
+.git
+.github
+
+.pnp.cjs
+.pnp.loader.mjs
+.yarn

.github/workflows/node.js.yml

@@ -23,5 +23,5 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install
-      - run: yarn test
+      - run: corepack yarn install
+      - run: corepack yarn test

.gitignore

@@ -24,4 +24,8 @@ dist
 *.db
 *.db-journal
 .eslintcache
-compose.yaml
+compose.yaml
+
+.pnp.cjs
+.pnp.loader.mjs
+.yarn

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -14,8 +14,8 @@ ENV PATH /app/node_modules/.bin:$PATH
 COPY . /app
 
 RUN apk add --no-cache bash
-RUN yarn install
-RUN yarn build
+RUN corepack yarn install && corepack yarn build && corepack yarn cache clean
+
 EXPOSE 5000
 
-CMD ["yarn", "start:prod"]
+CMD ["corepack", "yarn", "start:prod"]

package.json

@@ -7,12 +7,12 @@
     "types"
   ],
   "scripts": {
-    "prepare": "nx run-many -t build -p @filedrop/types",
-    "start": "WS_USE_PROXY=1 nx run-many -t start -p @filedrop/web @filedrop/ws",
-    "build": "nx run-many -t build",
-    "start:prod": "cd ws && yarn start:prod",
+    "prepare": "corepack yarn workspace types run build",
+    "start": "WS_USE_PROXY=1 corepack yarn workspaces foreach -Apt run start",
+    "build": "corepack yarn workspaces foreach -Apt run build",
+    "start:prod": "corepack yarn workspace @filedrop/ws run start:prod",
     "test": "vitest",
-    "lint": "nx run-many -t lint"
+    "lint": "corepack yarn workspaces foreach -Apt run lint"
   },
   "husky": {
     "hooks": {
@@ -34,9 +34,9 @@
     "eslint": "^8.46.0",
     "husky": "^8.0.3",
     "lint-staged": "^13.1.2",
-    "nx": "16.5.5",
     "prettier": "^2.8.4",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0"
-  }
+  },
+  "packageManager": "[email protected]"
 }

web/package.json

@@ -4,11 +4,13 @@
   "private": true,
   "type": "module",
   "devDependencies": {
+    "@babel/core": "^7.23.2",
     "@preact/preset-vite": "^2.6.0",
     "@testing-library/dom": "^9.3.1",
     "@testing-library/jest-dom": "^6.1.2",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.2.0",
+    "eslint": "^8.52.0",
     "vite": "^4.4.7",
     "vite-bundle-visualizer": "^0.10.0"
   },

ws/package.json

@@ -5,19 +5,12 @@
   "type": "module",
   "dependencies": {
     "@fastify/compress": "^6.4.0",
-    "@fastify/http-proxy": "^9.2.1",
     "@fastify/static": "^6.10.2",
     "@fastify/websocket": "^8.2.0",
     "@filedrop/types": "*",
-    "@types/node": "^20.4.5",
-    "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
     "dotenv-flow": "^4.0.0",
-    "eslint": "^8.46.0",
     "fastify": "^4.21.0",
     "joi": "^17.6.0",
-    "tsx": "^3.12.8",
     "ws": "^8.6.0"
   },
   "scripts": {
@@ -26,5 +19,11 @@
     "build": "tsc",
     "test": "vitest",
     "lint": "eslint . --ext ts,tsx"
+  },
+  "devDependencies": {
+    "@fastify/http-proxy": "^9.2.1",
+    "@types/node": "^20.8.9",
+    "@types/ws": "^8.5.8",
+    "tsx": "^3.14.0"
   }
 }