Skip to content

Commit

Permalink
chore(Deps): Hoist lint-staged dependency and remove parallel running
Browse files Browse the repository at this point in the history
`lint-staged` should be run once from the root directory, and therefore that's where it should be installed.

See https://github.com/okonet/lint-staged#how-to-use-lint-staged-in-a-multi-package-monorepo for more details.

Additionally, running it in parallel causes Git lock conflicts: lint-staged/lint-staged#1105 (comment).
  • Loading branch information
jpveooys committed Mar 18, 2022
1 parent c420adb commit 26d9a9c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -21,6 +21,7 @@
"eslint-plugin-prettier": "^4.0.0",
"husky": "^7.0.1",
"lerna": "^4.0.0",
"lint-staged": "^12.3.6",
"prettier": "^2.0.5"
},
"resolutions": {
Expand Down Expand Up @@ -48,7 +49,6 @@
"scripts": {
"build": "lerna run --stream --concurrency 1 build",
"lint": "lerna run --parallel lint",
"lint-staged": "lerna run --parallel lint-staged",
"test": "lerna run --parallel test",
"storybook:static": "lerna run --parallel storybook:static",
"lerna:prerelease": "yarn lerna:run-version --conventional-prerelease=* --no-changelog -m \"chore(Prerelease): %v [skip ci]\"",
Expand Down
2 changes: 0 additions & 2 deletions packages/react-component-library/package.json
Expand Up @@ -34,7 +34,6 @@
"build:ts:dev": "webpack --mode production --config=webpack/dev.js",
"chromatic": "chromatic --build-script-name storybook:static",
"dev": "concurrently \"webpack --watch --config=webpack/dev.js\" \"yarn types --watch\"",
"lint-staged": "lint-staged",
"lint": "eslint src cypress --ext .js --ext .jsx --ext .ts --ext .tsx",
"prepare": "yarn build",
"storybook": "BABEL_ENV=es RNDS_LOG_LEVEL=debug start-storybook -p 6006",
Expand Down Expand Up @@ -124,7 +123,6 @@
"jest-junit": "^13.0.0",
"jest-sonar-reporter": "^2.0.0",
"jest-styled-components": "^7.0.3",
"lint-staged": "^12.0.2",
"local-cypress": "^1.2.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
Expand Down
14 changes: 10 additions & 4 deletions yarn.lock
Expand Up @@ -11942,10 +11942,10 @@ lines-and-columns@^1.1.6:
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==

lint-staged@^12.0.2:
version "12.3.5"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.5.tgz#8048ce048c3cac12f57200a06344a54dc91c8fa9"
integrity sha512-oOH36RUs1It7b9U/C7Nl/a0sLfoIBcMB8ramiB3nuJ6brBqzsWiUAFSR5DQ3yyP/OR7XKMpijtgKl2DV1lQ3lA==
lint-staged@^12.3.6:
version "12.3.6"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.3.6.tgz#7b999ebe041c07f241537a17c49969027b4d26f0"
integrity sha512-tVNyl/HsAnplKh4oaoRNzyZLm0PE/6VaBUXvd/gA9zhYCC/+ivZwiwpoT6jOxcLzuIOjP19wW+mfOi7/Bw4c1A==
dependencies:
cli-truncate "^3.1.0"
colorette "^2.0.16"
Expand All @@ -11957,6 +11957,7 @@ lint-staged@^12.0.2:
micromatch "^4.0.4"
normalize-path "^3.0.0"
object-inspect "^1.12.0"
pidtree "^0.5.0"
string-argv "^0.3.1"
supports-color "^9.2.1"
yaml "^1.10.2"
Expand Down Expand Up @@ -13904,6 +13905,11 @@ pidtree@^0.3.0:
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==

pidtree@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.5.0.tgz#ad5fbc1de78b8a5f99d6fbdd4f6e4eee21d1aca1"
integrity sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==

pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
Expand Down

0 comments on commit 26d9a9c

Please sign in to comment.