Skip to content

Commit

Permalink
ci: upgrade to yarn 3
Browse files Browse the repository at this point in the history
  • Loading branch information
pyphilia committed Aug 5, 2021
1 parent 46e886d commit fd2b901
Show file tree
Hide file tree
Showing 8 changed files with 21,030 additions and 15,127 deletions.
8 changes: 7 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ cypress/downloads

# jetbrains
.idea

# yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commit-msg
npx --no-install commitlint --edit "$1"
631 changes: 631 additions & 0 deletions .yarn/releases/yarn-3.0.1-rc.1.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
yarnPath: .yarn/releases/yarn-3.0.1-rc.1.cjs
nodeLinker: node-modules
checksumBehavior: update
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@graasp/query-client": "git://github.com/graasp/graasp-query-client.git",
"@graasp/ui": "git://github.com/graasp/graasp-ui.git#master",
"@graasp/ui": "git://github.com/graasp/graasp-ui.git#39/yarn2",
"@material-ui/core": "4.11.4",
"@material-ui/icons": "4.11.2",
"@material-ui/lab": "4.0.0-alpha.58",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -98,5 +101,6 @@
"exclude": [
"src/serviceWorker.js"
]
}
},
"packageManager": "[email protected]"
}
35,488 changes: 20,370 additions & 15,118 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit fd2b901

Please sign in to comment.