Merge branch 'main' into next

meza · Jun 3, 2023 · 3bc88d7 · 3bc88d7
2 parents dce901f + dc3a0cb
commit 3bc88d7
Show file tree

Hide file tree

Showing 13 changed files with 2,848 additions and 2,106 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,6 +1,8 @@
 {
  "extends": [
  "tailored-tunes",
+ "plugin:@typescript-eslint/recommended",
+ "plugin:import/typescript",
  "plugin:json/recommended",
  "plugin:security/recommended"
  ],
@@ -13,9 +15,38 @@
  },
  "plugins": [
  "json",
- "@typescript-eslint"
+ "@typescript-eslint",
+ "import"
  ],
  "rules": {
+ "import/order": [
+ 2,
+ {
+ "alphabetize": {
+ "caseInsensitive": false,
+ "order": "asc"
+ },
+ "groups": [
+ "builtin",
+ "external",
+ "internal",
+ "parent",
+ "sibling",
+ "index",
+ "type"
+ ],
+ "pathGroups": [
+ {
+ "pattern": "react",
+ "group": "external",
+ "position": "before"
+ }
+ ],
+ "pathGroupsExcludedImportTypes": [
+ "type"
+ ]
+ }
+ ],
  "@typescript-eslint/no-unused-vars": 2,
  "no-console": "off",
  "no-else-return": "off",

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -59,7 +59,13 @@
  "matchDepTypes": [
  "engines"
  ],
- "automerge": true,
+ "automerge": false,
+ "rangeStrategy": "widen"
+ },
+ {
+ "matchDepTypes": [
+ "engines"
+ ],
  "rangeStrategy": "widen"
  }
  ],