Merge main into v2 [skip ci]

microsoft · Aug 23, 2024 · b8cff07 · b8cff07
2 parents be049ee + acf1890
commit b8cff07
Show file tree

Hide file tree

Showing 19 changed files with 2,937 additions and 2,349 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -23,9 +23,9 @@
     {
       // Group updates of all deps except Renovate.
       "groupName": "devDependencies",
-      "matchPackagePatterns": ["*"],
+      "matchPackageNames": ["*"],
       "matchUpdateTypes": ["minor", "patch"],
-      "excludeDepNames": ["renovate"],
+      "matchDepNames": ["!renovate"],
       "schedule": ["before 5am on the 5th and 20th day of the month"]
     },
     {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @microsoft/m365-renovate-config
 
+## 2.6.0
+
+[Compare source](https://github.com/microsoft/m365-renovate-config/compare/v2.5.0...v2.6.0) - August 22, 2024 at 9:55 PM PDT
+
+### Minor Changes
+
+- [#178](https://github.com/microsoft/m365-renovate-config/pull/178) [`ee3ecd0`](https://github.com/microsoft/m365-renovate-config/commit/ee3ecd054ba6aa03704ecd912e34adef017702fc) - Migrate configs for Renovate v38 (Thanks [@renovate](https://github.com/apps/renovate)!)
+
 ## 2.5.0
 
 [Compare source](https://github.com/microsoft/m365-renovate-config/compare/v2.4.0...v2.5.0) - February 27, 2024 at 2:16 PM PST

diff --git a/README.md b/README.md
@@ -256,7 +256,7 @@ Group D3 updates.
   "packageRules": [
     {
       "groupName": "D3 packages",
-      "matchPackagePrefixes": ["d3-", "@types/d3-"]
+      "matchPackageNames": ["d3-*", "@types/d3-*"]
     }
   ]
 }
@@ -281,8 +281,7 @@ Group and schedule all eslint-related updates.
   "packageRules": [
     {
       "groupName": "eslint packages",
-      "matchPackagePatterns": ["eslint"],
-      "excludePackagePrefixes": ["@typecript-eslint/"],
+      "matchPackageNames": ["/eslint/", "!@typecript-eslint/*"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]
     },
     {
@@ -325,7 +324,7 @@ Group, schedule, and auto-merge all dependency updates in `__fixtures__` sub-fol
       "groupName": "fixture dependencies",
       "schedule": ["before 5am on the 1st and 15th day of the month"],
       "matchFileNames": ["**/__fixtures__/**"],
-      "matchPackagePatterns": ["*"],
+      "matchPackageNames": ["*"],
       "matchDepTypes": [
         "dependencies",
         "devDependencies",
@@ -362,7 +361,7 @@ Note that this will still make separate PRs for major and non-major updates unle
 
 To customize this rule's behavior for individual packages, you can add entries to `packageRules` in your repo. For example:
 
-- Exclude individual packages: `{ "groupName": "fixture dependencies", "excludePackageNames": ["foo"] }` (or other [exclusion options](https://docs.renovatebot.com/configuration-options/#excludepackagenames))
+- Exclude individual packages: `{ "groupName": "fixture dependencies", "matchPackageNames": ["!foo"] }` (or other [exclusion options](https://docs.renovatebot.com/configuration-options/#matchrepositories))
 - Limit the allowed versions for a specific package: `{ "matchPackageNames": ["foo"], "allowedVersions": "<6.0.0 }`
 <!-- end extra content -->
 
@@ -379,21 +378,21 @@ Group Fluent UI and related package updates.
   "packageRules": [
     {
       "groupName": "Fluent UI React v9 packages",
-      "matchPackagePrefixes": ["@fluentui/"],
+      "matchPackageNames": ["@fluentui/*"],
       "matchCurrentVersion": ">=9.0.0-alpha.0"
     },
     {
       "groupName": "Fluent UI React v9 packages",
-      "matchPackagePrefixes": ["@griffel/"]
+      "matchPackageNames": ["@griffel/*"]
     },
     {
       "groupName": "Fluent UI React v8 packages",
-      "matchPackagePrefixes": ["@fluentui/"],
       "matchCurrentVersion": "/^[1234568]\\./",
-      "excludePackageNames": [
-        "@fluentui/eslint-plugin",
-        "@fluentui/react-conformance",
-        "@fluentui/react-teams"
+      "matchPackageNames": [
+        "@fluentui/*",
+        "!@fluentui/eslint-plugin",
+        "!@fluentui/react-conformance",
+        "!@fluentui/react-teams"
       ]
     },
     {
@@ -402,19 +401,18 @@ Group Fluent UI and related package updates.
     },
     {
       "groupName": "Fluent UI React Northstar packages",
-      "matchPackagePrefixes": ["@fluentui/"],
       "matchCurrentVersion": "0.x",
-      "excludePackageNames": [
-        "@fluentui/eslint-plugin",
-        "@fluentui/react-cards",
-        "@fluentui/react-conformance",
-        "@fluentui/public-docsite-setup"
+      "matchPackageNames": [
+        "@fluentui/*",
+        "!@fluentui/eslint-plugin",
+        "!@fluentui/react-cards",
+        "!@fluentui/react-conformance",
+        "!@fluentui/public-docsite-setup"
       ]
     },
     {
       "groupName": "Fabric packages",
-      "matchPackageNames": ["office-ui-fabric-react"],
-      "matchPackagePrefixes": ["@uifabric/"]
+      "matchPackageNames": ["office-ui-fabric-react", "@uifabric/*"]
     },
     {
       "groupName": "Fabric packages",
@@ -464,8 +462,7 @@ Group and schedule jest, ts-jest, jest types, and related packages.
     },
     {
       "groupName": "Jest packages",
-      "matchPackagePrefixes": ["@types/jest-", "jest-"],
-      "matchPackageNames": ["@types/jest", "ts-jest"],
+      "matchPackageNames": ["@types/jest", "ts-jest", "@types/jest-*", "jest-*"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]
     }
   ]
@@ -585,8 +582,7 @@ Group all Rollup-related updates.
   "packageRules": [
     {
       "groupName": "rollup packages",
-      "matchPackagePrefixes": ["@rollup"],
-      "matchPackagePatterns": ["^rollup"]
+      "matchPackageNames": ["/^@?rollup/"]
     }
   ]
 }
@@ -613,26 +609,27 @@ Group minor and patch updates to `@types` `devDependencies`.
       "groupName": "@types devDependencies",
       "schedule": ["before 5am on the 1st and 15th day of the month"],
       "matchManagers": ["npm"],
-      "matchPackagePrefixes": ["@types/"],
       "matchDepTypes": ["devDependencies"],
       "matchUpdateTypes": ["minor", "patch"],
       "matchCurrentVersion": ">1.0.0",
-      "excludePackagePrefixes": ["@types/d3-", "@types/jest-"],
-      "excludePackageNames": [
-        "@types/jest",
-        "@types/react",
-        "@types/react-dom",
-        "@types/react-is",
-        "@types/react-test-renderer",
-        "@types/scheduler",
-        "@types/yargs",
-        "@types/yargs-parser"
+      "matchPackageNames": [
+        "@types/*",
+        "!@types/d3-*",
+        "!@types/jest-*",
+        "!@types/jest",
+        "!@types/react",
+        "!@types/react-dom",
+        "!@types/react-is",
+        "!@types/react-test-renderer",
+        "!@types/scheduler",
+        "!@types/yargs",
+        "!@types/yargs-parser"
       ]
     },
     {
       "groupName": "@types devDependencies",
       "matchManagers": ["npm"],
-      "matchPackagePrefixes": ["@types/"],
+      "matchPackageNames": ["@types/*"],
       "matchDepTypes": ["devDependencies"],
       "matchUpdateTypes": ["patch"],
       "matchCurrentVersion": "0.x"
@@ -654,7 +651,7 @@ If you want to exclude a package from this group, add a new `packageRules` entry
 ```json
 {
   "groupName": "@types devDependencies",
-  "excludePackageNames": ["some-package"]
+  "matchPackageNames": ["!@types/some-package"]
 }
 ```
 
@@ -887,7 +884,7 @@ Update "noisy" (frequently-updating) packages once every other week.
 {
   "packageRules": [
     {
-      "matchPackagePrefixes": ["@microsoft/api-extractor"],
+      "matchPackageNames": ["@microsoft/api-extractor*"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]
     }
   ]
@@ -925,7 +922,7 @@ Auto-merge minor and patch updates to `devDependencies` and lock file maintenanc
       "automerge": true,
       "platformAutomerge": true,
       "internalChecksFilter": "strict",
-      "excludePackageNames": ["typescript"],
+      "matchPackageNames": ["!typescript"],
       "minimumReleaseAge": "2 days"
     }
   ]
@@ -954,11 +951,10 @@ Auto-merge minor and patch updates to `@types` `devDependencies` (if the build p
 {
   "packageRules": [
     {
-      "matchPackagePrefixes": ["@types/"],
+      "matchPackageNames": ["@types/*", "!@types/react", "!@types/react-dom"],
       "matchManagers": ["npm"],
       "matchDepTypes": ["devDependencies"],
       "matchUpdateTypes": ["minor", "patch"],
-      "excludePackageNames": ["@types/react", "@types/react-dom"],
       "automerge": true,
       "platformAutomerge": true
     }

diff --git a/automergeDevLock.json b/automergeDevLock.json
@@ -15,7 +15,7 @@
       "automerge": true,
       "platformAutomerge": true,
       "internalChecksFilter": "strict",
-      "excludePackageNames": ["typescript"],
+      "matchPackageNames": ["!typescript"],
       "minimumReleaseAge": "2 days"
     }
   ]

diff --git a/automergeTypes.json b/automergeTypes.json
@@ -5,11 +5,10 @@
 
   "packageRules": [
     {
-      "matchPackagePrefixes": ["@types/"],
+      "matchPackageNames": ["@types/*", "!@types/react", "!@types/react-dom"],
       "matchManagers": ["npm"],
       "matchDepTypes": ["devDependencies"],
       "matchUpdateTypes": ["minor", "patch"],
-      "excludePackageNames": ["@types/react", "@types/react-dom"],
       "automerge": true,
       "platformAutomerge": true
     }

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,63 @@
+// @ts-check
+import js from '@eslint/js';
+import prettierConfig from 'eslint-config-prettier';
+import globals from 'globals';
+
+/** @type {import('eslint').Linter.FlatConfig[]} */
+const config = [
+  js.configs.recommended,
+  prettierConfig,
+  {
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      globals: {
+        ...globals.es2021,
+        ...globals.node,
+      },
+    },
+    rules: {
+      // overrides
+      'no-unused-vars': ['error', { ignoreRestSiblings: true }],
+
+      // important
+      'no-shadow': 'error',
+
+      // possible errors
+      eqeqeq: 'error',
+      'no-constant-binary-expression': 'error',
+      'no-duplicate-imports': 'error',
+      'no-return-assign': 'error',
+      'no-sequences': 'error',
+
+      // preference/style
+      'no-else-return': 'error',
+      'no-return-await': 'error',
+      'no-var': 'error',
+      'require-await': 'error',
+      'spaced-comment': ['error', 'always'],
+
+      // not needed with typescript checking, copied from https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/eslint-recommended.ts
+      // (this repo currently doesn't use typescript-eslint)
+      'constructor-super': 'off', // ts(2335) & ts(2377)
+      'getter-return': 'off', // ts(2378)
+      'no-const-assign': 'off', // ts(2588)
+      'no-dupe-args': 'off', // ts(2300)
+      'no-dupe-class-members': 'off', // ts(2393) & ts(2300)
+      'no-dupe-keys': 'off', // ts(1117)
+      'no-func-assign': 'off', // ts(2539)
+      'no-import-assign': 'off', // ts(2539) & ts(2540)
+      'no-new-symbol': 'off', // ts(7009)
+      'no-obj-calls': 'off', // ts(2349)
+      'no-redeclare': 'off', // ts(2451)
+      'no-setter-return': 'off', // ts(2408)
+      'no-this-before-super': 'off', // ts(2376)
+      'no-undef': 'off', // ts(2304)
+      'no-unreachable': 'off', // ts(7027)
+      'no-unsafe-negation': 'off', // ts(2365) & ts(2360) & ts(2358)
+      'valid-typeof': 'off', // ts(2367)
+    },
+  },
+];
+
+export default config;
diff --git a/groupD3.json b/groupD3.json
@@ -6,7 +6,7 @@
   "packageRules": [
     {
       "groupName": "D3 packages",
-      "matchPackagePrefixes": ["d3-", "@types/d3-"]
+      "matchPackageNames": ["d3-*", "@types/d3-*"]
     }
   ]
 }
diff --git a/groupEslint.json b/groupEslint.json
@@ -6,8 +6,7 @@
   "packageRules": [
     {
       "groupName": "eslint packages",
-      "matchPackagePatterns": ["eslint"],
-      "excludePackagePrefixes": ["@typecript-eslint/"],
+      "matchPackageNames": ["/eslint/", "!@typecript-eslint/*"],
       "schedule": ["before 5am on the 8th and 22nd day of the month"]
     },
     {

diff --git a/groupFixtureUpdates.json b/groupFixtureUpdates.json
@@ -19,7 +19,7 @@
       "groupName": "fixture dependencies",
       "schedule": ["before 5am on the 1st and 15th day of the month"],
       "matchFileNames": ["**/__fixtures__/**"],
-      "matchPackagePatterns": ["*"],
+      "matchPackageNames": ["*"],
       "matchDepTypes": [
         "dependencies",
         "devDependencies",