Upgrade to Yarn berry

.github/workflows/nodejs.yml

@@ -16,30 +16,18 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Get yarn cache
-        id: yarn-cache
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - name: install
-        run: yarn install
-      - name: run tests
-        run: yarn workspaces run test
-        env:
-          CI: true
-      - name: run builds
-        run: yarn workspaces run build
-        env:
-          CI: true
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+      - name: Run Tests
+        run: yarn workspaces foreach --verbose run test
+      - name: Run Builds
+        run: yarn workspaces foreach --verbose run build

.gitignore

@@ -78,3 +78,12 @@ typings/
 
 # End of https://www.gitignore.io/api/node
 dist/
+
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

browser/package.json

@@ -45,8 +45,5 @@
     "prettier": "^2.4.1",
     "shx": "^0.3.3",
     "typescript": "^4.4.3"
-  },
-  "resolutions": {
-    "minimist": "^1.2.2"
   }
 }

browser/src/board/utils.ts

@@ -46,5 +46,5 @@ export function drawMask(board: Board) {
 }
 
 export function clearCanvas(board: Board) {
-  board.context.clearRect(0, 0, board.canvas.width, board.canvas.height)
+  board.context.clearRect(0, 0, Board.CANVAS_WIDTH, Board.CANVAS_HEIGHT)
 }

core/package.json

@@ -41,8 +41,5 @@
     "shx": "^0.3.3",
     "ts-jest": "^27.0.5",
     "typescript": "^4.4.3"
-  },
-  "resolutions": {
-    "minimist": "^1.2.2"
   }
 }

package.json

@@ -22,8 +22,9 @@
     "url": "https://github.com/kenrick95/c4/issues"
   },
   "engines": {
-    "node": "14.x"
+    "node": "^16"
   },
+  "packageManager": "[email protected]",
   "homepage": "https://github.com/kenrick95/c4",
   "license": "MIT",
   "keywords": [

server/package.json

@@ -27,7 +27,7 @@
   "source": "./src/index.ts",
   "scripts": {
     "start": "ts-node src/index.ts",
-    "start-dev": "nodemon --watch src --ignore 'src/**/*.spec.ts' --exec ts-node src/index.ts",
+    "start-dev": "nodemon --watch src --ignore 'src/**/*.spec.ts' --exec yarn start",
     "build": "echo 'OK'",
     "prettier": "prettier --write \"./**/*.?(ts|html|scss|css)\"",
     "test": "echo 'OK'"
@@ -37,6 +37,7 @@
     "@types/uuid": "^8.3.1",
     "@types/ws": "^7.4.7",
     "nodemon": "^2.0.13",
+    "prettier": "^2.4.1",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.3"
   },
@@ -46,8 +47,5 @@
     "redux-thunk": "^2.3.0",
     "uuid": "^8.3.2",
     "ws": "^8.2.2"
-  },
-  "resolutions": {
-    "minimist": "^1.2.2"
   }
 }