Skip to content

Commit

Permalink
Merge pull request #26 from jpedroh/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jpedroh authored Apr 29, 2021
2 parents d225bb3 + 80e7fa3 commit 9ab500a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 31 deletions.
9 changes: 6 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: 'npm'
directory: '/'
target-branch: 'develop'
schedule:
interval: "daily"
interval: 'daily'
commit-message:
prefix: 'build'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@mach/eslint-config": "*",
"@mach/prettier-config": "*",
"@types/jest": "^26.0.8",
"@types/node": "^14.0.27",
"@types/node": "^15.0.1",
"jest": "^26.2.2",
"lerna": "^4.0.0",
"ts-jest": "^26.1.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"@typescript-eslint/parser": "^3.7.0",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
"eslint-config-standard": "^16.0.2",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-standard": "^5.0.0",
"prettier": "^2.0.5"
}
}
2 changes: 1 addition & 1 deletion packages/front/package.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"styled-components": "^5.2.0"
},
"devDependencies": {
"@types/react": "^16.9.49"
"@types/react": "^17.0.4"
}
}
34 changes: 10 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2412,16 +2412,11 @@
resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==

"@types/node@*":
"@types/node@*", "@types/node@^15.0.1":
version "15.0.1"
resolved "https://registry.npmjs.org/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==

"@types/node@^14.0.27":
version "14.14.43"
resolved "https://registry.npmjs.org/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==

"@types/normalize-package-data@^2.4.0":
version "2.4.0"
resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
Expand Down Expand Up @@ -2459,7 +2454,7 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35":
"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.4":
version "17.0.4"
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.4.tgz#a67c6f7a460d2660e950d9ccc1c2f18525c28220"
integrity sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw==
Expand All @@ -2468,15 +2463,6 @@
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/react@^16.9.49":
version "16.14.5"
resolved "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz#2c39b5cadefaf4829818f9219e5e093325979f4d"
integrity sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/scheduler@*":
version "0.16.1"
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
Expand Down Expand Up @@ -4956,10 +4942,10 @@ eslint-config-prettier@^6.11.0:
dependencies:
get-stdin "^6.0.0"

eslint-config-standard@^14.1.1:
version "14.1.1"
resolved "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea"
integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==
eslint-config-standard@^16.0.2:
version "16.0.2"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6"
integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==

eslint-import-resolver-node@^0.3.4:
version "0.3.4"
Expand Down Expand Up @@ -5057,10 +5043,10 @@ eslint-plugin-react@^7.20.3:
resolve "^2.0.0-next.3"
string.prototype.matchall "^4.0.4"

eslint-plugin-standard@^4.0.1:
version "4.1.0"
resolved "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5"
integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==
eslint-plugin-standard@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4"
integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==

eslint-scope@^4.0.3:
version "4.0.3"
Expand Down

0 comments on commit 9ab500a

Please sign in to comment.