build: merge main, update dependencies

.eslintrc

@@ -11,7 +11,13 @@
     "cy": true,
     "Cypress": true
   },
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    "requireConfigFile": false,
+    "babelOptions": {
+      "presets": ["@babel/preset-react"]
+    }
+  },
   "rules": {
     "no-underscore-dangle": [
       "error",

.github/workflows/cypress.yml

@@ -8,8 +8,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: install
-        # network-concurrency 1 is necessary to avoid errors when using github packages
-        run: yarn cache clean && rm yarn.lock && yarn install --network-concurrency 1
+        run: yarn
 
       - name: cypress run
         uses: cypress-io/github-action@v2

.gitignore

@@ -32,3 +32,11 @@ cypress/downloads
 
 # jetbrains
 .idea
+
+# yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.husky/commit-msg

@@ -2,4 +2,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn commit-msg
+npx --no-install commitlint --edit "$1"

.yarnrc.yml

@@ -0,0 +1,3 @@
+yarnPath: .yarn/releases/yarn-3.0.1-rc.1.cjs
+nodeLinker: node-modules
+checksumBehavior: update

package.json

@@ -34,7 +34,6 @@
     "uuid": "8.3.2"
   },
   "scripts": {
-    "commit-msg": "commitlint --edit $1",
     "pre-commit": "pretty-quick --staged && yarn lint",
     "post-commit": "git status",
     "start": "env-cmd -f ./.env.local react-scripts start",
@@ -68,8 +67,9 @@
     ]
   },
   "devDependencies": {
-    "@commitlint/cli": "12.1.1",
-    "@commitlint/config-conventional": "12.1.1",
+    "@babel/eslint-parser": "^7.15.0",
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
     "@cypress/code-coverage": "3.9.6",
     "@cypress/instrument-cra": "1.4.0",
     "@graasp/websockets": "git://github.com/graasp/graasp-websockets.git#master",
@@ -81,8 +81,11 @@
     "env-cmd": "10.1.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
+    "eslint": "^7.31.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-prettier": "8.3.0",
+    "eslint-config-react-app": "^6.0.0",
+    "eslint-plugin-flowtype": "^5.9.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-react": "7.23.2",
@@ -98,5 +101,6 @@
     "exclude": [
       "src/serviceWorker.js"
     ]
-  }
+  },
+  "packageManager": "[email protected]"
 }