Merge main into v2 [skip ci]

.prettierrc.json5

@@ -6,9 +6,11 @@
     {
       // format .json5 files as jsonc for VS Code support
       "files": ["*.json5"],
-      "options": {
-        "parser": "json"
-      }
+      "options": { "parser": "json", "trailingComma": "none" }
+    },
+    {
+      "files": "*.json",
+      "options": { "trailingComma": "none" }
     }
   ]
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # @microsoft/m365-renovate-config
 
+## 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
+
+### Minor Changes
+
+- [`30d65c3`](https://github.com/microsoft/m365-renovate-config/commit/30d65c339391f09e57a79937f03d91dd76a7516d) - Disable minorDependencyUpdates by default and set rangeStrategy to "replace" for all npm dependencies (Thanks [@ecraig12345](https://github.com/ecraig12345)!)
+
 ## 2.4.0
 
 [Compare source](https://github.com/microsoft/m365-renovate-config/compare/v2.3.1...v2.4.0) - December 28, 2023 at 12:38 PM PST

README.md

@@ -26,8 +26,8 @@ There are a few different ways to reference presets from this repo in your Renov
     "github>microsoft/m365-renovate-config:somePreset#v2.1.0",
 
     // Use a major version of a preset (see note below)
-    "github>microsoft/m365-renovate-config:somePreset#v2"
-  ]
+    "github>microsoft/m365-renovate-config:somePreset#v2",
+  ],
 }
 ```
 
@@ -786,7 +786,6 @@ Keep locally-used dependency versions updated and deduplicated.
 
 ```json
 {
-  "extends": ["github>microsoft/m365-renovate-config:minorDependencyUpdates#v2"],
   "lockFileMaintenance": {
     "enabled": true,
     "rebaseWhen": "behind-base-branch",
@@ -796,7 +795,6 @@ Keep locally-used dependency versions updated and deduplicated.
   "packageRules": [
     {
       "matchManagers": ["npm"],
-      "matchDepTypes": ["devDependencies"],
       "rangeStrategy": "replace"
     }
   ]
@@ -812,9 +810,11 @@ Keep locally-used dependency versions updated and deduplicated.
 - [`postUpdateOptions`](https://docs.renovatebot.com/configuration-options/#postupdateoptions):
   - `yarnDedupeFewer`: If using yarn, run `yarn-deduplicate --strategy fewer` after updates.
   - `npmDedupe`: If using npm, run `npm dedupe` after updates. WARNING: This may slow down Renovate runs significantly.
-- Extend [`<m365>:minorDependencyUpdates`](#minordependencyupdates) and set the [`rangeStrategy`](https://docs.renovatebot.com/configuration-options/#rangestrategy) for `npm` `devDependencies` to `replace` (see below for details).
+- ~~Extend [`<m365>:minorDependencyUpdates`](#minordependencyupdates) and set the [`rangeStrategy`](https://docs.renovatebot.com/configuration-options/#rangestrategy) for `npm` `devDependencies` to `replace` (see below for details).~~
+  - `minorDependencyUpdates` was removed from the default config due to causing problematic duplication for consumer.
+  - `rangeStrategy: "replace"` is now set for all `npm` dependencies.
 
-With `dependencies` and/or `devDependencies` specified as ranges (unpinned), by default Renovate will make individual lockfile-only update PRs for in-range updates. These PRs are redundant when `lockFileMaintenance` is also enabled, so the the `<m365>:minorDependencyUpdates` preset and the `packageRules` rule for `devDependencies` here help reduce unnecessary PRs.
+With `dependencies` and/or `devDependencies` specified as ranges (unpinned), by default Renovate will make individual lockfile-only update PRs for in-range updates. These PRs are redundant when `lockFileMaintenance` is also enabled, so setting `rangeStrategy` to `replace` will reduce unnecessary PRs.
 
 (To unpin your `devDependencies` that Renovate previously pinned, run `npx better-deps unpin-dev-deps`.)
 

keepFresh.json

@@ -3,8 +3,6 @@
 
   "description": "Keep locally-used dependency versions updated and deduplicated.",
 
-  "extends": ["github>microsoft/m365-renovate-config:minorDependencyUpdates#v2"],
-
   "lockFileMaintenance": {
     "enabled": true,
     "rebaseWhen": "behind-base-branch",
@@ -16,7 +14,6 @@
   "packageRules": [
     {
       "matchManagers": ["npm"],
-      "matchDepTypes": ["devDependencies"],
       "rangeStrategy": "replace"
     }
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/m365-renovate-config",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "private": true,
   "type": "module",
   "repository": {
@@ -33,7 +33,7 @@
     "jju": "^1.4.0",
     "node-fetch": "^3.3.1",
     "prettier": "^3.0.0",
-    "renovate": "37.110.0",
+    "renovate": "37.214.1",
     "typescript": "^5.0.3"
   }
 }