From c9949f058cc033a8cf23098fd2bd3166d09554fb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 21 Oct 2021 06:24:15 +0000 Subject: [PATCH 1/2] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000..f45d8f110 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 634bf956ba933fe9babba3742c12c0653404f755 Mon Sep 17 00:00:00 2001 From: Emmanuel Chambon Date: Thu, 21 Oct 2021 10:55:50 +0200 Subject: [PATCH 2/2] fix: correct config --- .github/dependabot.yml | 14 -------- .github/renovate.json | 44 +++++++++++++++++++++++ package.json | 9 +++-- packages/eslint-config-react/package.json | 3 -- packages/jest-helpers/.npmignore | 1 + packages/jest-helpers/package.json | 3 -- packages/random-name/.eslintrc.cjs | 10 ++++++ packages/random-name/.npmignore | 1 + packages/random-name/package.json | 4 --- packages/use-dataloader/.eslintrc.cjs | 10 ++++++ packages/use-dataloader/.npmignore | 1 + packages/use-dataloader/package.json | 6 ---- packages/use-i18n/.eslintrc.cjs | 10 ++++++ packages/use-i18n/.npmignore | 3 +- packages/use-i18n/package.json | 6 ---- packages/use-query-params/.eslintrc.cjs | 10 ++++++ packages/use-query-params/.npmignore | 1 + packages/use-query-params/package.json | 5 --- renovate.json | 5 --- yarn.lock | 14 ++++---- 20 files changed, 103 insertions(+), 57 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 .github/renovate.json create mode 100644 packages/random-name/.eslintrc.cjs create mode 100644 packages/use-dataloader/.eslintrc.cjs create mode 100644 packages/use-i18n/.eslintrc.cjs create mode 100644 packages/use-query-params/.eslintrc.cjs delete mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 620c8366c..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - reviewers: - - "scaleway/console" - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "daily" - reviewers: - - "scaleway/console" diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 000000000..99595d70f --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,44 @@ +{ + "enabledManagers": ["npm"], + "extends": [ + "config:base", + ":combinePatchMinorReleases" + ], + "assignees": ["@scaleway/console"], + "prHourlyLimit": 5, + "prConcurrentLimit": 10, + "postUpdateOptions": ["yarnDedupeHighest"], + "labels": ["dependencies"], + "rangeStrategy": "pin", + "semanticCommitType": "chore", + "semanticCommitScope": "deps", + "packageRules": [ + { + "semanticCommitScope": "devDeps", + "matchDepTypes": ["devDependencies"], + "matchUpdateTypes": ["major"] + }, + { + "automerge": true, + "automergeType": "branch", + "semanticCommitScope": "devDeps", + "matchDepTypes": ["devDependencies"], + "matchUpdateTypes": ["minor", "patch"] + }, + { + "labels": ["UPDATE-MAJOR"], + "stabilityDays": 14, + "matchUpdateTypes": ["major"] + }, + { + "labels": ["UPDATE-MINOR"], + "stabilityDays": 5, + "matchUpdateTypes": ["minor"] + }, + { + "labels": ["UPDATE-PATCH"], + "stabilityDays": 1, + "matchUpdateTypes": ["patch"] + } + ] +} diff --git a/package.json b/package.json index c0756287c..236bc4c61 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "@commitlint/config-conventional": "^13.1.0", "@rollup/plugin-babel": "^5.2.2", "@rollup/plugin-node-resolve": "^13.0.0", - "@testing-library/jest-dom": "^5.11.9", - "@testing-library/react": "^12.0.0", - "@testing-library/react-hooks": "^7.0.0", + "@testing-library/jest-dom": "^5.14.1", + "@testing-library/react": "^12.1.2", + "@testing-library/react-hooks": "^7.0.2", "@types/react-router-dom": "^5.1.8", "builtin-modules": "^3.2.0", "cross-env": "^7.0.3", @@ -29,7 +29,10 @@ "jest-localstorage-mock": "^2.4.8", "lerna": "^4.0.0", "lint-staged": "^11.0.0", + "mockdate": "^3.0.5", "prettier": "^2.2.1", + "react": "^17.0.2", + "react-dom": "^17.0.2", "read-pkg": "^7.0.0", "rollup": "^2.36.1", "rollup-plugin-dts": "^4.0.0", diff --git a/packages/eslint-config-react/package.json b/packages/eslint-config-react/package.json index 14a32755f..75017ea34 100644 --- a/packages/eslint-config-react/package.json +++ b/packages/eslint-config-react/package.json @@ -27,9 +27,6 @@ "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^4.2.0" }, - "devDependencies": { - "eslint": "^7.32.0" - }, "peerDependencies": { "eslint": "7.x" } diff --git a/packages/jest-helpers/.npmignore b/packages/jest-helpers/.npmignore index d1811b877..4b70adadf 100644 --- a/packages/jest-helpers/.npmignore +++ b/packages/jest-helpers/.npmignore @@ -1,3 +1,4 @@ **/__tests__/** src +.eslintrc.cjs !.npmignore diff --git a/packages/jest-helpers/package.json b/packages/jest-helpers/package.json index ca1ebb97a..cbbf9314f 100644 --- a/packages/jest-helpers/package.json +++ b/packages/jest-helpers/package.json @@ -21,9 +21,6 @@ "@emotion/react": "^11.1.4", "@testing-library/react": "^12.1.2" }, - "devDependencies": { - "@types/react": "^17.0.27" - }, "peerDependencies": { "react": "^17.0.1" } diff --git a/packages/random-name/.eslintrc.cjs b/packages/random-name/.eslintrc.cjs new file mode 100644 index 000000000..f4bd0a419 --- /dev/null +++ b/packages/random-name/.eslintrc.cjs @@ -0,0 +1,10 @@ +const { join } = require('path'); + +module.exports = { + rules: { + 'import/no-extraneous-dependencies': [ + 'error', + { packageDir: [__dirname, join(__dirname, '../../')] } + ] + } +}; diff --git a/packages/random-name/.npmignore b/packages/random-name/.npmignore index d1811b877..4b70adadf 100644 --- a/packages/random-name/.npmignore +++ b/packages/random-name/.npmignore @@ -1,3 +1,4 @@ **/__tests__/** src +.eslintrc.cjs !.npmignore diff --git a/packages/random-name/package.json b/packages/random-name/package.json index cbd3d1be7..cad1ce4bd 100644 --- a/packages/random-name/package.json +++ b/packages/random-name/package.json @@ -18,10 +18,6 @@ "directory": "packages/random-name" }, "license": "MIT", - "devDependencies": { - "@testing-library/react-hooks": "^7.0.1", - "react": "^17.0.2" - }, "peerDependencies": { "react": ">=16.8" } diff --git a/packages/use-dataloader/.eslintrc.cjs b/packages/use-dataloader/.eslintrc.cjs new file mode 100644 index 000000000..f4bd0a419 --- /dev/null +++ b/packages/use-dataloader/.eslintrc.cjs @@ -0,0 +1,10 @@ +const { join } = require('path'); + +module.exports = { + rules: { + 'import/no-extraneous-dependencies': [ + 'error', + { packageDir: [__dirname, join(__dirname, '../../')] } + ] + } +}; diff --git a/packages/use-dataloader/.npmignore b/packages/use-dataloader/.npmignore index d1811b877..4b70adadf 100644 --- a/packages/use-dataloader/.npmignore +++ b/packages/use-dataloader/.npmignore @@ -1,3 +1,4 @@ **/__tests__/** src +.eslintrc.cjs !.npmignore diff --git a/packages/use-dataloader/package.json b/packages/use-dataloader/package.json index 1cfc7193d..02cef60f6 100644 --- a/packages/use-dataloader/package.json +++ b/packages/use-dataloader/package.json @@ -29,11 +29,5 @@ }, "peerDependencies": { "react": "17.x" - }, - "devDependencies": { - "@testing-library/jest-dom": "^5.11.9", - "@testing-library/react": "^12.0.0", - "@testing-library/react-hooks": "^7.0.0", - "react": "^17.0.1" } } diff --git a/packages/use-i18n/.eslintrc.cjs b/packages/use-i18n/.eslintrc.cjs new file mode 100644 index 000000000..f4bd0a419 --- /dev/null +++ b/packages/use-i18n/.eslintrc.cjs @@ -0,0 +1,10 @@ +const { join } = require('path'); + +module.exports = { + rules: { + 'import/no-extraneous-dependencies': [ + 'error', + { packageDir: [__dirname, join(__dirname, '../../')] } + ] + } +}; diff --git a/packages/use-i18n/.npmignore b/packages/use-i18n/.npmignore index b78b34648..5600eef5f 100644 --- a/packages/use-i18n/.npmignore +++ b/packages/use-i18n/.npmignore @@ -1,4 +1,5 @@ **/__tests__/** examples/ src -!.npmignore \ No newline at end of file +.eslintrc.cjs +!.npmignore diff --git a/packages/use-i18n/package.json b/packages/use-i18n/package.json index ff6e76d93..bd9e6a020 100644 --- a/packages/use-i18n/package.json +++ b/packages/use-i18n/package.json @@ -37,11 +37,5 @@ "date-fns": "2.x", "react": "17.x", "react-dom": "17.x" - }, - "devDependencies": { - "@testing-library/react-hooks": "^7.0.0", - "mockdate": "^3.0.5", - "react": "17.0.2", - "react-dom": "17.0.2" } } diff --git a/packages/use-query-params/.eslintrc.cjs b/packages/use-query-params/.eslintrc.cjs new file mode 100644 index 000000000..f4bd0a419 --- /dev/null +++ b/packages/use-query-params/.eslintrc.cjs @@ -0,0 +1,10 @@ +const { join } = require('path'); + +module.exports = { + rules: { + 'import/no-extraneous-dependencies': [ + 'error', + { packageDir: [__dirname, join(__dirname, '../../')] } + ] + } +}; diff --git a/packages/use-query-params/.npmignore b/packages/use-query-params/.npmignore index d1811b877..4b70adadf 100644 --- a/packages/use-query-params/.npmignore +++ b/packages/use-query-params/.npmignore @@ -1,3 +1,4 @@ **/__tests__/** src +.eslintrc.cjs !.npmignore diff --git a/packages/use-query-params/package.json b/packages/use-query-params/package.json index 4b0365323..bd9b71802 100644 --- a/packages/use-query-params/package.json +++ b/packages/use-query-params/package.json @@ -36,10 +36,5 @@ "react": "17.x", "react-dom": "17.x", "react-router-dom": "^5.2.0" - }, - "devDependencies": { - "@testing-library/react-hooks": "^7.0.0", - "react": "^17.0.1", - "react-dom": "^17.0.1" } } diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f45d8f110..000000000 --- a/renovate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": [ - "config:base" - ] -} diff --git a/yarn.lock b/yarn.lock index 1b38bc014..898f72779 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2577,7 +2577,7 @@ lz-string "^1.4.4" pretty-format "^27.0.2" -"@testing-library/jest-dom@^5.11.9": +"@testing-library/jest-dom@^5.14.1": version "5.14.1" resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.14.1.tgz#8501e16f1e55a55d675fe73eecee32cdaddb9766" integrity sha512-dfB7HVIgTNCxH22M1+KU6viG5of2ldoA5ly8Ar8xkezKHKXjRvznCdbMbqjYGgO2xjRbwnR+rR8MLUIqF3kKbQ== @@ -2592,7 +2592,7 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react-hooks@^7.0.0", "@testing-library/react-hooks@^7.0.1": +"@testing-library/react-hooks@^7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-7.0.2.tgz#3388d07f562d91e7f2431a4a21b5186062ecfee0" integrity sha512-dYxpz8u9m4q1TuzfcUApqi8iFfR6R0FaMbr2hjZJy1uC8z+bO/K4v8Gs9eogGKYQop7QsrBTFkv/BCF7MzD2Cg== @@ -2603,7 +2603,7 @@ "@types/react-test-renderer" ">=16.9.0" react-error-boundary "^3.1.0" -"@testing-library/react@^12.0.0", "@testing-library/react@^12.1.2": +"@testing-library/react@^12.1.2": version "12.1.2" resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76" integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g== @@ -2774,7 +2774,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.0", "@types/react@^17.0.27": +"@types/react@*", "@types/react@>=16.9.0": version "17.0.30" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.30.tgz#2f8e6f5ab6415c091cc5e571942ee9064b17609e" integrity sha512-3Dt/A8gd3TCXi2aRe84y7cK1K8G+N9CZRDG8kDGguOKa0kf/ZkSwTmVIDPsm/KbQOVMaDJXwhBtuOXxqwdpWVg== @@ -4397,7 +4397,7 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@^7.18.0, eslint@^7.32.0: +eslint@^7.18.0: version "7.32.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== @@ -7529,7 +7529,7 @@ quick-lru@^4.0.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== -react-dom@17.0.2, react-dom@^17.0.1: +react-dom@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== @@ -7584,7 +7584,7 @@ react-router@5.2.1: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react@17.0.2, react@^17.0.1, react@^17.0.2: +react@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==